1
0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 12:28:22 +01:00

wmaker: Moved definition of global variable 'wKeyBindings' to header

Multiple declaration of global variables in local source files is
a dangerous idea.
This commit is contained in:
Christophe CURIS
2013-10-10 23:55:55 +02:00
committed by Carlos R. Mafra
parent d9832e578f
commit 18059fb1c7
8 changed files with 6 additions and 15 deletions

View File

@@ -38,8 +38,6 @@
#include "xinerama.h"
#include "switchpanel.h"
/* Globals */
extern WShortKey wKeyBindings[WKBD_LAST];
static void raiseWindow(WSwitchPanel * swpanel, WWindow * wwin)
{

View File

@@ -71,8 +71,6 @@
#define GLOBAL_DEFAULTS_SUBDIR "WindowMaker"
#endif
/***** Global *****/
extern WShortKey wKeyBindings[WKBD_LAST];
typedef struct _WDefaultEntry WDefaultEntry;
typedef int (WDECallbackConvert) (WScreen *scr, WDefaultEntry *entry, WMPropList *plvalue, void *addr, void **tdata);

View File

@@ -76,8 +76,6 @@
#include "winmenu.h"
#include "switchmenu.h"
/******** Global Variables **********/
extern WShortKey wKeyBindings[WKBD_LAST];
#define MOD_MASK wPreferences.modifier_mask

View File

@@ -128,6 +128,12 @@ typedef struct WShortKey {
KeyCode keycode;
} WShortKey;
/* ---[ Global Variables ]------------------------------------------------ */
extern WShortKey wKeyBindings[WKBD_LAST];
/* ---[ Functions ]------------------------------------------------------- */
void wKeyboardInitialize(void);
#endif /* WMKEYBIND_H */

View File

@@ -84,9 +84,6 @@
# define SA_NODEFER 0
#endif
/****** Global Variables ******/
extern WShortKey wKeyBindings[WKBD_LAST];
/***** Local *****/
static WScreen **wScreen = NULL;
static unsigned int _NumLockMask = 0;

View File

@@ -72,8 +72,6 @@
#define MOD_MASK wPreferences.modifier_mask
/****** Global Variables ******/
extern WShortKey wKeyBindings[WKBD_LAST];
/***** Local Stuff *****/
static WWindowState *windowState = NULL;

View File

@@ -68,9 +68,6 @@
#define WO_OMNIPRESENT 2
#define WO_ENTRIES 3
/**** Global data ***/
extern WShortKey wKeyBindings[WKBD_LAST];
static void updateOptionsMenu(WMenu * menu, WWindow * wwin);

View File

@@ -59,7 +59,6 @@
#define MAX_SHORTCUT_LENGTH 32
#define WORKSPACE_NAME_DISPLAY_PADDING 32
extern WShortKey wKeyBindings[WKBD_LAST];
static WMPropList *dWorkspaces = NULL;
static WMPropList *dClip, *dName;