diff options
Diffstat (limited to 'zwgc/X_driver.c')
-rw-r--r-- | zwgc/X_driver.c | 59 |
1 files changed, 28 insertions, 31 deletions
diff --git a/zwgc/X_driver.c b/zwgc/X_driver.c index 925a05b..2577966 100644 --- a/zwgc/X_driver.c +++ b/zwgc/X_driver.c @@ -27,6 +27,7 @@ static const char rcsid_X_driver_c[] = "$Id$"; #ifndef X_DISPLAY_MISSING +#include "new_string.h" #include "X_driver.h" #include <X11/Xresource.h> #include "new_memory.h" @@ -84,8 +85,8 @@ static XrmDatabase x_resources = NULL; * returns -1. */ -static int convert_string_to_bool(text) - string text; +static int +convert_string_to_bool(string text) { if (!strcasecmp("yes", text) || !strcasecmp("y", text) || !strcasecmp("true", text) || !strcasecmp("t", text) || @@ -103,9 +104,9 @@ static int convert_string_to_bool(text) * */ -char *get_string_resource(name, class) - string name; - string class; +char * +get_string_resource(string name, + string class) { string full_name, full_class; int status; @@ -134,10 +135,10 @@ char *get_string_resource(name, class) * */ -int get_bool_resource(name, class, default_value) - string name; - string class; - int default_value; +int +get_bool_resource(string name, + string class, + int default_value) { int result; char *temp; @@ -165,9 +166,9 @@ static unsigned_long_dictionary color_dict = NULL; * trip each time. */ -unsigned long x_string_to_color(name,def) - char *name; - unsigned long def; +unsigned long +x_string_to_color(char *name, + unsigned long def) { unsigned_long_dictionary_binding *binding; int exists; @@ -236,14 +237,13 @@ static XrmOptionDescRec cmd_options[] = { * */ -int open_display_and_load_resources(pargc, argv) - int *pargc; - char **argv; +int +open_display_and_load_resources(int *pargc, + char **argv) { XrmDatabase temp_db1, temp_db2, temp_db3; char *filename, *res, *xdef; char dbasename[128]; - extern char *getenv(); /* Initialize X resource manager: */ XrmInitialize(); @@ -316,11 +316,9 @@ int open_display_and_load_resources(pargc, argv) * */ -int X_driver_ioerror(display) -Display *display; +int +X_driver_ioerror(Display *display) { - extern void finalize_zephyr(); - ERROR2("X IO error on display '%s'--exiting\n", DisplayString(display)); finalize_zephyr(); exit(1); @@ -331,14 +329,12 @@ Display *display; /* */ /****************************************************************************/ -extern void x_get_input(); - /*ARGSUSED*/ -int X_driver_init(drivername, notfirst, pargc, argv) - char *drivername; - char notfirst; - int *pargc; - char **argv; +int +X_driver_init(char *drivername, + char notfirst, + int *pargc, + char **argv) { string temp; int sync; @@ -373,12 +369,13 @@ int X_driver_init(drivername, notfirst, pargc, argv) x_gram_init(dpy); xicccmInitAtoms(dpy); - mux_add_input_source(ConnectionNumber(dpy), x_get_input, dpy); + mux_add_input_source(ConnectionNumber(dpy), (void(*)(void *))x_get_input, dpy); return(0); } -void X_driver_reset() +void +X_driver_reset(void) { } @@ -388,8 +385,8 @@ void X_driver_reset() /* */ /****************************************************************************/ -char *X_driver(text) - string text; +char * +X_driver(string text) { string text_copy; desctype *desc; |