pbentes/dwm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

several changes, new stuff

Browse Source
This commit is contained in:
Anselm R. Garbe
2006-07-11 18:53:41 +02:00
parent b1669b5c48
commit d6e0e6e987
7 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
wm.c
View File

@ -27,7 +27,7 @@ XRectangle rect, barrect;
Bool running = True;
Bool sel_screen;
char *bartext, tag[256];
char statustext[1024], tag[256];
int screen;
Brush brush = {0};
@ -35,9 +35,15 @@ Client *clients = NULL;
Client *stack = NULL;
static Bool other_wm_running;
static char version[] = "gridwm - " VERSION ", (C)opyright MMVI Anselm R. Garbe\n";
static const char version[] = "gridwm - " VERSION ", (C)opyright MMVI Anselm R. Garbe\n";
static int (*x_error_handler) (Display *, XErrorEvent *);
static const char *status[] = {
"sh", "-c", "echo -n `date '+%Y/%m/%d %H:%M'`"
" `uptime | sed 's/.*://; s/,//g'`"
" `acpi | awk '{print $4}' | sed 's/,//'`", 0
};
static void
usage()
{
@ -258,9 +264,9 @@ main(int argc, char *argv[])
barrect.width, barrect.height, 0, DefaultDepth(dpy, screen),
CopyFromParent, DefaultVisual(dpy, screen),
CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
bartext = NULL;
XDefineCursor(dpy, barwin, cursor[CurNormal]);
XMapRaised(dpy, barwin);
pipe_spawn(statustext, sizeof(statustext), dpy, (char **)status);
draw_bar();
wa.event_mask = SubstructureRedirectMask | EnterWindowMask \
@ -282,8 +288,10 @@ main(int argc, char *argv[])
t = timeout;
if(select(ConnectionNumber(dpy) + 1, &fds, NULL, NULL, &t) > 0)
continue;
else if(errno != EINTR)
else if(errno != EINTR) {
pipe_spawn(statustext, sizeof(statustext), dpy, (char **)status);
draw_bar();
}
}
cleanup();