1
0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 12:28:22 +01:00

Remove unneeded extern's in .c files

They were not being used in those files, so let's remove them.
This commit is contained in:
Carlos R. Mafra
2010-04-14 11:01:14 +02:00
parent 4041278f48
commit 0350b8445a
14 changed files with 3 additions and 70 deletions

View File

@@ -52,13 +52,8 @@
int ignore_wks_change = 0; int ignore_wks_change = 0;
extern Time LastTimestamp; extern Time LastTimestamp;
extern Time LastFocusChange; extern Time LastFocusChange;
extern Cursor wCursor[WCUR_LAST];
extern WPreferences wPreferences; extern WPreferences wPreferences;
extern Atom _XA_WM_TAKE_FOCUS; extern Atom _XA_WM_TAKE_FOCUS;
extern void ProcessPendingEvents(); extern void ProcessPendingEvents();
extern int calcIntersectionLength(int p1, int l1, int p2, int l2); extern int calcIntersectionLength(int p1, int l1, int p2, int l2);

View File

@@ -40,9 +40,7 @@
/******** Global Variables **********/ /******** Global Variables **********/
extern Atom _XA_WINDOWMAKER_MENU; extern Atom _XA_WINDOWMAKER_MENU;
extern Atom _XA_WINDOWMAKER_WM_PROTOCOLS;
extern Time LastTimestamp; extern Time LastTimestamp;
extern WPreferences wPreferences; extern WPreferences wPreferences;
typedef struct { typedef struct {

View File

@@ -69,18 +69,11 @@
#endif #endif
/***** Global *****/ /***** Global *****/
extern WDDomain *WDWindowMaker; extern WDDomain *WDWindowMaker;
extern WDDomain *WDWindowAttributes; extern WDDomain *WDWindowAttributes;
extern WDDomain *WDRootMenu; extern WDDomain *WDRootMenu;
extern int wScreenCount; extern int wScreenCount;
extern Atom _XA_WINDOWMAKER_ICON_SIZE;
extern Atom _XA_WINDOWMAKER_ICON_TILE;
extern WPreferences wPreferences; extern WPreferences wPreferences;
extern WShortKey wKeyBindings[WKBD_LAST]; extern WShortKey wKeyBindings[WKBD_LAST];
typedef struct { typedef struct {

View File

@@ -63,21 +63,13 @@
/* in dockedapp.c */ /* in dockedapp.c */
extern void DestroyDockAppSettingsPanel(); extern void DestroyDockAppSettingsPanel();
extern void ShowDockAppSettingsPanel(WAppIcon * aicon); extern void ShowDockAppSettingsPanel(WAppIcon * aicon);
extern XContext wWinContext;
extern Cursor wCursor[WCUR_LAST]; extern Cursor wCursor[WCUR_LAST];
extern WPreferences wPreferences; extern WPreferences wPreferences;
extern XContext wWinContext; extern XContext wWinContext;
extern void appIconMouseDown(WObjDescriptor *desc, XEvent *event);
#define MOD_MASK wPreferences.modifier_mask #define MOD_MASK wPreferences.modifier_mask
extern void appIconMouseDown(WObjDescriptor * desc, XEvent * event);
#define ICON_SIZE wPreferences.icon_size #define ICON_SIZE wPreferences.icon_size
/***** Local variables ****/ /***** Local variables ****/

View File

@@ -48,11 +48,8 @@
#include "xmodifier.h" #include "xmodifier.h"
/**** global variables *****/ /**** global variables *****/
extern WPreferences wPreferences; extern WPreferences wPreferences;
extern Time LastTimestamp;
#ifdef USECPP #ifdef USECPP
static void putdef(char *line, char *name, char *value) static void putdef(char *line, char *name, char *value)
{ {

View File

@@ -41,11 +41,8 @@
#include "funcs.h" #include "funcs.h"
/****** Global Variables ******/ /****** Global Variables ******/
extern WPreferences wPreferences; extern WPreferences wPreferences;
extern int wScreenCount;
int showCrashDialog(int sig) int showCrashDialog(int sig)
{ {
int crashAction; int crashAction;

View File

@@ -62,14 +62,9 @@
#define HAS_BORDER_WITH_SELECT(w) ((w)->flags.selected || HAS_BORDER(w)) #define HAS_BORDER_WITH_SELECT(w) ((w)->flags.selected || HAS_BORDER(w))
/****** Global Variables ******/ /****** Global Variables ******/
extern Time LastTimestamp;
extern Cursor wCursor[WCUR_LAST]; extern Cursor wCursor[WCUR_LAST];
extern WPreferences wPreferences; extern WPreferences wPreferences;
extern Atom _XA_WM_PROTOCOLS;
/* /*
*---------------------------------------------------------------------- *----------------------------------------------------------------------
* checkMouseSamplingRate- * checkMouseSamplingRate-

View File

@@ -33,22 +33,17 @@
/* atoms */ /* atoms */
extern Atom _XA_WM_STATE; extern Atom _XA_WM_STATE;
extern Atom _XA_WM_CHANGE_STATE;
extern Atom _XA_WM_PROTOCOLS;
extern Atom _XA_WM_CLIENT_LEADER; extern Atom _XA_WM_CLIENT_LEADER;
extern Atom _XA_WM_TAKE_FOCUS; extern Atom _XA_WM_TAKE_FOCUS;
extern Atom _XA_WM_DELETE_WINDOW; extern Atom _XA_WM_DELETE_WINDOW;
extern Atom _XA_WM_SAVE_YOURSELF; extern Atom _XA_WM_SAVE_YOURSELF;
extern Atom _XA_GNUSTEP_WM_ATTR; extern Atom _XA_GNUSTEP_WM_ATTR;
extern Atom _XA_GNUSTEP_WM_MINIATURIZE_WINDOW; extern Atom _XA_GNUSTEP_WM_MINIATURIZE_WINDOW;
extern Atom _XA_WINDOWMAKER_WM_FUNCTION; extern Atom _XA_WINDOWMAKER_WM_FUNCTION;
extern Atom _XA_WINDOWMAKER_MENU; extern Atom _XA_WINDOWMAKER_MENU;
extern Atom _XA_WINDOWMAKER_WM_PROTOCOLS; extern Atom _XA_WINDOWMAKER_WM_PROTOCOLS;
extern Atom _XA_WINDOWMAKER_NOTICEBOARD; extern Atom _XA_WINDOWMAKER_NOTICEBOARD;
extern Atom _XA_WINDOWMAKER_ICON_TILE; extern Atom _XA_WINDOWMAKER_ICON_TILE;
extern Atom _XA_WINDOWMAKER_ICON_SIZE;
int PropGetNormalHints(Window window, XSizeHints * size_hints, int *pre_iccm) int PropGetNormalHints(Window window, XSizeHints * size_hints, int *pre_iccm)
{ {

View File

@@ -56,17 +56,10 @@
#define MAX_SHORTCUT_LENGTH 32 #define MAX_SHORTCUT_LENGTH 32
extern char *Locale; extern char *Locale;
extern WDDomain *WDRootMenu; extern WDDomain *WDRootMenu;
extern Cursor wCursor[WCUR_LAST]; extern Cursor wCursor[WCUR_LAST];
extern Time LastTimestamp;
extern WPreferences wPreferences; extern WPreferences wPreferences;
extern int wScreenCount;
static WMenu *readMenuPipe(WScreen * scr, char **file_name); static WMenu *readMenuPipe(WScreen * scr, char **file_name);
static WMenu *readMenuFile(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); static WMenu *readMenuDirectory(WScreen * scr, char *title, char **file_name, char *command);

View File

@@ -80,15 +80,11 @@
#endif #endif
/****** Global Variables ******/ /****** Global Variables ******/
extern WPreferences wPreferences; extern WPreferences wPreferences;
extern WDDomain *WDWindowMaker; extern WDDomain *WDWindowMaker;
extern WDDomain *WDRootMenu; extern WDDomain *WDRootMenu;
extern WDDomain *WDWindowAttributes; extern WDDomain *WDWindowAttributes;
extern WShortKey wKeyBindings[WKBD_LAST]; extern WShortKey wKeyBindings[WKBD_LAST];
extern int wScreenCount; extern int wScreenCount;
#ifdef SHAPE #ifdef SHAPE
@@ -117,9 +113,7 @@ extern Atom _XA_WM_SAVE_YOURSELF;
extern Atom _XA_WM_CLIENT_LEADER; extern Atom _XA_WM_CLIENT_LEADER;
extern Atom _XA_WM_COLORMAP_WINDOWS; extern Atom _XA_WM_COLORMAP_WINDOWS;
extern Atom _XA_WM_COLORMAP_NOTIFY; extern Atom _XA_WM_COLORMAP_NOTIFY;
extern Atom _XA_GNUSTEP_WM_ATTR; extern Atom _XA_GNUSTEP_WM_ATTR;
extern Atom _XA_WINDOWMAKER_MENU; extern Atom _XA_WINDOWMAKER_MENU;
extern Atom _XA_WINDOWMAKER_WM_PROTOCOLS; extern Atom _XA_WINDOWMAKER_WM_PROTOCOLS;
extern Atom _XA_WINDOWMAKER_STATE; extern Atom _XA_WINDOWMAKER_STATE;
@@ -128,10 +122,8 @@ extern Atom _XA_WINDOWMAKER_NOTICEBOARD;
extern Atom _XA_WINDOWMAKER_COMMAND; extern Atom _XA_WINDOWMAKER_COMMAND;
extern Atom _XA_WINDOWMAKER_ICON_SIZE; extern Atom _XA_WINDOWMAKER_ICON_SIZE;
extern Atom _XA_WINDOWMAKER_ICON_TILE; extern Atom _XA_WINDOWMAKER_ICON_TILE;
extern Atom _XA_GNUSTEP_WM_MINIATURIZE_WINDOW; extern Atom _XA_GNUSTEP_WM_MINIATURIZE_WINDOW;
extern Atom _XA_GNUSTEP_TITLEBAR_STATE; extern Atom _XA_GNUSTEP_TITLEBAR_STATE;
extern Atom _XA_WM_IGNORE_FOCUS_EVENTS; extern Atom _XA_WM_IGNORE_FOCUS_EVENTS;
/* cursors */ /* cursors */
@@ -142,17 +134,14 @@ extern Cursor wCursor[WCUR_LAST];
extern char WDelayedActionSet; extern char WDelayedActionSet;
#endif #endif
extern void NotifyDeadProcess(pid_t pid, unsigned char status);
/***** Local *****/ /***** Local *****/
static WScreen **wScreen = NULL; static WScreen **wScreen = NULL;
static unsigned int _NumLockMask = 0; static unsigned int _NumLockMask = 0;
static unsigned int _ScrollLockMask = 0; static unsigned int _ScrollLockMask = 0;
static void manageAllWindows(WScreen * scr, int crashed); static void manageAllWindows(WScreen * scr, int crashed);
extern void NotifyDeadProcess(pid_t pid, unsigned char status);
static int catchXError(Display * dpy, XErrorEvent * error) static int catchXError(Display * dpy, XErrorEvent * error)
{ {
char buffer[MAXLINE]; char buffer[MAXLINE];

View File

@@ -41,10 +41,8 @@
/********* Global Variables *******/ /********* Global Variables *******/
extern WPreferences wPreferences; extern WPreferences wPreferences;
extern Time LastTimestamp;
static int initialized = 0; static int initialized = 0;
static void observer(void *self, WMNotification * notif); static void observer(void *self, WMNotification * notif);
static void wsobserver(void *self, WMNotification * notif); static void wsobserver(void *self, WMNotification * notif);

View File

@@ -74,14 +74,10 @@ extern Bool wShapeSupported;
/* contexts */ /* contexts */
extern XContext wWinContext; extern XContext wWinContext;
/* cursors */
extern Cursor wCursor[WCUR_LAST];
/* protocol atoms */ /* protocol atoms */
extern Atom _XA_WM_DELETE_WINDOW; extern Atom _XA_WM_DELETE_WINDOW;
extern Atom _XA_GNUSTEP_WM_MINIATURIZE_WINDOW; extern Atom _XA_GNUSTEP_WM_MINIATURIZE_WINDOW;
extern Atom _XA_WINDOWMAKER_STATE; extern Atom _XA_WINDOWMAKER_STATE;
extern WPreferences wPreferences; extern WPreferences wPreferences;
extern Time LastTimestamp; extern Time LastTimestamp;
@@ -90,7 +86,6 @@ extern void DoWindowBirth(WWindow *wwin);
/***** Local Stuff *****/ /***** Local Stuff *****/
static WWindowState *windowState = NULL; static WWindowState *windowState = NULL;
static FocusMode getFocusMode(WWindow *wwin); static FocusMode getFocusMode(WWindow *wwin);
static int getSavedState(Window window, WSavedState **state); static int getSavedState(Window window, WSavedState **state);
static void setupGNUstepHints(WWindow *wwin, GNUstepWMAttributes *gs_hints); static void setupGNUstepHints(WWindow *wwin, GNUstepWMAttributes *gs_hints);

View File

@@ -55,9 +55,7 @@
extern int ignore_wks_change; extern int ignore_wks_change;
extern WPreferences wPreferences; extern WPreferences wPreferences;
extern XContext wWinContext;
extern XContext wVEdgeContext; extern XContext wVEdgeContext;
extern void ProcessPendingEvents(); extern void ProcessPendingEvents();
static WMPropList *dWorkspaces = NULL; static WMPropList *dWorkspaces = NULL;

View File

@@ -36,8 +36,6 @@
# endif # endif
#endif #endif
extern WPreferences wPreferences;
void wInitXinerama(WScreen * scr) void wInitXinerama(WScreen * scr)
{ {
scr->xine_info.primary_head = 0; scr->xine_info.primary_head = 0;