head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.178 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.176 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.174 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.172 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.170 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.168 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.166 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.164 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.162 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.160 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.158 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.156 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.154 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.152 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.150 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.148 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.146 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.144 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.142 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.140 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.138 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.136 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.134 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.130 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.110 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.132 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.128 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.126 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.124 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.122 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.120 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.118 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.116 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.114 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.112 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.108 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.106 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.104 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.102 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.100 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.98 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.96 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.94 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.92 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.90 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.88 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.86 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.84 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.82 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.80 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.78 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.76 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.74 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.72 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.70 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.68 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.66 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.64 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.62 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.60 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.58 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.56 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.54 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.52 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.50 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.48 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.46 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.44 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.42 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.40 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.38 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.36 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.34 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.32 pkgsrc-2008Q1:1.2.0.30 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.28 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.26 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.24 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.22 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.20 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.18 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.16 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.14 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.12 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.10 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.8 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.6 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.4 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.2 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.1.1.1.0.14 pkgsrc-2004Q2-base:1.1.1.1 pkgsrc-2004Q1:1.1.1.1.0.12 pkgsrc-2004Q1-base:1.1.1.1 pkgsrc-2003Q4:1.1.1.1.0.10 pkgsrc-2003Q4-base:1.1.1.1 netbsd-1-6-1:1.1.1.1.0.6 netbsd-1-6-1-base:1.1.1.1 netbsd-1-6:1.1.1.1.0.8 netbsd-1-6-RELEASE-base:1.1.1.1 pkgviews:1.1.1.1.0.4 pkgviews-base:1.1.1.1 buildlink2:1.1.1.1.0.2 buildlink2-base:1.1.1.1 netbsd-1-5-PATCH003:1.1.1.1 netbsd-1-5-PATCH001:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.2 date 2004.09.18.11.59.06; author blymn; state Exp; branches; next 1.1; 1.1 date 2000.12.12.02.03.49; author wiz; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2000.12.12.02.03.49; author wiz; state Exp; branches; next ; desc @@ 1.2 log @Update patch to move.c to stop tvtwm crashing in some rare situations. @ text @$NetBSD$ --- move.c.orig 1994-05-12 08:28:47.000000000 +0930 +++ move.c @@@@ -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 int doingMove = False; 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 adding; /* adding a window from add 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 @@@@ int panner; 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 panner; 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 @@@@ int paint; 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 @@@@ int paint; } 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 *first; int adding; int pulldown; { - Window junkChild; int doingFine; XEvent event,bakevent; - int xdest, ydest; unsigned mask; static int buttons; @@@@ -521,7 +512,7 @@@@ int pulldown; } break; case EnterNotify: - if (doingMove && event.xcrossing.window == Scr->Panner && event.xcrossing.detail != NotifyInferior) + if (doingMove && Scr != NULL && event.xcrossing.window == Scr->Panner && event.xcrossing.detail != NotifyInferior) { MoveOutline(outlineWindow, 0,0,0,0,0,0); *cancel = IN_PANNER; @@@@ -530,7 +521,7 @@@@ int pulldown; } break; case LeaveNotify: - if (doingMove && event.xcrossing.window == Scr->Panner && + if (doingMove && Scr != NULL && event.xcrossing.window == Scr->Panner && event.xcrossing.detail != NotifyInferior && event.xcrossing.mode == NotifyNormal) { MoveOutline(outlineWindow, 0,0,0,0,0,0); @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD: patch-ap,v 1.2 2000/02/05 15:58:30 wiz Exp $ d3 2 a4 8 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 d17 1 a17 1 @@@@ -70,7 +65,8 @@@@ d27 1 a27 1 @@@@ -165,11 +161,9 @@@@ d40 1 a40 1 @@@@ -338,7 +332,7 @@@@ d49 1 a49 1 @@@@ -363,9 +357,8 @@@@ d60 1 a60 1 @@@@ -374,8 +367,8 @@@@ d71 1 a71 1 @@@@ -438,8 +431,8 @@@@ d82 1 a82 1 @@@@ -448,11 +441,9 @@@@ d94 18 @ 1.1.1.1 log @Add new category wm for window managers, and move lots of package from x11 here. Only changes are: `wm' in category added and some paths fixed. @ text @@