>From c031c2fcfbeadce7c8da0dbd13b251cfa65bb825 Mon Sep 17 00:00:00 2001
From: Rodolfo García Peñas (kix) <[email protected]>
Date: Wed, 25 Jan 2012 06:51:28 +0100
Subject: [PATCH 14/24] WindowMaker: XShape and XRandr variables in WindowMaker.h
The variables for XShape and XRandr now are in WindowMaker.h and the externs
are not needed.
---
src/WindowMaker.h | 10 ++++++++++
src/client.c | 6 ------
src/event.c | 14 --------------
src/main.c | 10 ----------
src/screen.c | 5 -----
src/startup.c | 10 ----------
src/switchpanel.c | 2 --
src/window.c | 4 ----
8 files changed, 10 insertions(+), 51 deletions(-)
diff --git a/src/WindowMaker.h b/src/WindowMaker.h
index d74240f..15e9216 100644
--- a/src/WindowMaker.h
+++ b/src/WindowMaker.h
@@ -474,4 +474,14 @@ XContext wAppWinContext;
XContext wStackContext;
XContext wVEdgeContext;
+#ifdef SHAPE
+Bool wShapeSupported;
+int wShapeEventBase;
+#endif
+
+#ifdef HAVE_XRANDR
+Bool has_randr;
+int randr_event_base;
+#endif
+
#endif
diff --git a/src/client.c b/src/client.c
index 3d9fabb..a0c4ced 100644
--- a/src/client.c
+++ b/src/client.c
@@ -44,12 +44,6 @@
#include "wmspec.h"
#include "main.h"
-/****** Global Variables ******/
-
-#ifdef SHAPE
-extern Bool wShapeSupported;
-#endif
-
/*
*--------------------------------------------------------------------
* wClientRestore--
diff --git a/src/event.c b/src/event.c
index 2ec63a6..2eb9bbb 100644
--- a/src/event.c
+++ b/src/event.c
@@ -76,21 +76,7 @@ extern Time LastFocusChange;
#define MOD_MASK wPreferences.modifier_mask
-#ifdef SHAPE
-extern Bool wShapeSupported;
-extern int wShapeEventBase;
-#endif
-
-#ifdef HAVE_XRANDR
-extern Bool has_randr;
-extern int randr_event_base;
-#endif
-
-/* special flags */
-/*extern char WDelayedActionSet;*/
-
/************ Local stuff ***********/
-
static void saveTimestamp(XEvent *event);
static void handleColormapNotify(XEvent *event);
static void handleMapNotify(XEvent *event);
diff --git a/src/main.c b/src/main.c
index b223a0e..fa72056 100644
--- a/src/main.c
+++ b/src/main.c
@@ -89,16 +89,6 @@ Time LastTimestamp = CurrentTime;
/* timestamp on the last time we did XSetInputFocus() */
Time LastFocusChange = CurrentTime;
-#ifdef SHAPE
-Bool wShapeSupported;
-int wShapeEventBase;
-#endif
-
-#ifdef HAVE_XRANDR
-Bool has_randr;
-int randr_event_base;
-#endif
-
/* special flags */
char WDelayedActionSet = 0;
/******** End Global Variables *****/
diff --git a/src/screen.c b/src/screen.c
index 4bad564..5cca7bb 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -70,11 +70,6 @@
/**** Global variables ****/
extern int wScreenCount;
-
-#ifdef HAVE_XRANDR
-extern int has_randr;
-#endif
-
extern WDDomain *WDWindowMaker;
/**** Local ****/
diff --git a/src/startup.c b/src/startup.c
index 5640e92..26ccc8f 100644
--- a/src/startup.c
+++ b/src/startup.c
@@ -89,16 +89,6 @@ extern WDDomain *WDWindowAttributes;
extern WShortKey wKeyBindings[WKBD_LAST];
extern int wScreenCount;
-#ifdef SHAPE
-extern Bool wShapeSupported;
-extern int wShapeEventBase;
-#endif
-
-#ifdef HAVE_XRANDR
-extern Bool has_randr;
-extern int randr_event_base;
-#endif
-
#ifndef HAVE_INOTIFY
/* special flags */
extern char WDelayedActionSet;
diff --git a/src/switchpanel.c b/src/switchpanel.c
index 94aee03..daf3c90 100644
--- a/src/switchpanel.c
+++ b/src/switchpanel.c
@@ -36,8 +36,6 @@
#ifdef SHAPE
#include <X11/extensions/shape.h>
-
-extern Bool wShapeSupported;
#endif
struct SwitchPanel {
diff --git a/src/window.c b/src/window.c
index 836a1ad..52f2dc5 100644
--- a/src/window.c
+++ b/src/window.c
@@ -69,10 +69,6 @@
/****** Global Variables ******/
extern WShortKey wKeyBindings[WKBD_LAST];
-#ifdef SHAPE
-extern Bool wShapeSupported;
-#endif
-
/* protocol atoms */
extern Time LastTimestamp;
--
1.7.2.3
--
||// //\\// Rodolfo "kix" Garcia
||\\// //\\ http://www.kix.es/
>From c031c2fcfbeadce7c8da0dbd13b251cfa65bb825 Mon Sep 17 00:00:00 2001
From: Rodolfo GarcÃa Peñas (kix) <[email protected]>
Date: Wed, 25 Jan 2012 06:51:28 +0100
Subject: [PATCH 14/24] WindowMaker: XShape and XRandr variables in WindowMaker.h
The variables for XShape and XRandr now are in WindowMaker.h and the externs are not needed.
---
src/WindowMaker.h | 10 ++++++++++
src/client.c | 6 ------
src/event.c | 14 --------------
src/main.c | 10 ----------
src/screen.c | 5 -----
src/startup.c | 10 ----------
src/switchpanel.c | 2 --
src/window.c | 4 ----
8 files changed, 10 insertions(+), 51 deletions(-)
diff --git a/src/WindowMaker.h b/src/WindowMaker.h
index d74240f..15e9216 100644
--- a/src/WindowMaker.h
+++ b/src/WindowMaker.h
@@ -474,4 +474,14 @@ XContext wAppWinContext;
XContext wStackContext;
XContext wVEdgeContext;
+#ifdef SHAPE
+Bool wShapeSupported;
+int wShapeEventBase;
+#endif
+
+#ifdef HAVE_XRANDR
+Bool has_randr;
+int randr_event_base;
+#endif
+
#endif
diff --git a/src/client.c b/src/client.c
index 3d9fabb..a0c4ced 100644
--- a/src/client.c
+++ b/src/client.c
@@ -44,12 +44,6 @@
#include "wmspec.h"
#include "main.h"
-/****** Global Variables ******/
-
-#ifdef SHAPE
-extern Bool wShapeSupported;
-#endif
-
/*
*--------------------------------------------------------------------
* wClientRestore--
diff --git a/src/event.c b/src/event.c
index 2ec63a6..2eb9bbb 100644
--- a/src/event.c
+++ b/src/event.c
@@ -76,21 +76,7 @@ extern Time LastFocusChange;
#define MOD_MASK wPreferences.modifier_mask
-#ifdef SHAPE
-extern Bool wShapeSupported;
-extern int wShapeEventBase;
-#endif
-
-#ifdef HAVE_XRANDR
-extern Bool has_randr;
-extern int randr_event_base;
-#endif
-
-/* special flags */
-/*extern char WDelayedActionSet;*/
-
/************ Local stuff ***********/
-
static void saveTimestamp(XEvent *event);
static void handleColormapNotify(XEvent *event);
static void handleMapNotify(XEvent *event);
diff --git a/src/main.c b/src/main.c
index b223a0e..fa72056 100644
--- a/src/main.c
+++ b/src/main.c
@@ -89,16 +89,6 @@ Time LastTimestamp = CurrentTime;
/* timestamp on the last time we did XSetInputFocus() */
Time LastFocusChange = CurrentTime;
-#ifdef SHAPE
-Bool wShapeSupported;
-int wShapeEventBase;
-#endif
-
-#ifdef HAVE_XRANDR
-Bool has_randr;
-int randr_event_base;
-#endif
-
/* special flags */
char WDelayedActionSet = 0;
/******** End Global Variables *****/
diff --git a/src/screen.c b/src/screen.c
index 4bad564..5cca7bb 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -70,11 +70,6 @@
/**** Global variables ****/
extern int wScreenCount;
-
-#ifdef HAVE_XRANDR
-extern int has_randr;
-#endif
-
extern WDDomain *WDWindowMaker;
/**** Local ****/
diff --git a/src/startup.c b/src/startup.c
index 5640e92..26ccc8f 100644
--- a/src/startup.c
+++ b/src/startup.c
@@ -89,16 +89,6 @@ extern WDDomain *WDWindowAttributes;
extern WShortKey wKeyBindings[WKBD_LAST];
extern int wScreenCount;
-#ifdef SHAPE
-extern Bool wShapeSupported;
-extern int wShapeEventBase;
-#endif
-
-#ifdef HAVE_XRANDR
-extern Bool has_randr;
-extern int randr_event_base;
-#endif
-
#ifndef HAVE_INOTIFY
/* special flags */
extern char WDelayedActionSet;
diff --git a/src/switchpanel.c b/src/switchpanel.c
index 94aee03..daf3c90 100644
--- a/src/switchpanel.c
+++ b/src/switchpanel.c
@@ -36,8 +36,6 @@
#ifdef SHAPE
#include <X11/extensions/shape.h>
-
-extern Bool wShapeSupported;
#endif
struct SwitchPanel {
diff --git a/src/window.c b/src/window.c
index 836a1ad..52f2dc5 100644
--- a/src/window.c
+++ b/src/window.c
@@ -69,10 +69,6 @@
/****** Global Variables ******/
extern WShortKey wKeyBindings[WKBD_LAST];
-#ifdef SHAPE
-extern Bool wShapeSupported;
-#endif
-
/* protocol atoms */
extern Time LastTimestamp;
--
1.7.2.3
