>From 538bfda5091d281f98d2da96cf11ceb2b8de0e2a Mon Sep 17 00:00:00 2001
From: Rodolfo García Peñas (kix) <[email protected]>
Date: Wed, 25 Jan 2012 08:51:08 +0100
Subject: [PATCH 24/24] WindowMaker: Duplicated defines removed.
There are multiple #defines that are duplicated in the code. Now are only in
one place.
---
src/WindowMaker.h | 4 ++++
src/appicon.c | 7 -------
src/defaults.c | 10 ----------
src/dialog.c | 4 ----
src/dock.c | 5 -----
src/event.c | 2 --
src/framewin.h | 7 -------
src/icon.c | 3 ---
src/main.c | 5 +----
src/menu.c | 2 --
src/rootmenu.c | 2 --
src/session.c | 2 --
src/usermenu.c | 2 --
src/window.c | 4 ----
src/window.h | 8 --------
src/workspace.c | 1 -
16 files changed, 5 insertions(+), 63 deletions(-)
diff --git a/src/WindowMaker.h b/src/WindowMaker.h
index 42143fa..77d5dc4 100644
--- a/src/WindowMaker.h
+++ b/src/WindowMaker.h
@@ -287,6 +287,10 @@ NOTIFICATION(MenuAppearanceSettingsChanged);
NOTIFICATION(MenuTitleAppearanceSettingsChanged);
+#define MOD_MASK wPreferences.modifier_mask
+#define MAX_SHORTCUT_LENGTH 32
+#define GLOBAL_DEFAULTS_SUBDIR "WindowMaker"
+#define SAME(x, y) (((x) && (y) && !strcmp((x), (y))) || (!(x) && !(y)))
/* appearance settings clientdata flags */
enum {
diff --git a/src/appicon.c b/src/appicon.c
index 781fff3..0c95e3a 100644
--- a/src/appicon.c
+++ b/src/appicon.c
@@ -47,13 +47,6 @@
#include "xdnd.h"
#endif
-/*
- * icon_file for the dock is got from the preferences file by
- * using the classname/instancename
- */
-
-#define MOD_MASK wPreferences.modifier_mask
-
void appIconMouseDown(WObjDescriptor * desc, XEvent * event);
static void iconDblClick(WObjDescriptor * desc, XEvent * event);
static void iconExpose(WObjDescriptor * desc, XEvent * event);
diff --git a/src/defaults.c b/src/defaults.c
index e01be2f..9f97b0e 100644
--- a/src/defaults.c
+++ b/src/defaults.c
@@ -36,10 +36,6 @@
#include <limits.h>
#include <signal.h>
-#ifndef PATH_MAX
-#define PATH_MAX DEFAULT_PATH_MAX
-#endif
-
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/keysym.h>
@@ -62,12 +58,6 @@
#include "workspace.h"
#include "properties.h"
-#define MAX_SHORTCUT_LENGTH 32
-
-#ifndef GLOBAL_DEFAULTS_SUBDIR
-#define GLOBAL_DEFAULTS_SUBDIR "WindowMaker"
-#endif
-
typedef struct {
char *key;
char *default_value;
diff --git a/src/dialog.c b/src/dialog.c
index 03d59e9..e445843 100644
--- a/src/dialog.c
+++ b/src/dialog.c
@@ -44,10 +44,6 @@
#include <sys/signal.h>
#endif
-#ifndef PATH_MAX
-#define PATH_MAX DEFAULT_PATH_MAX
-#endif
-
#include "WindowMaker.h"
#include "GNUstep.h"
#include "screen.h"
diff --git a/src/dock.c b/src/dock.c
index 85bdf47..032660a 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -31,10 +31,6 @@
#include <math.h>
#include <limits.h>
-#ifndef PATH_MAX
-#define PATH_MAX DEFAULT_PATH_MAX
-#endif
-
#include "WindowMaker.h"
#include "wcore.h"
#include "window.h"
@@ -61,7 +57,6 @@
#define CLIP_FORWARD 2
/**** Global variables ****/
-#define MOD_MASK wPreferences.modifier_mask
#define ICON_SIZE wPreferences.icon_size
/***** Local variables ****/
diff --git a/src/event.c b/src/event.c
index f996300..cdf0132 100644
--- a/src/event.c
+++ b/src/event.c
@@ -69,8 +69,6 @@
#include "main.h"
#include "event.h"
-#define MOD_MASK wPreferences.modifier_mask
-
/************ Local stuff ***********/
static void saveTimestamp(XEvent *event);
static void handleColormapNotify(XEvent *event);
diff --git a/src/framewin.h b/src/framewin.h
index f01e267..a974842 100644
--- a/src/framewin.h
+++ b/src/framewin.h
@@ -24,13 +24,6 @@
#include "wcore.h"
#include "pixmap.h"
-#define BORDER_TOP 1
-#define BORDER_BOTTOM 2
-#define BORDER_LEFT 4
-#define BORDER_RIGHT 8
-#define BORDER_ALL (1|2|4|8)
-
-
#define WFF_TITLEBAR (1<<0)
#define WFF_LEFT_BUTTON (1<<1)
#define WFF_RIGHT_BUTTON (1<<2)
diff --git a/src/icon.c b/src/icon.c
index 342930d..e737fc9 100644
--- a/src/icon.c
+++ b/src/icon.c
@@ -45,9 +45,6 @@
#include "appicon.h"
#include "wmspec.h"
-/**** Global varianebles ****/
-#define MOD_MASK wPreferences.modifier_mask
-
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 0bf4320..c80fa03 100644
--- a/src/main.c
+++ b/src/main.c
@@ -55,13 +55,10 @@
#include "startup.h"
#include "actions.h"
#include "monitor.h"
+#include "event.h"
#include <WINGs/WUtil.h>
-#ifndef GLOBAL_DEFAULTS_SUBDIR
-#define GLOBAL_DEFAULTS_SUBDIR "WindowMaker"
-#endif
-
/* general info */
char *ProgName;
diff --git a/src/menu.c b/src/menu.c
index 894ab2e..eb184d5 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -44,8 +44,6 @@
#include "workspace.h"
#include "dialog.h"
-#define MOD_MASK wPreferences.modifier_mask
-
#define MENU_SCROLL_STEP
menuScrollParameters[(int)wPreferences.menu_scroll_speed].steps
#define MENU_SCROLL_DELAY
menuScrollParameters[(int)wPreferences.menu_scroll_speed].delay
diff --git a/src/rootmenu.c b/src/rootmenu.c
index 2d2ba58..7a8d29e 100644
--- a/src/rootmenu.c
+++ b/src/rootmenu.c
@@ -53,8 +53,6 @@
#include <WINGs/WUtil.h>
-#define MAX_SHORTCUT_LENGTH 32
-
static WMenu *readMenuPipe(WScreen * scr, char **file_name);
static WMenu *readMenuFile(WScreen * scr, char *file_name);
static WMenu *readMenuDirectory(WScreen * scr, char *title, char **file_name,
char *command);
diff --git a/src/session.c b/src/session.c
index f4af01b..b91a27c 100644
--- a/src/session.c
+++ b/src/session.c
@@ -406,8 +406,6 @@ static WSavedState *getWindowState(WScreen * scr,
WMPropList * win_state)
return state;
}
-#define SAME(x, y) (((x) && (y) && !strcmp((x), (y))) || (!(x) && !(y)))
-
void wSessionRestoreState(WScreen * scr)
{
WSavedState *state;
diff --git a/src/usermenu.c b/src/usermenu.c
index 3f0741b..536a538 100644
--- a/src/usermenu.c
+++ b/src/usermenu.c
@@ -77,8 +77,6 @@
#include "framewin.h"
-#define MAX_SHORTCUT_LENGTH 32
-
/*** var ***/
typedef struct {
WScreen *screen;
diff --git a/src/window.c b/src/window.c
index 96e8247..1ff44fd 100644
--- a/src/window.c
+++ b/src/window.c
@@ -65,8 +65,6 @@
#include "wmspec.h"
#include "main.h"
-#define MOD_MASK wPreferences.modifier_mask
-
/***** Local Stuff *****/
static WWindowState *windowState = NULL;
static FocusMode getFocusMode(WWindow *wwin);
@@ -2606,8 +2604,6 @@ WMagicNumber wWindowAddSavedState(char *instance, char
*class, char *command, pi
return wstate;
}
-#define SAME(x, y) (((x) && (y) && !strcmp((x), (y))) || (!(x) && !(y)))
-
WMagicNumber wWindowGetSavedState(Window win)
{
char *instance, *class, *command = NULL;
diff --git a/src/window.h b/src/window.h
index edebe80..49296be 100644
--- a/src/window.h
+++ b/src/window.h
@@ -34,14 +34,6 @@
#define UrgencyHint (1L << 8)
#endif
-
-#define BORDER_TOP 1
-#define BORDER_BOTTOM 2
-#define BORDER_LEFT 4
-#define BORDER_RIGHT 8
-#define BORDER_ALL (1|2|4|8)
-
-
#define CLIENT_EVENTS (StructureNotifyMask | PropertyChangeMask\
| EnterWindowMask | LeaveWindowMask | ColormapChangeMask \
| FocusChangeMask | VisibilityChangeMask)
diff --git a/src/workspace.c b/src/workspace.c
index 3aa141f..2afac50 100644
--- a/src/workspace.c
+++ b/src/workspace.c
@@ -50,7 +50,6 @@
#include "xinerama.h"
#include "event.h"
-#define MAX_SHORTCUT_LENGTH 32
#define WORKSPACE_NAME_DISPLAY_PADDING 32
static WMPropList *dWorkspaces = NULL;
--
1.7.2.3
--
||// //\\// Rodolfo "kix" Garcia
||\\// //\\ http://www.kix.es/
>From 538bfda5091d281f98d2da96cf11ceb2b8de0e2a Mon Sep 17 00:00:00 2001
From: Rodolfo GarcÃa Peñas (kix) <[email protected]>
Date: Wed, 25 Jan 2012 08:51:08 +0100
Subject: [PATCH 24/24] WindowMaker: Duplicated defines removed.
There are multiple #defines that are duplicated in the code. Now are only in one place.
---
src/WindowMaker.h | 4 ++++
src/appicon.c | 7 -------
src/defaults.c | 10 ----------
src/dialog.c | 4 ----
src/dock.c | 5 -----
src/event.c | 2 --
src/framewin.h | 7 -------
src/icon.c | 3 ---
src/main.c | 5 +----
src/menu.c | 2 --
src/rootmenu.c | 2 --
src/session.c | 2 --
src/usermenu.c | 2 --
src/window.c | 4 ----
src/window.h | 8 --------
src/workspace.c | 1 -
16 files changed, 5 insertions(+), 63 deletions(-)
diff --git a/src/WindowMaker.h b/src/WindowMaker.h
index 42143fa..77d5dc4 100644
--- a/src/WindowMaker.h
+++ b/src/WindowMaker.h
@@ -287,6 +287,10 @@ NOTIFICATION(MenuAppearanceSettingsChanged);
NOTIFICATION(MenuTitleAppearanceSettingsChanged);
+#define MOD_MASK wPreferences.modifier_mask
+#define MAX_SHORTCUT_LENGTH 32
+#define GLOBAL_DEFAULTS_SUBDIR "WindowMaker"
+#define SAME(x, y) (((x) && (y) && !strcmp((x), (y))) || (!(x) && !(y)))
/* appearance settings clientdata flags */
enum {
diff --git a/src/appicon.c b/src/appicon.c
index 781fff3..0c95e3a 100644
--- a/src/appicon.c
+++ b/src/appicon.c
@@ -47,13 +47,6 @@
#include "xdnd.h"
#endif
-/*
- * icon_file for the dock is got from the preferences file by
- * using the classname/instancename
- */
-
-#define MOD_MASK wPreferences.modifier_mask
-
void appIconMouseDown(WObjDescriptor * desc, XEvent * event);
static void iconDblClick(WObjDescriptor * desc, XEvent * event);
static void iconExpose(WObjDescriptor * desc, XEvent * event);
diff --git a/src/defaults.c b/src/defaults.c
index e01be2f..9f97b0e 100644
--- a/src/defaults.c
+++ b/src/defaults.c
@@ -36,10 +36,6 @@
#include <limits.h>
#include <signal.h>
-#ifndef PATH_MAX
-#define PATH_MAX DEFAULT_PATH_MAX
-#endif
-
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/keysym.h>
@@ -62,12 +58,6 @@
#include "workspace.h"
#include "properties.h"
-#define MAX_SHORTCUT_LENGTH 32
-
-#ifndef GLOBAL_DEFAULTS_SUBDIR
-#define GLOBAL_DEFAULTS_SUBDIR "WindowMaker"
-#endif
-
typedef struct {
char *key;
char *default_value;
diff --git a/src/dialog.c b/src/dialog.c
index 03d59e9..e445843 100644
--- a/src/dialog.c
+++ b/src/dialog.c
@@ -44,10 +44,6 @@
#include <sys/signal.h>
#endif
-#ifndef PATH_MAX
-#define PATH_MAX DEFAULT_PATH_MAX
-#endif
-
#include "WindowMaker.h"
#include "GNUstep.h"
#include "screen.h"
diff --git a/src/dock.c b/src/dock.c
index 85bdf47..032660a 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -31,10 +31,6 @@
#include <math.h>
#include <limits.h>
-#ifndef PATH_MAX
-#define PATH_MAX DEFAULT_PATH_MAX
-#endif
-
#include "WindowMaker.h"
#include "wcore.h"
#include "window.h"
@@ -61,7 +57,6 @@
#define CLIP_FORWARD 2
/**** Global variables ****/
-#define MOD_MASK wPreferences.modifier_mask
#define ICON_SIZE wPreferences.icon_size
/***** Local variables ****/
diff --git a/src/event.c b/src/event.c
index f996300..cdf0132 100644
--- a/src/event.c
+++ b/src/event.c
@@ -69,8 +69,6 @@
#include "main.h"
#include "event.h"
-#define MOD_MASK wPreferences.modifier_mask
-
/************ Local stuff ***********/
static void saveTimestamp(XEvent *event);
static void handleColormapNotify(XEvent *event);
diff --git a/src/framewin.h b/src/framewin.h
index f01e267..a974842 100644
--- a/src/framewin.h
+++ b/src/framewin.h
@@ -24,13 +24,6 @@
#include "wcore.h"
#include "pixmap.h"
-#define BORDER_TOP 1
-#define BORDER_BOTTOM 2
-#define BORDER_LEFT 4
-#define BORDER_RIGHT 8
-#define BORDER_ALL (1|2|4|8)
-
-
#define WFF_TITLEBAR (1<<0)
#define WFF_LEFT_BUTTON (1<<1)
#define WFF_RIGHT_BUTTON (1<<2)
diff --git a/src/icon.c b/src/icon.c
index 342930d..e737fc9 100644
--- a/src/icon.c
+++ b/src/icon.c
@@ -45,9 +45,6 @@
#include "appicon.h"
#include "wmspec.h"
-/**** Global varianebles ****/
-#define MOD_MASK wPreferences.modifier_mask
-
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 0bf4320..c80fa03 100644
--- a/src/main.c
+++ b/src/main.c
@@ -55,13 +55,10 @@
#include "startup.h"
#include "actions.h"
#include "monitor.h"
+#include "event.h"
#include <WINGs/WUtil.h>
-#ifndef GLOBAL_DEFAULTS_SUBDIR
-#define GLOBAL_DEFAULTS_SUBDIR "WindowMaker"
-#endif
-
/* general info */
char *ProgName;
diff --git a/src/menu.c b/src/menu.c
index 894ab2e..eb184d5 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -44,8 +44,6 @@
#include "workspace.h"
#include "dialog.h"
-#define MOD_MASK wPreferences.modifier_mask
-
#define MENU_SCROLL_STEP menuScrollParameters[(int)wPreferences.menu_scroll_speed].steps
#define MENU_SCROLL_DELAY menuScrollParameters[(int)wPreferences.menu_scroll_speed].delay
diff --git a/src/rootmenu.c b/src/rootmenu.c
index 2d2ba58..7a8d29e 100644
--- a/src/rootmenu.c
+++ b/src/rootmenu.c
@@ -53,8 +53,6 @@
#include <WINGs/WUtil.h>
-#define MAX_SHORTCUT_LENGTH 32
-
static WMenu *readMenuPipe(WScreen * scr, char **file_name);
static WMenu *readMenuFile(WScreen * scr, char *file_name);
static WMenu *readMenuDirectory(WScreen * scr, char *title, char **file_name, char *command);
diff --git a/src/session.c b/src/session.c
index f4af01b..b91a27c 100644
--- a/src/session.c
+++ b/src/session.c
@@ -406,8 +406,6 @@ static WSavedState *getWindowState(WScreen * scr, WMPropList * win_state)
return state;
}
-#define SAME(x, y) (((x) && (y) && !strcmp((x), (y))) || (!(x) && !(y)))
-
void wSessionRestoreState(WScreen * scr)
{
WSavedState *state;
diff --git a/src/usermenu.c b/src/usermenu.c
index 3f0741b..536a538 100644
--- a/src/usermenu.c
+++ b/src/usermenu.c
@@ -77,8 +77,6 @@
#include "framewin.h"
-#define MAX_SHORTCUT_LENGTH 32
-
/*** var ***/
typedef struct {
WScreen *screen;
diff --git a/src/window.c b/src/window.c
index 96e8247..1ff44fd 100644
--- a/src/window.c
+++ b/src/window.c
@@ -65,8 +65,6 @@
#include "wmspec.h"
#include "main.h"
-#define MOD_MASK wPreferences.modifier_mask
-
/***** Local Stuff *****/
static WWindowState *windowState = NULL;
static FocusMode getFocusMode(WWindow *wwin);
@@ -2606,8 +2604,6 @@ WMagicNumber wWindowAddSavedState(char *instance, char *class, char *command, pi
return wstate;
}
-#define SAME(x, y) (((x) && (y) && !strcmp((x), (y))) || (!(x) && !(y)))
-
WMagicNumber wWindowGetSavedState(Window win)
{
char *instance, *class, *command = NULL;
diff --git a/src/window.h b/src/window.h
index edebe80..49296be 100644
--- a/src/window.h
+++ b/src/window.h
@@ -34,14 +34,6 @@
#define UrgencyHint (1L << 8)
#endif
-
-#define BORDER_TOP 1
-#define BORDER_BOTTOM 2
-#define BORDER_LEFT 4
-#define BORDER_RIGHT 8
-#define BORDER_ALL (1|2|4|8)
-
-
#define CLIENT_EVENTS (StructureNotifyMask | PropertyChangeMask\
| EnterWindowMask | LeaveWindowMask | ColormapChangeMask \
| FocusChangeMask | VisibilityChangeMask)
diff --git a/src/workspace.c b/src/workspace.c
index 3aa141f..2afac50 100644
--- a/src/workspace.c
+++ b/src/workspace.c
@@ -50,7 +50,6 @@
#include "xinerama.h"
#include "event.h"
-#define MAX_SHORTCUT_LENGTH 32
#define WORKSPACE_NAME_DISPLAY_PADDING 32
static WMPropList *dWorkspaces = NULL;
--
1.7.2.3
