>From 9bc8cb3299c99a9be4386a1706f6627aadf6de9d Mon Sep 17 00:00:00 2001
From: Rodolfo García Peñas (kix) <[email protected]>
Date: Wed, 25 Jan 2012 05:37:22 +0100
Subject: [PATCH 08/24] WindowMaker: Atoms are defined in main.h
The Atoms are defined now in main.h and included in the files that need them.
Externs removed.
---
src/actions.c | 2 +-
src/appmenu.c | 2 +-
src/client.c | 10 +---------
src/event.c | 12 +-----------
src/main.c | 29 -----------------------------
src/main.h | 30 ++++++++++++++++++++++++++++++
src/properties.c | 15 +--------------
src/screen.c | 2 --
src/session.c | 3 +--
src/shutdown.c | 2 +-
src/startup.c | 23 -----------------------
src/switchpanel.c | 3 +--
src/window.c | 5 +----
src/winmenu.c | 3 +--
src/wmspec.c | 2 +-
15 files changed, 41 insertions(+), 102 deletions(-)
diff --git a/src/actions.c b/src/actions.c
index d7edf45..c7d1c37 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -45,6 +45,7 @@
#include "winspector.h"
#include "workspace.h"
#include "xinerama.h"
+#include "main.h"
/****** Global Variables ******/
@@ -52,7 +53,6 @@ int ignore_wks_change = 0;
extern Time LastTimestamp;
extern Time LastFocusChange;
extern WPreferences wPreferences;
-extern Atom _XA_WM_TAKE_FOCUS;
extern void ProcessPendingEvents();
extern int calcIntersectionLength(int p1, int l1, int p2, int l2);
diff --git a/src/appmenu.c b/src/appmenu.c
index 7c6e6a3..7a1b118 100644
--- a/src/appmenu.c
+++ b/src/appmenu.c
@@ -36,9 +36,9 @@
#include "funcs.h"
#include "appmenu.h"
#include "framewin.h"
+#include "main.h"
/******** Global Variables **********/
-extern Atom _XA_WINDOWMAKER_MENU;
extern Time LastTimestamp;
extern WPreferences wPreferences;
diff --git a/src/client.c b/src/client.c
index 16a4f11..6cd8dc0 100644
--- a/src/client.c
+++ b/src/client.c
@@ -42,21 +42,13 @@
#include "appicon.h"
#include "appmenu.h"
#include "wmspec.h"
+#include "main.h"
/****** Global Variables ******/
/* contexts */
extern XContext wWinContext;
-extern Atom _XA_WM_STATE;
-extern Atom _XA_WM_PROTOCOLS;
-extern Atom _XA_WM_COLORMAP_WINDOWS;
-
-extern Atom _XA_WINDOWMAKER_MENU;
-
-extern Atom _XA_GNUSTEP_WM_ATTR;
-extern Atom _XA_GNUSTEP_WM_RESIZEBAR;
-
#ifdef SHAPE
extern Bool wShapeSupported;
#endif
diff --git a/src/event.c b/src/event.c
index e45cdc2..d541521 100644
--- a/src/event.c
+++ b/src/event.c
@@ -66,6 +66,7 @@
#include "balloon.h"
#include "xinerama.h"
#include "wmspec.h"
+#include "main.h"
/******** Global Variables **********/
extern XContext wWinContext;
@@ -82,17 +83,6 @@ extern WPreferences wPreferences;
#define MOD_MASK wPreferences.modifier_mask
-extern Atom _XA_WM_COLORMAP_NOTIFY;
-
-extern Atom _XA_WM_CHANGE_STATE;
-extern Atom _XA_WM_DELETE_WINDOW;
-extern Atom _XA_GNUSTEP_WM_ATTR;
-extern Atom _XA_GNUSTEP_WM_MINIATURIZE_WINDOW;
-extern Atom _XA_GNUSTEP_TITLEBAR_STATE;
-extern Atom _XA_WINDOWMAKER_WM_FUNCTION;
-extern Atom _XA_WINDOWMAKER_COMMAND;
-extern Atom _XA_WM_IGNORE_FOCUS_EVENTS;
-
#ifdef SHAPE
extern Bool wShapeSupported;
extern int wShapeEventBase;
diff --git a/src/main.c b/src/main.c
index 48c7040..a2695bb 100644
--- a/src/main.c
+++ b/src/main.c
@@ -92,35 +92,6 @@ XContext wAppWinContext;
XContext wStackContext;
XContext wVEdgeContext;
-/* Atoms */
-Atom _XA_WM_STATE;
-Atom _XA_WM_CHANGE_STATE;
-Atom _XA_WM_PROTOCOLS;
-Atom _XA_WM_TAKE_FOCUS;
-Atom _XA_WM_DELETE_WINDOW;
-Atom _XA_WM_SAVE_YOURSELF;
-Atom _XA_WM_CLIENT_LEADER;
-Atom _XA_WM_COLORMAP_WINDOWS;
-Atom _XA_WM_COLORMAP_NOTIFY;
-
-Atom _XA_GNUSTEP_WM_ATTR;
-Atom _XA_GNUSTEP_WM_MINIATURIZE_WINDOW;
-Atom _XA_GNUSTEP_WM_RESIZEBAR;
-Atom _XA_GNUSTEP_TITLEBAR_STATE;
-
-Atom _XA_WINDOWMAKER_MENU;
-Atom _XA_WINDOWMAKER_WM_PROTOCOLS;
-Atom _XA_WINDOWMAKER_STATE;
-
-Atom _XA_WINDOWMAKER_WM_FUNCTION;
-Atom _XA_WINDOWMAKER_NOTICEBOARD;
-Atom _XA_WINDOWMAKER_COMMAND;
-
-Atom _XA_WINDOWMAKER_ICON_SIZE;
-Atom _XA_WINDOWMAKER_ICON_TILE;
-
-Atom _XA_WM_IGNORE_FOCUS_EVENTS;
-
/* cursors */
Cursor wCursor[WCUR_LAST];
diff --git a/src/main.h b/src/main.h
index 9ef4232..f73179e 100644
--- a/src/main.h
+++ b/src/main.h
@@ -1 +1,31 @@
void wAbort(Bool dumpCore);
+
+/* Atoms */
+Atom _XA_WM_STATE;
+Atom _XA_WM_CHANGE_STATE;
+Atom _XA_WM_PROTOCOLS;
+Atom _XA_WM_TAKE_FOCUS;
+Atom _XA_WM_DELETE_WINDOW;
+Atom _XA_WM_SAVE_YOURSELF;
+Atom _XA_WM_CLIENT_LEADER;
+Atom _XA_WM_COLORMAP_WINDOWS;
+Atom _XA_WM_COLORMAP_NOTIFY;
+
+Atom _XA_GNUSTEP_WM_ATTR;
+Atom _XA_GNUSTEP_WM_MINIATURIZE_WINDOW;
+Atom _XA_GNUSTEP_WM_RESIZEBAR;
+Atom _XA_GNUSTEP_TITLEBAR_STATE;
+
+Atom _XA_WINDOWMAKER_MENU;
+Atom _XA_WINDOWMAKER_WM_PROTOCOLS;
+Atom _XA_WINDOWMAKER_STATE;
+
+Atom _XA_WINDOWMAKER_WM_FUNCTION;
+Atom _XA_WINDOWMAKER_NOTICEBOARD;
+Atom _XA_WINDOWMAKER_COMMAND;
+
+Atom _XA_WINDOWMAKER_ICON_SIZE;
+Atom _XA_WINDOWMAKER_ICON_TILE;
+
+Atom _XA_WM_IGNORE_FOCUS_EVENTS;
+
diff --git a/src/properties.c b/src/properties.c
index 46bc3ca..c72572b 100644
--- a/src/properties.c
+++ b/src/properties.c
@@ -29,20 +29,7 @@
#include "WindowMaker.h"
#include "window.h"
#include "GNUstep.h"
-
-/* atoms */
-extern Atom _XA_WM_STATE;
-extern Atom _XA_WM_CLIENT_LEADER;
-extern Atom _XA_WM_TAKE_FOCUS;
-extern Atom _XA_WM_DELETE_WINDOW;
-extern Atom _XA_WM_SAVE_YOURSELF;
-extern Atom _XA_GNUSTEP_WM_ATTR;
-extern Atom _XA_GNUSTEP_WM_MINIATURIZE_WINDOW;
-extern Atom _XA_WINDOWMAKER_WM_FUNCTION;
-extern Atom _XA_WINDOWMAKER_MENU;
-extern Atom _XA_WINDOWMAKER_WM_PROTOCOLS;
-extern Atom _XA_WINDOWMAKER_NOTICEBOARD;
-extern Atom _XA_WINDOWMAKER_ICON_TILE;
+#include "main.h"
int PropGetNormalHints(Window window, XSizeHints * size_hints, int *pre_iccm)
{
diff --git a/src/screen.c b/src/screen.c
index 3bf9d25..78adc12 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -71,8 +71,6 @@
/**** Global variables ****/
extern Cursor wCursor[WCUR_LAST];
extern WPreferences wPreferences;
-extern Atom _XA_WINDOWMAKER_STATE;
-extern Atom _XA_WINDOWMAKER_NOTICEBOARD;
extern int wScreenCount;
diff --git a/src/session.c b/src/session.c
index 811aee3..a4604bc 100644
--- a/src/session.c
+++ b/src/session.c
@@ -81,13 +81,12 @@
#include "application.h"
#include "appicon.h"
#include "dock.h"
+#include "main.h"
#include <WINGs/WUtil.h>
/** Global **/
-extern Atom _XA_WM_SAVE_YOURSELF;
-
extern Time LastTimestamp;
static WMPropList *sApplications = NULL;
diff --git a/src/shutdown.c b/src/shutdown.c
index f0b137d..f7041a5 100644
--- a/src/shutdown.c
+++ b/src/shutdown.c
@@ -35,8 +35,8 @@
#include "session.h"
#include "winspector.h"
#include "wmspec.h"
+#include "main.h"
-extern Atom _XA_WM_DELETE_WINDOW;
extern Time LastTimestamp;
extern int wScreenCount;
diff --git a/src/startup.c b/src/startup.c
index bceda56..d40dedd 100644
--- a/src/startup.c
+++ b/src/startup.c
@@ -111,29 +111,6 @@ extern XContext wAppWinContext;
extern XContext wStackContext;
extern XContext wVEdgeContext;
-/* atoms */
-extern Atom _XA_WM_STATE;
-extern Atom _XA_WM_CHANGE_STATE;
-extern Atom _XA_WM_PROTOCOLS;
-extern Atom _XA_WM_TAKE_FOCUS;
-extern Atom _XA_WM_DELETE_WINDOW;
-extern Atom _XA_WM_SAVE_YOURSELF;
-extern Atom _XA_WM_CLIENT_LEADER;
-extern Atom _XA_WM_COLORMAP_WINDOWS;
-extern Atom _XA_WM_COLORMAP_NOTIFY;
-extern Atom _XA_GNUSTEP_WM_ATTR;
-extern Atom _XA_WINDOWMAKER_MENU;
-extern Atom _XA_WINDOWMAKER_WM_PROTOCOLS;
-extern Atom _XA_WINDOWMAKER_STATE;
-extern Atom _XA_WINDOWMAKER_WM_FUNCTION;
-extern Atom _XA_WINDOWMAKER_NOTICEBOARD;
-extern Atom _XA_WINDOWMAKER_COMMAND;
-extern Atom _XA_WINDOWMAKER_ICON_SIZE;
-extern Atom _XA_WINDOWMAKER_ICON_TILE;
-extern Atom _XA_GNUSTEP_WM_MINIATURIZE_WINDOW;
-extern Atom _XA_GNUSTEP_TITLEBAR_STATE;
-extern Atom _XA_WM_IGNORE_FOCUS_EVENTS;
-
/* cursors */
extern Cursor wCursor[WCUR_LAST];
diff --git a/src/switchpanel.c b/src/switchpanel.c
index 3836991..0bceef5 100644
--- a/src/switchpanel.c
+++ b/src/switchpanel.c
@@ -32,8 +32,7 @@
#include "switchpanel.h"
#include "funcs.h"
#include "xinerama.h"
-
-extern Atom _XA_WM_IGNORE_FOCUS_EVENTS;
+#include "main.h"
#ifdef SHAPE
#include <X11/extensions/shape.h>
diff --git a/src/window.c b/src/window.c
index 7402b7d..31035b6 100644
--- a/src/window.c
+++ b/src/window.c
@@ -62,6 +62,7 @@
# include "motif.h"
#endif
#include "wmspec.h"
+#include "main.h"
#define MOD_MASK wPreferences.modifier_mask
@@ -76,9 +77,6 @@ extern Bool wShapeSupported;
extern XContext wWinContext;
/* protocol atoms */
-extern Atom _XA_WM_DELETE_WINDOW;
-extern Atom _XA_GNUSTEP_WM_MINIATURIZE_WINDOW;
-extern Atom _XA_WINDOWMAKER_STATE;
extern WPreferences wPreferences;
extern Time LastTimestamp;
@@ -765,7 +763,6 @@ WWindow *wManageWindow(WScreen *scr, Window window)
WSETUFLAG(wwin, shared_appicon, 0);
if (wwin->main_window) {
- extern Atom _XA_WINDOWMAKER_MENU;
XTextProperty text_prop;
if (XGetTextProperty(dpy, wwin->main_window, &text_prop,
_XA_WINDOWMAKER_MENU)) {
diff --git a/src/winmenu.c b/src/winmenu.c
index 8e657e6..843f4c5 100644
--- a/src/winmenu.c
+++ b/src/winmenu.c
@@ -44,6 +44,7 @@
#include "stacking.h"
#include "icon.h"
#include "xinerama.h"
+#include "main.h"
#define MC_MAXIMIZE 0
#define MC_MINIATURIZE 1
@@ -66,8 +67,6 @@
/**** Global data ***/
extern Time LastTimestamp;
-extern Atom _XA_WM_DELETE_WINDOW;
-extern Atom _XA_GNUSTEP_WM_MINIATURIZE_WINDOW;
extern WShortKey wKeyBindings[WKBD_LAST];
diff --git a/src/wmspec.c b/src/wmspec.c
index 1b4cf03..9dac4f4 100644
--- a/src/wmspec.c
+++ b/src/wmspec.c
@@ -49,9 +49,9 @@
#include "stacking.h"
#include "xinerama.h"
#include "properties.h"
+#include "main.h"
/* Global variables */
-extern Atom _XA_WM_DELETE_WINDOW;
extern Time LastTimestamp;
extern WPreferences wPreferences;
--
1.7.2.3
--
||// //\\// Rodolfo "kix" Garcia
||\\// //\\ http://www.kix.es/
>From 9bc8cb3299c99a9be4386a1706f6627aadf6de9d Mon Sep 17 00:00:00 2001
From: Rodolfo GarcÃa Peñas (kix) <[email protected]>
Date: Wed, 25 Jan 2012 05:37:22 +0100
Subject: [PATCH 08/24] WindowMaker: Atoms are defined in main.h
The Atoms are defined now in main.h and included in the files that need them. Externs removed.
---
src/actions.c | 2 +-
src/appmenu.c | 2 +-
src/client.c | 10 +---------
src/event.c | 12 +-----------
src/main.c | 29 -----------------------------
src/main.h | 30 ++++++++++++++++++++++++++++++
src/properties.c | 15 +--------------
src/screen.c | 2 --
src/session.c | 3 +--
src/shutdown.c | 2 +-
src/startup.c | 23 -----------------------
src/switchpanel.c | 3 +--
src/window.c | 5 +----
src/winmenu.c | 3 +--
src/wmspec.c | 2 +-
15 files changed, 41 insertions(+), 102 deletions(-)
diff --git a/src/actions.c b/src/actions.c
index d7edf45..c7d1c37 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -45,6 +45,7 @@
#include "winspector.h"
#include "workspace.h"
#include "xinerama.h"
+#include "main.h"
/****** Global Variables ******/
@@ -52,7 +53,6 @@ int ignore_wks_change = 0;
extern Time LastTimestamp;
extern Time LastFocusChange;
extern WPreferences wPreferences;
-extern Atom _XA_WM_TAKE_FOCUS;
extern void ProcessPendingEvents();
extern int calcIntersectionLength(int p1, int l1, int p2, int l2);
diff --git a/src/appmenu.c b/src/appmenu.c
index 7c6e6a3..7a1b118 100644
--- a/src/appmenu.c
+++ b/src/appmenu.c
@@ -36,9 +36,9 @@
#include "funcs.h"
#include "appmenu.h"
#include "framewin.h"
+#include "main.h"
/******** Global Variables **********/
-extern Atom _XA_WINDOWMAKER_MENU;
extern Time LastTimestamp;
extern WPreferences wPreferences;
diff --git a/src/client.c b/src/client.c
index 16a4f11..6cd8dc0 100644
--- a/src/client.c
+++ b/src/client.c
@@ -42,21 +42,13 @@
#include "appicon.h"
#include "appmenu.h"
#include "wmspec.h"
+#include "main.h"
/****** Global Variables ******/
/* contexts */
extern XContext wWinContext;
-extern Atom _XA_WM_STATE;
-extern Atom _XA_WM_PROTOCOLS;
-extern Atom _XA_WM_COLORMAP_WINDOWS;
-
-extern Atom _XA_WINDOWMAKER_MENU;
-
-extern Atom _XA_GNUSTEP_WM_ATTR;
-extern Atom _XA_GNUSTEP_WM_RESIZEBAR;
-
#ifdef SHAPE
extern Bool wShapeSupported;
#endif
diff --git a/src/event.c b/src/event.c
index e45cdc2..d541521 100644
--- a/src/event.c
+++ b/src/event.c
@@ -66,6 +66,7 @@
#include "balloon.h"
#include "xinerama.h"
#include "wmspec.h"
+#include "main.h"
/******** Global Variables **********/
extern XContext wWinContext;
@@ -82,17 +83,6 @@ extern WPreferences wPreferences;
#define MOD_MASK wPreferences.modifier_mask
-extern Atom _XA_WM_COLORMAP_NOTIFY;
-
-extern Atom _XA_WM_CHANGE_STATE;
-extern Atom _XA_WM_DELETE_WINDOW;
-extern Atom _XA_GNUSTEP_WM_ATTR;
-extern Atom _XA_GNUSTEP_WM_MINIATURIZE_WINDOW;
-extern Atom _XA_GNUSTEP_TITLEBAR_STATE;
-extern Atom _XA_WINDOWMAKER_WM_FUNCTION;
-extern Atom _XA_WINDOWMAKER_COMMAND;
-extern Atom _XA_WM_IGNORE_FOCUS_EVENTS;
-
#ifdef SHAPE
extern Bool wShapeSupported;
extern int wShapeEventBase;
diff --git a/src/main.c b/src/main.c
index 48c7040..a2695bb 100644
--- a/src/main.c
+++ b/src/main.c
@@ -92,35 +92,6 @@ XContext wAppWinContext;
XContext wStackContext;
XContext wVEdgeContext;
-/* Atoms */
-Atom _XA_WM_STATE;
-Atom _XA_WM_CHANGE_STATE;
-Atom _XA_WM_PROTOCOLS;
-Atom _XA_WM_TAKE_FOCUS;
-Atom _XA_WM_DELETE_WINDOW;
-Atom _XA_WM_SAVE_YOURSELF;
-Atom _XA_WM_CLIENT_LEADER;
-Atom _XA_WM_COLORMAP_WINDOWS;
-Atom _XA_WM_COLORMAP_NOTIFY;
-
-Atom _XA_GNUSTEP_WM_ATTR;
-Atom _XA_GNUSTEP_WM_MINIATURIZE_WINDOW;
-Atom _XA_GNUSTEP_WM_RESIZEBAR;
-Atom _XA_GNUSTEP_TITLEBAR_STATE;
-
-Atom _XA_WINDOWMAKER_MENU;
-Atom _XA_WINDOWMAKER_WM_PROTOCOLS;
-Atom _XA_WINDOWMAKER_STATE;
-
-Atom _XA_WINDOWMAKER_WM_FUNCTION;
-Atom _XA_WINDOWMAKER_NOTICEBOARD;
-Atom _XA_WINDOWMAKER_COMMAND;
-
-Atom _XA_WINDOWMAKER_ICON_SIZE;
-Atom _XA_WINDOWMAKER_ICON_TILE;
-
-Atom _XA_WM_IGNORE_FOCUS_EVENTS;
-
/* cursors */
Cursor wCursor[WCUR_LAST];
diff --git a/src/main.h b/src/main.h
index 9ef4232..f73179e 100644
--- a/src/main.h
+++ b/src/main.h
@@ -1 +1,31 @@
void wAbort(Bool dumpCore);
+
+/* Atoms */
+Atom _XA_WM_STATE;
+Atom _XA_WM_CHANGE_STATE;
+Atom _XA_WM_PROTOCOLS;
+Atom _XA_WM_TAKE_FOCUS;
+Atom _XA_WM_DELETE_WINDOW;
+Atom _XA_WM_SAVE_YOURSELF;
+Atom _XA_WM_CLIENT_LEADER;
+Atom _XA_WM_COLORMAP_WINDOWS;
+Atom _XA_WM_COLORMAP_NOTIFY;
+
+Atom _XA_GNUSTEP_WM_ATTR;
+Atom _XA_GNUSTEP_WM_MINIATURIZE_WINDOW;
+Atom _XA_GNUSTEP_WM_RESIZEBAR;
+Atom _XA_GNUSTEP_TITLEBAR_STATE;
+
+Atom _XA_WINDOWMAKER_MENU;
+Atom _XA_WINDOWMAKER_WM_PROTOCOLS;
+Atom _XA_WINDOWMAKER_STATE;
+
+Atom _XA_WINDOWMAKER_WM_FUNCTION;
+Atom _XA_WINDOWMAKER_NOTICEBOARD;
+Atom _XA_WINDOWMAKER_COMMAND;
+
+Atom _XA_WINDOWMAKER_ICON_SIZE;
+Atom _XA_WINDOWMAKER_ICON_TILE;
+
+Atom _XA_WM_IGNORE_FOCUS_EVENTS;
+
diff --git a/src/properties.c b/src/properties.c
index 46bc3ca..c72572b 100644
--- a/src/properties.c
+++ b/src/properties.c
@@ -29,20 +29,7 @@
#include "WindowMaker.h"
#include "window.h"
#include "GNUstep.h"
-
-/* atoms */
-extern Atom _XA_WM_STATE;
-extern Atom _XA_WM_CLIENT_LEADER;
-extern Atom _XA_WM_TAKE_FOCUS;
-extern Atom _XA_WM_DELETE_WINDOW;
-extern Atom _XA_WM_SAVE_YOURSELF;
-extern Atom _XA_GNUSTEP_WM_ATTR;
-extern Atom _XA_GNUSTEP_WM_MINIATURIZE_WINDOW;
-extern Atom _XA_WINDOWMAKER_WM_FUNCTION;
-extern Atom _XA_WINDOWMAKER_MENU;
-extern Atom _XA_WINDOWMAKER_WM_PROTOCOLS;
-extern Atom _XA_WINDOWMAKER_NOTICEBOARD;
-extern Atom _XA_WINDOWMAKER_ICON_TILE;
+#include "main.h"
int PropGetNormalHints(Window window, XSizeHints * size_hints, int *pre_iccm)
{
diff --git a/src/screen.c b/src/screen.c
index 3bf9d25..78adc12 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -71,8 +71,6 @@
/**** Global variables ****/
extern Cursor wCursor[WCUR_LAST];
extern WPreferences wPreferences;
-extern Atom _XA_WINDOWMAKER_STATE;
-extern Atom _XA_WINDOWMAKER_NOTICEBOARD;
extern int wScreenCount;
diff --git a/src/session.c b/src/session.c
index 811aee3..a4604bc 100644
--- a/src/session.c
+++ b/src/session.c
@@ -81,13 +81,12 @@
#include "application.h"
#include "appicon.h"
#include "dock.h"
+#include "main.h"
#include <WINGs/WUtil.h>
/** Global **/
-extern Atom _XA_WM_SAVE_YOURSELF;
-
extern Time LastTimestamp;
static WMPropList *sApplications = NULL;
diff --git a/src/shutdown.c b/src/shutdown.c
index f0b137d..f7041a5 100644
--- a/src/shutdown.c
+++ b/src/shutdown.c
@@ -35,8 +35,8 @@
#include "session.h"
#include "winspector.h"
#include "wmspec.h"
+#include "main.h"
-extern Atom _XA_WM_DELETE_WINDOW;
extern Time LastTimestamp;
extern int wScreenCount;
diff --git a/src/startup.c b/src/startup.c
index bceda56..d40dedd 100644
--- a/src/startup.c
+++ b/src/startup.c
@@ -111,29 +111,6 @@ extern XContext wAppWinContext;
extern XContext wStackContext;
extern XContext wVEdgeContext;
-/* atoms */
-extern Atom _XA_WM_STATE;
-extern Atom _XA_WM_CHANGE_STATE;
-extern Atom _XA_WM_PROTOCOLS;
-extern Atom _XA_WM_TAKE_FOCUS;
-extern Atom _XA_WM_DELETE_WINDOW;
-extern Atom _XA_WM_SAVE_YOURSELF;
-extern Atom _XA_WM_CLIENT_LEADER;
-extern Atom _XA_WM_COLORMAP_WINDOWS;
-extern Atom _XA_WM_COLORMAP_NOTIFY;
-extern Atom _XA_GNUSTEP_WM_ATTR;
-extern Atom _XA_WINDOWMAKER_MENU;
-extern Atom _XA_WINDOWMAKER_WM_PROTOCOLS;
-extern Atom _XA_WINDOWMAKER_STATE;
-extern Atom _XA_WINDOWMAKER_WM_FUNCTION;
-extern Atom _XA_WINDOWMAKER_NOTICEBOARD;
-extern Atom _XA_WINDOWMAKER_COMMAND;
-extern Atom _XA_WINDOWMAKER_ICON_SIZE;
-extern Atom _XA_WINDOWMAKER_ICON_TILE;
-extern Atom _XA_GNUSTEP_WM_MINIATURIZE_WINDOW;
-extern Atom _XA_GNUSTEP_TITLEBAR_STATE;
-extern Atom _XA_WM_IGNORE_FOCUS_EVENTS;
-
/* cursors */
extern Cursor wCursor[WCUR_LAST];
diff --git a/src/switchpanel.c b/src/switchpanel.c
index 3836991..0bceef5 100644
--- a/src/switchpanel.c
+++ b/src/switchpanel.c
@@ -32,8 +32,7 @@
#include "switchpanel.h"
#include "funcs.h"
#include "xinerama.h"
-
-extern Atom _XA_WM_IGNORE_FOCUS_EVENTS;
+#include "main.h"
#ifdef SHAPE
#include <X11/extensions/shape.h>
diff --git a/src/window.c b/src/window.c
index 7402b7d..31035b6 100644
--- a/src/window.c
+++ b/src/window.c
@@ -62,6 +62,7 @@
# include "motif.h"
#endif
#include "wmspec.h"
+#include "main.h"
#define MOD_MASK wPreferences.modifier_mask
@@ -76,9 +77,6 @@ extern Bool wShapeSupported;
extern XContext wWinContext;
/* protocol atoms */
-extern Atom _XA_WM_DELETE_WINDOW;
-extern Atom _XA_GNUSTEP_WM_MINIATURIZE_WINDOW;
-extern Atom _XA_WINDOWMAKER_STATE;
extern WPreferences wPreferences;
extern Time LastTimestamp;
@@ -765,7 +763,6 @@ WWindow *wManageWindow(WScreen *scr, Window window)
WSETUFLAG(wwin, shared_appicon, 0);
if (wwin->main_window) {
- extern Atom _XA_WINDOWMAKER_MENU;
XTextProperty text_prop;
if (XGetTextProperty(dpy, wwin->main_window, &text_prop, _XA_WINDOWMAKER_MENU)) {
diff --git a/src/winmenu.c b/src/winmenu.c
index 8e657e6..843f4c5 100644
--- a/src/winmenu.c
+++ b/src/winmenu.c
@@ -44,6 +44,7 @@
#include "stacking.h"
#include "icon.h"
#include "xinerama.h"
+#include "main.h"
#define MC_MAXIMIZE 0
#define MC_MINIATURIZE 1
@@ -66,8 +67,6 @@
/**** Global data ***/
extern Time LastTimestamp;
-extern Atom _XA_WM_DELETE_WINDOW;
-extern Atom _XA_GNUSTEP_WM_MINIATURIZE_WINDOW;
extern WShortKey wKeyBindings[WKBD_LAST];
diff --git a/src/wmspec.c b/src/wmspec.c
index 1b4cf03..9dac4f4 100644
--- a/src/wmspec.c
+++ b/src/wmspec.c
@@ -49,9 +49,9 @@
#include "stacking.h"
#include "xinerama.h"
#include "properties.h"
+#include "main.h"
/* Global variables */
-extern Atom _XA_WM_DELETE_WINDOW;
extern Time LastTimestamp;
extern WPreferences wPreferences;
--
1.7.2.3
