Move usage() to be with run() in x.c

[st.git] / x.c

diff --git a/x.c b/x.c
index c484dfc..f660ca3 100644 (file)
--- a/x.c
+++ b/x.c
@@ -15,6 +15,7 @@
 #include <X11/Xft/Xft.h>
 #include <X11/XKBlib.h>
 
 #include <X11/Xft/Xft.h>
 #include <X11/XKBlib.h>
 

+static char *argv0;

 #include "arg.h"
 
 #define Glyph Glyph_
 #include "arg.h"
 
 #define Glyph Glyph_


@@ -87,8 +88,10 @@ static void xdrawglyph(Glyph, int, int);
 static void xclear(int, int, int, int);
 static void xdrawcursor(void);
 static int xgeommasktogravity(int);
 static void xclear(int, int, int, int);
 static void xdrawcursor(void);
 static int xgeommasktogravity(int);

+static void xinit(void);

 static int xloadfont(Font *, FcPattern *);
 static void xunloadfont(Font *);
 static int xloadfont(Font *, FcPattern *);
 static void xunloadfont(Font *);

+static void xsetenv(void);

 
 static void expose(XEvent *);
 static void visibility(XEvent *);
 
 static void expose(XEvent *);
 static void visibility(XEvent *);


@@ -109,6 +112,9 @@ static void selcopy(Time);
 static void getbuttoninfo(XEvent *);
 static void mousereport(XEvent *);
 
 static void getbuttoninfo(XEvent *);
 static void mousereport(XEvent *);
 

+static void run(void);
+static void usage(void);
+

 static void (*handler[LASTEvent])(XEvent *) = {
        [KeyPress] = kpress,
        [ClientMessage] = cmessage,
 static void (*handler[LASTEvent])(XEvent *) = {
        [KeyPress] = kpress,
        [ClientMessage] = cmessage,


@@ -1487,12 +1493,6 @@ xbell(int vol)
        XkbBell(xw.dpy, xw.win, vol, (Atom)NULL);
 }
 
        XkbBell(xw.dpy, xw.win, vol, (Atom)NULL);
 }
 

-unsigned long
-xwinid(void)
-{
-       return xw.win;
-}
-

 void
 focus(XEvent *ev)
 {
 void
 focus(XEvent *ev)
 {


@@ -1703,6 +1703,19 @@ run(void)
        }
 }
 
        }
 }
 

+void
+usage(void)
+{
+       die("usage: %s [-aiv] [-c class] [-f font] [-g geometry]"
+           " [-n name] [-o file]\n"
+           "          [-T title] [-t title] [-w windowid]"
+           " [[-e] command [args ...]]\n"
+           "       %s [-aiv] [-c class] [-f font] [-g geometry]"
+           " [-n name] [-o file]\n"
+           "          [-T title] [-t title] [-w windowid] -l line"
+           " [stty_args ...]\n", argv0, argv0);
+}
+

 int
 main(int argc, char *argv[])
 {
 int
 main(int argc, char *argv[])
 {


@@ -1765,6 +1778,7 @@ run:
        XSetLocaleModifiers("");
        tnew(MAX(cols, 1), MAX(rows, 1));
        xinit();
        XSetLocaleModifiers("");
        tnew(MAX(cols, 1), MAX(rows, 1));
        xinit();

+       xsetenv();

        selinit();
        run();
 
        selinit();
        run();