aboutsummaryrefslogtreecommitdiff
path: root/terminal.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2023-06-27 14:57:33 +0000
committerDaniel Eklöf <daniel@ekloef.se>2023-07-03 12:36:32 +0000
commitee794a121e4603d01fb662ad6d1f3b18b6937d2c (patch)
tree704298b5e68dece52429d14237d6a857764cbbdb /terminal.c
parentwayland: handle enum value XDG_TOPLEVEL_STATE_SUSPENDED (diff)
refactor: track current xcursor using an enum, instead of a char pointer
Diffstat (limited to 'terminal.c')
-rw-r--r--terminal.c34
1 files changed, 10 insertions, 24 deletions
diff --git a/terminal.c b/terminal.c
index df77d2b9..3591040b 100644
--- a/terminal.c
+++ b/terminal.c
@@ -47,20 +47,6 @@
#define PTMX_TIMING 0
-const char *const XCURSOR_HIDDEN = "hidden";
-const char *const XCURSOR_LEFT_PTR = "left_ptr";
-const char *const XCURSOR_TEXT = "text";
-const char *const XCURSOR_TEXT_FALLBACK = "xterm";
-//const char *const XCURSOR_HAND2 = "hand2";
-const char *const XCURSOR_TOP_LEFT_CORNER = "top_left_corner";
-const char *const XCURSOR_TOP_RIGHT_CORNER = "top_right_corner";
-const char *const XCURSOR_BOTTOM_LEFT_CORNER = "bottom_left_corner";
-const char *const XCURSOR_BOTTOM_RIGHT_CORNER = "bottom_right_corner";
-const char *const XCURSOR_LEFT_SIDE = "left_side";
-const char *const XCURSOR_RIGHT_SIDE = "right_side";
-const char *const XCURSOR_TOP_SIDE = "top_side";
-const char *const XCURSOR_BOTTOM_SIDE = "bottom_side";
-
static void
enqueue_data_for_slave(const void *data, size_t len, size_t offset,
ptmx_buffer_list_t *buffer_list)
@@ -3137,44 +3123,44 @@ term_mouse_motion(struct terminal *term, int button, int row, int col,
void
term_xcursor_update_for_seat(struct terminal *term, struct seat *seat)
{
- const char *xcursor = NULL;
+ enum cursor_shape shape = CURSOR_SHAPE_NONE;
switch (term->active_surface) {
case TERM_SURF_GRID: {
bool have_custom_cursor =
render_xcursor_is_valid(seat, term->mouse_user_cursor);
- xcursor = seat->pointer.hidden ? XCURSOR_HIDDEN
- : have_custom_cursor ? term->mouse_user_cursor
- : term->is_searching ? XCURSOR_LEFT_PTR
+ shape = seat->pointer.hidden ? CURSOR_SHAPE_HIDDEN
+ : have_custom_cursor ? CURSOR_SHAPE_CUSTOM //term->mouse_user_cursor
+ : term->is_searching ? CURSOR_SHAPE_LEFT_PTR
: (seat->mouse.col >= 0 &&
seat->mouse.row >= 0 &&
- term_mouse_grabbed(term, seat)) ? XCURSOR_TEXT
- : XCURSOR_LEFT_PTR;
+ term_mouse_grabbed(term, seat)) ? CURSOR_SHAPE_TEXT
+ : CURSOR_SHAPE_LEFT_PTR;
break;
}
case TERM_SURF_TITLE:
case TERM_SURF_BUTTON_MINIMIZE:
case TERM_SURF_BUTTON_MAXIMIZE:
case TERM_SURF_BUTTON_CLOSE:
- xcursor = XCURSOR_LEFT_PTR;
+ shape = CURSOR_SHAPE_LEFT_PTR;
break;
case TERM_SURF_BORDER_LEFT:
case TERM_SURF_BORDER_RIGHT:
case TERM_SURF_BORDER_TOP:
case TERM_SURF_BORDER_BOTTOM:
- xcursor = xcursor_for_csd_border(term, seat->mouse.x, seat->mouse.y);
+ shape = xcursor_for_csd_border(term, seat->mouse.x, seat->mouse.y);
break;
case TERM_SURF_NONE:
return;
}
- if (xcursor == NULL)
+ if (shape == CURSOR_SHAPE_NONE)
BUG("xcursor not set");
- render_xcursor_set(seat, term, xcursor);
+ render_xcursor_set(seat, term, shape);
}
void