use the NONE cursor when not specifying a cursor
Dana Jansens danakj@orodu.net
3 files changed,
16 insertions(+),
15 deletions(-)
M
openbox/action.c
→
openbox/action.c
@@ -926,9 +926,9 @@ void action_move_relative_horz(union ActionData *data)
{ ObClient *c = data->relative.any.c; if (c) { - grab_pointer(TRUE, None); + grab_pointer(TRUE, OB_CURSOR_NONE); client_move(c, c->area.x + data->relative.delta, c->area.y); - grab_pointer(FALSE, None); + grab_pointer(FALSE, OB_CURSOR_NONE); } }@@ -936,9 +936,9 @@ void action_move_relative_vert(union ActionData *data)
{ ObClient *c = data->relative.any.c; if (c) { - grab_pointer(TRUE, None); + grab_pointer(TRUE, OB_CURSOR_NONE); client_move(c, c->area.x, c->area.y + data->relative.delta); - grab_pointer(FALSE, None); + grab_pointer(FALSE, OB_CURSOR_NONE); } }@@ -946,11 +946,11 @@ void action_resize_relative_horz(union ActionData *data)
{ ObClient *c = data->relative.any.c; if (c) { - grab_pointer(TRUE, None); + grab_pointer(TRUE, OB_CURSOR_NONE); client_resize(c, c->area.width + data->relative.delta * c->size_inc.width, c->area.height); - grab_pointer(FALSE, None); + grab_pointer(FALSE, OB_CURSOR_NONE); } }@@ -958,10 +958,10 @@ void action_resize_relative_vert(union ActionData *data)
{ ObClient *c = data->relative.any.c; if (c && !c->shaded) { - grab_pointer(TRUE, None); + grab_pointer(TRUE, OB_CURSOR_NONE); client_resize(c, c->area.width, c->area.height + data->relative.delta * c->size_inc.height); - grab_pointer(FALSE, None); + grab_pointer(FALSE, OB_CURSOR_NONE); } }@@ -1166,9 +1166,9 @@ default:
g_assert_not_reached(); } frame_frame_gravity(c->frame, &x, &y); - grab_pointer(TRUE, None); + grab_pointer(TRUE, OB_CURSOR_NONE); client_move(c, x, y); - grab_pointer(FALSE, None); + grab_pointer(FALSE, OB_CURSOR_NONE); }@@ -1231,9 +1231,9 @@ }
frame_frame_gravity(c->frame, &x, &y); width -= c->frame->size.left + c->frame->size.right; height -= c->frame->size.top + c->frame->size.bottom; - grab_pointer(TRUE, None); + grab_pointer(TRUE, OB_CURSOR_NONE); client_move_resize(c, x, y, width, height); - grab_pointer(FALSE, None); + grab_pointer(FALSE, OB_CURSOR_NONE); } void action_send_to_layer(union ActionData *data)
M
openbox/keyboard.c
→
openbox/keyboard.c
@@ -136,7 +136,7 @@
if (!interactive_states) { if (!grab_keyboard(TRUE)) return; - if (!grab_pointer(TRUE, None)) { + if (!grab_pointer(TRUE, OB_CURSOR_NONE)) { grab_keyboard(FALSE); return; }@@ -187,7 +187,7 @@
s->action->func(&s->action->data); grab_keyboard(FALSE); - grab_pointer(FALSE, None); + grab_pointer(FALSE, OB_CURSOR_NONE); keyboard_reset_chains(); g_free(s);
M
openbox/mouse.c
→
openbox/mouse.c
@@ -53,7 +53,8 @@ manufactured in event() */
} else continue; if (grab) - grab_button_full(b->button, b->state, win, mask, mode, None); + grab_button_full(b->button, b->state, win, mask, mode, + OB_CURSOR_NONE); else ungrab_button(b->button, b->state, win); }