diff options
| author | Thomas James Alexander Thurman <tthurman@src.gnome.org> | 2009-01-25 22:59:50 +0000 |
|---|---|---|
| committer | Thomas James Alexander Thurman <tthurman@src.gnome.org> | 2009-01-25 22:59:50 +0000 |
| commit | 35d9d2864f61d9f72baabfd73bbb475a0702fa53 (patch) | |
| tree | 492360a9c647e04e1687c2d83210ab180fbc9a0f | |
| parent | bb5c0d0c34b9c064ec91aa709947825e98f3295a (diff) | |
| download | metacity-35d9d2864f61d9f72baabfd73bbb475a0702fa53.tar.gz | |
add support for _NET_WM_MOVERESIZE_CANCEL.
* src/core/window.c: add support for _NET_WM_MOVERESIZE_CANCEL.
svn path=/trunk/; revision=4088
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | src/core/window.c | 10 |
2 files changed, 13 insertions, 1 deletions
@@ -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> * src/ui/theme.[ch]: add meta_theme_draw_frame_by_name, which diff --git a/src/core/window.c b/src/core/window.c index 0f93c409..52d3b2aa 100644 --- a/src/core/window.c +++ b/src/core/window.c @@ -4762,6 +4762,7 @@ meta_window_property_notify (MetaWindow *window, #define _NET_WM_MOVERESIZE_MOVE 8 #define _NET_WM_MOVERESIZE_SIZE_KEYBOARD 9 #define _NET_WM_MOVERESIZE_MOVE_KEYBOARD 10 +#define _NET_WM_MOVERESIZE_CANCEL 11 gboolean meta_window_client_message (MetaWindow *window, @@ -5094,11 +5095,18 @@ meta_window_client_message (MetaWindow *window, case _NET_WM_MOVERESIZE_MOVE_KEYBOARD: op = META_GRAB_OP_KEYBOARD_MOVING; break; + case _NET_WM_MOVERESIZE_CANCEL: + /* handled below */ + break; default: 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_resize_func && op == META_GRAB_OP_KEYBOARD_RESIZING_UNKNOWN))) { |