add support for _NET_WM_MOVERESIZE_CANCEL.

* src/core/window.c: add support for _NET_WM_MOVERESIZE_CANCEL.


svn path=/trunk/; revision=4088
This commit is contained in:
Thomas James Alexander Thurman 2009-01-25 22:59:50 +00:00
parent bb5c0d0c34
commit 35d9d2864f
2 changed files with 13 additions and 1 deletions

View File

@ -1,3 +1,7 @@
2009-01-25 Elijah Newren <newren gmail com>
* src/core/window.c: add support for _NET_WM_MOVERESIZE_CANCEL.
2009-01-10 Thomas Thurman <tthurman@gnome.org> 2009-01-10 Thomas Thurman <tthurman@gnome.org>
* src/ui/theme.[ch]: add meta_theme_draw_frame_by_name, which * src/ui/theme.[ch]: add meta_theme_draw_frame_by_name, which

View File

@ -4762,6 +4762,7 @@ meta_window_property_notify (MetaWindow *window,
#define _NET_WM_MOVERESIZE_MOVE 8 #define _NET_WM_MOVERESIZE_MOVE 8
#define _NET_WM_MOVERESIZE_SIZE_KEYBOARD 9 #define _NET_WM_MOVERESIZE_SIZE_KEYBOARD 9
#define _NET_WM_MOVERESIZE_MOVE_KEYBOARD 10 #define _NET_WM_MOVERESIZE_MOVE_KEYBOARD 10
#define _NET_WM_MOVERESIZE_CANCEL 11
gboolean gboolean
meta_window_client_message (MetaWindow *window, meta_window_client_message (MetaWindow *window,
@ -5094,11 +5095,18 @@ meta_window_client_message (MetaWindow *window,
case _NET_WM_MOVERESIZE_MOVE_KEYBOARD: case _NET_WM_MOVERESIZE_MOVE_KEYBOARD:
op = META_GRAB_OP_KEYBOARD_MOVING; op = META_GRAB_OP_KEYBOARD_MOVING;
break; break;
case _NET_WM_MOVERESIZE_CANCEL:
/* handled below */
break;
default: default:
break; break;
} }
if (op != META_GRAB_OP_NONE && if (action == _NET_WM_MOVERESIZE_CANCEL)
{
meta_display_end_grab_op (window->display, timestamp);
}
else if (op != META_GRAB_OP_NONE &&
((window->has_move_func && op == META_GRAB_OP_KEYBOARD_MOVING) || ((window->has_move_func && op == META_GRAB_OP_KEYBOARD_MOVING) ||
(window->has_resize_func && op == META_GRAB_OP_KEYBOARD_RESIZING_UNKNOWN))) (window->has_resize_func && op == META_GRAB_OP_KEYBOARD_RESIZING_UNKNOWN)))
{ {