s/cursor_mode/input_mode/

diff --git a/include/labwc.h b/include/labwc.h
index a28e14e98793de9fa4c7d6399cf3ee84aa639544..de0736c1b5482f08d7327404016ef83b62743920 100644 (file)
--- a/include/labwc.h
+++ b/include/labwc.h
@@ -37,10 +37,10 @@
 #define XCURSOR_SIZE 24
 #define XCURSOR_MOVE "grabbing"
 
-enum cursor_mode {
-       LAB_CURSOR_PASSTHROUGH = 0,
-       LAB_CURSOR_MOVE,
-       LAB_CURSOR_RESIZE,
+enum input_mode {
+       LAB_INPUT_STATE_PASSTHROUGH = 0,
+       LAB_INPUT_STATE_MOVE,
+       LAB_INPUT_STATE_RESIZE,
        LAB_INPUT_STATE_MENU,
 };
 
@@ -95,7 +95,7 @@ struct server {
        struct seat seat;
 
        /* cursor interactive */
-       enum cursor_mode cursor_mode;
+       enum input_mode input_mode;
        struct view *grabbed_view;
        double grab_x, grab_y;
        struct wlr_box grab_box;
@@ -245,7 +245,7 @@ void seat_init(struct server *server);
 void seat_finish(struct server *server);
 void seat_focus_surface(struct seat *seat, struct wlr_surface *surface);
 
-void interactive_begin(struct view *view, enum cursor_mode mode,
+void interactive_begin(struct view *view, enum input_mode mode,
                       uint32_t edges);
 
 void output_init(struct server *server);

diff --git a/src/cursor.c b/src/cursor.c
index a7e555d8aabdb53318c0f1aa922729eab7a9505e..67d3d1b88ee3309a7b02f2c257bf8208e490a392 100644 (file)
--- a/src/cursor.c
+++ b/src/cursor.c
@@ -103,13 +103,13 @@ static void
 process_cursor_motion(struct server *server, uint32_t time)
 {
        /* If the mode is non-passthrough, delegate to those functions. */
-       if (server->cursor_mode == LAB_CURSOR_MOVE) {
+       if (server->input_mode == LAB_INPUT_STATE_MOVE) {
                process_cursor_move(server, time);
                return;
-       } else if (server->cursor_mode == LAB_CURSOR_RESIZE) {
+       } else if (server->input_mode == LAB_INPUT_STATE_RESIZE) {
                process_cursor_resize(server, time);
                return;
-       } else if (server->cursor_mode == LAB_INPUT_STATE_MENU) {
+       } else if (server->input_mode == LAB_INPUT_STATE_MENU) {
                menu_set_selected(server->rootmenu,
                        server->seat.cursor->x, server->seat.cursor->y);
                return;
@@ -250,24 +250,24 @@ cursor_button(struct wl_listener *listener, void *data)
 
        /* handle _release_ */
        if (event->state == WLR_BUTTON_RELEASED) {
-               if (server->cursor_mode == LAB_INPUT_STATE_MENU) {
+               if (server->input_mode == LAB_INPUT_STATE_MENU) {
                        return;
                }
                /* Exit interactive move/resize/menu mode. */
-               server->cursor_mode = LAB_CURSOR_PASSTHROUGH;
+               server->input_mode = LAB_INPUT_STATE_PASSTHROUGH;
                return;
        }
 
-       if (server->cursor_mode == LAB_INPUT_STATE_MENU) {
+       if (server->input_mode == LAB_INPUT_STATE_MENU) {
                menu_action_selected(server, server->rootmenu);
-               server->cursor_mode = LAB_CURSOR_PASSTHROUGH;
+               server->input_mode = LAB_INPUT_STATE_PASSTHROUGH;
                return;
        }
 
        /* handle _press_ on desktop */
        if (!view) {
                /* launch root-menu */
-               server->cursor_mode = LAB_INPUT_STATE_MENU;
+               server->input_mode = LAB_INPUT_STATE_MENU;
                menu_move(server->rootmenu, server->seat.cursor->x,
                        server->seat.cursor->y);
                return;
@@ -284,22 +284,22 @@ cursor_button(struct wl_listener *listener, void *data)
                view_minimize(view);
                break;
        case LAB_DECO_PART_TITLE:
-               interactive_begin(view, LAB_CURSOR_MOVE, 0);
+               interactive_begin(view, LAB_INPUT_STATE_MOVE, 0);
                break;
        case LAB_DECO_PART_TOP:
-               interactive_begin(view, LAB_CURSOR_RESIZE,
+               interactive_begin(view, LAB_INPUT_STATE_RESIZE,
                                  WLR_EDGE_TOP);
                break;
        case LAB_DECO_PART_RIGHT:
-               interactive_begin(view, LAB_CURSOR_RESIZE,
+               interactive_begin(view, LAB_INPUT_STATE_RESIZE,
                                  WLR_EDGE_RIGHT);
                break;
        case LAB_DECO_PART_BOTTOM:
-               interactive_begin(view, LAB_CURSOR_RESIZE,
+               interactive_begin(view, LAB_INPUT_STATE_RESIZE,
                                  WLR_EDGE_BOTTOM);
                break;
        case LAB_DECO_PART_LEFT:
-               interactive_begin(view, LAB_CURSOR_RESIZE,
+               interactive_begin(view, LAB_INPUT_STATE_RESIZE,
                                  WLR_EDGE_LEFT);
                break;
        }

diff --git a/src/interactive.c b/src/interactive.c
index 77198e985c647e99a24211917378fd9960f96605..dbe0292f4f41a5b79aebb1d00726879977d81820 100644 (file)
--- a/src/interactive.c
+++ b/src/interactive.c
@@ -1,7 +1,7 @@
 #include "labwc.h"
 
 void
-interactive_begin(struct view *view, enum cursor_mode mode, uint32_t edges)
+interactive_begin(struct view *view, enum input_mode mode, uint32_t edges)
 {
        /*
         * This function sets up an interactive move or resize operation, where
@@ -11,7 +11,7 @@ interactive_begin(struct view *view, enum cursor_mode mode, uint32_t edges)
        struct seat *seat = &view->server->seat;
        struct server *server = view->server;
        server->grabbed_view = view;
-       server->cursor_mode = mode;
+       server->input_mode = mode;
 
        /* Remember view and cursor positions at start of move/resize */
        server->grab_x = seat->cursor->x;

diff --git a/src/output.c b/src/output.c
index 97d0d5a6f5ac3052913bf1315a65216ed9b86519..01d1d8d7c1725521ca22fa9804631e48d0a7f376 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -362,7 +362,7 @@ output_frame_notify(struct wl_listener *listener, void *data)
        render_layer(&now, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP]);
        render_layer(&now, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY]);
 
-       if (output->server->cursor_mode == LAB_INPUT_STATE_MENU) {
+       if (output->server->input_mode == LAB_INPUT_STATE_MENU) {
                render_rootmenu(output);
        }
 

diff --git a/src/xdg.c b/src/xdg.c
index 265dff56aa4f75c9ca09e2a321a314462aa3bccd..c95c8055074273401596bc9fc353bb6f90282368 100644 (file)
--- a/src/xdg.c
+++ b/src/xdg.c
@@ -112,7 +112,7 @@ handle_request_move(struct wl_listener *listener, void *data)
         * client, to prevent the client from requesting this whenever they
         * want. */
        struct view *view = wl_container_of(listener, view, request_move);
-       interactive_begin(view, LAB_CURSOR_MOVE, 0);
+       interactive_begin(view, LAB_INPUT_STATE_MOVE, 0);
 }
 
 static void
@@ -127,7 +127,7 @@ handle_request_resize(struct wl_listener *listener, void *data)
         * want. */
        struct wlr_xdg_toplevel_resize_event *event = data;
        struct view *view = wl_container_of(listener, view, request_resize);
-       interactive_begin(view, LAB_CURSOR_RESIZE, event->edges);
+       interactive_begin(view, LAB_INPUT_STATE_RESIZE, event->edges);
 }
 
 static void