Skip to content
Snippets Groups Projects
Commit a3890868 authored by Andre Miranda's avatar Andre Miranda
Browse files

Replace gdk_pointer/keyboard_grab by gdk_device_grab

parent 25323f94
No related branches found
No related tags found
No related merge requests found
...@@ -955,8 +955,9 @@ static GdkPixbuf ...@@ -955,8 +955,9 @@ static GdkPixbuf
Display *display; Display *display;
gint screen; gint screen;
RbData rbdata; RbData rbdata;
GdkEventMask mask;
GdkCursor *xhair_cursor; GdkCursor *xhair_cursor;
GdkDevice *pointer, *keyboard;
GdkSeat *seat;
long value_mask; long value_mask;
/* Get root window */ /* Get root window */
...@@ -989,17 +990,25 @@ static GdkPixbuf ...@@ -989,17 +990,25 @@ static GdkPixbuf
/* Change cursor to cross-hair */ /* Change cursor to cross-hair */
TRACE ("Set the cursor"); TRACE ("Set the cursor");
xhair_cursor = gdk_cursor_new_for_display (gdk_display_get_default (), xhair_cursor = gdk_cursor_new_for_display (gdk_display_get_default (),
GDK_CROSSHAIR); GDK_CROSSHAIR);
mask = GDK_POINTER_MOTION_MASK | seat = gdk_display_get_default_seat (gdk_display_get_default ());
GDK_BUTTON_PRESS_MASK | pointer = gdk_seat_get_pointer (seat);
GDK_BUTTON_RELEASE_MASK; keyboard = gdk_seat_get_keyboard (seat);
gdk_pointer_grab (root_window, FALSE, mask, NULL, gdk_device_grab (keyboard, root_window,
xhair_cursor, GDK_CURRENT_TIME); GDK_OWNERSHIP_NONE, FALSE,
gdk_keyboard_grab (root_window, FALSE, GDK_CURRENT_TIME); GDK_KEY_PRESS_MASK |
GDK_KEY_RELEASE_MASK,
NULL, GDK_CURRENT_TIME);
gdk_device_grab (pointer, root_window,
GDK_OWNERSHIP_NONE, FALSE,
GDK_POINTER_MOTION_MASK |
GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK,
xhair_cursor, GDK_CURRENT_TIME);
/* Initialize the rubber band data */ /* Initialize the rubber band data */
TRACE ("Initialize the rubber band data"); TRACE ("Initialize the rubber band data");
...@@ -1020,8 +1029,8 @@ static GdkPixbuf ...@@ -1020,8 +1029,8 @@ static GdkPixbuf
(GdkFilterFunc) region_filter_func, (GdkFilterFunc) region_filter_func,
&rbdata); &rbdata);
gdk_pointer_ungrab (GDK_CURRENT_TIME); gdk_device_ungrab (pointer, GDK_CURRENT_TIME);
gdk_keyboard_ungrab (GDK_CURRENT_TIME); gdk_device_ungrab (keyboard, GDK_CURRENT_TIME);
/* Get the screenshot's pixbuf */ /* Get the screenshot's pixbuf */
if (G_LIKELY (!rbdata.cancelled)) if (G_LIKELY (!rbdata.cancelled))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment