1.1 --- a/align.c	Mon Oct 19 17:00:22 2009 +0200
     1.2 +++ b/align.c	Mon Oct 19 17:11:00 2009 +0200
     1.3 @@ -17,8 +17,8 @@
     1.4  
     1.5  void *XPW(draw)(void *ptr)
     1.6  {
     1.7 -	struct widget *w = ptr;
     1.8 -	char *label = XPW(get_value(w));
     1.9 +	//struct widget *w = ptr;
    1.10 +	//char *label = XPW(get_value(w));
    1.11  
    1.12  	/*
    1.13  	XSetForeground(dpy, dc.gc, dc.fg[0]);

     2.1 --- a/commands.c	Mon Oct 19 17:00:22 2009 +0200
     2.2 +++ b/commands.c	Mon Oct 19 17:11:00 2009 +0200
     2.3 @@ -71,7 +71,7 @@
     2.4  	/* Initialize X11 environment */
     2.5  	dpy = XOpenDisplay(0);
     2.6  	if (!dpy) {
     2.7 -		printf("Cannot open display\n");
     2.8 +		fprintf(stderr, "Cannot open display\n");
     2.9  		return 1;
    2.10  	}
    2.11  	screen = DefaultScreen(dpy);
    2.12 @@ -90,6 +90,7 @@
    2.13  	XSelectInput(dpy, win, 
    2.14  		ExposureMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | KeyPressMask);
    2.15  	layout_reset();
    2.16 +	return 0;
    2.17  }
    2.18  
    2.19  void xpw_destroy()
    2.20 @@ -98,5 +99,4 @@
    2.21  	XDestroyWindow(dpy, win);
    2.22  	XCloseDisplay(dpy);
    2.23  	kill(getpid(), SIGTERM);
    2.24 -
    2.25  }

     3.1 --- a/event.c	Mon Oct 19 17:00:22 2009 +0200
     3.2 +++ b/event.c	Mon Oct 19 17:11:00 2009 +0200
     3.3 @@ -105,7 +105,7 @@
     3.4  	fd_set rmask;
     3.5  	int xfd = ConnectionNumber(dpy);
     3.6  	int ret = 0;
     3.7 -	int off = 0;
     3.8 +	//int off = 0;
     3.9  	int i = 0;
    3.10  	int dr = 0;
    3.11  

     4.1 --- a/layout.c	Mon Oct 19 17:00:22 2009 +0200
     4.2 +++ b/layout.c	Mon Oct 19 17:11:00 2009 +0200
     4.3 @@ -18,7 +18,7 @@
     4.4  	if (n_widgets>100)
     4.5  		return -1;
     4.6  	widgets[n_widgets++] = w;
     4.7 -//	restack();
     4.8 +//	xpw_restack();
     4.9  	return 0;
    4.10  }
    4.11  
    4.12 @@ -41,11 +41,12 @@
    4.13  	f_widgets = -1;
    4.14  }
    4.15  
    4.16 -void xpw_restack()
    4.17 +void
    4.18 +xpw_restack()
    4.19  {
    4.20  	int i;
    4.21  	int mw = DisplayWidth(dpy, screen);
    4.22 -	int mh = DisplayHeight(dpy, screen);
    4.23 +	//int mh = DisplayHeight(dpy, screen);
    4.24  	int tx = DEFAULT_BORDER;
    4.25  	int ty = DEFAULT_BORDER;
    4.26  	int align = ALIGN_LEFT;

     5.1 --- a/widget.h	Mon Oct 19 17:00:22 2009 +0200
     5.2 +++ b/widget.h	Mon Oct 19 17:11:00 2009 +0200
     5.3 @@ -52,3 +52,10 @@
     5.4  struct widget xwp_newline(char *name, char *label);
     5.5  struct widget xwp_label(char *name, char *label);
     5.6  extern struct widget widgets[128];
     5.7 +void setfont(const char *fontstr);
     5.8 +
     5.9 +int xpw_init();
    5.10 +void xpw_destroy();
    5.11 +void xpw_main();
    5.12 +void xpw_msg(char *cmd);
    5.13 +void xpw_restack();