>From f0c0caeebe2968128089a781331f97e32586f5dc Mon Sep 17 00:00:00 2001 From: Rodolfo García Peñas (kix) <k...@kix.es> Date: Wed, 25 Jan 2012 07:40:28 +0100 Subject: [PATCH 20/24] WindowMaker: wKeyBindings is defined now at keybind.h
The externs for wKeyBindings are now not needed, because the header file is included in the other files. --- src/cycling.c | 2 -- src/defaults.c | 3 --- src/event.c | 3 --- src/keybind.h | 2 ++ src/main.c | 2 -- src/startup.c | 3 --- src/window.c | 3 --- src/winmenu.c | 3 --- 8 files changed, 2 insertions(+), 19 deletions(-) diff --git a/src/cycling.c b/src/cycling.c index 3b21884..f7d3e25 100644 --- a/src/cycling.c +++ b/src/cycling.c @@ -39,8 +39,6 @@ #include "switchpanel.h" /* Globals */ -extern WShortKey wKeyBindings[WKBD_LAST]; - static void raiseWindow(WSwitchPanel * swpanel, WWindow * wwin) { Window swwin = wSwitchPanelGetWindow(swpanel); diff --git a/src/defaults.c b/src/defaults.c index 8b2ffd4..e01be2f 100644 --- a/src/defaults.c +++ b/src/defaults.c @@ -68,9 +68,6 @@ #define GLOBAL_DEFAULTS_SUBDIR "WindowMaker" #endif -/***** Global *****/ -extern WShortKey wKeyBindings[WKBD_LAST]; - typedef struct { char *key; char *default_value; diff --git a/src/event.c b/src/event.c index 196dbea..6cfd627 100644 --- a/src/event.c +++ b/src/event.c @@ -68,9 +68,6 @@ #include "wmspec.h" #include "main.h" -/******** Global Variables **********/ -extern WShortKey wKeyBindings[WKBD_LAST]; - #define MOD_MASK wPreferences.modifier_mask /************ Local stuff ***********/ diff --git a/src/keybind.h b/src/keybind.h index e8b503c..b0f81ae 100644 --- a/src/keybind.h +++ b/src/keybind.h @@ -101,6 +101,8 @@ typedef struct WShortKey { KeyCode keycode; } WShortKey; +WShortKey wKeyBindings[WKBD_LAST]; + void wKeyboardInitialize(); #endif /* WMKEYBIND_H */ diff --git a/src/main.c b/src/main.c index 3f0d8df..d0d662a 100644 --- a/src/main.c +++ b/src/main.c @@ -62,8 +62,6 @@ /* general info */ char *ProgName; -WShortKey wKeyBindings[WKBD_LAST]; - /* special flags */ char WDelayedActionSet = 0; /******** End Global Variables *****/ diff --git a/src/startup.c b/src/startup.c index e7bda9b..0727b8e 100644 --- a/src/startup.c +++ b/src/startup.c @@ -82,9 +82,6 @@ # define SA_NODEFER 0 #endif -/****** Global Variables ******/ -extern WShortKey wKeyBindings[WKBD_LAST]; - #ifndef HAVE_INOTIFY /* special flags */ extern char WDelayedActionSet; diff --git a/src/window.c b/src/window.c index 95e82ea..e6385cc 100644 --- a/src/window.c +++ b/src/window.c @@ -66,9 +66,6 @@ #define MOD_MASK wPreferences.modifier_mask -/****** Global Variables ******/ -extern WShortKey wKeyBindings[WKBD_LAST]; - /* superfluous... */ extern void DoWindowBirth(WWindow *wwin); diff --git a/src/winmenu.c b/src/winmenu.c index 835c824..1e74225 100644 --- a/src/winmenu.c +++ b/src/winmenu.c @@ -65,9 +65,6 @@ #define WO_OMNIPRESENT 2 #define WO_ENTRIES 3 -/**** Global data ***/ -extern WShortKey wKeyBindings[WKBD_LAST]; - static void updateOptionsMenu(WMenu * menu, WWindow * wwin); static void execWindowOptionCommand(WMenu * menu, WMenuEntry * entry) -- 1.7.2.3 -- ||// //\\// Rodolfo "kix" Garcia ||\\// //\\ http://www.kix.es/
>From f0c0caeebe2968128089a781331f97e32586f5dc Mon Sep 17 00:00:00 2001 From: Rodolfo GarcÃa Peñas (kix) <k...@kix.es> Date: Wed, 25 Jan 2012 07:40:28 +0100 Subject: [PATCH 20/24] WindowMaker: wKeyBindings is defined now at keybind.h The externs for wKeyBindings are now not needed, because the header file is included in the other files. --- src/cycling.c | 2 -- src/defaults.c | 3 --- src/event.c | 3 --- src/keybind.h | 2 ++ src/main.c | 2 -- src/startup.c | 3 --- src/window.c | 3 --- src/winmenu.c | 3 --- 8 files changed, 2 insertions(+), 19 deletions(-) diff --git a/src/cycling.c b/src/cycling.c index 3b21884..f7d3e25 100644 --- a/src/cycling.c +++ b/src/cycling.c @@ -39,8 +39,6 @@ #include "switchpanel.h" /* Globals */ -extern WShortKey wKeyBindings[WKBD_LAST]; - static void raiseWindow(WSwitchPanel * swpanel, WWindow * wwin) { Window swwin = wSwitchPanelGetWindow(swpanel); diff --git a/src/defaults.c b/src/defaults.c index 8b2ffd4..e01be2f 100644 --- a/src/defaults.c +++ b/src/defaults.c @@ -68,9 +68,6 @@ #define GLOBAL_DEFAULTS_SUBDIR "WindowMaker" #endif -/***** Global *****/ -extern WShortKey wKeyBindings[WKBD_LAST]; - typedef struct { char *key; char *default_value; diff --git a/src/event.c b/src/event.c index 196dbea..6cfd627 100644 --- a/src/event.c +++ b/src/event.c @@ -68,9 +68,6 @@ #include "wmspec.h" #include "main.h" -/******** Global Variables **********/ -extern WShortKey wKeyBindings[WKBD_LAST]; - #define MOD_MASK wPreferences.modifier_mask /************ Local stuff ***********/ diff --git a/src/keybind.h b/src/keybind.h index e8b503c..b0f81ae 100644 --- a/src/keybind.h +++ b/src/keybind.h @@ -101,6 +101,8 @@ typedef struct WShortKey { KeyCode keycode; } WShortKey; +WShortKey wKeyBindings[WKBD_LAST]; + void wKeyboardInitialize(); #endif /* WMKEYBIND_H */ diff --git a/src/main.c b/src/main.c index 3f0d8df..d0d662a 100644 --- a/src/main.c +++ b/src/main.c @@ -62,8 +62,6 @@ /* general info */ char *ProgName; -WShortKey wKeyBindings[WKBD_LAST]; - /* special flags */ char WDelayedActionSet = 0; /******** End Global Variables *****/ diff --git a/src/startup.c b/src/startup.c index e7bda9b..0727b8e 100644 --- a/src/startup.c +++ b/src/startup.c @@ -82,9 +82,6 @@ # define SA_NODEFER 0 #endif -/****** Global Variables ******/ -extern WShortKey wKeyBindings[WKBD_LAST]; - #ifndef HAVE_INOTIFY /* special flags */ extern char WDelayedActionSet; diff --git a/src/window.c b/src/window.c index 95e82ea..e6385cc 100644 --- a/src/window.c +++ b/src/window.c @@ -66,9 +66,6 @@ #define MOD_MASK wPreferences.modifier_mask -/****** Global Variables ******/ -extern WShortKey wKeyBindings[WKBD_LAST]; - /* superfluous... */ extern void DoWindowBirth(WWindow *wwin); diff --git a/src/winmenu.c b/src/winmenu.c index 835c824..1e74225 100644 --- a/src/winmenu.c +++ b/src/winmenu.c @@ -65,9 +65,6 @@ #define WO_OMNIPRESENT 2 #define WO_ENTRIES 3 -/**** Global data ***/ -extern WShortKey wKeyBindings[WKBD_LAST]; - static void updateOptionsMenu(WMenu * menu, WWindow * wwin); static void execWindowOptionCommand(WMenu * menu, WMenuEntry * entry) -- 1.7.2.3