Sat Oct 17 00:35:25 2015 UTC ()
Fix x/y edito.


(uwe)
diff -r1.15 -r1.16 src/lib/libcurses/toucholap.c
cvs diff -r1.15 -r1.16 src/lib/libcurses/toucholap.c (expand / switch to unified diff)

--- src/lib/libcurses/toucholap.c 2007/01/21 13:25:36 1.15
+++ src/lib/libcurses/toucholap.c 2015/10/17 00:35:25 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: toucholap.c,v 1.15 2007/01/21 13:25:36 jdc Exp $ */ 1/* $NetBSD: toucholap.c,v 1.16 2015/10/17 00:35:25 uwe Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1981, 1993, 1994 4 * Copyright (c) 1981, 1993, 1994
5 * The Regents of the University of California. All rights reserved. 5 * The Regents of the University of California. All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -24,48 +24,48 @@ @@ -24,48 +24,48 @@
24 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 24 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
25 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 25 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
26 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 26 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
27 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 27 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
28 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 28 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
29 * SUCH DAMAGE. 29 * SUCH DAMAGE.
30 */ 30 */
31 31
32#include <sys/cdefs.h> 32#include <sys/cdefs.h>
33#ifndef lint 33#ifndef lint
34#if 0 34#if 0
35static char sccsid[] = "@(#)toucholap.c 8.2 (Berkeley) 5/4/94"; 35static char sccsid[] = "@(#)toucholap.c 8.2 (Berkeley) 5/4/94";
36#else 36#else
37__RCSID("$NetBSD: toucholap.c,v 1.15 2007/01/21 13:25:36 jdc Exp $"); 37__RCSID("$NetBSD: toucholap.c,v 1.16 2015/10/17 00:35:25 uwe Exp $");
38#endif 38#endif
39#endif /* not lint */ 39#endif /* not lint */
40 40
41#include "curses.h" 41#include "curses.h"
42#include "curses_private.h" 42#include "curses_private.h"
43 43
44/* 44/*
45 * touchoverlap -- 45 * touchoverlap --
46 * Touch, on win2, the part that overlaps with win1. 46 * Touch, on win2, the part that overlaps with win1.
47 */ 47 */
48int 48int
49touchoverlap(WINDOW *win1, WINDOW *win2) 49touchoverlap(WINDOW *win1, WINDOW *win2)
50{ 50{
51 int y, endy, endx, starty, startx; 51 int y, endy, endx, starty, startx;
52 52
53#ifdef DEBUG 53#ifdef DEBUG
54 __CTRACE(__CTRACE_WINDOW, "touchoverlap: (%p, %p);\n", win1, win2); 54 __CTRACE(__CTRACE_WINDOW, "touchoverlap: (%p, %p);\n", win1, win2);
55#endif 55#endif
56 starty = max(win1->begy, win2->begy); 56 starty = max(win1->begy, win2->begy);
57 startx = max(win1->begx, win2->begx); 57 startx = max(win1->begx, win2->begx);
58 endy = min(win1->maxy + win1->begy, win2->maxy + win2->begx); 58 endy = min(win1->maxy + win1->begy, win2->maxy + win2->begy);
59 endx = min(win1->maxx + win1->begx, win2->maxx + win2->begx); 59 endx = min(win1->maxx + win1->begx, win2->maxx + win2->begx);
60#ifdef DEBUG 60#ifdef DEBUG
61 __CTRACE(__CTRACE_WINDOW, "touchoverlap: from (%d,%d) to (%d,%d)\n", 61 __CTRACE(__CTRACE_WINDOW, "touchoverlap: from (%d,%d) to (%d,%d)\n",
62 starty, startx, endy, endx); 62 starty, startx, endy, endx);
63 __CTRACE(__CTRACE_WINDOW, "touchoverlap: win1 (%d,%d) to (%d,%d)\n", 63 __CTRACE(__CTRACE_WINDOW, "touchoverlap: win1 (%d,%d) to (%d,%d)\n",
64 win1->begy, win1->begx, win1->begy + win1->maxy, 64 win1->begy, win1->begx, win1->begy + win1->maxy,
65 win1->begx + win1->maxx); 65 win1->begx + win1->maxx);
66 __CTRACE(__CTRACE_WINDOW, "touchoverlap: win2 (%d,%d) to (%d,%d)\n", 66 __CTRACE(__CTRACE_WINDOW, "touchoverlap: win2 (%d,%d) to (%d,%d)\n",
67 win2->begy, win2->begx, win2->begy + win2->maxy, 67 win2->begy, win2->begx, win2->begy + win2->maxy,
68 win2->begx + win2->maxx); 68 win2->begx + win2->maxx);
69#endif 69#endif
70 if (starty >= endy || startx >= endx) 70 if (starty >= endy || startx >= endx)
71 return (OK); 71 return (OK);