>From 448f0e04bab5a0368a80ff74275ec75b7a888315 Mon Sep 17 00:00:00 2001
From: Rodolfo García Peñas (kix) <[email protected]>
Date: Wed, 25 Jan 2012 06:24:27 +0100
Subject: [PATCH 10/24] WindowMaker: wCursor is now defined in WindowMaker.h
The variable wCursor is now defined in WindowMaker.h and therefore the externs
are not needed.
---
src/WindowMaker.h | 1 +
src/appicon.c | 3 ---
src/defaults.c | 1 -
src/dock.c | 1 -
src/event.c | 2 --
src/icon.c | 2 --
src/main.c | 3 ---
src/menu.c | 2 --
src/moveres.c | 3 ---
src/rootmenu.c | 1 -
src/screen.c | 1 -
src/startup.c | 3 ---
src/wcore.c | 3 ---
src/winspector.c | 1 -
14 files changed, 1 insertions(+), 26 deletions(-)
diff --git a/src/WindowMaker.h b/src/WindowMaker.h
index a3f5212..de5b411 100644
--- a/src/WindowMaker.h
+++ b/src/WindowMaker.h
@@ -444,6 +444,7 @@ typedef struct WPreferences {
/****** Global Variables ******/
Display *dpy;
WPreferences wPreferences;
+Cursor wCursor[WCUR_LAST];
unsigned int ValidModMask;
char WProgramState;
char WProgramSigState;
diff --git a/src/appicon.c b/src/appicon.c
index f0c654a..781fff3 100644
--- a/src/appicon.c
+++ b/src/appicon.c
@@ -52,9 +52,6 @@
* using the classname/instancename
*/
-/**** Global variables ****/
-extern Cursor wCursor[WCUR_LAST];
-
#define MOD_MASK wPreferences.modifier_mask
void appIconMouseDown(WObjDescriptor * desc, XEvent * event);
diff --git a/src/defaults.c b/src/defaults.c
index dd35cd6..2608818 100644
--- a/src/defaults.c
+++ b/src/defaults.c
@@ -149,7 +149,6 @@ static int updateUsableArea();
static int setModifierKeyLabels();
-extern Cursor wCursor[WCUR_LAST];
static int getCursor();
static int setCursor();
diff --git a/src/dock.c b/src/dock.c
index 7c45aff..8fb1f89 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -64,7 +64,6 @@
/* in dockedapp.c */
extern void DestroyDockAppSettingsPanel();
extern void ShowDockAppSettingsPanel(WAppIcon * aicon);
-extern Cursor wCursor[WCUR_LAST];
extern XContext wWinContext;
extern void appIconMouseDown(WObjDescriptor *desc, XEvent *event);
diff --git a/src/event.c b/src/event.c
index ce3fe94..8effde5 100644
--- a/src/event.c
+++ b/src/event.c
@@ -72,8 +72,6 @@
extern XContext wWinContext;
extern XContext wVEdgeContext;
-extern Cursor wCursor[WCUR_LAST];
-
extern WShortKey wKeyBindings[WKBD_LAST];
extern int wScreenCount;
extern Time LastTimestamp;
diff --git a/src/icon.c b/src/icon.c
index 13b1c31..342930d 100644
--- a/src/icon.c
+++ b/src/icon.c
@@ -48,8 +48,6 @@
/**** Global varianebles ****/
#define MOD_MASK wPreferences.modifier_mask
-extern Cursor wCursor[WCUR_LAST];
-
static void miniwindowExpose(WObjDescriptor * desc, XEvent * event);
static void miniwindowMouseDown(WObjDescriptor * desc, XEvent * event);
static void miniwindowDblClick(WObjDescriptor * desc, XEvent * event);
diff --git a/src/main.c b/src/main.c
index bd38c4b..bd751f0 100644
--- a/src/main.c
+++ b/src/main.c
@@ -90,9 +90,6 @@ XContext wAppWinContext;
XContext wStackContext;
XContext wVEdgeContext;
-/* cursors */
-Cursor wCursor[WCUR_LAST];
-
/* last event timestamp for XSetInputFocus */
Time LastTimestamp = CurrentTime;
/* timestamp on the last time we did XSetInputFocus() */
diff --git a/src/menu.c b/src/menu.c
index 4a22e3a..6679f66 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -46,8 +46,6 @@
/****** Global Variables ******/
-extern Cursor wCursor[WCUR_LAST];
-
extern XContext wWinContext;
#define MOD_MASK wPreferences.modifier_mask
diff --git a/src/moveres.c b/src/moveres.c
index b37dd14..f75165c 100644
--- a/src/moveres.c
+++ b/src/moveres.c
@@ -60,9 +60,6 @@
*/
#define HAS_BORDER_WITH_SELECT(w) ((w)->flags.selected || HAS_BORDER(w))
-/****** Global Variables ******/
-extern Cursor wCursor[WCUR_LAST];
-
/*
*----------------------------------------------------------------------
* checkMouseSamplingRate-
diff --git a/src/rootmenu.c b/src/rootmenu.c
index afcfaca..0c3f13e 100644
--- a/src/rootmenu.c
+++ b/src/rootmenu.c
@@ -57,7 +57,6 @@
extern char *Locale;
extern WDDomain *WDRootMenu;
-extern Cursor wCursor[WCUR_LAST];
static WMenu *readMenuPipe(WScreen * scr, char **file_name);
static WMenu *readMenuFile(WScreen * scr, char *file_name);
diff --git a/src/screen.c b/src/screen.c
index a989d92..6e37d68 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -69,7 +69,6 @@
|KeyPressMask|KeyReleaseMask)
/**** Global variables ****/
-extern Cursor wCursor[WCUR_LAST];
extern int wScreenCount;
#ifdef KEEP_XKB_LOCK_STATUS
diff --git a/src/startup.c b/src/startup.c
index 67a81e4..d307ee3 100644
--- a/src/startup.c
+++ b/src/startup.c
@@ -110,9 +110,6 @@ extern XContext wAppWinContext;
extern XContext wStackContext;
extern XContext wVEdgeContext;
-/* cursors */
-extern Cursor wCursor[WCUR_LAST];
-
#ifndef HAVE_INOTIFY
/* special flags */
extern char WDelayedActionSet;
diff --git a/src/wcore.c b/src/wcore.c
index 164e0d5..3e6fe78 100644
--- a/src/wcore.c
+++ b/src/wcore.c
@@ -29,9 +29,6 @@
#include "WindowMaker.h"
#include "wcore.h"
-/* cursors */
-extern Cursor wCursor[WCUR_LAST];
-
extern XContext wWinContext;
/*
diff --git a/src/winspector.c b/src/winspector.c
index a847e33..fc55b79 100644
--- a/src/winspector.c
+++ b/src/winspector.c
@@ -117,7 +117,6 @@ typedef struct InspectorPanel {
unsigned int choosingIcon:1;
} InspectorPanel;
-extern Cursor wCursor[WCUR_LAST];
extern WDDomain *WDWindowAttributes;
static InspectorPanel *panelList = NULL;
--
1.7.2.3
--
||// //\\// Rodolfo "kix" Garcia
||\\// //\\ http://www.kix.es/
>From 448f0e04bab5a0368a80ff74275ec75b7a888315 Mon Sep 17 00:00:00 2001
From: Rodolfo GarcÃa Peñas (kix) <[email protected]>
Date: Wed, 25 Jan 2012 06:24:27 +0100
Subject: [PATCH 10/24] WindowMaker: wCursor is now defined in WindowMaker.h
The variable wCursor is now defined in WindowMaker.h and therefore the externs are not needed.
---
src/WindowMaker.h | 1 +
src/appicon.c | 3 ---
src/defaults.c | 1 -
src/dock.c | 1 -
src/event.c | 2 --
src/icon.c | 2 --
src/main.c | 3 ---
src/menu.c | 2 --
src/moveres.c | 3 ---
src/rootmenu.c | 1 -
src/screen.c | 1 -
src/startup.c | 3 ---
src/wcore.c | 3 ---
src/winspector.c | 1 -
14 files changed, 1 insertions(+), 26 deletions(-)
diff --git a/src/WindowMaker.h b/src/WindowMaker.h
index a3f5212..de5b411 100644
--- a/src/WindowMaker.h
+++ b/src/WindowMaker.h
@@ -444,6 +444,7 @@ typedef struct WPreferences {
/****** Global Variables ******/
Display *dpy;
WPreferences wPreferences;
+Cursor wCursor[WCUR_LAST];
unsigned int ValidModMask;
char WProgramState;
char WProgramSigState;
diff --git a/src/appicon.c b/src/appicon.c
index f0c654a..781fff3 100644
--- a/src/appicon.c
+++ b/src/appicon.c
@@ -52,9 +52,6 @@
* using the classname/instancename
*/
-/**** Global variables ****/
-extern Cursor wCursor[WCUR_LAST];
-
#define MOD_MASK wPreferences.modifier_mask
void appIconMouseDown(WObjDescriptor * desc, XEvent * event);
diff --git a/src/defaults.c b/src/defaults.c
index dd35cd6..2608818 100644
--- a/src/defaults.c
+++ b/src/defaults.c
@@ -149,7 +149,6 @@ static int updateUsableArea();
static int setModifierKeyLabels();
-extern Cursor wCursor[WCUR_LAST];
static int getCursor();
static int setCursor();
diff --git a/src/dock.c b/src/dock.c
index 7c45aff..8fb1f89 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -64,7 +64,6 @@
/* in dockedapp.c */
extern void DestroyDockAppSettingsPanel();
extern void ShowDockAppSettingsPanel(WAppIcon * aicon);
-extern Cursor wCursor[WCUR_LAST];
extern XContext wWinContext;
extern void appIconMouseDown(WObjDescriptor *desc, XEvent *event);
diff --git a/src/event.c b/src/event.c
index ce3fe94..8effde5 100644
--- a/src/event.c
+++ b/src/event.c
@@ -72,8 +72,6 @@
extern XContext wWinContext;
extern XContext wVEdgeContext;
-extern Cursor wCursor[WCUR_LAST];
-
extern WShortKey wKeyBindings[WKBD_LAST];
extern int wScreenCount;
extern Time LastTimestamp;
diff --git a/src/icon.c b/src/icon.c
index 13b1c31..342930d 100644
--- a/src/icon.c
+++ b/src/icon.c
@@ -48,8 +48,6 @@
/**** Global varianebles ****/
#define MOD_MASK wPreferences.modifier_mask
-extern Cursor wCursor[WCUR_LAST];
-
static void miniwindowExpose(WObjDescriptor * desc, XEvent * event);
static void miniwindowMouseDown(WObjDescriptor * desc, XEvent * event);
static void miniwindowDblClick(WObjDescriptor * desc, XEvent * event);
diff --git a/src/main.c b/src/main.c
index bd38c4b..bd751f0 100644
--- a/src/main.c
+++ b/src/main.c
@@ -90,9 +90,6 @@ XContext wAppWinContext;
XContext wStackContext;
XContext wVEdgeContext;
-/* cursors */
-Cursor wCursor[WCUR_LAST];
-
/* last event timestamp for XSetInputFocus */
Time LastTimestamp = CurrentTime;
/* timestamp on the last time we did XSetInputFocus() */
diff --git a/src/menu.c b/src/menu.c
index 4a22e3a..6679f66 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -46,8 +46,6 @@
/****** Global Variables ******/
-extern Cursor wCursor[WCUR_LAST];
-
extern XContext wWinContext;
#define MOD_MASK wPreferences.modifier_mask
diff --git a/src/moveres.c b/src/moveres.c
index b37dd14..f75165c 100644
--- a/src/moveres.c
+++ b/src/moveres.c
@@ -60,9 +60,6 @@
*/
#define HAS_BORDER_WITH_SELECT(w) ((w)->flags.selected || HAS_BORDER(w))
-/****** Global Variables ******/
-extern Cursor wCursor[WCUR_LAST];
-
/*
*----------------------------------------------------------------------
* checkMouseSamplingRate-
diff --git a/src/rootmenu.c b/src/rootmenu.c
index afcfaca..0c3f13e 100644
--- a/src/rootmenu.c
+++ b/src/rootmenu.c
@@ -57,7 +57,6 @@
extern char *Locale;
extern WDDomain *WDRootMenu;
-extern Cursor wCursor[WCUR_LAST];
static WMenu *readMenuPipe(WScreen * scr, char **file_name);
static WMenu *readMenuFile(WScreen * scr, char *file_name);
diff --git a/src/screen.c b/src/screen.c
index a989d92..6e37d68 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -69,7 +69,6 @@
|KeyPressMask|KeyReleaseMask)
/**** Global variables ****/
-extern Cursor wCursor[WCUR_LAST];
extern int wScreenCount;
#ifdef KEEP_XKB_LOCK_STATUS
diff --git a/src/startup.c b/src/startup.c
index 67a81e4..d307ee3 100644
--- a/src/startup.c
+++ b/src/startup.c
@@ -110,9 +110,6 @@ extern XContext wAppWinContext;
extern XContext wStackContext;
extern XContext wVEdgeContext;
-/* cursors */
-extern Cursor wCursor[WCUR_LAST];
-
#ifndef HAVE_INOTIFY
/* special flags */
extern char WDelayedActionSet;
diff --git a/src/wcore.c b/src/wcore.c
index 164e0d5..3e6fe78 100644
--- a/src/wcore.c
+++ b/src/wcore.c
@@ -29,9 +29,6 @@
#include "WindowMaker.h"
#include "wcore.h"
-/* cursors */
-extern Cursor wCursor[WCUR_LAST];
-
extern XContext wWinContext;
/*
diff --git a/src/winspector.c b/src/winspector.c
index a847e33..fc55b79 100644
--- a/src/winspector.c
+++ b/src/winspector.c
@@ -117,7 +117,6 @@ typedef struct InspectorPanel {
unsigned int choosingIcon:1;
} InspectorPanel;
-extern Cursor wCursor[WCUR_LAST];
extern WDDomain *WDWindowAttributes;
static InspectorPanel *panelList = NULL;
--
1.7.2.3
