diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/input/imquartz.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/modules/input/imquartz.c b/modules/input/imquartz.c index 5db6481f5c..508ecf895f 100644 --- a/modules/input/imquartz.c +++ b/modules/input/imquartz.c @@ -186,15 +186,11 @@ quartz_filter_keypress (GtkIMContext *context, GTK_NOTE (MISC, g_print ("quartz_filter_keypress\n")); - if (!qc->client_window) + if (!GDK_IS_QUARTZ_WINDOW (qc->client_window)) return FALSE; nsview = gdk_quartz_window_get_nsview (qc->client_window); - if (GDK_IS_WINDOW (nsview)) - /* it gets GDK_WINDOW in some cases */ - return gtk_im_context_filter_keypress (qc->slave, event); - else - win = (GdkWindow *)[ (GdkQuartzView *)nsview gdkWindow]; + win = (GdkWindow *)[ (GdkQuartzView *)nsview gdkWindow]; GTK_NOTE (MISC, g_print ("client_window: %p, win: %p, nsview: %p\n", qc->client_window, win, nsview)); @@ -242,11 +238,11 @@ discard_preedit (GtkIMContext *context) if (!qc->client_window) return; - NSView *nsview = gdk_quartz_window_get_nsview (qc->client_window); - if (!nsview) + if (!GDK_IS_QUARTZ_WINDOW (qc->client_window)) return; - if (GDK_IS_WINDOW (nsview)) + NSView *nsview = gdk_quartz_window_get_nsview (qc->client_window); + if (!nsview) return; /* reset any partial input for this NSView */ @@ -328,11 +324,10 @@ quartz_set_cursor_location (GtkIMContext *context, GdkRectangle *area) qc->cursor_rect->x = area->x + x; qc->cursor_rect->y = area->y + y; - nsview = gdk_quartz_window_get_nsview (qc->client_window); - if (GDK_IS_WINDOW (nsview)) - /* it returns GDK_WINDOW in some cases */ + if (!GDK_IS_QUARTZ_WINDOW (qc->client_window)) return; + nsview = gdk_quartz_window_get_nsview (qc->client_window); win = (GdkWindow *)[ (GdkQuartzView*)nsview gdkWindow]; g_object_set_data (G_OBJECT (win), GIC_CURSOR_RECT, qc->cursor_rect); } |