summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.md2
-rw-r--r--man/twm.man2
-rw-r--r--src/events.c6
-rw-r--r--src/gram.y2
-rw-r--r--src/iconmgr.c4
-rw-r--r--src/icons.c2
-rw-r--r--src/menus.c2
-rw-r--r--src/resize.c2
-rw-r--r--src/screen.h2
-rw-r--r--src/twm.c4
-rw-r--r--src/twm.h8
11 files changed, 18 insertions, 18 deletions
diff --git a/README.md b/README.md
index 24e0ee2..06b6607 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ Xorg mailing list:
https://lists.x.org/mailman/listinfo/xorg
-The master development code repository can be found at:
+The primary development code repository can be found at:
https://gitlab.freedesktop.org/xorg/app/twm
diff --git a/man/twm.man b/man/twm.man
index e6ea7df..d421da8 100644
--- a/man/twm.man
+++ b/man/twm.man
@@ -1241,7 +1241,7 @@ This should only be used as a last
resort for shutting down runaway clients.
See also \fBf.delete\fP.
.IP "\fBf.downiconmgr\fI" 8
-This function warps the pointer to the next row in the current icon manger,
+This function warps the pointer to the next row in the current icon manager,
wrapping to the beginning of the next column if necessary.
.IP "\fBf.exec\fP \fIstring\fP" 8
This function passes the argument \fIstring\fP to /bin/sh for execution.
diff --git a/src/events.c b/src/events.c
index 9d92322..d940848 100644
--- a/src/events.c
+++ b/src/events.c
@@ -86,7 +86,7 @@ XEvent Event; /* the current event */
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
+ * that has not received a LeaveNotify event because of a pointer grab
*/
static TwmWindow *UnHighLight_win = NULL;
@@ -539,7 +539,7 @@ HandleVisibilityNotify(void)
return;
/*
- * when Saber complains about retreiving an <int> from an <unsigned int>
+ * when Saber complains about retrieving an <int> from an <unsigned int>
* just type "touch vevent->state" and "cont"
*/
cmap = cwin->colormap;
@@ -1612,7 +1612,7 @@ HandleButtonRelease(void)
Context = C_NO_CONTEXT;
ButtonWindow = NULL;
- /* if we are not executing a defered command, then take down the
+ /* if we are not executing a deferred command, then take down the
* menu
*/
if (RootFunction == 0) {
diff --git a/src/gram.y b/src/gram.y
index 8b18038..791e60f 100644
--- a/src/gram.y
+++ b/src/gram.y
@@ -54,7 +54,7 @@ in this Software without prior written authorization from The Open Group.
*
* $Xorg: gram.y,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $
*
- * .twmrc command grammer
+ * .twmrc command grammar
*
* 07-Jan-86 Thomas E. LaStrange File created
* 11-Nov-90 Dave Sternlicht Adding SaveColors
diff --git a/src/iconmgr.c b/src/iconmgr.c
index 48a2931..7cbc7a7 100644
--- a/src/iconmgr.c
+++ b/src/iconmgr.c
@@ -586,7 +586,7 @@ DrawIconManagerBorder(WList *tmp)
/**
* sort The Dude
*
- * \param ip a pointer to the icon manager struture
+ * \param ip a pointer to the icon manager structure
*/
void
SortIconManager(IconMgr *ip)
@@ -622,7 +622,7 @@ SortIconManager(IconMgr *ip)
* pack the icon manager windows following
* an addition or deletion
*
- * \param ip a pointer to the icon manager struture
+ * \param ip a pointer to the icon manager structure
*/
void
PackIconManager(IconMgr *ip)
diff --git a/src/icons.c b/src/icons.c
index bf8d8aa..6a04e7b 100644
--- a/src/icons.c
+++ b/src/icons.c
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group.
/**********************************************************************
*
- * Icon releated routines
+ * Icon related routines
*
* 10-Apr-89 Tom LaStrange Initial Version.
*
diff --git a/src/menus.c b/src/menus.c
index 5ffaa3f..e27df43 100644
--- a/src/menus.c
+++ b/src/menus.c
@@ -507,7 +507,7 @@ UpdateMenu(void)
XQueryPointer(dpy, ActiveMenu->w, &JunkRoot, &JunkChild,
&x_root, &y_root, &x, &y, &JunkMask);
- /* if we haven't recieved the enter notify yet, wait */
+ /* if we haven't received the enter notify yet, wait */
if (!ActiveMenu->entered)
continue;
diff --git a/src/resize.c b/src/resize.c
index dce406d..d7727fb 100644
--- a/src/resize.c
+++ b/src/resize.c
@@ -1123,7 +1123,7 @@ SetFrameShape(TwmWindow *tmp)
*
* Dimensions and Positions:
*
- * frame orgin (0, 0)
+ * frame origin (0, 0)
* frame upper left border (-tmp->frame_bw, -tmp->frame_bw)
* frame size w/o border tmp->frame_width , tmp->frame_height
* frame/title border width tmp->frame_bw
diff --git a/src/screen.h b/src/screen.h
index 583597a..39603df 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -89,7 +89,7 @@ typedef struct ScreenInfo {
MenuRoot *Windows; /* the TwmWindows menu */
TwmWindow *Ring; /* one of the windows in window ring */
- TwmWindow *RingLeader; /* current winodw in ring */
+ TwmWindow *RingLeader; /* current window in ring */
MouseButton Mouse[MAX_BUTTONS + 1][NUM_CONTEXTS][MOD_SIZE];
MouseButton DefaultFunction;
diff --git a/src/twm.c b/src/twm.c
index 2abb603..252bdf7 100644
--- a/src/twm.c
+++ b/src/twm.c
@@ -119,7 +119,7 @@ int PreviousScreen; /* last screen that we were on */
int FirstScreen; /* TRUE ==> first screen of display */
int message_level = 1; /* controls error messages */
static int RedirectError; /* TRUE ==> another window manager running */
-static int TwmErrorHandler(Display *dpy, XErrorEvent *event); /* for settting RedirectError */
+static int TwmErrorHandler(Display *dpy, XErrorEvent *event); /* for setting RedirectError */
static int CatchRedirectError(Display *dpy, XErrorEvent *event); /* for everything else */
static void sigHandler(int);
char Info[INFO_LINES][INFO_SIZE]; /* info strings to print */
@@ -597,7 +597,7 @@ main(int argc, char *argv[])
/* Parse it once for each screen. */
ParseTwmrc(InitFile);
- assign_var_savecolor(); /* storeing pixels for twmrc "entities" */
+ assign_var_savecolor(); /* storing pixels for twmrc "entities" */
if (Scr->SqueezeTitle == -1)
Scr->SqueezeTitle = FALSE;
if (!Scr->HaveFonts)
diff --git a/src/twm.h b/src/twm.h
index 2428391..3b0396a 100644
--- a/src/twm.h
+++ b/src/twm.h
@@ -55,7 +55,7 @@ from The Open Group.
* twm include file
*
* 28-Oct-87 Thomas E. LaStrange File created
- * 10-Oct-90 David M. Sternlicht Storeing saved colors on root
+ * 10-Oct-90 David M. Sternlicht Storing saved colors on root
***********************************************************************/
#ifndef _TWM_
@@ -106,7 +106,7 @@ typedef void (*SigProc) (int); /* type of function returned by signal() */
#define MAX_BUTTONS 16 /* max mouse buttons supported */
-/* info stings defines */
+/* info strings defines */
#define INFO_LINES 30
#define INFO_SIZE 200
@@ -165,7 +165,7 @@ typedef struct ColorPair {
typedef struct _TitleButton {
struct _TitleButton *next; /* next link in chain */
- const char *name; /* bitmap name in case of deferal */
+ const char *name; /* bitmap name in case of deferral */
Pixmap bitmap; /* image to display in button */
int srcx, srcy; /* from where to start copying */
unsigned int width, height; /* size of pixmap */
@@ -244,7 +244,7 @@ typedef struct TwmWindow {
int title_x;
int title_y;
int icon_x; /* icon text x coordinate */
- int icon_y; /* icon text y coordiante */
+ int icon_y; /* icon text y coordinate */
int icon_w_width; /* width of the icon window */
int icon_w_height; /* height of the icon window */
int icon_width; /* width of the icon bitmap */