forked from mirror/dwm
ordered variables in structs and source files alphabetically
This commit is contained in:
parent
e743836541
commit
bf35794507
7 changed files with 71 additions and 78 deletions
4
draw.c
4
draw.c
|
@ -8,7 +8,7 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <X11/Xlocale.h>
|
#include <X11/Xlocale.h>
|
||||||
|
|
||||||
/* static functions */
|
/* static */
|
||||||
|
|
||||||
static void
|
static void
|
||||||
drawborder(void)
|
drawborder(void)
|
||||||
|
@ -90,7 +90,7 @@ drawtext(const char *text, Bool invert, Bool border)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* extern functions */
|
/* extern */
|
||||||
|
|
||||||
void
|
void
|
||||||
drawall()
|
drawall()
|
||||||
|
|
38
dwm.h
38
dwm.h
|
@ -37,28 +37,28 @@ union Arg {
|
||||||
};
|
};
|
||||||
|
|
||||||
/* atoms */
|
/* atoms */
|
||||||
enum { WMProtocols, WMDelete, WMLast };
|
|
||||||
enum { NetSupported, NetWMName, NetLast };
|
enum { NetSupported, NetWMName, NetLast };
|
||||||
|
enum { WMProtocols, WMDelete, WMLast };
|
||||||
|
|
||||||
/* cursor */
|
/* cursor */
|
||||||
enum { CurNormal, CurResize, CurMove, CurInput, CurLast };
|
enum { CurNormal, CurResize, CurMove, CurLast };
|
||||||
|
|
||||||
struct Fnt {
|
struct Fnt {
|
||||||
XFontStruct *xfont;
|
|
||||||
XFontSet set;
|
|
||||||
int ascent;
|
int ascent;
|
||||||
int descent;
|
int descent;
|
||||||
int height;
|
int height;
|
||||||
|
XFontSet set;
|
||||||
|
XFontStruct *xfont;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct DC { /* draw context */
|
struct DC { /* draw context */
|
||||||
GC gc;
|
|
||||||
Drawable drawable;
|
|
||||||
int x, y, w, h;
|
int x, y, w, h;
|
||||||
Fnt font;
|
|
||||||
unsigned long bg;
|
unsigned long bg;
|
||||||
unsigned long fg;
|
unsigned long fg;
|
||||||
unsigned long border;
|
unsigned long border;
|
||||||
|
Drawable drawable;
|
||||||
|
Fnt font;
|
||||||
|
GC gc;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct Client {
|
struct Client {
|
||||||
|
@ -72,10 +72,10 @@ struct Client {
|
||||||
unsigned int border;
|
unsigned int border;
|
||||||
long flags;
|
long flags;
|
||||||
Bool isfloat;
|
Bool isfloat;
|
||||||
Window win;
|
|
||||||
Window title;
|
|
||||||
Client *next;
|
Client *next;
|
||||||
Client *revert;
|
Client *revert;
|
||||||
|
Window win;
|
||||||
|
Window title;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct Rule {
|
struct Rule {
|
||||||
|
@ -92,20 +92,18 @@ struct Key {
|
||||||
Arg arg;
|
Arg arg;
|
||||||
};
|
};
|
||||||
|
|
||||||
extern Display *dpy;
|
extern char *tags[TLast], stext[1024];
|
||||||
extern Window root, barwin;
|
extern int tsel, screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
|
||||||
extern Atom wmatom[WMLast], netatom[NetLast];
|
|
||||||
extern Cursor cursor[CurLast];
|
|
||||||
extern Bool running, issel;
|
|
||||||
extern void (*handler[LASTEvent])(XEvent *);
|
extern void (*handler[LASTEvent])(XEvent *);
|
||||||
extern void (*arrange)(Arg *);
|
extern void (*arrange)(Arg *);
|
||||||
extern Key key[];
|
extern Atom wmatom[WMLast], netatom[NetLast];
|
||||||
|
extern Bool running, issel;
|
||||||
extern int tsel, screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
|
|
||||||
extern char *tags[TLast], stext[1024];
|
|
||||||
|
|
||||||
extern DC dc;
|
|
||||||
extern Client *clients, *sel;
|
extern Client *clients, *sel;
|
||||||
|
extern Cursor cursor[CurLast];
|
||||||
|
extern DC dc;
|
||||||
|
extern Display *dpy;
|
||||||
|
extern Key key[];
|
||||||
|
extern Window root, barwin;
|
||||||
|
|
||||||
/* client.c */
|
/* client.c */
|
||||||
extern void ban(Client *c);
|
extern void ban(Client *c);
|
||||||
|
|
7
dwm.html
7
dwm.html
|
@ -39,10 +39,9 @@
|
||||||
</p>
|
</p>
|
||||||
<ul>
|
<ul>
|
||||||
<li>
|
<li>
|
||||||
dwm has no 9P support, no menu, no editable tagbars,
|
dwm has no 9P support, no editable tagbars, no shell-based
|
||||||
no shell-based configuration and remote control and comes without
|
configuration and remote control and comes without any additional
|
||||||
any additional tools like printing the selection or warping the
|
tools like printing the selection or warping the mouse.
|
||||||
mouse.
|
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
dwm is only a single binary, it's source code is intended to never
|
dwm is only a single binary, it's source code is intended to never
|
||||||
|
|
37
event.c
37
event.c
|
@ -11,45 +11,44 @@
|
||||||
#define ButtonMask (ButtonPressMask | ButtonReleaseMask)
|
#define ButtonMask (ButtonPressMask | ButtonReleaseMask)
|
||||||
#define MouseMask (ButtonMask | PointerMotionMask)
|
#define MouseMask (ButtonMask | PointerMotionMask)
|
||||||
|
|
||||||
/********** CUSTOMIZE **********/
|
/* CUSTOMIZE */
|
||||||
|
const char *browse[] = { "firefox", NULL };
|
||||||
|
const char *gimp[] = { "gimp", NULL };
|
||||||
const char *term[] = {
|
const char *term[] = {
|
||||||
"urxvtc", "-tr", "+sb", "-bg", "black", "-fg", "white", "-cr", "white",
|
"urxvtc", "-tr", "+sb", "-bg", "black", "-fg", "white", "-cr", "white",
|
||||||
"-fn", "-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*", NULL
|
"-fn", "-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*", NULL
|
||||||
};
|
};
|
||||||
const char *browse[] = { "firefox", NULL };
|
|
||||||
const char *xlock[] = { "xlock", NULL };
|
const char *xlock[] = { "xlock", NULL };
|
||||||
|
|
||||||
Key key[] = {
|
Key key[] = {
|
||||||
/* modifier key function arguments */
|
/* modifier key function arguments */
|
||||||
{ Mod1Mask, XK_Return, zoom, { 0 } },
|
{ ControlMask, XK_0, appendtag, { .i = Tscratch } },
|
||||||
{ Mod1Mask, XK_k, focusprev, { 0 } },
|
{ ControlMask, XK_1, appendtag, { .i = Tdev } },
|
||||||
{ Mod1Mask, XK_j, focusnext, { 0 } },
|
{ ControlMask, XK_2, appendtag, { .i = Twww } },
|
||||||
{ Mod1Mask, XK_m, maximize, { 0 } },
|
{ ControlMask, XK_3, appendtag, { .i = Twork } },
|
||||||
{ Mod1Mask, XK_0, view, { .i = Tscratch } },
|
{ Mod1Mask, XK_0, view, { .i = Tscratch } },
|
||||||
{ Mod1Mask, XK_1, view, { .i = Tdev } },
|
{ Mod1Mask, XK_1, view, { .i = Tdev } },
|
||||||
{ Mod1Mask, XK_2, view, { .i = Twww } },
|
{ Mod1Mask, XK_2, view, { .i = Twww } },
|
||||||
{ Mod1Mask, XK_3, view, { .i = Twork } },
|
{ Mod1Mask, XK_3, view, { .i = Twork } },
|
||||||
|
{ Mod1Mask, XK_j, focusnext, { 0 } },
|
||||||
|
{ Mod1Mask, XK_k, focusprev, { 0 } },
|
||||||
|
{ Mod1Mask, XK_m, maximize, { 0 } },
|
||||||
{ Mod1Mask, XK_space, dotile, { 0 } },
|
{ Mod1Mask, XK_space, dotile, { 0 } },
|
||||||
{ Mod1Mask|ShiftMask, XK_space, dofloat, { 0 } },
|
{ Mod1Mask, XK_Return, zoom, { 0 } },
|
||||||
{ Mod1Mask|ShiftMask, XK_0, replacetag, { .i = Tscratch } },
|
{ Mod1Mask|ShiftMask, XK_0, replacetag, { .i = Tscratch } },
|
||||||
{ Mod1Mask|ShiftMask, XK_1, replacetag, { .i = Tdev } },
|
{ Mod1Mask|ShiftMask, XK_1, replacetag, { .i = Tdev } },
|
||||||
{ Mod1Mask|ShiftMask, XK_2, replacetag, { .i = Twww } },
|
{ Mod1Mask|ShiftMask, XK_2, replacetag, { .i = Twww } },
|
||||||
{ Mod1Mask|ShiftMask, XK_3, replacetag, { .i = Twork } },
|
{ Mod1Mask|ShiftMask, XK_3, replacetag, { .i = Twork } },
|
||||||
{ Mod1Mask|ShiftMask, XK_c, killclient, { 0 } },
|
{ Mod1Mask|ShiftMask, XK_c, killclient, { 0 } },
|
||||||
{ Mod1Mask|ShiftMask, XK_q, quit, { 0 } },
|
{ Mod1Mask|ShiftMask, XK_g, spawn, { .argv = gimp } },
|
||||||
{ Mod1Mask|ShiftMask, XK_Return, spawn, { .argv = term } },
|
|
||||||
{ Mod1Mask|ShiftMask, XK_w, spawn, { .argv = browse } },
|
|
||||||
{ Mod1Mask|ShiftMask, XK_l, spawn, { .argv = xlock } },
|
{ Mod1Mask|ShiftMask, XK_l, spawn, { .argv = xlock } },
|
||||||
{ ControlMask, XK_0, appendtag, { .i = Tscratch } },
|
{ Mod1Mask|ShiftMask, XK_q, quit, { 0 } },
|
||||||
{ ControlMask, XK_1, appendtag, { .i = Tdev } },
|
{ Mod1Mask|ShiftMask, XK_space, dofloat, { 0 } },
|
||||||
{ ControlMask, XK_2, appendtag, { .i = Twww } },
|
{ Mod1Mask|ShiftMask, XK_w, spawn, { .argv = browse } },
|
||||||
{ ControlMask, XK_3, appendtag, { .i = Twork } },
|
{ Mod1Mask|ShiftMask, XK_Return, spawn, { .argv = term } },
|
||||||
};
|
};
|
||||||
|
|
||||||
/********** CUSTOMIZE **********/
|
/* static */
|
||||||
|
|
||||||
/* static functions */
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
movemouse(Client *c)
|
movemouse(Client *c)
|
||||||
|
@ -337,7 +336,7 @@ unmapnotify(XEvent *e)
|
||||||
unmanage(c);
|
unmanage(c);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* extern functions */
|
/* extern */
|
||||||
|
|
||||||
void (*handler[LASTEvent]) (XEvent *) = {
|
void (*handler[LASTEvent]) (XEvent *) = {
|
||||||
[ButtonPress] = buttonpress,
|
[ButtonPress] = buttonpress,
|
||||||
|
|
38
main.c
38
main.c
|
@ -14,26 +14,12 @@
|
||||||
#include <X11/Xatom.h>
|
#include <X11/Xatom.h>
|
||||||
#include <X11/Xproto.h>
|
#include <X11/Xproto.h>
|
||||||
|
|
||||||
Display *dpy;
|
|
||||||
Window root, barwin;
|
|
||||||
Atom wmatom[WMLast], netatom[NetLast];
|
|
||||||
Cursor cursor[CurLast];
|
|
||||||
Bool running = True;
|
|
||||||
Bool issel = True;
|
|
||||||
|
|
||||||
int tsel = Tdev; /* default tag */
|
/* static */
|
||||||
int screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
|
|
||||||
char stext[1024];
|
|
||||||
|
|
||||||
DC dc = {0};
|
|
||||||
Client *clients = NULL;
|
|
||||||
Client *sel = NULL;
|
|
||||||
|
|
||||||
static Bool otherwm;
|
static Bool otherwm;
|
||||||
static int (*xerrorxlib)(Display *, XErrorEvent *);
|
static int (*xerrorxlib)(Display *, XErrorEvent *);
|
||||||
|
|
||||||
/* static functions */
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
cleanup()
|
cleanup()
|
||||||
{
|
{
|
||||||
|
@ -97,7 +83,20 @@ xerrorstart(Display *dsply, XErrorEvent *ee)
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* extern functions */
|
/* extern */
|
||||||
|
|
||||||
|
char stext[1024];
|
||||||
|
int tsel = Tdev; /* default tag */
|
||||||
|
int screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
|
||||||
|
Atom wmatom[WMLast], netatom[NetLast];
|
||||||
|
Bool running = True;
|
||||||
|
Bool issel = True;
|
||||||
|
Client *clients = NULL;
|
||||||
|
Client *sel = NULL;
|
||||||
|
Cursor cursor[CurLast];
|
||||||
|
Display *dpy;
|
||||||
|
DC dc = {0};
|
||||||
|
Window root, barwin;
|
||||||
|
|
||||||
int
|
int
|
||||||
getproto(Window w)
|
getproto(Window w)
|
||||||
|
@ -141,10 +140,9 @@ quit(Arg *arg)
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* There's no way to check accesses to destroyed windows, thus
|
* There's no way to check accesses to destroyed windows, thus those cases are
|
||||||
* those cases are ignored (especially on UnmapNotify's).
|
* ignored (especially on UnmapNotify's). Other types of errors call Xlibs
|
||||||
* Other types of errors call Xlib's default error handler, which
|
* default error handler, which calls exit().
|
||||||
* calls exit().
|
|
||||||
*/
|
*/
|
||||||
int
|
int
|
||||||
xerror(Display *dpy, XErrorEvent *ee)
|
xerror(Display *dpy, XErrorEvent *ee)
|
||||||
|
|
21
tag.c
21
tag.c
|
@ -7,24 +7,23 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <X11/Xutil.h>
|
#include <X11/Xutil.h>
|
||||||
|
|
||||||
/********** CUSTOMIZE **********/
|
/* static */
|
||||||
|
|
||||||
|
/* CUSTOMIZE */
|
||||||
|
static Rule rule[] = {
|
||||||
|
/* class instance tags isfloat */
|
||||||
|
{ "Firefox-bin", "Gecko", { [Twww] = "www" }, False },
|
||||||
|
};
|
||||||
|
|
||||||
|
/* extern */
|
||||||
|
|
||||||
|
/* CUSTOMIZE */
|
||||||
char *tags[TLast] = {
|
char *tags[TLast] = {
|
||||||
[Tscratch] = "scratch",
|
[Tscratch] = "scratch",
|
||||||
[Tdev] = "dev",
|
[Tdev] = "dev",
|
||||||
[Twww] = "www",
|
[Twww] = "www",
|
||||||
[Twork] = "work",
|
[Twork] = "work",
|
||||||
};
|
};
|
||||||
|
|
||||||
static Rule rule[] = {
|
|
||||||
/* class instance tags isfloat */
|
|
||||||
{ "Firefox-bin", "Gecko", { [Twww] = "www" }, False },
|
|
||||||
};
|
|
||||||
|
|
||||||
/********** CUSTOMIZE **********/
|
|
||||||
|
|
||||||
/* extern functions */
|
|
||||||
|
|
||||||
void (*arrange)(Arg *) = dotile;
|
void (*arrange)(Arg *) = dotile;
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
4
util.c
4
util.c
|
@ -10,7 +10,7 @@
|
||||||
#include <sys/wait.h>
|
#include <sys/wait.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
/* static functions */
|
/* static */
|
||||||
|
|
||||||
static void
|
static void
|
||||||
bad_malloc(unsigned int size)
|
bad_malloc(unsigned int size)
|
||||||
|
@ -20,7 +20,7 @@ bad_malloc(unsigned int size)
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* extern functions */
|
/* extern */
|
||||||
|
|
||||||
void *
|
void *
|
||||||
emallocz(unsigned int size)
|
emallocz(unsigned int size)
|
||||||
|
|
Loading…
Reference in a new issue