Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Okay, so we need the X11R6 keysyms so programs don't have to worry about

Browse Source 
* Okay, so we need the X11R6 keysyms so programs don't have to
worry about them. They don't conflict anyway. Reverted the #ifdef
changes to gtk/*.c

* gdk/Makefile.am: remove the BUILT_SOURCES rule, and make a
special rule for them (X-derived-headers)

-Yosh
This commit is contained in:
Manish Singh
1998-11-02 04:16:28 +00:00
parent f1bad6c4fe
commit 33dc032aa2
14 changed files with 1466 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@@ -1,3 +1,12 @@
Sun Nov 1 20:05:55 PST 1998 Manish Singh <yosh@gimp.org>
* Okay, so we need the X11R6 keysyms so programs don't have to
worry about them. They don't conflict anyway. Reverted the #ifdef
changes to gtk/*.c
* gdk/Makefile.am: remove the BUILT_SOURCES rule, and make a
special rule for them (X-derived-headers)
Sun Nov 1 05:30:32 PST 1998 Manish Singh <yosh@gimp.org>
* gdk/Makefile.am: changed the awk scripts to generate gdkcursors.h

9
ChangeLog.pre-2-0
View File

@@ -1,3 +1,12 @@
Sun Nov 1 20:05:55 PST 1998 Manish Singh <yosh@gimp.org>
* Okay, so we need the X11R6 keysyms so programs don't have to
worry about them. They don't conflict anyway. Reverted the #ifdef
changes to gtk/*.c
* gdk/Makefile.am: remove the BUILT_SOURCES rule, and make a
special rule for them (X-derived-headers)
Sun Nov 1 05:30:32 PST 1998 Manish Singh <yosh@gimp.org>
* gdk/Makefile.am: changed the awk scripts to generate gdkcursors.h

9
ChangeLog.pre-2-10
View File

@@ -1,3 +1,12 @@
Sun Nov 1 20:05:55 PST 1998 Manish Singh <yosh@gimp.org>
* Okay, so we need the X11R6 keysyms so programs don't have to
worry about them. They don't conflict anyway. Reverted the #ifdef
changes to gtk/*.c
* gdk/Makefile.am: remove the BUILT_SOURCES rule, and make a
special rule for them (X-derived-headers)
Sun Nov 1 05:30:32 PST 1998 Manish Singh <yosh@gimp.org>
* gdk/Makefile.am: changed the awk scripts to generate gdkcursors.h

9
ChangeLog.pre-2-2
View File

@@ -1,3 +1,12 @@
Sun Nov 1 20:05:55 PST 1998 Manish Singh <yosh@gimp.org>
* Okay, so we need the X11R6 keysyms so programs don't have to
worry about them. They don't conflict anyway. Reverted the #ifdef
changes to gtk/*.c
* gdk/Makefile.am: remove the BUILT_SOURCES rule, and make a
special rule for them (X-derived-headers)
Sun Nov 1 05:30:32 PST 1998 Manish Singh <yosh@gimp.org>
* gdk/Makefile.am: changed the awk scripts to generate gdkcursors.h

9
ChangeLog.pre-2-4
View File

@@ -1,3 +1,12 @@
Sun Nov 1 20:05:55 PST 1998 Manish Singh <yosh@gimp.org>
* Okay, so we need the X11R6 keysyms so programs don't have to
worry about them. They don't conflict anyway. Reverted the #ifdef
changes to gtk/*.c
* gdk/Makefile.am: remove the BUILT_SOURCES rule, and make a
special rule for them (X-derived-headers)
Sun Nov 1 05:30:32 PST 1998 Manish Singh <yosh@gimp.org>
* gdk/Makefile.am: changed the awk scripts to generate gdkcursors.h

9
ChangeLog.pre-2-6
View File

@@ -1,3 +1,12 @@
Sun Nov 1 20:05:55 PST 1998 Manish Singh <yosh@gimp.org>
* Okay, so we need the X11R6 keysyms so programs don't have to
worry about them. They don't conflict anyway. Reverted the #ifdef
changes to gtk/*.c
* gdk/Makefile.am: remove the BUILT_SOURCES rule, and make a
special rule for them (X-derived-headers)
Sun Nov 1 05:30:32 PST 1998 Manish Singh <yosh@gimp.org>
* gdk/Makefile.am: changed the awk scripts to generate gdkcursors.h

9
ChangeLog.pre-2-8
View File

@@ -1,3 +1,12 @@
Sun Nov 1 20:05:55 PST 1998 Manish Singh <yosh@gimp.org>
* Okay, so we need the X11R6 keysyms so programs don't have to
worry about them. They don't conflict anyway. Reverted the #ifdef
changes to gtk/*.c
* gdk/Makefile.am: remove the BUILT_SOURCES rule, and make a
special rule for them (X-derived-headers)
Sun Nov 1 05:30:32 PST 1998 Manish Singh <yosh@gimp.org>
* gdk/Makefile.am: changed the awk scripts to generate gdkcursors.h

13
gdk/Makefile.am
View File

@@ -67,21 +67,14 @@ gxid_LDADD = \
@x_libs@ \
-lm
BUILT_SOURCES = gdkcursors.h gdkkeysyms.h
# cause the built sources to be rebuild when possible, even with --include-deps
$(libgdk_la_SOURCES): $(BUILT_SOURCES)
gdkcursors.h:
X-derived-headers:
sed -e 's/^#define[ ]*XC\([^ ]*\)[ ]*\([^ ]*\)[ ]*.*$$/GDK\1 = \2,/' \
-e 'tb' -e 'd' -e ':b' \
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \
< @x_includes@/X11/cursorfont.h > $@
gdkkeysyms.h:
< @x_includes@/X11/cursorfont.h > gdkcursors.h ; \
sed -e 's/^#define[ ]*XK\([^ ]*\)[ ]*\([^ ]*\)[ ]*.*$$/#define GDK\1 \2/' \
-e 'tb' -e 'd' -e ':b' -e 's/ 0X/ 0x/' \
< @x_includes@/X11/keysymdef.h > $@
< @x_includes@/X11/keysymdef.h > gdkkeysyms.h
.PHONY: files

78
gdk/gdkcursors.h Normal file
View File

@@ -0,0 +1,78 @@
GDK_NUM_GLYPHS = 154,
GDK_X_CURSOR = 0,
GDK_ARROW = 2,
GDK_BASED_ARROW_DOWN = 4,
GDK_BASED_ARROW_UP = 6,
GDK_BOAT = 8,
GDK_BOGOSITY = 10,
GDK_BOTTOM_LEFT_CORNER = 12,
GDK_BOTTOM_RIGHT_CORNER = 14,
GDK_BOTTOM_SIDE = 16,
GDK_BOTTOM_TEE = 18,
GDK_BOX_SPIRAL = 20,
GDK_CENTER_PTR = 22,
GDK_CIRCLE = 24,
GDK_CLOCK = 26,
GDK_COFFEE_MUG = 28,
GDK_CROSS = 30,
GDK_CROSS_REVERSE = 32,
GDK_CROSSHAIR = 34,
GDK_DIAMOND_CROSS = 36,
GDK_DOT = 38,
GDK_DOTBOX = 40,
GDK_DOUBLE_ARROW = 42,
GDK_DRAFT_LARGE = 44,
GDK_DRAFT_SMALL = 46,
GDK_DRAPED_BOX = 48,
GDK_EXCHANGE = 50,
GDK_FLEUR = 52,
GDK_GOBBLER = 54,
GDK_GUMBY = 56,
GDK_HAND1 = 58,
GDK_HAND2 = 60,
GDK_HEART = 62,
GDK_ICON = 64,
GDK_IRON_CROSS = 66,
GDK_LEFT_PTR = 68,
GDK_LEFT_SIDE = 70,
GDK_LEFT_TEE = 72,
GDK_LEFTBUTTON = 74,
GDK_LL_ANGLE = 76,
GDK_LR_ANGLE = 78,
GDK_MAN = 80,
GDK_MIDDLEBUTTON = 82,
GDK_MOUSE = 84,
GDK_PENCIL = 86,
GDK_PIRATE = 88,
GDK_PLUS = 90,
GDK_QUESTION_ARROW = 92,
GDK_RIGHT_PTR = 94,
GDK_RIGHT_SIDE = 96,
GDK_RIGHT_TEE = 98,
GDK_RIGHTBUTTON = 100,
GDK_RTL_LOGO = 102,
GDK_SAILBOAT = 104,
GDK_SB_DOWN_ARROW = 106,
GDK_SB_H_DOUBLE_ARROW = 108,
GDK_SB_LEFT_ARROW = 110,
GDK_SB_RIGHT_ARROW = 112,
GDK_SB_UP_ARROW = 114,
GDK_SB_V_DOUBLE_ARROW = 116,
GDK_SHUTTLE = 118,
GDK_SIZING = 120,
GDK_SPIDER = 122,
GDK_SPRAYCAN = 124,
GDK_STAR = 126,
GDK_TARGET = 128,
GDK_TCROSS = 130,
GDK_TOP_LEFT_ARROW = 132,
GDK_TOP_LEFT_CORNER = 134,
GDK_TOP_RIGHT_CORNER = 136,
GDK_TOP_SIDE = 138,
GDK_TOP_TEE = 140,
GDK_TREK = 142,
GDK_UL_ANGLE = 144,
GDK_UMBRELLA = 146,
GDK_UR_ANGLE = 148,
GDK_WATCH = 150,
GDK_XTERM = 152,

1317
gdk/gdkkeysyms.h Normal file
View File

File diff suppressed because it is too large Load Diff

34
gtk/gtkaccelgroup.c
View File

@@ -704,40 +704,16 @@ gtk_accelerator_valid (guint keyval,
{
guint invalid_accelerator_vals[] = {
GDK_BackSpace, GDK_Delete, GDK_KP_Delete,
GDK_Shift_L, GDK_Shift_R, GDK_Shift_Lock, GDK_Caps_Lock,
GDK_Shift_L, GDK_Shift_R, GDK_Shift_Lock, GDK_Caps_Lock, GDK_ISO_Lock,
GDK_Control_L, GDK_Control_R, GDK_Meta_L, GDK_Meta_R,
GDK_Super_L, GDK_Super_R, GDK_Hyper_L, GDK_Hyper_R,
GDK_Mode_switch, GDK_Num_Lock, GDK_Multi_key,
GDK_Scroll_Lock, GDK_Sys_Req,
GDK_Up, GDK_Down, GDK_Left, GDK_Right, GDK_Tab,
GDK_Up, GDK_Down, GDK_Left, GDK_Right, GDK_Tab, GDK_ISO_Left_Tab,
GDK_KP_Up, GDK_KP_Down, GDK_KP_Left, GDK_KP_Right, GDK_KP_Tab,
/* These aren't available on X11R5 */
#ifdef GDK_ISO_Lock
GDK_ISO_Lock,
#endif
#ifdef GDK_ISO_Left_Tab
GDK_ISO_Left_Tab,
#endif
#ifdef GDK_First_Virtual_Screen
GDK_First_Virtual_Screen,
#endif
#ifdef GDK_Prev_Virtual_Screen
GDK_Prev_Virtual_Screen,
#endif
#ifdef GDK_Next_Virtual_Screen
GDK_Next_Virtual_Screen,
#endif
#ifdef GDK_Last_Virtual_Screen
GDK_Last_Virtual_Screen,
#endif
#ifdef GDK_Terminate_Server
GDK_Terminate_Server,
#endif
#ifdef GDK_AudibleBell_Enable
GDK_AudibleBell_Enable,
#endif
GDK_First_Virtual_Screen, GDK_Prev_Virtual_Screen,
GDK_Next_Virtual_Screen, GDK_Last_Virtual_Screen,
GDK_Terminate_Server, GDK_AudibleBell_Enable,
0
};
guint *ac_val;

