Attachment 50420 Details for Bug 117115

[patch] A better patch for gtk2.

gtkentry-invisible.diff (text/plain), 4.15 KB, created by Zhe Su on 2005-09-20 13:24:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Zhe Su

Created: 2005-09-20 13:24:41 UTC

Size: 4.15 KB

patch

obsolete

>--- gtk/gtkentry.c.old	2005-09-20 20:38:31.000000000 +0800
>+++ gtk/gtkentry.c	2005-09-20 20:37:23.000000000 +0800
>@@ -876,7 +876,7 @@
> 	    if (!new_value)
> 	      {
> 		gtk_entry_reset_im_context (entry);
>-		if (GTK_WIDGET_HAS_FOCUS (entry))
>+		if (GTK_WIDGET_HAS_FOCUS (entry) && entry->visible)
> 		  gtk_im_context_focus_out (entry->im_context);
> 
> 		entry->preedit_length = 0;
>@@ -885,7 +885,7 @@
> 
> 	    entry->editable = new_value;
> 
>-	    if (new_value && GTK_WIDGET_HAS_FOCUS (entry))
>+	    if (new_value && GTK_WIDGET_HAS_FOCUS (entry) && entry->visible)
> 	      gtk_im_context_focus_in (entry->im_context);
> 	    
> 	    gtk_entry_queue_draw (entry);
>@@ -1849,7 +1849,7 @@
> 
>   gtk_entry_pend_cursor_blink (entry);
> 
>-  if (entry->editable)
>+  if (entry->editable && entry->visible)
>     {
>       if (gtk_im_context_filter_keypress (entry->im_context, event))
> 	{
>@@ -1876,6 +1876,26 @@
>      */
>     return TRUE;
> 
>+  /* Commit key event directly if visible is set to FALSE.
>+   */
>+  if (entry->editable && !entry->visible)
>+    {
>+      gunichar ch;
>+      ch = gdk_keyval_to_unicode (event->keyval);
>+
>+      if (g_unichar_validate (ch))
>+	{
>+	  gchar buf[10];
>+	  gint len;
>+	  len = g_unichar_to_utf8 (ch, buf);
>+	  buf[len] = '\0';
>+
>+	  g_signal_emit_by_name (entry->im_context, "commit", &buf);
>+
>+	  return TRUE;
>+	}
>+    }
>+
>   return FALSE;
> }
> 
>@@ -1885,7 +1905,7 @@
> {
>   GtkEntry *entry = GTK_ENTRY (widget);
> 
>-  if (entry->editable)
>+  if (entry->editable && entry->visible)
>     {
>       if (gtk_im_context_filter_keypress (entry->im_context, event))
> 	{
>@@ -1905,7 +1925,7 @@
>   
>   gtk_widget_queue_draw (widget);
>   
>-  if (entry->editable)
>+  if (entry->editable && entry->visible)
>     {
>       entry->need_im_reset = TRUE;
>       gtk_im_context_focus_in (entry->im_context);
>@@ -1929,7 +1949,7 @@
>   
>   gtk_widget_queue_draw (widget);
> 
>-  if (entry->editable)
>+  if (entry->editable && entry->visible)
>     {
>       entry->need_im_reset = TRUE;
>       gtk_im_context_focus_out (entry->im_context);
>@@ -2735,7 +2755,7 @@
> gtk_entry_preedit_changed_cb (GtkIMContext *context,
> 			      GtkEntry     *entry)
> {
>-  if (entry->editable)
>+  if (entry->editable && entry->visible)
>     {
>       gchar *preedit_string;
>       gint cursor_pos;
>@@ -2756,12 +2776,16 @@
> gtk_entry_retrieve_surrounding_cb (GtkIMContext *context,
> 			       GtkEntry     *entry)
> {
>-  gtk_im_context_set_surrounding (context,
>-				  entry->text,
>-				  entry->n_bytes,
>-				  g_utf8_offset_to_pointer (entry->text, entry->current_pos) - entry->text);
>+  if (entry->visible)
>+    {
>+      gtk_im_context_set_surrounding (context,
>+				      entry->text,
>+				      entry->n_bytes,
>+				      g_utf8_offset_to_pointer (entry->text, entry->current_pos) - entry->text);
>+      return TRUE;
>+    }
> 
>-  return TRUE;
>+  return FALSE;
> }
> 
> static gboolean
>@@ -2770,12 +2794,16 @@
> 				 gint          n_chars,
> 				 GtkEntry     *entry)
> {
>-  if (entry->editable)
>-    gtk_editable_delete_text (GTK_EDITABLE (entry),
>-                              entry->current_pos + offset,
>-                              entry->current_pos + offset + n_chars);
>+  if (entry->editable && entry->visible)
>+    {
>+      gtk_editable_delete_text (GTK_EDITABLE (entry),
>+                                entry->current_pos + offset,
>+                                entry->current_pos + offset + n_chars);
> 
>-  return TRUE;
>+      return TRUE;
>+    }
>+
>+  return FALSE;
> }
> 
> /* Internal functions
>@@ -2874,7 +2902,8 @@
>   area.width = 0;
>   area.height = area_height;
> 
>-  gtk_im_context_set_cursor_location (entry->im_context, &area);
>+  if (entry->visible)
>+    gtk_im_context_set_cursor_location (entry->im_context, &area);
> }
> 
> static gboolean
>@@ -2947,7 +2976,7 @@
> 
>   pango_layout_set_single_paragraph_mode (layout, TRUE);
>   
>-  if (include_preedit)
>+  if (include_preedit && entry->visible)
>     {
>       gtk_im_context_get_preedit_string (entry->im_context,
> 					 &preedit_string, &preedit_attrs, NULL);
>@@ -3295,7 +3324,7 @@
> static void
> gtk_entry_reset_im_context (GtkEntry *entry)
> {
>-  if (entry->need_im_reset)
>+  if (entry->need_im_reset && entry->visible)
>     {
>       entry->need_im_reset = 0;
>       gtk_im_context_reset (entry->im_context);

Actions: View | Diff

Attachments on bug 117115: 50156 | 50175 | 50420 | 50547 | 50636 | 51106