set the cursor before using it
Dana Jansens danakj@orodu.net
1 files changed,
25 insertions(+),
25 deletions(-)
jump to
M
openbox/moveresize.c
→
openbox/moveresize.c
@@ -162,6 +162,31 @@ (c->functions & OB_CLIENT_FUNC_MOVE) :
(c->functions & OB_CLIENT_FUNC_RESIZE))) return; + if (corner == prop_atoms.net_wm_moveresize_size_topleft) + cur = OB_CURSOR_NORTHWEST; + else if (corner == prop_atoms.net_wm_moveresize_size_top) + cur = OB_CURSOR_NORTH; + else if (corner == prop_atoms.net_wm_moveresize_size_topright) + cur = OB_CURSOR_NORTHEAST; + else if (corner == prop_atoms.net_wm_moveresize_size_right) + cur = OB_CURSOR_EAST; + else if (corner == prop_atoms.net_wm_moveresize_size_bottomright) + cur = OB_CURSOR_SOUTHEAST; + else if (corner == prop_atoms.net_wm_moveresize_size_bottom) + cur = OB_CURSOR_SOUTH; + else if (corner == prop_atoms.net_wm_moveresize_size_bottomleft) + cur = OB_CURSOR_SOUTHWEST; + else if (corner == prop_atoms.net_wm_moveresize_size_left) + cur = OB_CURSOR_WEST; + else if (corner == prop_atoms.net_wm_moveresize_size_keyboard) + cur = OB_CURSOR_SOUTHEAST; + else if (corner == prop_atoms.net_wm_moveresize_move) + cur = OB_CURSOR_MOVE; + else if (corner == prop_atoms.net_wm_moveresize_move_keyboard) + cur = OB_CURSOR_MOVE; + else + g_assert_not_reached(); + if (!grab_pointer(TRUE, FALSE, cur)) return; if (!grab_keyboard(TRUE)) {@@ -203,31 +228,6 @@ cur_y = start_ch;
} moveresize_in_progress = TRUE; - - if (corner == prop_atoms.net_wm_moveresize_size_topleft) - cur = OB_CURSOR_NORTHWEST; - else if (corner == prop_atoms.net_wm_moveresize_size_top) - cur = OB_CURSOR_NORTH; - else if (corner == prop_atoms.net_wm_moveresize_size_topright) - cur = OB_CURSOR_NORTHEAST; - else if (corner == prop_atoms.net_wm_moveresize_size_right) - cur = OB_CURSOR_EAST; - else if (corner == prop_atoms.net_wm_moveresize_size_bottomright) - cur = OB_CURSOR_SOUTHEAST; - else if (corner == prop_atoms.net_wm_moveresize_size_bottom) - cur = OB_CURSOR_SOUTH; - else if (corner == prop_atoms.net_wm_moveresize_size_bottomleft) - cur = OB_CURSOR_SOUTHWEST; - else if (corner == prop_atoms.net_wm_moveresize_size_left) - cur = OB_CURSOR_WEST; - else if (corner == prop_atoms.net_wm_moveresize_size_keyboard) - cur = OB_CURSOR_SOUTHEAST; - else if (corner == prop_atoms.net_wm_moveresize_move) - cur = OB_CURSOR_MOVE; - else if (corner == prop_atoms.net_wm_moveresize_move_keyboard) - cur = OB_CURSOR_MOVE; - else - g_assert_not_reached(); #ifdef SYNC if (config_resize_redraw && !moving && extensions_shape &&