brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

st-im-text: don't require st_im_text_set_event_window() to be called

Browse Source 
Tests like tests/interactive/entry.js don't call it; make sure we still
display an entry in that case.

https://bugzilla.gnome.org/show_bug.cgi?id=783484
This commit is contained in:
Cosimo Cecchi 2017-06-06 14:27:55 -07:00
parent a256a35779
commit 9e0e7a4067
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/st/st-im-text.c
View File

@ -217,9 +217,11 @@ st_im_text_realize (ClutterActor *actor)
{ {
StIMTextPrivate *priv = ST_IM_TEXT (actor)->priv; StIMTextPrivate *priv = ST_IM_TEXT (actor)->priv;
g_assert (event_window != NULL); if (event_window != NULL)
priv->window = g_object_ref (event_window); {
gtk_im_context_set_client_window (priv->im_context, priv->window); priv->window = g_object_ref (event_window);
gtk_im_context_set_client_window (priv->im_context, priv->window);
}
} }
static void static void
@ -230,8 +232,12 @@ st_im_text_unrealize (ClutterActor *actor)
reset_im_context (self); reset_im_context (self);
gtk_im_context_set_client_window (priv->im_context, NULL); gtk_im_context_set_client_window (priv->im_context, NULL);
g_object_unref (priv->window);
priv->window = NULL; if (priv->window != NULL)
{
g_object_unref (priv->window);
priv->window = NULL;
}
} }
static gboolean static gboolean
@ -277,10 +283,12 @@ static GdkEventKey *
key_event_to_gdk (ClutterKeyEvent *event_clutter) key_event_to_gdk (ClutterKeyEvent *event_clutter)
{ {
GdkEventKey *event_gdk; GdkEventKey *event_gdk;
if (event_window == NULL)
return NULL;
event_gdk = (GdkEventKey *)gdk_event_new ((event_clutter->type == CLUTTER_KEY_PRESS) ? event_gdk = (GdkEventKey *)gdk_event_new ((event_clutter->type == CLUTTER_KEY_PRESS) ?
GDK_KEY_PRESS : GDK_KEY_RELEASE); GDK_KEY_PRESS : GDK_KEY_RELEASE);
g_assert (event_window != NULL);
event_gdk->window = g_object_ref (event_window); event_gdk->window = g_object_ref (event_window);
event_gdk->send_event = FALSE; event_gdk->send_event = FALSE;
event_gdk->time = event_clutter->time; event_gdk->time = event_clutter->time;
@ -348,13 +356,14 @@ st_im_text_captured_event (ClutterActor *actor,
{ {
GdkEventKey *event_gdk = key_event_to_gdk ((ClutterKeyEvent *)event); GdkEventKey *event_gdk = key_event_to_gdk ((ClutterKeyEvent *)event);
if (gtk_im_context_filter_keypress (priv->im_context, event_gdk)) if (event_gdk && gtk_im_context_filter_keypress (priv->im_context, event_gdk))
{ {
priv->need_im_reset = TRUE; priv->need_im_reset = TRUE;
result = TRUE; result = TRUE;
} }
gdk_event_free ((GdkEvent *)event_gdk); if (event_gdk)
gdk_event_free ((GdkEvent *)event_gdk);
} }
old_position = clutter_text_get_cursor_position (clutter_text); old_position = clutter_text_get_cursor_position (clutter_text);