diff options
| author | Bastien Nocera <hadess@hadess.net> | 2009-09-10 10:15:10 +0100 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2009-09-10 10:16:44 +0100 |
| commit | 4ccd47f47ec533564c7159856d4a40306b8c330b (patch) | |
| tree | e943e5393d79ebf46120c5b2254e414071ee879b /gdk | |
| parent | 43fbf646a870c0ae321f891adabeab5cbe2dc977 (diff) | |
| download | gtk+-4ccd47f47ec533564c7159856d4a40306b8c330b.tar.gz | |
Avoid duplicate keysyms, ignore mispelled one
GDK_Select and GDK_Clear were duplicated, GDK_Calculater is
only useful for compulsive misspellers.
Diffstat (limited to 'gdk')
| -rwxr-xr-x | gdk/gdkkeysyms-update.pl | 12 | ||||
| -rw-r--r-- | gdk/gdkkeysyms.h | 5 |
2 files changed, 13 insertions, 4 deletions
diff --git a/gdk/gdkkeysyms-update.pl b/gdk/gdkkeysyms-update.pl index 62d05daffd..bdfb9c29ec 100755 --- a/gdk/gdkkeysyms-update.pl +++ b/gdk/gdkkeysyms-update.pl @@ -145,10 +145,20 @@ while (<IN_XF86KEYSYM>) if ($_ eq "XF86XK_XF86BackForward") { $keysymelements[1] = "XF86XK_AudioForward"; } + # XF86XK_Clear could end up a dupe of XK_Clear + # XF86XK_Select could end up a dupe of XK_Select + if ($_ eq "XF86XK_Clear") { + $keysymelements[1] = "XF86XK_WindowClear"; + } + if ($_ eq "XF86XK_Select") { + $keysymelements[1] = "XF86XK_SelectButton"; + } # Ignore XF86XK_Q next if ( $_ eq "XF86XK_Q"); - + # XF86XK_Calculater is misspelled, and a dupe + next if ( $_ eq "XF86XK_Calculater"); + $_ = $keysymelements[2]; die "Internal error, was expecting \"0x*\", found: $_\n" if ( ! /^0x/ ); diff --git a/gdk/gdkkeysyms.h b/gdk/gdkkeysyms.h index 6364edd052..b4da5de9cc 100644 --- a/gdk/gdkkeysyms.h +++ b/gdk/gdkkeysyms.h @@ -2116,8 +2116,7 @@ #define GDK_ApplicationRight 0x1008ff51 #define GDK_Book 0x1008ff52 #define GDK_CD 0x1008ff53 -#define GDK_Calculater 0x1008ff54 -#define GDK_Clear 0x1008ff55 +#define GDK_WindowClear 0x1008ff55 #define GDK_Close 0x1008ff56 #define GDK_Copy 0x1008ff57 #define GDK_Cut 0x1008ff58 @@ -2187,7 +2186,7 @@ #define GDK_FrameBack 0x1008ff9d #define GDK_FrameForward 0x1008ff9e #define GDK_Time 0x1008ff9f -#define GDK_Select 0x1008ffa0 +#define GDK_SelectButton 0x1008ffa0 #define GDK_View 0x1008ffa1 #define GDK_TopMenu 0x1008ffa2 #define GDK_Red 0x1008ffa3 |