2
gtk/gtkclist.c
View File

@@ -4404,9 +4404,7 @@ gtk_clist_key_press (GtkWidget *widget,
switch (event->keyval)
{
case GDK_Tab:
#ifdef GDK_ISO_Left_Tab /* Not available on X11R5 */
case GDK_ISO_Left_Tab:
#endif
if (event->state & GDK_SHIFT_MASK)
return gtk_container_focus (GTK_CONTAINER (widget),
GTK_DIR_TAB_BACKWARD);

2
gtk/gtknotebook.c
View File

@@ -3123,9 +3123,7 @@ gtk_notebook_key_press (GtkWidget *widget,
direction = GTK_DIR_RIGHT;
break;
case GDK_Tab:
#ifdef GDK_ISO_Left_Tab /* Not available on X11R5 */
case GDK_ISO_Left_Tab:
#endif
if (event->state & GDK_SHIFT_MASK)
direction = GTK_DIR_TAB_BACKWARD;
else

4
gtk/gtkwindow.c
View File

@@ -818,9 +818,7 @@ gtk_window_key_press_event (GtkWidget *widget,
case GDK_Left:
case GDK_Right:
case GDK_Tab:
#ifdef GDK_ISO_Left_Tab /* Not available on X11R5 */
case GDK_ISO_Left_Tab:
#endif
switch (event->keyval)
{
case GDK_Up:
@@ -836,9 +834,7 @@ gtk_window_key_press_event (GtkWidget *widget,
direction = GTK_DIR_RIGHT;
break;
case GDK_Tab:
#ifdef GDK_ISO_Left_Tab /* Not available on X11R5 */
case GDK_ISO_Left_Tab:
#endif
if (event->state & GDK_SHIFT_MASK)
direction = GTK_DIR_TAB_BACKWARD;
else