|
 |
1cbaad6 |
--- 9wm-1.2.orig/menu.c
|
|
|
1cbaad6 |
+++ 9wm-1.2/menu.c
|
|
|
1cbaad6 |
@@ -1,6 +1,8 @@
|
|
|
1cbaad6 |
/* Copyright (c) 1994-1996 David Hogan, see README for licence details */
|
|
|
1cbaad6 |
+#include <stdlib.h>
|
|
|
1cbaad6 |
#include <stdio.h>
|
|
|
1cbaad6 |
#include <signal.h>
|
|
|
1cbaad6 |
+#include <unistd.h>
|
|
|
1cbaad6 |
#include <X11/X.h>
|
|
|
1cbaad6 |
#include <X11/Xlib.h>
|
|
|
1cbaad6 |
#include <X11/Xutil.h>
|
|
|
1cbaad6 |
@@ -191,7 +193,7 @@
|
|
|
1cbaad6 |
}
|
|
|
1cbaad6 |
XUnmapWindow(dpy, c->parent);
|
|
|
1cbaad6 |
XUnmapWindow(dpy, c->window);
|
|
|
1cbaad6 |
- setstate(c, IconicState);
|
|
|
1cbaad6 |
+ setwinstate(c, IconicState);
|
|
|
1cbaad6 |
if (c == current)
|
|
|
1cbaad6 |
nofocus();
|
|
|
1cbaad6 |
hiddenc[numhidden] = c;
|
|
|
1cbaad6 |
@@ -222,7 +224,7 @@
|
|
|
1cbaad6 |
if (map) {
|
|
|
1cbaad6 |
XMapWindow(dpy, c->window);
|
|
|
1cbaad6 |
XMapRaised(dpy, c->parent);
|
|
|
1cbaad6 |
- setstate(c, NormalState);
|
|
|
1cbaad6 |
+ setwinstate(c, NormalState);
|
|
|
1cbaad6 |
active(c);
|
|
|
1cbaad6 |
top(c);
|
|
|
1cbaad6 |
}
|
|
|
1cbaad6 |
--- 9wm-1.2.orig/manage.c
|
|
|
1cbaad6 |
+++ 9wm-1.2/manage.c
|
|
|
1cbaad6 |
@@ -50,7 +50,7 @@
|
|
|
1cbaad6 |
|
|
|
1cbaad6 |
/* Figure out what to do with the window from hints */
|
|
|
1cbaad6 |
|
|
|
1cbaad6 |
- if (!getstate(c->window, &state))
|
|
|
1cbaad6 |
+ if (!getwinstate(c->window, &state))
|
|
|
1cbaad6 |
state = hints ? hints->initial_state : NormalState;
|
|
|
1cbaad6 |
dohide = (state == IconicState);
|
|
|
1cbaad6 |
|
|
|
1cbaad6 |
@@ -135,7 +135,7 @@
|
|
|
1cbaad6 |
active(c);
|
|
|
1cbaad6 |
else
|
|
|
1cbaad6 |
setactive(c, 0);
|
|
|
1cbaad6 |
- setstate(c, NormalState);
|
|
|
1cbaad6 |
+ setwinstate(c, NormalState);
|
|
|
1cbaad6 |
}
|
|
|
1cbaad6 |
if (current && (current != c))
|
|
|
1cbaad6 |
cmapfocus(current);
|
|
|
1cbaad6 |
@@ -195,7 +195,7 @@
|
|
|
1cbaad6 |
XReparentWindow(dpy, c->window, c->screen->root, c->x, c->y);
|
|
|
1cbaad6 |
gravitate(c, 0);
|
|
|
1cbaad6 |
XRemoveFromSaveSet(dpy, c->window);
|
|
|
1cbaad6 |
- setstate(c, WithdrawnState);
|
|
|
1cbaad6 |
+ setwinstate(c, WithdrawnState);
|
|
|
1cbaad6 |
|
|
|
1cbaad6 |
/* flush any errors */
|
|
|
1cbaad6 |
ignore_badwindow = 1;
|
|
|
1cbaad6 |
@@ -452,7 +452,7 @@
|
|
|
1cbaad6 |
}
|
|
|
1cbaad6 |
|
|
|
1cbaad6 |
void
|
|
|
1cbaad6 |
-setstate(c, state)
|
|
|
1cbaad6 |
+setwinstate(c, state)
|
|
|
1cbaad6 |
Client *c;
|
|
|
1cbaad6 |
int state;
|
|
|
1cbaad6 |
{
|
|
|
1cbaad6 |
@@ -467,7 +467,7 @@
|
|
|
1cbaad6 |
}
|
|
|
1cbaad6 |
|
|
|
1cbaad6 |
int
|
|
|
1cbaad6 |
-getstate(w, state)
|
|
|
1cbaad6 |
+getwinstate(w, state)
|
|
|
1cbaad6 |
Window w;
|
|
|
1cbaad6 |
int *state;
|
|
|
1cbaad6 |
{
|
|
|
1cbaad6 |
--- 9wm-1.2.orig/client.c
|
|
|
1cbaad6 |
+++ 9wm-1.2/client.c
|
|
|
1cbaad6 |
@@ -1,5 +1,7 @@
|
|
|
1cbaad6 |
/* Copyright (c) 1994-1996 David Hogan, see README for licence details */
|
|
|
1cbaad6 |
+#include <stdlib.h>
|
|
|
1cbaad6 |
#include <stdio.h>
|
|
|
1cbaad6 |
+#include <string.h>
|
|
|
1cbaad6 |
#include <X11/X.h>
|
|
|
1cbaad6 |
#include <X11/Xlib.h>
|
|
|
1cbaad6 |
#include <X11/Xutil.h>
|
|
|
1cbaad6 |
--- 9wm-1.2.orig/main.c
|
|
|
1cbaad6 |
+++ 9wm-1.2/main.c
|
|
|
1cbaad6 |
@@ -1,4 +1,5 @@
|
|
|
1cbaad6 |
/* Copyright (c) 1994-1996 David Hogan, see README for licence details */
|
|
|
1cbaad6 |
+#include <stdlib.h>
|
|
|
1cbaad6 |
#include <stdio.h>
|
|
|
1cbaad6 |
#include <signal.h>
|
|
|
1cbaad6 |
#include <errno.h>
|
|
|
1cbaad6 |
--- 9wm-1.2.orig/event.c
|
|
|
1cbaad6 |
+++ 9wm-1.2/event.c
|
|
|
1cbaad6 |
@@ -1,4 +1,5 @@
|
|
|
1cbaad6 |
/* Copyright (c) 1994-1996 David Hogan, see README for licence details */
|
|
|
1cbaad6 |
+#include <stdlib.h>
|
|
|
1cbaad6 |
#include <stdio.h>
|
|
|
1cbaad6 |
#include <X11/X.h>
|
|
|
1cbaad6 |
#include <X11/Xos.h>
|
|
|
1cbaad6 |
@@ -200,7 +201,7 @@
|
|
|
1cbaad6 |
XMapWindow(dpy, c->window);
|
|
|
1cbaad6 |
XMapRaised(dpy, c->parent);
|
|
|
1cbaad6 |
top(c);
|
|
|
1cbaad6 |
- setstate(c, NormalState);
|
|
|
1cbaad6 |
+ setwinstate(c, NormalState);
|
|
|
1cbaad6 |
if (c->trans != None && current && c->trans == current->window)
|
|
|
1cbaad6 |
active(c);
|
|
|
1cbaad6 |
break;
|
|
|
1cbaad6 |
--- 9wm-1.2.orig/error.c
|
|
|
1cbaad6 |
+++ 9wm-1.2/error.c
|
|
|
1cbaad6 |
@@ -1,4 +1,5 @@
|
|
|
1cbaad6 |
/* Copyright (c) 1994-1996 David Hogan, see README for licence details */
|
|
|
1cbaad6 |
+#include <stdlib.h>
|
|
|
1cbaad6 |
#include <stdio.h>
|
|
|
1cbaad6 |
#include <X11/X.h>
|
|
|
1cbaad6 |
#include <X11/Xlib.h>
|
|
|
1cbaad6 |
--- 9wm-1.2.orig/fns.h
|
|
|
1cbaad6 |
+++ 9wm-1.2/fns.h
|
|
|
1cbaad6 |
@@ -46,8 +46,8 @@
|
|
|
1cbaad6 |
char *getprop();
|
|
|
1cbaad6 |
Window getwprop();
|
|
|
1cbaad6 |
int getiprop();
|
|
|
1cbaad6 |
-int getstate();
|
|
|
1cbaad6 |
-void setstate();
|
|
|
1cbaad6 |
+int getwinstate();
|
|
|
1cbaad6 |
+void setwinstate();
|
|
|
1cbaad6 |
void setlabel();
|
|
|
1cbaad6 |
void getproto();
|
|
|
1cbaad6 |
void gettrans();
|