summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2013-07-31 22:24:22 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2013-07-31 22:24:22 -0700
commitafcad0de54ecd1a8bfaf261e4e6882985a234963 (patch)
treec3cbfe52cc80dacab9ff14c148e6a55cf1d90577
parent4c2ff3f0a6bae8b369dfb74267f7fa52d511dfb2 (diff)
Make some more previously global variables into file-scoped statics
Not used from other source files, so no need to export them Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--src/events.c10
-rw-r--r--src/iconmgr.c2
-rw-r--r--src/parse.c2
-rw-r--r--src/session.c8
-rw-r--r--src/twm.c6
5 files changed, 14 insertions, 14 deletions
diff --git a/src/events.c b/src/events.c
index aa61bf6..b900516 100644
--- a/src/events.c
+++ b/src/events.c
@@ -76,17 +76,17 @@ in this Software without prior written authorization from The Open Group.
#define MAX_X_EVENT 256
event_proc EventHandler[MAX_X_EVENT]; /* event handler jump table */
-const char *Action;
+static const char *Action;
int Context = C_NO_CONTEXT; /* current button press context */
-TwmWindow *ButtonWindow; /* button press window structure */
-XEvent ButtonEvent; /* button press event */
+static TwmWindow *ButtonWindow; /* button press window structure */
+static XEvent ButtonEvent; /* button press event */
XEvent Event; /* the current event */
-TwmWindow *Tmp_win; /* the current twm window */
+static TwmWindow *Tmp_win; /* the current twm window */
/** Used in HandleEnterNotify to remove border highlight from a window
* that has not recieved a LeaveNotify event because of a pointer grab
*/
-TwmWindow *UnHighLight_win = NULL;
+static TwmWindow *UnHighLight_win = NULL;
Window DragWindow; /* variables used in moving windows */
int origDragX;
diff --git a/src/iconmgr.c b/src/iconmgr.c
index 9458477..29c3c16 100644
--- a/src/iconmgr.c
+++ b/src/iconmgr.c
@@ -43,7 +43,7 @@ in this Software without prior written authorization from The Open Group.
#include <X11/Xmu/CharSet.h>
int iconmgr_textx = siconify_width+11;
-WList *Active = NULL;
+static WList *Active = NULL;
WList *DownIconManager = NULL;
int iconifybox_width = siconify_width;
int iconifybox_height = siconify_height;
diff --git a/src/parse.c b/src/parse.c
index e565ad5..eb52c62 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -981,7 +981,7 @@ do_string_savecolor(int colormode, char *s)
}
typedef struct _cnode {int i; struct _cnode *next;} Cnode, *Cptr;
-Cptr chead = NULL;
+static Cptr chead = NULL;
/**
* save a color from a var in the twmrc file
diff --git a/src/session.c b/src/session.c
index 8040a51..4dd91c3 100644
--- a/src/session.c
+++ b/src/session.c
@@ -63,10 +63,10 @@ Author: Ralph Mor, X Consortium
#include "session.h"
SmcConn smcConn = NULL;
-XtInputId iceInputId;
-char *twm_clientId;
-TWMWinConfigEntry *winConfigHead = NULL;
-Bool sent_save_done = 0;
+static XtInputId iceInputId;
+static char *twm_clientId;
+static TWMWinConfigEntry *winConfigHead = NULL;
+static Bool sent_save_done = 0;
#define SAVEFILE_VERSION 2
diff --git a/src/twm.c b/src/twm.c
index 7a30aad..e7791da 100644
--- a/src/twm.c
+++ b/src/twm.c
@@ -103,14 +103,14 @@ ScreenInfo **ScreenList; /* structures for each screen */
ScreenInfo *Scr = NULL; /* the cur and prev screens */
int PreviousScreen; /* last screen that we were on */
int FirstScreen; /* TRUE ==> first screen of display */
-Bool PrintErrorMessages = False; /* controls error messages */
+static Bool PrintErrorMessages = False; /* controls error messages */
static int RedirectError; /* TRUE ==> another window manager running */
static int TwmErrorHandler ( Display *dpy, XErrorEvent *event ); /* for settting RedirectError */
static int CatchRedirectError ( Display *dpy, XErrorEvent *event ); /* for everything else */
static SIGNAL_T sigHandler(int);
char Info[INFO_LINES][INFO_SIZE]; /* info strings to print */
int InfoLines;
-char *InitFile = NULL;
+static char *InitFile = NULL;
Cursor UpperLeftCursor; /* upper Left corner cursor */
Cursor RightButt;
@@ -145,7 +145,7 @@ char **Argv;
Bool RestartPreviousState = False; /* try to restart in previous state */
-unsigned long black, white;
+static unsigned long black, white;
Atom TwmAtoms[11];