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

Fix warning from synthesized events with GdkDevice

Browse Source 
In GTK+ 3, it's mandatory to have a GdkDevice in a synthesized event,
so fill in the pointer device for the events we synthesize and forward
to GTK+. Since gdk_event_set_device() only works for allocated events,
we need to switch to gdk_event_new() rather than using stack allocated
events.

https://bugzilla.gnome.org/show_bug.cgi?id=633401
This commit is contained in:
Owen W. Taylor 2010-10-28 17:03:44 -04:00
parent 441c050808
commit c40fab214d
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/ui/ui.c
View File

@ -92,7 +92,7 @@ maybe_redirect_mouse_event (XEvent *xevent)
{ {
GdkDisplay *gdisplay; GdkDisplay *gdisplay;
MetaUI *ui; MetaUI *ui;
GdkEvent gevent; GdkEvent *gevent;
GdkWindow *gdk_window; GdkWindow *gdk_window;
Window window; Window window;
@ -129,8 +129,6 @@ maybe_redirect_mouse_event (XEvent *xevent)
if (gdk_display_pointer_is_grabbed (gdisplay)) if (gdk_display_pointer_is_grabbed (gdisplay))
return FALSE; return FALSE;
memset (&gevent, 0, sizeof (gevent));
switch (xevent->type) switch (xevent->type)
{ {
case ButtonPress: case ButtonPress:
@ -152,13 +150,13 @@ maybe_redirect_mouse_event (XEvent *xevent)
ABS (xevent->xbutton.x - ui->button_click_x) <= double_click_distance && ABS (xevent->xbutton.x - ui->button_click_x) <= double_click_distance &&
ABS (xevent->xbutton.y - ui->button_click_y) <= double_click_distance) ABS (xevent->xbutton.y - ui->button_click_y) <= double_click_distance)
{ {
gevent.button.type = GDK_2BUTTON_PRESS; gevent = gdk_event_new (GDK_2BUTTON_PRESS);
ui->button_click_number = 0; ui->button_click_number = 0;
} }
else else
{ {
gevent.button.type = GDK_BUTTON_PRESS; gevent = gdk_event_new (GDK_BUTTON_PRESS);
ui->button_click_number = xevent->xbutton.button; ui->button_click_number = xevent->xbutton.button;
ui->button_click_window = xevent->xbutton.window; ui->button_click_window = xevent->xbutton.window;
ui->button_click_time = xevent->xbutton.time; ui->button_click_time = xevent->xbutton.time;
@ -168,36 +166,39 @@ maybe_redirect_mouse_event (XEvent *xevent)
} }
else else
{ {
gevent.button.type = GDK_BUTTON_RELEASE; gevent = gdk_event_new (GDK_BUTTON_RELEASE);
} }
gevent.button.window = gdk_window; gevent->button.window = g_object_ref (gdk_window);
gevent.button.button = xevent->xbutton.button; gevent->button.button = xevent->xbutton.button;
gevent.button.time = xevent->xbutton.time; gevent->button.time = xevent->xbutton.time;
gevent.button.x = xevent->xbutton.x; gevent->button.x = xevent->xbutton.x;
gevent.button.y = xevent->xbutton.y; gevent->button.y = xevent->xbutton.y;
gevent.button.x_root = xevent->xbutton.x_root; gevent->button.x_root = xevent->xbutton.x_root;
gevent.button.y_root = xevent->xbutton.y_root; gevent->button.y_root = xevent->xbutton.y_root;
break; break;
case MotionNotify: case MotionNotify:
gevent.motion.type = GDK_MOTION_NOTIFY; gevent = gdk_event_new (GDK_MOTION_NOTIFY);
gevent.motion.window = gdk_window; gevent->motion.type = GDK_MOTION_NOTIFY;
gevent->motion.window = g_object_ref (gdk_window);
break; break;
case EnterNotify: case EnterNotify:
case LeaveNotify: case LeaveNotify:
gevent.crossing.type = xevent->type == EnterNotify ? GDK_ENTER_NOTIFY : GDK_LEAVE_NOTIFY; gevent = gdk_event_new (xevent->type == EnterNotify ? GDK_ENTER_NOTIFY : GDK_LEAVE_NOTIFY);
gevent.crossing.window = gdk_window; gevent->crossing.window = g_object_ref (gdk_window);
gevent.crossing.x = xevent->xcrossing.x; gevent->crossing.x = xevent->xcrossing.x;
gevent.crossing.y = xevent->xcrossing.y; gevent->crossing.y = xevent->xcrossing.y;
break; break;
default: default:
g_assert_not_reached (); g_assert_not_reached ();
break; break;
} }
/* If we've gotten here, we've filled in the gdk_event and should send it on */ /* If we've gotten here, we've created the gdk_event and should send it on */
gtk_main_do_event (&gevent); gdk_event_set_device (gevent, gdk_display_get_core_pointer (gdisplay));
gtk_main_do_event (gevent);
gdk_event_free (gevent);
return TRUE; return TRUE;
} }