>From 24c83de0d3a3071281cb5b0f217264d49a5d07e6 Mon Sep 17 00:00:00 2001
From: Rodolfo García Peñas (kix) <[email protected]>
Date: Wed, 25 Jan 2012 06:42:17 +0100
Subject: [PATCH 13/24] WindowMaker: X Contexts are defined in WindowMaker.h
The XContext variables are defined in WindowMaker.h, therefore the externs are
not needed.
---
src/WindowMaker.h | 7 +++++++
src/application.c | 3 ---
src/client.c | 3 ---
src/dock.c | 1 -
src/event.c | 3 ---
src/main.c | 6 ------
src/menu.c | 4 ----
src/stacking.c | 3 ---
src/startup.c | 6 ------
src/wcore.c | 2 --
src/window.c | 3 ---
src/workspace.c | 1 -
12 files changed, 7 insertions(+), 35 deletions(-)
diff --git a/src/WindowMaker.h b/src/WindowMaker.h
index 17f98b9..d74240f 100644
--- a/src/WindowMaker.h
+++ b/src/WindowMaker.h
@@ -467,4 +467,11 @@ const char *WMNWorkspaceChanged;
const char *WMNWorkspaceNameChanged;
const char *WMNResetStacking;
+
+/* XContexts */
+XContext wWinContext;
+XContext wAppWinContext;
+XContext wStackContext;
+XContext wVEdgeContext;
+
#endif
diff --git a/src/application.c b/src/application.c
index 8a06859..863fed7 100644
--- a/src/application.c
+++ b/src/application.c
@@ -51,9 +51,6 @@
#include "xinerama.h"
/******** Global variables ********/
-
-extern XContext wAppWinContext;
-extern XContext wWinContext;
extern WDDomain *WDWindowAttributes;
/******** Local variables ********/
diff --git a/src/client.c b/src/client.c
index 9663e7f..3d9fabb 100644
--- a/src/client.c
+++ b/src/client.c
@@ -46,9 +46,6 @@
/****** Global Variables ******/
-/* contexts */
-extern XContext wWinContext;
-
#ifdef SHAPE
extern Bool wShapeSupported;
#endif
diff --git a/src/dock.c b/src/dock.c
index 8fb1f89..df2892b 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 XContext wWinContext;
extern void appIconMouseDown(WObjDescriptor *desc, XEvent *event);
#define MOD_MASK wPreferences.modifier_mask
diff --git a/src/event.c b/src/event.c
index a7d6d26..2ec63a6 100644
--- a/src/event.c
+++ b/src/event.c
@@ -69,9 +69,6 @@
#include "main.h"
/******** Global Variables **********/
-extern XContext wWinContext;
-extern XContext wVEdgeContext;
-
extern WShortKey wKeyBindings[WKBD_LAST];
extern int wScreenCount;
extern Time LastTimestamp;
diff --git a/src/main.c b/src/main.c
index 649e466..b223a0e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -84,12 +84,6 @@ WDDomain *WDWindowMaker = NULL;
WDDomain *WDWindowAttributes = NULL;
WDDomain *WDRootMenu = NULL;
-/* XContexts */
-XContext wWinContext;
-XContext wAppWinContext;
-XContext wStackContext;
-XContext wVEdgeContext;
-
/* 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 6679f66..894ab2e 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -44,10 +44,6 @@
#include "workspace.h"
#include "dialog.h"
-/****** Global Variables ******/
-
-extern XContext wWinContext;
-
#define MOD_MASK wPreferences.modifier_mask
#define MENU_SCROLL_STEP
menuScrollParameters[(int)wPreferences.menu_scroll_speed].steps
diff --git a/src/stacking.c b/src/stacking.c
index 11875c3..d6403e4 100644
--- a/src/stacking.c
+++ b/src/stacking.c
@@ -36,9 +36,6 @@
#include "stacking.h"
#include "workspace.h"
-/*** Global Variables ***/
-extern XContext wStackContext;
-
static void notifyStackChange(WCoreWindow * frame, char *detail)
{
WWindow *wwin = wWindowFor(frame->window);
diff --git a/src/startup.c b/src/startup.c
index 53cd208..5640e92 100644
--- a/src/startup.c
+++ b/src/startup.c
@@ -99,12 +99,6 @@ extern Bool has_randr;
extern int randr_event_base;
#endif
-/* contexts */
-extern XContext wWinContext;
-extern XContext wAppWinContext;
-extern XContext wStackContext;
-extern XContext wVEdgeContext;
-
#ifndef HAVE_INOTIFY
/* special flags */
extern char WDelayedActionSet;
diff --git a/src/wcore.c b/src/wcore.c
index 3e6fe78..3198298 100644
--- a/src/wcore.c
+++ b/src/wcore.c
@@ -29,8 +29,6 @@
#include "WindowMaker.h"
#include "wcore.h"
-extern XContext wWinContext;
-
/*
*----------------------------------------------------------------------
* wCoreCreateTopLevel--
diff --git a/src/window.c b/src/window.c
index a2aa136..836a1ad 100644
--- a/src/window.c
+++ b/src/window.c
@@ -73,9 +73,6 @@ extern WShortKey wKeyBindings[WKBD_LAST];
extern Bool wShapeSupported;
#endif
-/* contexts */
-extern XContext wWinContext;
-
/* protocol atoms */
extern Time LastTimestamp;
diff --git a/src/workspace.c b/src/workspace.c
index f9e89bf..53c61c7 100644
--- a/src/workspace.c
+++ b/src/workspace.c
@@ -53,7 +53,6 @@
#define WORKSPACE_NAME_DISPLAY_PADDING 32
extern int ignore_wks_change;
-extern XContext wVEdgeContext;
extern void ProcessPendingEvents();
static WMPropList *dWorkspaces = NULL;
--
1.7.2.3
--
||// //\\// Rodolfo "kix" Garcia
||\\// //\\ http://www.kix.es/
>From 24c83de0d3a3071281cb5b0f217264d49a5d07e6 Mon Sep 17 00:00:00 2001
From: Rodolfo GarcÃa Peñas (kix) <[email protected]>
Date: Wed, 25 Jan 2012 06:42:17 +0100
Subject: [PATCH 13/24] WindowMaker: X Contexts are defined in WindowMaker.h
The XContext variables are defined in WindowMaker.h, therefore the externs are not needed.
---
src/WindowMaker.h | 7 +++++++
src/application.c | 3 ---
src/client.c | 3 ---
src/dock.c | 1 -
src/event.c | 3 ---
src/main.c | 6 ------
src/menu.c | 4 ----
src/stacking.c | 3 ---
src/startup.c | 6 ------
src/wcore.c | 2 --
src/window.c | 3 ---
src/workspace.c | 1 -
12 files changed, 7 insertions(+), 35 deletions(-)
diff --git a/src/WindowMaker.h b/src/WindowMaker.h
index 17f98b9..d74240f 100644
--- a/src/WindowMaker.h
+++ b/src/WindowMaker.h
@@ -467,4 +467,11 @@ const char *WMNWorkspaceChanged;
const char *WMNWorkspaceNameChanged;
const char *WMNResetStacking;
+
+/* XContexts */
+XContext wWinContext;
+XContext wAppWinContext;
+XContext wStackContext;
+XContext wVEdgeContext;
+
#endif
diff --git a/src/application.c b/src/application.c
index 8a06859..863fed7 100644
--- a/src/application.c
+++ b/src/application.c
@@ -51,9 +51,6 @@
#include "xinerama.h"
/******** Global variables ********/
-
-extern XContext wAppWinContext;
-extern XContext wWinContext;
extern WDDomain *WDWindowAttributes;
/******** Local variables ********/
diff --git a/src/client.c b/src/client.c
index 9663e7f..3d9fabb 100644
--- a/src/client.c
+++ b/src/client.c
@@ -46,9 +46,6 @@
/****** Global Variables ******/
-/* contexts */
-extern XContext wWinContext;
-
#ifdef SHAPE
extern Bool wShapeSupported;
#endif
diff --git a/src/dock.c b/src/dock.c
index 8fb1f89..df2892b 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 XContext wWinContext;
extern void appIconMouseDown(WObjDescriptor *desc, XEvent *event);
#define MOD_MASK wPreferences.modifier_mask
diff --git a/src/event.c b/src/event.c
index a7d6d26..2ec63a6 100644
--- a/src/event.c
+++ b/src/event.c
@@ -69,9 +69,6 @@
#include "main.h"
/******** Global Variables **********/
-extern XContext wWinContext;
-extern XContext wVEdgeContext;
-
extern WShortKey wKeyBindings[WKBD_LAST];
extern int wScreenCount;
extern Time LastTimestamp;
diff --git a/src/main.c b/src/main.c
index 649e466..b223a0e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -84,12 +84,6 @@ WDDomain *WDWindowMaker = NULL;
WDDomain *WDWindowAttributes = NULL;
WDDomain *WDRootMenu = NULL;
-/* XContexts */
-XContext wWinContext;
-XContext wAppWinContext;
-XContext wStackContext;
-XContext wVEdgeContext;
-
/* 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 6679f66..894ab2e 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -44,10 +44,6 @@
#include "workspace.h"
#include "dialog.h"
-/****** Global Variables ******/
-
-extern XContext wWinContext;
-
#define MOD_MASK wPreferences.modifier_mask
#define MENU_SCROLL_STEP menuScrollParameters[(int)wPreferences.menu_scroll_speed].steps
diff --git a/src/stacking.c b/src/stacking.c
index 11875c3..d6403e4 100644
--- a/src/stacking.c
+++ b/src/stacking.c
@@ -36,9 +36,6 @@
#include "stacking.h"
#include "workspace.h"
-/*** Global Variables ***/
-extern XContext wStackContext;
-
static void notifyStackChange(WCoreWindow * frame, char *detail)
{
WWindow *wwin = wWindowFor(frame->window);
diff --git a/src/startup.c b/src/startup.c
index 53cd208..5640e92 100644
--- a/src/startup.c
+++ b/src/startup.c
@@ -99,12 +99,6 @@ extern Bool has_randr;
extern int randr_event_base;
#endif
-/* contexts */
-extern XContext wWinContext;
-extern XContext wAppWinContext;
-extern XContext wStackContext;
-extern XContext wVEdgeContext;
-
#ifndef HAVE_INOTIFY
/* special flags */
extern char WDelayedActionSet;
diff --git a/src/wcore.c b/src/wcore.c
index 3e6fe78..3198298 100644
--- a/src/wcore.c
+++ b/src/wcore.c
@@ -29,8 +29,6 @@
#include "WindowMaker.h"
#include "wcore.h"
-extern XContext wWinContext;
-
/*
*----------------------------------------------------------------------
* wCoreCreateTopLevel--
diff --git a/src/window.c b/src/window.c
index a2aa136..836a1ad 100644
--- a/src/window.c
+++ b/src/window.c
@@ -73,9 +73,6 @@ extern WShortKey wKeyBindings[WKBD_LAST];
extern Bool wShapeSupported;
#endif
-/* contexts */
-extern XContext wWinContext;
-
/* protocol atoms */
extern Time LastTimestamp;
diff --git a/src/workspace.c b/src/workspace.c
index f9e89bf..53c61c7 100644
--- a/src/workspace.c
+++ b/src/workspace.c
@@ -53,7 +53,6 @@
#define WORKSPACE_NAME_DISPLAY_PADDING 32
extern int ignore_wks_change;
-extern XContext wVEdgeContext;
extern void ProcessPendingEvents();
static WMPropList *dWorkspaces = NULL;
--
1.7.2.3
