refactor start_backend_and_socket into oo

Author: collinalexbell

include/wayland/wlr_compositor.h

@@ -116,6 +116,7 @@ struct WlrServer {
   bool create_seat();
   bool init_protocols();
   void register_listeners();
+  bool start_backend_and_socket();
   wl_display* display = nullptr;
   wlr_backend* backend = nullptr;
   wlr_renderer* renderer = nullptr;
@@ -174,6 +175,5 @@ void log_env();
 void initialize_wlr_logging();
 
 void apply_backend_env_defaults();
-bool start_backend_and_socket(WlrServer& server);
 void install_sigint_handler();
 void teardown_server(WlrServer& server);

src/main.cpp

@@ -22,7 +22,7 @@ int main(int argc, char** argv, char** envp) {
 
   server.register_listeners();
 
-  if(!start_backend_and_socket(server)) { return EXIT_FAILURE; }
+  if(!server.start_backend_and_socket()) { return EXIT_FAILURE; }
 
   wl_display_run(server.display);
 

src/wayland/wlr_compositor.cpp

@@ -2484,13 +2484,13 @@ WlrServer::register_listeners()
 }
 
 bool
-start_backend_and_socket(WlrServer& server)
+WlrServer::start_backend_and_socket()
 {
-  if (!wlr_backend_start(server.backend)) {
+  if (!wlr_backend_start(backend)) {
     std::fprintf(stderr, "Failed to start wlroots backend\n");
     return false;
   }
-  const char* socket = wl_display_add_socket_auto(server.display);
+  const char* socket = wl_display_add_socket_auto(display);
   if (!socket) {
     std::fprintf(stderr, "Failed to create Wayland socket\n");
     return false;