mirror of
https://github.com/gryf/wmaker.git
synced 2025-12-19 20:38:08 +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:
committed by
Carlos R. Mafra
parent
d9832e578f
commit
18059fb1c7
@@ -38,8 +38,6 @@
|
||||
#include "xinerama.h"
|
||||
#include "switchpanel.h"
|
||||
|
||||
/* Globals */
|
||||
extern WShortKey wKeyBindings[WKBD_LAST];
|
||||
|
||||
static void raiseWindow(WSwitchPanel * swpanel, WWindow * wwin)
|
||||
{
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -76,8 +76,6 @@
|
||||
#include "winmenu.h"
|
||||
#include "switchmenu.h"
|
||||
|
||||
/******** Global Variables **********/
|
||||
extern WShortKey wKeyBindings[WKBD_LAST];
|
||||
|
||||
#define MOD_MASK wPreferences.modifier_mask
|
||||
|
||||
|
||||
@@ -128,6 +128,12 @@ typedef struct WShortKey {
|
||||
KeyCode keycode;
|
||||
} WShortKey;
|
||||
|
||||
/* ---[ Global Variables ]------------------------------------------------ */
|
||||
|
||||
extern WShortKey wKeyBindings[WKBD_LAST];
|
||||
|
||||
/* ---[ Functions ]------------------------------------------------------- */
|
||||
|
||||
void wKeyboardInitialize(void);
|
||||
|
||||
#endif /* WMKEYBIND_H */
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -72,8 +72,6 @@
|
||||
|
||||
#define MOD_MASK wPreferences.modifier_mask
|
||||
|
||||
/****** Global Variables ******/
|
||||
extern WShortKey wKeyBindings[WKBD_LAST];
|
||||
|
||||
/***** Local Stuff *****/
|
||||
static WWindowState *windowState = NULL;
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user