Move server_new_output() to output.c

diff --git a/include/labwc.h b/include/labwc.h
index 21f8d7c82f184801f370e04103bf6099d697412b..cb806b0cf62777e047223aaef7b70d93fdea7f3d 100644 (file)
--- a/include/labwc.h
+++ b/include/labwc.h
@@ -174,10 +174,12 @@ void cursor_motion_absolute(struct wl_listener *listener, void *data);
 void cursor_button(struct wl_listener *listener, void *data);
 void cursor_axis(struct wl_listener *listener, void *data);
 void cursor_frame(struct wl_listener *listener, void *data);
+void cursor_new(struct server *server, struct wlr_input_device *device);
 
 void keyboard_new(struct server *server, struct wlr_input_device *device);
 
 void output_frame(struct wl_listener *listener, void *data);
+void output_new(struct wl_listener *listener, void *data);
 
 void dbg_show_one_view(struct view *view);
 void dbg_show_views(struct server *server);

diff --git a/src/cursor.c b/src/cursor.c
index bfd5e75848a4c78cac5ae52f40ec48f0d2765c12..e26b535777b68e98f846f601c5ddf5222c4455ae 100644 (file)
--- a/src/cursor.c
+++ b/src/cursor.c
@@ -225,3 +225,9 @@ void cursor_frame(struct wl_listener *listener, void *data)
        /* Notify the client with pointer focus of the frame event. */
        wlr_seat_pointer_notify_frame(server->seat);
 }
+
+void cursor_new(struct server *server, struct wlr_input_device *device)
+{
+       /* TODO: Configure libinput on device to set tap, acceleration, etc */
+       wlr_cursor_attach_input_device(server->cursor, device);
+}

diff --git a/src/main.c b/src/main.c
index 2e259951d3a4b013f42104929e2fa3cbe5e4e162..ecac877afc7a24a65dc25717c2796129125c494a 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -110,7 +110,7 @@ int main(int argc, char *argv[])
         * Configure a listener to be notified when new outputs are available
         * on the backend.
         */
-       server.new_output.notify = server_new_output;
+       server.new_output.notify = output_new;
        wl_signal_add(&server.backend->events.new_output, &server.new_output);
 
        /*

diff --git a/src/output.c b/src/output.c
index 60bc22ae2116f593cce45ad9a76d3a4a5b5f8e33..633aa4996075a0ad048cb9cc692e6601b98dd6ff 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -184,3 +184,48 @@ void output_frame(struct wl_listener *listener, void *data)
        wlr_renderer_end(renderer);
        wlr_output_commit(output->wlr_output);
 }
+
+void output_new(struct wl_listener *listener, void *data)
+{
+       /* This event is rasied by the backend when a new output (aka a display
+        * or monitor) becomes available. */
+       struct server *server = wl_container_of(listener, server, new_output);
+       struct wlr_output *wlr_output = data;
+
+       /*
+        * Some backends don't have modes. DRM+KMS does, and we need to set a
+        * mode before we can use the output. The mode is a tuple of (width,
+        * height, refresh rate), and each monitor supports only a specific set
+        * of modes. We just pick the monitor's preferred mode.
+        * TODO: support user configuration
+        */
+       if (!wl_list_empty(&wlr_output->modes)) {
+               struct wlr_output_mode *mode =
+                       wlr_output_preferred_mode(wlr_output);
+               wlr_output_set_mode(wlr_output, mode);
+               wlr_output_enable(wlr_output, true);
+               if (!wlr_output_commit(wlr_output)) {
+                       return;
+               }
+       }
+
+       /* Allocates and configures our state for this output */
+       struct output *output = calloc(1, sizeof(struct output));
+       output->wlr_output = wlr_output;
+       output->server = server;
+       /* Sets up a listener for the frame notify event. */
+       output->frame.notify = output_frame;
+       wl_signal_add(&wlr_output->events.frame, &output->frame);
+       wl_list_insert(&server->outputs, &output->link);
+
+       /* Adds this to the output layout. The add_auto function arranges
+        * outputs from left-to-right in the order they appear. A more
+        * sophisticated compositor would let the user configure the arrangement
+        * of outputs in the layout.
+        *
+        * The output layout utility automatically adds a wl_output global to
+        * the display, which Wayland clients can see to find out information
+        * about the output (such as DPI, scale factor, manufacturer, etc).
+        */
+       wlr_output_layout_add_auto(server->output_layout, wlr_output);
+}

diff --git a/src/server.c b/src/server.c
index 0bb5ed999e873b287d7186ea401617a29d5635aa..254d8971db9379a22998d1b4ae0af3885500d8ba 100644 (file)
--- a/src/server.c
+++ b/src/server.c
@@ -1,12 +1,5 @@
 #include "labwc.h"
 
-static void server_new_pointer(struct server *server,
-                              struct wlr_input_device *device)
-{
-       /* TODO: Configure libinput on device to set tap, acceleration, etc */
-       wlr_cursor_attach_input_device(server->cursor, device);
-}
-
 void server_new_input(struct wl_listener *listener, void *data)
 {
        /*
@@ -20,7 +13,7 @@ void server_new_input(struct wl_listener *listener, void *data)
                keyboard_new(server, device);
                break;
        case WLR_INPUT_DEVICE_POINTER:
-               server_new_pointer(server, device);
+               cursor_new(server, device);
                break;
        default:
                break;
@@ -68,48 +61,3 @@ void seat_request_set_selection(struct wl_listener *listener, void *data)
        struct wlr_seat_request_set_selection_event *event = data;
        wlr_seat_set_selection(server->seat, event->source, event->serial);
 }
-
-void server_new_output(struct wl_listener *listener, void *data)
-{
-       /* This event is rasied by the backend when a new output (aka a display
-        * or monitor) becomes available. */
-       struct server *server = wl_container_of(listener, server, new_output);
-       struct wlr_output *wlr_output = data;
-
-       /*
-        * Some backends don't have modes. DRM+KMS does, and we need to set a
-        * mode before we can use the output. The mode is a tuple of (width,
-        * height, refresh rate), and each monitor supports only a specific set
-        * of modes. We just pick the monitor's preferred mode.
-        * TODO: support user configuration
-        */
-       if (!wl_list_empty(&wlr_output->modes)) {
-               struct wlr_output_mode *mode =
-                       wlr_output_preferred_mode(wlr_output);
-               wlr_output_set_mode(wlr_output, mode);
-               wlr_output_enable(wlr_output, true);
-               if (!wlr_output_commit(wlr_output)) {
-                       return;
-               }
-       }
-
-       /* Allocates and configures our state for this output */
-       struct output *output = calloc(1, sizeof(struct output));
-       output->wlr_output = wlr_output;
-       output->server = server;
-       /* Sets up a listener for the frame notify event. */
-       output->frame.notify = output_frame;
-       wl_signal_add(&wlr_output->events.frame, &output->frame);
-       wl_list_insert(&server->outputs, &output->link);
-
-       /* Adds this to the output layout. The add_auto function arranges
-        * outputs from left-to-right in the order they appear. A more
-        * sophisticated compositor would let the user configure the arrangement
-        * of outputs in the layout.
-        *
-        * The output layout utility automatically adds a wl_output global to
-        * the display, which Wayland clients can see to find out information
-        * about the output (such as DPI, scale factor, manufacturer, etc).
-        */
-       wlr_output_layout_add_auto(server->output_layout, wlr_output);
-}