applied Jukkas patch

new_dwm
arg@mmvi 18 years ago
parent cff951c650
commit 6b25d06d7d

@ -80,7 +80,7 @@ drawtext(const char *text, unsigned long col[ColLast], Bool highlight) {
/* extern */ /* extern */
void void
drawall() { drawall(void) {
Client *c; Client *c;
for(c = clients; c; c = getnext(c->next)) for(c = clients; c; c = getnext(c->next))
@ -89,7 +89,7 @@ drawall() {
} }
void void
drawstatus() { drawstatus(void) {
int i, x; int i, x;
dc.x = dc.y = 0; dc.x = dc.y = 0;

12
dwm.h

@ -121,16 +121,16 @@ extern void updatetitle(Client *c); /* update the name of c */
extern void unmanage(Client *c); /* destroy c */ extern void unmanage(Client *c); /* destroy c */
/* draw.c */ /* draw.c */
extern void drawall(); /* draw all visible client titles and the bar */ extern void drawall(void); /* draw all visible client titles and the bar */
extern void drawstatus(); /* draw the bar */ extern void drawstatus(void); /* draw the bar */
extern void drawtitle(Client *c); /* draw title of c */ extern void drawtitle(Client *c); /* draw title of c */
extern unsigned long getcolor(const char *colstr); /* return color of colstr */ extern unsigned long getcolor(const char *colstr); /* return color of colstr */
extern void setfont(const char *fontstr); /* set the font for DC */ extern void setfont(const char *fontstr); /* set the font for DC */
extern unsigned int textw(const char *text); /* return the width of text in px*/ extern unsigned int textw(const char *text); /* return the width of text in px*/
/* event.c */ /* event.c */
extern void grabkeys(); /* grab all keys defined in config.h */ extern void grabkeys(void); /* grab all keys defined in config.h */
extern void procevent(); /* process pending X events */ extern void procevent(void); /* process pending X events */
/* main.c */ /* main.c */
extern int getproto(Window w); /* return protocol mask of WMProtocols property of w */ extern int getproto(Window w); /* return protocol mask of WMProtocols property of w */
@ -139,7 +139,7 @@ extern void sendevent(Window w, Atom a, long value); /* send synthetic event to
extern int xerror(Display *dsply, XErrorEvent *ee); /* dwm's X error handler */ extern int xerror(Display *dsply, XErrorEvent *ee); /* dwm's X error handler */
/* tag.c */ /* tag.c */
extern void initrregs(); /* initialize regexps of rules defined in config.h */ extern void initrregs(void); /* initialize regexps of rules defined in config.h */
extern Client *getnext(Client *c); /* returns next visible client */ extern Client *getnext(Client *c); /* returns next visible client */
extern Client *getprev(Client *c); /* returns previous visible client */ extern Client *getprev(Client *c); /* returns previous visible client */
extern void settags(Client *c, Client *trans); /* sets tags of c */ extern void settags(Client *c, Client *trans); /* sets tags of c */
@ -160,7 +160,7 @@ extern void focusnext(Arg *arg); /* focuses next visible client, arg is ignored
extern void focusprev(Arg *arg); /* focuses previous visible client, arg is ignored */ extern void focusprev(Arg *arg); /* focuses previous visible client, arg is ignored */
extern Bool isvisible(Client *c); /* returns True if client is visible */ extern Bool isvisible(Client *c); /* returns True if client is visible */
extern void resizecol(Arg *arg); /* resizes the master width with arg's index value */ extern void resizecol(Arg *arg); /* resizes the master width with arg's index value */
extern void restack(); /* restores z layers of all clients */ extern void restack(void); /* restores z layers of all clients */
extern void togglemode(Arg *arg); /* toggles global arrange function (dotile/dofloat) */ extern void togglemode(Arg *arg); /* toggles global arrange function (dotile/dofloat) */
extern void toggleview(Arg *arg); /* toggles the tag with arg's index (in)visible */ extern void toggleview(Arg *arg); /* toggles the tag with arg's index (in)visible */
extern void view(Arg *arg); /* views the tag with arg's index */ extern void view(Arg *arg); /* views the tag with arg's index */

@ -170,13 +170,13 @@ buttonpress(XEvent *e) {
if(CLEANMASK(ev->state) != MODKEY) if(CLEANMASK(ev->state) != MODKEY)
return; return;
if(ev->button == Button1 && (arrange == dofloat || c->isfloat)) { if(ev->button == Button1 && (arrange == dofloat || c->isfloat)) {
restack(c); restack();
movemouse(c); movemouse(c);
} }
else if(ev->button == Button2) else if(ev->button == Button2)
zoom(NULL); zoom(NULL);
else if(ev->button == Button3 && (arrange == dofloat || c->isfloat)) { else if(ev->button == Button3 && (arrange == dofloat || c->isfloat)) {
restack(c); restack();
resizemouse(c); resizemouse(c);
} }
} }
@ -388,7 +388,7 @@ void (*handler[LASTEvent]) (XEvent *) = {
}; };
void void
grabkeys() { grabkeys(void) {
static unsigned int len = sizeof(key) / sizeof(key[0]); static unsigned int len = sizeof(key) / sizeof(key[0]);
unsigned int i; unsigned int i;
KeyCode code; KeyCode code;
@ -408,7 +408,7 @@ grabkeys() {
} }
void void
procevent() { procevent(void) {
XEvent ev; XEvent ev;
while(XPending(dpy)) { while(XPending(dpy)) {

@ -38,7 +38,7 @@ static int (*xerrorxlib)(Display *, XErrorEvent *);
static Bool otherwm, readin; static Bool otherwm, readin;
static void static void
cleanup() { cleanup(void) {
close(STDIN_FILENO); close(STDIN_FILENO);
while(sel) { while(sel) {
resize(sel, True, TopLeft); resize(sel, True, TopLeft);
@ -58,7 +58,7 @@ cleanup() {
} }
static void static void
scan() { scan(void) {
unsigned int i, num; unsigned int i, num;
Window *wins, d1, d2; Window *wins, d1, d2;
XWindowAttributes wa; XWindowAttributes wa;
@ -79,7 +79,7 @@ scan() {
} }
static void static void
setup() { setup(void) {
int i, j; int i, j;
unsigned int mask; unsigned int mask;
Window w; Window w;

@ -45,7 +45,7 @@ getprev(Client *c) {
} }
void void
initrregs() { initrregs(void) {
unsigned int i; unsigned int i;
regex_t *reg; regex_t *reg;

@ -7,7 +7,7 @@
/* static */ /* static */
static Client * static Client *
minclient() { minclient(void) {
Client *c, *min; Client *c, *min;
if((clients && clients->isfloat) || arrange == dofloat) if((clients && clients->isfloat) || arrange == dofloat)
@ -25,7 +25,7 @@ nexttiled(Client *c) {
} }
static void static void
reorder() { reorder(void) {
Client *c, *newclients, *tail; Client *c, *newclients, *tail;
newclients = tail = NULL; newclients = tail = NULL;
@ -225,7 +225,7 @@ resizecol(Arg *arg) {
} }
void void
restack() { restack(void) {
Client *c; Client *c;
XEvent ev; XEvent ev;

Loading…
Cancel
Save