callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Call gtk_widget_activate for GDK_Return.

Browse Source 
Sat Nov 11 23:07:30 2000  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkentry.c (gtk_entry_key_press): Call
	gtk_widget_activate for GDK_Return.

	* gtk/gtkentry.c (gtk_entry_preedit_changed_cb): Fix handling
	of preedit cursor position.
This commit is contained in:
Owen Taylor
2000-11-12 04:56:51 +00:00
committed by Owen Taylor
parent dfba226908
commit 8f05462d59
8 changed files with 71 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Sat Nov 11 23:07:30 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c (gtk_entry_key_press): Call
gtk_widget_activate for GDK_Return.
* gtk/gtkentry.c (gtk_entry_preedit_changed_cb): Fix handling
of preedit cursor position.
Sun Nov 5 04:24:53 2000 Owen Taylor <otaylor@redhat.com> Sun Nov 5 04:24:53 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcellrenderertextpixbuf.c: Make parent_class * gtk/gtkcellrenderertextpixbuf.c: Make parent_class

8
ChangeLog.pre-2-0
View File

@ -1,3 +1,11 @@
Sat Nov 11 23:07:30 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c (gtk_entry_key_press): Call
gtk_widget_activate for GDK_Return.
* gtk/gtkentry.c (gtk_entry_preedit_changed_cb): Fix handling
of preedit cursor position.
Sun Nov 5 04:24:53 2000 Owen Taylor <otaylor@redhat.com> Sun Nov 5 04:24:53 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcellrenderertextpixbuf.c: Make parent_class * gtk/gtkcellrenderertextpixbuf.c: Make parent_class

8
ChangeLog.pre-2-10
View File

@ -1,3 +1,11 @@
Sat Nov 11 23:07:30 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c (gtk_entry_key_press): Call
gtk_widget_activate for GDK_Return.
* gtk/gtkentry.c (gtk_entry_preedit_changed_cb): Fix handling
of preedit cursor position.
Sun Nov 5 04:24:53 2000 Owen Taylor <otaylor@redhat.com> Sun Nov 5 04:24:53 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcellrenderertextpixbuf.c: Make parent_class * gtk/gtkcellrenderertextpixbuf.c: Make parent_class

8
ChangeLog.pre-2-2
View File

@ -1,3 +1,11 @@
Sat Nov 11 23:07:30 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c (gtk_entry_key_press): Call
gtk_widget_activate for GDK_Return.
* gtk/gtkentry.c (gtk_entry_preedit_changed_cb): Fix handling
of preedit cursor position.
Sun Nov 5 04:24:53 2000 Owen Taylor <otaylor@redhat.com> Sun Nov 5 04:24:53 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcellrenderertextpixbuf.c: Make parent_class * gtk/gtkcellrenderertextpixbuf.c: Make parent_class

8
ChangeLog.pre-2-4
View File

@ -1,3 +1,11 @@
Sat Nov 11 23:07:30 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c (gtk_entry_key_press): Call
gtk_widget_activate for GDK_Return.
* gtk/gtkentry.c (gtk_entry_preedit_changed_cb): Fix handling
of preedit cursor position.
Sun Nov 5 04:24:53 2000 Owen Taylor <otaylor@redhat.com> Sun Nov 5 04:24:53 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcellrenderertextpixbuf.c: Make parent_class * gtk/gtkcellrenderertextpixbuf.c: Make parent_class

8
ChangeLog.pre-2-6
View File

@ -1,3 +1,11 @@
Sat Nov 11 23:07:30 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c (gtk_entry_key_press): Call
gtk_widget_activate for GDK_Return.
* gtk/gtkentry.c (gtk_entry_preedit_changed_cb): Fix handling
of preedit cursor position.
Sun Nov 5 04:24:53 2000 Owen Taylor <otaylor@redhat.com> Sun Nov 5 04:24:53 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcellrenderertextpixbuf.c: Make parent_class * gtk/gtkcellrenderertextpixbuf.c: Make parent_class

8
ChangeLog.pre-2-8
View File

@ -1,3 +1,11 @@
Sat Nov 11 23:07:30 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c (gtk_entry_key_press): Call
gtk_widget_activate for GDK_Return.
* gtk/gtkentry.c (gtk_entry_preedit_changed_cb): Fix handling
of preedit cursor position.
Sun Nov 5 04:24:53 2000 Owen Taylor <otaylor@redhat.com> Sun Nov 5 04:24:53 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcellrenderertextpixbuf.c: Make parent_class * gtk/gtkcellrenderertextpixbuf.c: Make parent_class

23
gtk/gtkentry.c
View File

@ -1040,15 +1040,22 @@ gtk_entry_key_press (GtkWidget *widget,
if (!entry->editable) if (!entry->editable)
return FALSE; return FALSE;
/* Activate key bindings if (gtk_im_context_filter_keypress (entry->im_context, event))
*/ {
if (GTK_WIDGET_CLASS (parent_class)->key_press_event (widget, event)) entry->need_im_reset = TRUE;
return TRUE;
}
else if (GTK_WIDGET_CLASS (parent_class)->key_press_event (widget, event))
/* Activate key bindings
*/
return TRUE; return TRUE;
else if (event->keyval == GDK_Return)
{
gtk_widget_activate (widget);
return TRUE;
}
/* Not bound, pass to input method return FALSE;
*/
entry->need_im_reset = TRUE;
return gtk_im_context_filter_keypress (entry->im_context, event);
} }
static gint static gint
@ -1564,7 +1571,7 @@ gtk_entry_preedit_changed_cb (GtkIMContext *context,
&cursor_pos); &cursor_pos);
entry->preedit_length = strlen (preedit_string); entry->preedit_length = strlen (preedit_string);
cursor_pos = CLAMP (cursor_pos, 0, g_utf8_strlen (preedit_string, -1)); cursor_pos = CLAMP (cursor_pos, 0, g_utf8_strlen (preedit_string, -1));
cursor_pos = g_utf8_offset_to_pointer (preedit_string, cursor_pos) - preedit_string; entry->preedit_cursor = g_utf8_offset_to_pointer (preedit_string, cursor_pos) - preedit_string;
g_free (preedit_string); g_free (preedit_string);
gtk_entry_recompute (entry); gtk_entry_recompute (entry);