Avoid duplicate keysyms, ignore mispelled one

GDK_Select and GDK_Clear were duplicated, GDK_Calculater is
only useful for compulsive misspellers.
This commit is contained in:
Bastien Nocera 2009-09-10 10:15:10 +01:00
parent 43fbf646a8
commit 4ccd47f47e
2 changed files with 13 additions and 4 deletions

View File

@ -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/ );

View File

@ -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