diff options
author | Devin J. Pohly <djpohly@gmail.com> | 2017-10-10 11:11:27 -0500 |
---|---|---|
committer | Devin J. Pohly <djpohly@gmail.com> | 2018-02-25 21:53:24 -0600 |
commit | 3518dba2a5fb57f601b74528ddeb67f173e4024b (patch) | |
tree | 680c384eecbef2d9894eef8bc6044c4b449177b1 | |
parent | 3e44ee5569a81ba6f06e1ecd19bf0ceb1e97f18d (diff) | |
download | st-3518dba2a5fb57f601b74528ddeb67f173e4024b.tar.gz st-3518dba2a5fb57f601b74528ddeb67f173e4024b.tar.bz2 st-3518dba2a5fb57f601b74528ddeb67f173e4024b.zip |
Move usage() to be with run() in x.c
run/usage/xinit are now all internal to x.c
Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
-rw-r--r-- | st.c | 15 | ||||
-rw-r--r-- | st.h | 2 | ||||
-rw-r--r-- | win.h | 2 | ||||
-rw-r--r-- | x.c | 18 |
4 files changed, 18 insertions, 19 deletions
@@ -28,8 +28,6 @@ #include <X11/cursorfont.h> #include <X11/Xft/Xft.h> -char *argv0; - #define Glyph Glyph_ #define Font Font_ @@ -2687,16 +2685,3 @@ cresize(int width, int height) tresize(col, row); xresize(col, row); } - -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); -} @@ -214,8 +214,6 @@ size_t utf8encode(Rune, char *); void *xmalloc(size_t); char *xstrdup(char *); -void usage(void); - /* Globals */ extern TermWindow win; extern Term term; @@ -9,13 +9,11 @@ typedef XftGlyphFontSpec GlyphFontSpec; void draw(void); void drawregion(int, int, int, int); -void run(void); void xbell(int); void xclipcopy(void); void xclippaste(void); void xhints(void); -void xinit(void); void xloadcols(void); int xsetcolorname(int, const char *); void xloadfonts(char *, double); @@ -15,6 +15,7 @@ #include <X11/Xft/Xft.h> #include <X11/XKBlib.h> +static char *argv0; #include "arg.h" #define Glyph Glyph_ @@ -87,6 +88,7 @@ static void xdrawglyph(Glyph, int, 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 void xsetenv(void); @@ -110,6 +112,9 @@ static void selcopy(Time); 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, @@ -1698,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[]) { |