From 88e361d4a01e568d682bce0358d86847e4cb0b15 Mon Sep 17 00:00:00 2001 From: Daniel Carbonell Fraj Date: Sat, 16 Aug 2003 14:15:55 +0000 Subject: [PATCH] added missing default keys, closes Debian bug #205656 --- ChangeLog | 8 ++++++++ src/config.c | 8 +++++++- src/config.h | 33 ++++++++++++++++++--------------- 3 files changed, 33 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 520a8dc..4b0e423 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2003-08-16 Dani Carbonell + + * src/config.c: Addded missing default keys to the 'defaultkeys' + array, fixes Debian bug #205656. + + * src/config.h (GTetrinetKeys): Changed this bunch of defines to be a + single enum. + 2003-08-10 Hasbullah Bin Pit * configure.in: Added 'ms' (Malay) to AlL_LINGUAS. diff --git a/src/config.c b/src/config.c index c7b4ad8..33f8cb3 100644 --- a/src/config.c +++ b/src/config.c @@ -66,7 +66,13 @@ guint defaultkeys[K_NUM] = { GDK_Down, GDK_space, GDK_d, - GDK_t + GDK_t, + GDK_1, + GDK_2, + GDK_3, + GDK_4, + GDK_5, + GDK_6 }; guint keys[K_NUM]; diff --git a/src/config.h b/src/config.h index d8818c0..37ea825 100644 --- a/src/config.h +++ b/src/config.h @@ -115,19 +115,22 @@ partyline_enable_channel_list_changed (GConfClient *client, #define GTETRINET_THEMES GTETRINET_DATA"/themes" #define DEFAULTTHEME GTETRINET_THEMES"/default/" -#define K_RIGHT 0 -#define K_LEFT 1 -#define K_ROTRIGHT 2 -#define K_ROTLEFT 3 -#define K_DOWN 4 -#define K_DROP 5 -#define K_DISCARD 6 -#define K_GAMEMSG 7 -#define K_SPECIAL1 8 -#define K_SPECIAL2 9 -#define K_SPECIAL3 10 -#define K_SPECIAL4 11 -#define K_SPECIAL5 12 -#define K_SPECIAL6 13 +typedef enum +{ + K_RIGHT, + K_LEFT, + K_ROTRIGHT, + K_ROTLEFT, + K_DOWN, + K_DROP, + K_DISCARD, + K_GAMEMSG, + K_SPECIAL1, + K_SPECIAL2, + K_SPECIAL3, + K_SPECIAL4, + K_SPECIAL5, + K_SPECIAL6, /* not a key but the number of configurable keys */ -#define K_NUM 14 + K_NUM +} GTetrinetKeys; -- 2.50.1