Rename some {cursor,keyboard}_ functions

diff --git a/include/labwc.h b/include/labwc.h
index 89c6366dbfd99f09d487ce1d35d03498c239ecac..21f8d7c82f184801f370e04103bf6099d697412b 100644 (file)
--- a/include/labwc.h
+++ b/include/labwc.h
@@ -167,14 +167,15 @@ void interactive_begin(struct view *view, enum cursor_mode mode,
 void server_new_input(struct wl_listener *listener, void *data);
 void seat_request_cursor(struct wl_listener *listener, void *data);
 void seat_request_set_selection(struct wl_listener *listener, void *data);
-void server_cursor_motion(struct wl_listener *listener, void *data);
-void server_cursor_motion_absolute(struct wl_listener *listener, void *data);
-void server_cursor_button(struct wl_listener *listener, void *data);
-void server_cursor_axis(struct wl_listener *listener, void *data);
-void server_cursor_frame(struct wl_listener *listener, void *data);
 void server_new_output(struct wl_listener *listener, void *data);
 
-void server_new_keyboard(struct server *server, struct wlr_input_device *device);
+void cursor_motion(struct wl_listener *listener, void *data);
+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 keyboard_new(struct server *server, struct wlr_input_device *device);
 
 void output_frame(struct wl_listener *listener, void *data);
 

diff --git a/src/cursor.c b/src/cursor.c
index b0b29d4fba44b9a0cd82085af4d91274b6937c0c..bfd5e75848a4c78cac5ae52f40ec48f0d2765c12 100644 (file)
--- a/src/cursor.c
+++ b/src/cursor.c
@@ -117,7 +117,7 @@ static void process_cursor_motion(struct server *server, uint32_t time)
        }
 }
 
-void server_cursor_motion(struct wl_listener *listener, void *data)
+void cursor_motion(struct wl_listener *listener, void *data)
 {
        /*
         * This event is forwarded by the cursor when a pointer emits a
@@ -139,7 +139,7 @@ void server_cursor_motion(struct wl_listener *listener, void *data)
        process_cursor_motion(server, event->time_msec);
 }
 
-void server_cursor_motion_absolute(struct wl_listener *listener, void *data)
+void cursor_motion_absolute(struct wl_listener *listener, void *data)
 {
        /*
         * This event is forwarded by the cursor when a pointer emits an
@@ -157,7 +157,7 @@ void server_cursor_motion_absolute(struct wl_listener *listener, void *data)
        process_cursor_motion(server, event->time_msec);
 }
 
-void server_cursor_button(struct wl_listener *listener, void *data)
+void cursor_button(struct wl_listener *listener, void *data)
 {
        /*
         * This event is forwarded by the cursor when a pointer emits a button
@@ -197,7 +197,7 @@ void server_cursor_button(struct wl_listener *listener, void *data)
        }
 }
 
-void server_cursor_axis(struct wl_listener *listener, void *data)
+void cursor_axis(struct wl_listener *listener, void *data)
 {
        /*
         * This event is forwarded by the cursor when a pointer emits an axis
@@ -212,7 +212,7 @@ void server_cursor_axis(struct wl_listener *listener, void *data)
                                     event->delta_discrete, event->source);
 }
 
-void server_cursor_frame(struct wl_listener *listener, void *data)
+void cursor_frame(struct wl_listener *listener, void *data)
 {
        /*
         * This event is forwarded by the cursor when a pointer emits an frame

diff --git a/src/keyboard.c b/src/keyboard.c
index 2412492e4b609770fce2c03a1305aba5fed8cb87..e8fb4bd98ee741280b6cfa1d9885f381e1e163a2 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -106,7 +106,7 @@ static void keyboard_handle_key(struct wl_listener *listener, void *data)
        }
 }
 
-void server_new_keyboard(struct server *server, struct wlr_input_device *device)
+void keyboard_new(struct server *server, struct wlr_input_device *device)
 {
        struct keyboard *keyboard = calloc(1, sizeof(struct keyboard));
        keyboard->server = server;

diff --git a/src/main.c b/src/main.c
index 692684c151b3a60e97b78d873b9c01136c89672f..2e259951d3a4b013f42104929e2fa3cbe5e4e162 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -140,16 +140,16 @@ int main(int argc, char *argv[])
        //      return 1;
        //}
 
-       server.cursor_motion.notify = server_cursor_motion;
+       server.cursor_motion.notify = cursor_motion;
        wl_signal_add(&server.cursor->events.motion, &server.cursor_motion);
-       server.cursor_motion_absolute.notify = server_cursor_motion_absolute;
+       server.cursor_motion_absolute.notify = cursor_motion_absolute;
        wl_signal_add(&server.cursor->events.motion_absolute,
                      &server.cursor_motion_absolute);
-       server.cursor_button.notify = server_cursor_button;
+       server.cursor_button.notify = cursor_button;
        wl_signal_add(&server.cursor->events.button, &server.cursor_button);
-       server.cursor_axis.notify = server_cursor_axis;
+       server.cursor_axis.notify = cursor_axis;
        wl_signal_add(&server.cursor->events.axis, &server.cursor_axis);
-       server.cursor_frame.notify = server_cursor_frame;
+       server.cursor_frame.notify = cursor_frame;
        wl_signal_add(&server.cursor->events.frame, &server.cursor_frame);
 
        wl_list_init(&server.keyboards);

diff --git a/src/server.c b/src/server.c
index d32ac1b410c5d898eba6838a9febdafc333a746e..0bb5ed999e873b287d7186ea401617a29d5635aa 100644 (file)
--- a/src/server.c
+++ b/src/server.c
@@ -17,7 +17,7 @@ void server_new_input(struct wl_listener *listener, void *data)
        struct wlr_input_device *device = data;
        switch (device->type) {
        case WLR_INPUT_DEVICE_KEYBOARD:
-               server_new_keyboard(server, device);
+               keyboard_new(server, device);
                break;
        case WLR_INPUT_DEVICE_POINTER:
                server_new_pointer(server, device);