brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ui: Remove deprecated stuff

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=662895
This commit is contained in:
Jasper St. Pierre 2011-10-27 16:52:21 -04:00
parent 7ecd673d23
commit 3ad25a62cd
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/ui/ui.c
View File

@ -102,6 +102,7 @@ maybe_redirect_mouse_event (XEvent *xevent)
{ {
GdkDisplay *gdisplay; GdkDisplay *gdisplay;
GdkDeviceManager *gmanager; GdkDeviceManager *gmanager;
GdkDevice *gdevice;
MetaUI *ui; MetaUI *ui;
GdkEvent *gevent; GdkEvent *gevent;
GdkWindow *gdk_window; GdkWindow *gdk_window;
@ -133,11 +134,14 @@ maybe_redirect_mouse_event (XEvent *xevent)
if (gdk_window == NULL) if (gdk_window == NULL)
return FALSE; return FALSE;
gmanager = gdk_display_get_device_manager (gdisplay);
gdevice = gdk_device_manager_get_client_pointer (gmanager);
/* If GDK already thinks it has a grab, we better let it see events; this /* If GDK already thinks it has a grab, we better let it see events; this
* is the menu-navigation case and events need to get sent to the appropriate * is the menu-navigation case and events need to get sent to the appropriate
* (client-side) subwindow for individual menu items. * (client-side) subwindow for individual menu items.
*/ */
if (gdk_display_pointer_is_grabbed (gdisplay)) if (gdk_display_device_is_grabbed (gdisplay, gdevice))
return FALSE; return FALSE;
switch (xevent->type) switch (xevent->type)
@ -207,8 +211,7 @@ maybe_redirect_mouse_event (XEvent *xevent)
} }
/* If we've gotten here, we've created the gdk_event and should send it on */ /* If we've gotten here, we've created the gdk_event and should send it on */
gmanager = gdk_display_get_device_manager (gdisplay); gdk_event_set_device (gevent, gdevice);
gdk_event_set_device (gevent, gdk_device_manager_get_client_pointer (gmanager));
gtk_main_do_event (gevent); gtk_main_do_event (gevent);
gdk_event_free (gevent); gdk_event_free (gevent);