From 5c91c3a08ae4b4d96b1d42e54d88a4db27613f95 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Tue, 22 Oct 2002 19:04:51 +0000 Subject: [PATCH] Produce C-m, not C-j for return. Handle Escape. Fri Oct 18 16:47:02 2002 Owen Taylor * gdk/x11/gdkevents-x11.c (translate_key_event): Produce C-m, not C-j for return. Handle Escape. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gdk/x11/gdkevents-x11.c | 7 ++++++- 7 files changed, 36 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7fa88dff0c..fa02a94192 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Oct 18 16:47:02 2002 Owen Taylor + + * gdk/x11/gdkevents-x11.c (translate_key_event): Produce + C-m, not C-j for return. Handle Escape. + 2002-10-22 Matthias Clasen * gtk/gtkstatusbar.c (gtk_statusbar_get_type): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 7fa88dff0c..fa02a94192 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Fri Oct 18 16:47:02 2002 Owen Taylor + + * gdk/x11/gdkevents-x11.c (translate_key_event): Produce + C-m, not C-j for return. Handle Escape. + 2002-10-22 Matthias Clasen * gtk/gtkstatusbar.c (gtk_statusbar_get_type): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 7fa88dff0c..fa02a94192 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Fri Oct 18 16:47:02 2002 Owen Taylor + + * gdk/x11/gdkevents-x11.c (translate_key_event): Produce + C-m, not C-j for return. Handle Escape. + 2002-10-22 Matthias Clasen * gtk/gtkstatusbar.c (gtk_statusbar_get_type): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 7fa88dff0c..fa02a94192 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Fri Oct 18 16:47:02 2002 Owen Taylor + + * gdk/x11/gdkevents-x11.c (translate_key_event): Produce + C-m, not C-j for return. Handle Escape. + 2002-10-22 Matthias Clasen * gtk/gtkstatusbar.c (gtk_statusbar_get_type): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 7fa88dff0c..fa02a94192 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Fri Oct 18 16:47:02 2002 Owen Taylor + + * gdk/x11/gdkevents-x11.c (translate_key_event): Produce + C-m, not C-j for return. Handle Escape. + 2002-10-22 Matthias Clasen * gtk/gtkstatusbar.c (gtk_statusbar_get_type): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 7fa88dff0c..fa02a94192 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Fri Oct 18 16:47:02 2002 Owen Taylor + + * gdk/x11/gdkevents-x11.c (translate_key_event): Produce + C-m, not C-j for return. Handle Escape. + 2002-10-22 Matthias Clasen * gtk/gtkstatusbar.c (gtk_statusbar_get_type): diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c index a675734de6..ceef45d9f7 100644 --- a/gdk/x11/gdkevents-x11.c +++ b/gdk/x11/gdkevents-x11.c @@ -576,11 +576,16 @@ translate_key_event (GdkDisplay *display, if (event->key.string) event->key.length = bytes_written; } + else if (event->key.keyval == GDK_Escape) + { + event->key.length = 1; + event->key.string = g_strdup ("\033"); + } else if (event->key.keyval == GDK_Return || event->key.keyval == GDK_KP_Enter) { event->key.length = 1; - event->key.string = g_strdup ("\n"); + event->key.string = g_strdup ("\r"); } if (!event->key.string) -- GitLab