asolkar/st
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
run/usage/xinit are now all internal to x.c

Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
This commit is contained in:
Devin J. Pohly
2017-10-10 11:11:27 -05:00
parent 3e44ee5569
commit 3518dba2a5
4 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
st.c
View File

@@ -28,8 +28,6 @@
#include <X11/cursorfont.h> #include <X11/cursorfont.h>
#include <X11/Xft/Xft.h> #include <X11/Xft/Xft.h>
char *argv0;
#define Glyph Glyph_ #define Glyph Glyph_
#define Font Font_ #define Font Font_
@@ -2687,16 +2685,3 @@ cresize(int width, int height)
tresize(col, row); tresize(col, row);
xresize(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);
}

2
st.h
View File

@@ -214,8 +214,6 @@ size_t utf8encode(Rune, char *);
void *xmalloc(size_t); void *xmalloc(size_t);
char *xstrdup(char *); char *xstrdup(char *);
void usage(void);
/* Globals */ /* Globals */
extern TermWindow win; extern TermWindow win;
extern Term term; extern Term term;

2
win.h
View File

@@ -9,13 +9,11 @@ typedef XftGlyphFontSpec GlyphFontSpec;
void draw(void); void draw(void);
void drawregion(int, int, int, int); void drawregion(int, int, int, int);
void run(void);
void xbell(int); void xbell(int);
void xclipcopy(void); void xclipcopy(void);
void xclippaste(void); void xclippaste(void);
void xhints(void); void xhints(void);
void xinit(void);
void xloadcols(void); void xloadcols(void);
int xsetcolorname(int, const char *); int xsetcolorname(int, const char *);
void xloadfonts(char *, double); void xloadfonts(char *, double);

18
x.c
View File

@@ -15,6 +15,7 @@
#include <X11/Xft/Xft.h> #include <X11/Xft/Xft.h>
#include <X11/XKBlib.h> #include <X11/XKBlib.h>
static char *argv0;
#include "arg.h" #include "arg.h"
#define Glyph Glyph_ #define Glyph Glyph_
@@ -87,6 +88,7 @@ static void xdrawglyph(Glyph, int, int);
static void xclear(int, int, int, int); static void xclear(int, int, int, int);
static void xdrawcursor(void); static void xdrawcursor(void);
static int xgeommasktogravity(int); static int xgeommasktogravity(int);
static void xinit(void);
static int xloadfont(Font *, FcPattern *); static int xloadfont(Font *, FcPattern *);
static void xunloadfont(Font *); static void xunloadfont(Font *);
static void xsetenv(void); static void xsetenv(void);
@@ -110,6 +112,9 @@ static void selcopy(Time);
static void getbuttoninfo(XEvent *); static void getbuttoninfo(XEvent *);
static void mousereport(XEvent *); static void mousereport(XEvent *);
static void run(void);
static void usage(void);
static void (*handler[LASTEvent])(XEvent *) = { static void (*handler[LASTEvent])(XEvent *) = {
[KeyPress] = kpress, [KeyPress] = kpress,
[ClientMessage] = cmessage, [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 int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {