isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 17:40:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

In XGrabPointer, set the confine_to argument to the root window of the

Browse Source 
2002-08-14  Jayaraj Rajappan <jayaraj.rajappan@wipro.com>

        * src/display.c (meta_display_set_grab_op_cursor):
        In XGrabPointer, set the confine_to argument to the root window
        of the screen the window is on.

        * src/display.h: add screen argument.

        * src/window.c (meta_window_update_resize_grab_op):
        pass screen argument as NULL.
This commit is contained in:
Jayaraj Rajappan 2002-08-14 16:51:13 +00:00 committed by Jayaraj Rajappan
parent b9529231b4
commit bb9cc21d8e
4 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2002-08-14 Jayaraj Rajappan <jayaraj.rajappan@wipro.com>
* src/display.c (meta_display_set_grab_op_cursor):
In XGrabPointer, set the confine_to argument to the root window
of the screen the window is on.
* src/display.h: add screen argument.
* src/window.c (meta_window_update_resize_grab_op):
pass screen argument as NULL.
2002-08-14 James M. Cape <jcape@ignore-your.tv> 2002-08-14 James M. Cape <jcape@ignore-your.tv>
* src/themes/Esco/metacity-theme-1.xml: use button positioning * src/themes/Esco/metacity-theme-1.xml: use button positioning

6
src/display.c
View File

@ -2248,6 +2248,7 @@ xcursor_for_op (MetaDisplay *display,
void void
meta_display_set_grab_op_cursor (MetaDisplay *display, meta_display_set_grab_op_cursor (MetaDisplay *display,
MetaScreen *screen,
MetaGrabOp op, MetaGrabOp op,
gboolean change_pointer, gboolean change_pointer,
Window grab_xwindow, Window grab_xwindow,
@ -2279,7 +2280,7 @@ meta_display_set_grab_op_cursor (MetaDisplay *display,
False, False,
GRAB_MASK, GRAB_MASK,
GrabModeAsync, GrabModeAsync, GrabModeAsync, GrabModeAsync,
None, screen->xroot,
cursor, cursor,
timestamp) == GrabSuccess) timestamp) == GrabSuccess)
{ {
@ -2341,7 +2342,8 @@ meta_display_begin_grab_op (MetaDisplay *display,
if (pointer_already_grabbed) if (pointer_already_grabbed)
display->grab_have_pointer = TRUE; display->grab_have_pointer = TRUE;
meta_display_set_grab_op_cursor (display, op, FALSE, grab_xwindow, timestamp); meta_display_set_grab_op_cursor (display, screen, op, FALSE, grab_xwindow,
timestamp);
if (!display->grab_have_pointer) if (!display->grab_have_pointer)
{ {

1
src/display.h
View File

@ -293,6 +293,7 @@ Cursor meta_display_create_x_cursor (MetaDisplay *display,
MetaCursor cursor); MetaCursor cursor);
void meta_display_set_grab_op_cursor (MetaDisplay *display, void meta_display_set_grab_op_cursor (MetaDisplay *display,
MetaScreen *screen,
MetaGrabOp op, MetaGrabOp op,
gboolean change_pointer, gboolean change_pointer,
Window grab_xwindow, Window grab_xwindow,

1
src/window.c
View File

@ -6475,6 +6475,7 @@ void meta_window_update_resize_grab_op (MetaWindow *window,
if (update_cursor) if (update_cursor)
{ {
meta_display_set_grab_op_cursor (window->display, meta_display_set_grab_op_cursor (window->display,
NULL,
window->display->grab_op, window->display->grab_op,
TRUE, TRUE,
window->display->grab_xwindow, window->display->grab_xwindow,