diff options
| -rw-r--r-- | zwgc/exec.c | 3 | ||||
| -rw-r--r-- | zwgc/main.c | 4 | ||||
| -rw-r--r-- | zwgc/standard_ports.c | 3 | ||||
| -rw-r--r-- | zwgc/xerror.c | 1 | ||||
| -rw-r--r-- | zwgc/xmark.c | 16 | ||||
| -rw-r--r-- | zwgc/xmark.h | 1 | ||||
| -rw-r--r-- | zwgc/xrevstack.c | 2 | ||||
| -rw-r--r-- | zwgc/xrevstack.h | 8 | ||||
| -rw-r--r-- | zwgc/xselect.c | 6 |
9 files changed, 23 insertions, 21 deletions
diff --git a/zwgc/exec.c b/zwgc/exec.c index 962fedf..5c123ed 100644 --- a/zwgc/exec.c +++ b/zwgc/exec.c @@ -349,9 +349,6 @@ static int exec_exec(node) return(NOBREAK); } -/* <<<>>> */ -extern int exec_fields(); - static struct _Opstuff { int (*exec)(); } opstuff[] = { diff --git a/zwgc/main.c b/zwgc/main.c index 182e411..bf0c204 100644 --- a/zwgc/main.c +++ b/zwgc/main.c @@ -79,7 +79,7 @@ static void fake_startup_packet() { ZNotice_t notice; - var_set_variable("version", "0.3.5"); + var_set_variable("version", "0.3.6"); bzero(¬ice, sizeof(notice)); @@ -93,7 +93,7 @@ static void fake_startup_packet() notice.z_port = 0; notice.z_kind = ACKED; notice.z_auth = ZAUTH_YES; - notice.z_message = "Zwgc mark II version 0.3.5 now running..."; + notice.z_message = "Zwgc mark II version 0.3.6 now running..."; notice.z_message_len = strlen(notice.z_message)+1; notice_handler(¬ice); diff --git a/zwgc/standard_ports.c b/zwgc/standard_ports.c index 4d2d2b5..615a975 100644 --- a/zwgc/standard_ports.c +++ b/zwgc/standard_ports.c @@ -29,6 +29,7 @@ static char rcsid_standard_ports_c[] = "$Id$"; #include "port.h" #include "variables.h" #include "error.h" +#include <zephyr/zephyr.h> extern string tty_filter(); extern char *X_driver(); @@ -36,6 +37,8 @@ extern char *X_driver(); extern int X_driver_init(); extern int tty_filter_init(); +extern void usage(); + /* * */ diff --git a/zwgc/xerror.c b/zwgc/xerror.c index 974d2c8..58283a8 100644 --- a/zwgc/xerror.c +++ b/zwgc/xerror.c @@ -32,6 +32,7 @@ static int xerrortrap(dpy,xerrev) xerror_happened = 1; } +/*ARGSUSED*/ void begin_xerror_trap(dpy) Display *dpy; { diff --git a/zwgc/xmark.c b/zwgc/xmark.c index 790c5bf..ab36923 100644 --- a/zwgc/xmark.c +++ b/zwgc/xmark.c @@ -222,14 +222,14 @@ void xmarkRedraw(dpy,w,gram,range) x_gram *gram; int range; { -#define ob1 (oldblock[XMARK_START_BOUND]) -#define ob2 (oldblock[XMARK_END_BOUND]) -#define nb1 (markblock[XMARK_START_BOUND]) -#define nb2 (markblock[XMARK_END_BOUND]) -#define op1 (oldpixel[XMARK_START_BOUND]) -#define op2 (oldpixel[XMARK_END_BOUND]) -#define np1 (markpixel[XMARK_START_BOUND]) -#define np2 (markpixel[XMARK_END_BOUND]) +#define ob1 ((unsigned int) oldblock[XMARK_START_BOUND]) +#define ob2 ((unsigned int) oldblock[XMARK_END_BOUND]) +#define nb1 ((unsigned int) markblock[XMARK_START_BOUND]) +#define nb2 ((unsigned int) markblock[XMARK_END_BOUND]) +#define op1 ((unsigned int) oldpixel[XMARK_START_BOUND]) +#define op2 ((unsigned int) oldpixel[XMARK_END_BOUND]) +#define np1 ((unsigned int) markpixel[XMARK_START_BOUND]) +#define np2 ((unsigned int) markpixel[XMARK_END_BOUND]) if (range==XMARK_REDRAW_CURRENT) { if (!markgram) return; diff --git a/zwgc/xmark.h b/zwgc/xmark.h index 7eea2f0..c17e57b 100644 --- a/zwgc/xmark.h +++ b/zwgc/xmark.h @@ -43,6 +43,7 @@ extern x_gram *markgram; #define STARTPIXEL (markpixel[XMARK_START_BOUND]) #define ENDPIXEL (markpixel[XMARK_END_BOUND]) +extern void xmarkSetBound(); extern int xmarkSecond(); extern void xmarkRedraw(); extern void xmarkClear(); diff --git a/zwgc/xrevstack.c b/zwgc/xrevstack.c index a18f85c..6e903d3 100644 --- a/zwgc/xrevstack.c +++ b/zwgc/xrevstack.c @@ -42,10 +42,12 @@ void add_to_bottom(gram) } } +/*ARGSUSED*/ void pull_to_top(gram) x_gram *gram; {} +/*ARGSUSED*/ void push_to_bottom(gram) x_gram *gram; {} diff --git a/zwgc/xrevstack.h b/zwgc/xrevstack.h index 24eaf77..35b6f24 100644 --- a/zwgc/xrevstack.h +++ b/zwgc/xrevstack.h @@ -24,9 +24,9 @@ static char rcsid_xrevstack_h[] = "$Id$"; extern x_gram *bottom_gram; /* for testing against NULL */ extern int reverse_stack; /* is reverse stack on? */ -void add_to_bottom(/* x_gram */); -void delete_from_list(/* x_gram */); -void pull_to_top(/* x_gram */); -void push_to_bottom(/* x_gram */); +extern void add_to_bottom(/* x_gram */); +extern void delete_gram(/* x_gram */); +extern void pull_to_top(/* x_gram */); +extern void push_to_bottom(/* x_gram */); #endif /* _XREVSTACK_H_ */ diff --git a/zwgc/xselect.c b/zwgc/xselect.c index 90c95cd..04211ae 100644 --- a/zwgc/xselect.c +++ b/zwgc/xselect.c @@ -157,9 +157,6 @@ int xselProcessSelection(dpy,w,event) XEvent *event; { XSelectionRequestEvent *selreq = &(event->xselectionrequest); - int (*syncfunc)(); - Atom targetprop; - char *selvalue; #ifdef DEBUG if ((selreq->owner != w) || (selreq->selection != XA_PRIMARY)) @@ -171,7 +168,7 @@ int xselProcessSelection(dpy,w,event) ((ownership_end != CurrentTime) && (ownership_end > ownership_start) && (selreq->time > ownership_end))) - xselNotify(dpy,event,None); + xselNotify(dpy,selreq,None); xselSetProperties(dpy,selreq->requestor,selreq->property,selreq->target, selreq); @@ -185,6 +182,7 @@ void xselOwnershipLost(time) ownership_end = time; } +/*ARGSUSED*/ void xselGiveUpOwnership(dpy,w) Display *dpy; Window w; |