summaryrefslogtreecommitdiff
path: root/wm/tvtwm/patches/patch-az
diff options
context:
space:
mode:
Diffstat (limited to 'wm/tvtwm/patches/patch-az')
-rw-r--r--wm/tvtwm/patches/patch-az98
1 files changed, 98 insertions, 0 deletions
diff --git a/wm/tvtwm/patches/patch-az b/wm/tvtwm/patches/patch-az
new file mode 100644
index 00000000000..93c15056870
--- /dev/null
+++ b/wm/tvtwm/patches/patch-az
@@ -0,0 +1,98 @@
+$NetBSD: patch-az,v 1.1.1.1 2000/12/12 02:03:49 wiz Exp $
+
+Index: vdt.c
+===================================================================
+RCS file: /home/siren/src/tvtwm/vdt.c,v
+retrieving revision 1.1.1.1
+retrieving revision 1.2
+diff -u -r1.1.1.1 -r1.2
+--- vdt.c 1999/08/08 05:46:53 1.1.1.1
++++ vdt.c 1999/08/08 05:57:00 1.2
+@@ -139,12 +139,8 @@
+ *
+ **********************************************************************/
+
+-#if !defined(lint) && !defined(SABER)
+-static char RCSinfo[]=
+-"$XConsortium: vdt.c,v 1.140 90/03/23 11:42:33 jim Exp $";
+-#endif
+-
+ #include <stdio.h>
++#include <unistd.h>
+ #include <X11/X.h>
+ #include <X11/Xatom.h>
+ #include "twm.h"
+@@ -545,8 +541,6 @@
+ TwmWindow *tmp_win;
+ int x, y;
+ {
+- XWindowChanges xwc;
+-
+ XMoveWindow(dpy, tmp_win->icon.w, x, y);
+ tmp_win->icon_loc_x = x;
+ tmp_win->icon_loc_y = y;
+@@ -572,13 +566,14 @@
+ Pixmap pm;
+ XSetWindowAttributes attr;
+ unsigned attrMask;
+- extern char *display_name;
++#ifdef XLOADIMAGE
+ char display[80];
+ char *ptr;
+- int fres;
+ char fg_text[14], bg_text[14];
+ XColor colors[2];
+-
++ pid_t fres;
++#endif
++
+ /*
+ * Make vdt size an integral multiple of physical screen size
+ * if the given width and/or height are less than physical
+@@ -638,7 +633,7 @@
+ colors[1].green, colors[1].blue);
+ /* Fork the process */
+ fres = fork();
+- if (fres < 0) fprintf(stderr, "%s: error in fork()...\n");
++ if (fres < 0) fprintf(stderr, "%s: error in fork()...\n", ProgramName);
+ if (fres == 0) { /* This is the child */
+ execlp("xloadimage", "xsetbg", "-display",
+ display, "-foreground",
+@@ -703,7 +698,6 @@
+ XSizeHints *sizeHints;
+ XWMHints *wmHints;
+ XClassHint *classHints;
+- int status;
+ int x, y, width, height;
+ Pixmap pm;
+ unsigned attrMask;
+@@ -980,10 +974,10 @@
+ int y;
+ {
+ TwmWindow *tmp;
+- XSetWindowAttributes attributes;
+ XEvent ev;
+ register int delta_x, delta_y;
+ #ifdef INSTANT_MOVE_HACK
++ XSetWindowAttributes attributes;
+ Window hack;
+ #endif
+
+@@ -1288,7 +1282,6 @@
+ TwmWindow *tmp_win;
+ {
+ register int x, y;
+- int xr, yb;
+
+ if (!tmp_win->sticky) {
+ x=tmp_win->frame_x;
+@@ -1320,9 +1313,6 @@
+ PaintVirtualWindow(tmp_win)
+ TwmWindow *tmp_win;
+ {
+- int x, y;
+- int xr, yb;
+-
+ if (Scr->ShowVirtualNames) {
+ FBF(tmp_win->virtual.fore, tmp_win->virtual.back,
+ Scr->VirtualFont.font->fid);