head	1.3;
access;
symbols
	pkgsrc-2013Q2:1.3.0.54
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2012Q4:1.3.0.52
	pkgsrc-2012Q4-base:1.3
	pkgsrc-2011Q4:1.3.0.50
	pkgsrc-2011Q4-base:1.3
	pkgsrc-2011Q2:1.3.0.48
	pkgsrc-2011Q2-base:1.3
	pkgsrc-2009Q4:1.3.0.46
	pkgsrc-2009Q4-base:1.3
	pkgsrc-2008Q4:1.3.0.44
	pkgsrc-2008Q4-base:1.3
	pkgsrc-2008Q3:1.3.0.42
	pkgsrc-2008Q3-base:1.3
	cube-native-xorg:1.3.0.40
	cube-native-xorg-base:1.3
	pkgsrc-2008Q2:1.3.0.38
	pkgsrc-2008Q2-base:1.3
	pkgsrc-2008Q1:1.3.0.36
	pkgsrc-2008Q1-base:1.3
	pkgsrc-2007Q4:1.3.0.34
	pkgsrc-2007Q4-base:1.3
	pkgsrc-2007Q3:1.3.0.32
	pkgsrc-2007Q3-base:1.3
	pkgsrc-2007Q2:1.3.0.30
	pkgsrc-2007Q2-base:1.3
	pkgsrc-2007Q1:1.3.0.28
	pkgsrc-2007Q1-base:1.3
	pkgsrc-2006Q4:1.3.0.26
	pkgsrc-2006Q4-base:1.3
	pkgsrc-2006Q3:1.3.0.24
	pkgsrc-2006Q3-base:1.3
	pkgsrc-2006Q2:1.3.0.22
	pkgsrc-2006Q2-base:1.3
	pkgsrc-2006Q1:1.3.0.20
	pkgsrc-2006Q1-base:1.3
	pkgsrc-2005Q4:1.3.0.18
	pkgsrc-2005Q4-base:1.3
	pkgsrc-2005Q3:1.3.0.16
	pkgsrc-2005Q3-base:1.3
	pkgsrc-2005Q2:1.3.0.14
	pkgsrc-2005Q2-base:1.3
	pkgsrc-2005Q1:1.3.0.12
	pkgsrc-2005Q1-base:1.3
	pkgsrc-2004Q4:1.3.0.10
	pkgsrc-2004Q4-base:1.3
	pkgsrc-2004Q3:1.3.0.8
	pkgsrc-2004Q3-base:1.3
	pkgsrc-2004Q2:1.3.0.6
	pkgsrc-2004Q2-base:1.3
	pkgsrc-2004Q1:1.3.0.4
	pkgsrc-2004Q1-base:1.3
	pkgsrc-2003Q4:1.3.0.2
	pkgsrc-2003Q4-base:1.3
	buildlink2-base:1.3
	netbsd-1-5-RELEASE:1.2
	netbsd-1-4-PATCH003:1.2
	netbsd-1-4-PATCH002:1.2
	comdex-fall-1999:1.1;
locks; strict;
comment	@# @;


1.3
date	2000.12.12.02.11.40;	author wiz;	state dead;
branches;
next	1.2;

1.2
date	2000.02.05.15.58.30;	author wiz;	state Exp;
branches;
next	1.1;

1.1
date	99.08.08.08.40.24;	author blymn;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Added wm category to main Makefile; remove packages that have been moved
from x11 to wm; fix paths in packages that depend on the moved ones.
@
text
@$NetBSD: patch-az,v 1.2 2000/02/05 15:58:30 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);
@


1.2
log
@RCS tags added
@
text
@d1 1
a1 1
$NetBSD$
@


1.1
log
@This set of patches does the following:
	1) makes m4 work so preprocessing of tvtwm menu files is possible
	2) general code clean up.  Code now compiles almost without
	   warnings with -Wall on.
	3) bug fixes spotted when doing (2) - things like fucntions not
	   returning values when they should and assignments in if
	   statements that were not meant to be.
@
text
@d1 2
@