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.38; 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-ap,v 1.2 2000/02/05 15:58:30 wiz Exp $ Index: move.c =================================================================== RCS file: /home/siren/src/tvtwm/move.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- move.c 1999/08/08 05:46:52 1.1.1.1 +++ move.c 1999/08/08 05:56:54 1.2 @@@@ -34,11 +34,6 @@@@ * **********************************************************************/ -#if !defined(lint) && !defined(SABER) -static char RCSinfo[]= -"$XConsortium: move.c,v 1.140 90/03/23 11:42:33 jim Exp $"; -#endif - #include #include #include @@@@ -70,7 +65,8 @@@@ static void reallyStartMove(); static void doMove(); -static void getPointer(); +static void getPointer(int *x_root, int *y_root, int *cancel, int *done, + int *first, int adding, int pulldown); /*********************************************************************** * @@@@ -165,11 +161,9 @@@@ int pulldown; /* moving window from a pulldown menu */ { Window junkRoot, junkChild; - unsigned int junkDepth, numChildren; + unsigned int junkDepth; int junkX, junkY; - int junkxroot, junkyroot; Bool old_save_under; - unsigned int junkMask; int first; XSetWindowAttributes attr; XWindowAttributes wattr; @@@@ -338,7 +332,7 @@@@ XRaiseWindow(dpy, window); while (True) { - getPointer(outlineWindow, x_root, y_root, cancel, &done, first, adding, pulldown); + getPointer(/*outlineWindow,*/ x_root, y_root, cancel, &done, first, adding, pulldown); if (done) { doMove(tmp_win, window, *x_root, *y_root, &xdest, &ydest, panner, False); break; @@@@ -363,9 +357,8 @@@@ int paint; { int xl, yt; - int deltax, deltay; +/* int deltax, deltay;*/ int vdtx, vdty; - char str[20]; Window actual, virtual; dragX = x_root; @@@@ -374,8 +367,8 @@@@ xl = dragX + diffX; yt = dragY + diffY; - deltax = xl - origX/scale; - deltay = yt - origY/scale; +/* deltax = xl - origX/scale; + deltay = yt - origY/scale;*/ if (MoveFunction != F_FORCEMOVE && Scr->DontMoveOff && outlineWindow != Scr->Panner) { if (tmp_win->root == Scr->VirtualDesktop || tmp_win->root == Scr->Panner) { @@@@ -438,8 +431,8 @@@@ } static void -getPointer(window, x_root, y_root, cancel, done, first, adding, pulldown) -Window window; +getPointer(/*window,*/ x_root, y_root, cancel, done, first, adding, pulldown) +/*Window window;*/ int *x_root; int *y_root; int *cancel; @@@@ -448,11 +441,9 @@@@ int adding; int pulldown; { - Window junkChild; int doingFine; XEvent event,bakevent; - int xdest, ydest; unsigned mask; static int buttons; @ 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 @