Make sure Page_Up, Page_Down get those names, not Prior, Next.

Tue Feb 26 19:16:28 2002  Owen Taylor  <otaylor@redhat.com>

        * gdk/win32/gdkkeys-win32.c (gdk_keyval_name):
        * gdk/x11/gdkkeys-x11.c (gdk_keyval_name):
        Make sure Page_Up, Page_Down get those names, not Prior,
        Next.

diff --git a/ChangeLog b/ChangeLog
index 8940ffb0be164a9a495e11ae9c683d80613447e2..5943462795cf6e6873934ce71365c87764799b4c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Feb 26 19:16:28 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/win32/gdkkeys-win32.c (gdk_keyval_name): 
+       * gdk/x11/gdkkeys-x11.c (gdk_keyval_name): 
+       Make sure Page_Up, Page_Down get those names, not Prior,
+       Next.
+
 Tue Feb 26 18:58:49 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkaccelgroup.c (gtk_accelerator_set_default_mod_mask):

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 8940ffb0be164a9a495e11ae9c683d80613447e2..5943462795cf6e6873934ce71365c87764799b4c 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+Tue Feb 26 19:16:28 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/win32/gdkkeys-win32.c (gdk_keyval_name): 
+       * gdk/x11/gdkkeys-x11.c (gdk_keyval_name): 
+       Make sure Page_Up, Page_Down get those names, not Prior,
+       Next.
+
 Tue Feb 26 18:58:49 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkaccelgroup.c (gtk_accelerator_set_default_mod_mask):

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8940ffb0be164a9a495e11ae9c683d80613447e2..5943462795cf6e6873934ce71365c87764799b4c 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Tue Feb 26 19:16:28 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/win32/gdkkeys-win32.c (gdk_keyval_name): 
+       * gdk/x11/gdkkeys-x11.c (gdk_keyval_name): 
+       Make sure Page_Up, Page_Down get those names, not Prior,
+       Next.
+
 Tue Feb 26 18:58:49 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkaccelgroup.c (gtk_accelerator_set_default_mod_mask):

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 8940ffb0be164a9a495e11ae9c683d80613447e2..5943462795cf6e6873934ce71365c87764799b4c 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Tue Feb 26 19:16:28 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/win32/gdkkeys-win32.c (gdk_keyval_name): 
+       * gdk/x11/gdkkeys-x11.c (gdk_keyval_name): 
+       Make sure Page_Up, Page_Down get those names, not Prior,
+       Next.
+
 Tue Feb 26 18:58:49 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkaccelgroup.c (gtk_accelerator_set_default_mod_mask):

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 8940ffb0be164a9a495e11ae9c683d80613447e2..5943462795cf6e6873934ce71365c87764799b4c 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Tue Feb 26 19:16:28 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/win32/gdkkeys-win32.c (gdk_keyval_name): 
+       * gdk/x11/gdkkeys-x11.c (gdk_keyval_name): 
+       Make sure Page_Up, Page_Down get those names, not Prior,
+       Next.
+
 Tue Feb 26 18:58:49 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkaccelgroup.c (gtk_accelerator_set_default_mod_mask):

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 8940ffb0be164a9a495e11ae9c683d80613447e2..5943462795cf6e6873934ce71365c87764799b4c 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Tue Feb 26 19:16:28 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/win32/gdkkeys-win32.c (gdk_keyval_name): 
+       * gdk/x11/gdkkeys-x11.c (gdk_keyval_name): 
+       Make sure Page_Up, Page_Down get those names, not Prior,
+       Next.
+
 Tue Feb 26 18:58:49 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkaccelgroup.c (gtk_accelerator_set_default_mod_mask):

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 8940ffb0be164a9a495e11ae9c683d80613447e2..5943462795cf6e6873934ce71365c87764799b4c 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Tue Feb 26 19:16:28 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/win32/gdkkeys-win32.c (gdk_keyval_name): 
+       * gdk/x11/gdkkeys-x11.c (gdk_keyval_name): 
+       Make sure Page_Up, Page_Down get those names, not Prior,
+       Next.
+
 Tue Feb 26 18:58:49 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkaccelgroup.c (gtk_accelerator_set_default_mod_mask):

diff --git a/gdk/win32/gdkkeys-win32.c b/gdk/win32/gdkkeys-win32.c
index 2eebe11dc995f2f65bdb4de377659b3a2b7e122d..30be9db06c831b4a130d3c62a0ca3f773e82e760 100644 (file)
--- a/gdk/win32/gdkkeys-win32.c
+++ b/gdk/win32/gdkkeys-win32.c
@@ -1836,8 +1836,8 @@ static struct gdk_key {
   { 0x00ff54, "Down" },
   { 0x00ff55, "Page_Up" },
   { 0x00ff55, "Prior" },
-  { 0x00ff56, "Next" },
   { 0x00ff56, "Page_Down" },
+  { 0x00ff56, "Next" },
   { 0x00ff57, "End" },
   { 0x00ff58, "Begin" },
   { 0x00ff60, "Select" },
@@ -1874,8 +1874,8 @@ static struct gdk_key {
   { 0x00ff99, "KP_Down" },
   { 0x00ff9a, "KP_Page_Up" },
   { 0x00ff9a, "KP_Prior" },
-  { 0x00ff9b, "KP_Next" },
   { 0x00ff9b, "KP_Page_Down" },
+  { 0x00ff9b, "KP_Next" },
   { 0x00ff9c, "KP_End" },
   { 0x00ff9d, "KP_Begin" },
   { 0x00ff9e, "KP_Insert" },
@@ -1963,12 +1963,22 @@ gdk_keys_keyval_compare (const void *pkey, const void *pbase)
 gchar*
 gdk_keyval_name (guint       keyval)
 {
-  struct gdk_key *found =
-    bsearch (&keyval, gdk_keys_by_keyval,
-            GDK_NUM_KEYS, sizeof (struct gdk_key),
-            gdk_keys_keyval_compare);
+  struct gdk_key *found;
+
+  found = bsearch (&keyval, gdk_keys_by_keyval,
+                  GDK_NUM_KEYS, sizeof (struct gdk_key),
+                  gdk_keys_keyval_compare);
+
   if (found != NULL)
-    return (gchar *) found->name;
+    {
+      while (found > gdk_keys_by_keyval)
+       {
+         if ((found - 1)->keyval == keyval)
+           keyval--;
+       }
+           
+      return (gchar *) found->name;
+    }
   else
     return NULL;
 }

diff --git a/gdk/x11/gdkkeys-x11.c b/gdk/x11/gdkkeys-x11.c
index 3d43d61ebf6f019d54f453a606e8393930f529ed..9d2677b44b719d8b9a3dac6e63f7a63ea7ce9a81 100644 (file)
--- a/gdk/x11/gdkkeys-x11.c
+++ b/gdk/x11/gdkkeys-x11.c
@@ -860,6 +860,18 @@ gdk_keymap_translate_keyboard_state (GdkKeymap       *keymap,
 gchar*
 gdk_keyval_name (guint       keyval)
 {
+  switch (keyval)
+    {
+    case GDK_Page_Up:
+      return "Page_Up";
+    case GDK_Page_Down:
+      return "Page_Down";
+    case GDK_KP_Page_Up:
+      return "KP_Page_Up";
+    case GDK_KP_Page_Down:
+      return "KP_Page_Down";
+    }
+  
   return XKeysymToString (keyval);
 }