mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-12-26 13:41:07 +00:00
im-xim: Use window macros instead of drawable macros
This commit is contained in:
parent
3af4432c6f
commit
28ba4c2146
@ -707,9 +707,9 @@ gtk_im_context_xim_filter_keypress (GtkIMContext *context,
|
|||||||
xevent.type = (event->type == GDK_KEY_PRESS) ? KeyPress : KeyRelease;
|
xevent.type = (event->type == GDK_KEY_PRESS) ? KeyPress : KeyRelease;
|
||||||
xevent.serial = 0; /* hope it doesn't matter */
|
xevent.serial = 0; /* hope it doesn't matter */
|
||||||
xevent.send_event = event->send_event;
|
xevent.send_event = event->send_event;
|
||||||
xevent.display = GDK_DRAWABLE_XDISPLAY (event->window);
|
xevent.display = GDK_WINDOW_XDISPLAY (event->window);
|
||||||
xevent.window = GDK_DRAWABLE_XID (event->window);
|
xevent.window = GDK_WINDOW_XID (event->window);
|
||||||
xevent.root = GDK_DRAWABLE_XID (root_window);
|
xevent.root = GDK_WINDOW_XID (root_window);
|
||||||
xevent.subwindow = xevent.window;
|
xevent.subwindow = xevent.window;
|
||||||
xevent.time = event->time;
|
xevent.time = event->time;
|
||||||
xevent.x = xevent.x_root = 0;
|
xevent.x = xevent.x_root = 0;
|
||||||
@ -718,7 +718,7 @@ gtk_im_context_xim_filter_keypress (GtkIMContext *context,
|
|||||||
xevent.keycode = event->hardware_keycode;
|
xevent.keycode = event->hardware_keycode;
|
||||||
xevent.same_screen = True;
|
xevent.same_screen = True;
|
||||||
|
|
||||||
if (XFilterEvent ((XEvent *)&xevent, GDK_DRAWABLE_XID (context_xim->client_window)))
|
if (XFilterEvent ((XEvent *)&xevent, GDK_WINDOW_XID (context_xim->client_window)))
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
|
||||||
if (event->state &
|
if (event->state &
|
||||||
@ -1434,7 +1434,7 @@ gtk_im_context_xim_get_ic (GtkIMContextXIM *context_xim)
|
|||||||
|
|
||||||
xic = XCreateIC (context_xim->im_info->im,
|
xic = XCreateIC (context_xim->im_info->im,
|
||||||
XNInputStyle, im_style,
|
XNInputStyle, im_style,
|
||||||
XNClientWindow, GDK_DRAWABLE_XID (context_xim->client_window),
|
XNClientWindow, GDK_WINDOW_XID (context_xim->client_window),
|
||||||
name1, list1,
|
name1, list1,
|
||||||
name2, list2,
|
name2, list2,
|
||||||
NULL);
|
NULL);
|
||||||
|
Loading…
Reference in New Issue
Block a user