move entry/exit debugging to 21.1

[unix-history] / usr / src / lib / libcurses / toucholap.c

diff --git a/usr/src/lib/libcurses/toucholap.c b/usr/src/lib/libcurses/toucholap.c
index cc0580f..53f193d 100644 (file)
--- a/usr/src/lib/libcurses/toucholap.c
+++ b/usr/src/lib/libcurses/toucholap.c
@@ -1,15 +1,15 @@
 /*
 /*

- * Copyright (c) 1981 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1981, 1993, 1994
+ *     The Regents of the University of California.  All rights reserved.

  *
  * %sccs.include.redist.c%
  */
 
 #ifndef lint
  *
  * %sccs.include.redist.c%
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)toucholap.c        5.9 (Berkeley) %G%";
+static char sccsid[] = "@(#)toucholap.c        8.2 (Berkeley) %G%";

 #endif /* not lint */
 
 #endif /* not lint */
 

-#include <curses.h>
+#include "curses.h"

 
 /*
  * touchoverlap --
 
 /*
  * touchoverlap --


@@ -22,30 +22,30 @@ touchoverlap(win1, win2)
        register int y, endy, endx, starty, startx;
 
 #ifdef DEBUG
        register int y, endy, endx, starty, startx;
 
 #ifdef DEBUG

-       __TRACE("touchoverlap: (%0.2o, %0.2o);\n", win1, win2);
+       __CTRACE("touchoverlap: (%0.2o, %0.2o);\n", win1, win2);

 #endif
        starty = max(win1->begy, win2->begy);
        startx = max(win1->begx, win2->begx);
        endy = min(win1->maxy + win1->begy, win2->maxy + win2->begx);
        endx = min(win1->maxx + win1->begx, win2->maxx + win2->begx);
 #ifdef DEBUG
 #endif
        starty = max(win1->begy, win2->begy);
        startx = max(win1->begx, win2->begx);
        endy = min(win1->maxy + win1->begy, win2->maxy + win2->begx);
        endx = min(win1->maxx + win1->begx, win2->maxx + win2->begx);
 #ifdef DEBUG

-       __TRACE("touchoverlap: from (%d,%d) to (%d,%d)\n",
+       __CTRACE("touchoverlap: from (%d,%d) to (%d,%d)\n",

            starty, startx, endy, endx);
            starty, startx, endy, endx);

-       __TRACE("touchoverlap: win1 (%d,%d) to (%d,%d)\n",
+       __CTRACE("touchoverlap: win1 (%d,%d) to (%d,%d)\n",

            win1->begy, win1->begx, win1->begy + win1->maxy,
            win1->begx + win1->maxx);
            win1->begy, win1->begx, win1->begy + win1->maxy,
            win1->begx + win1->maxx);

-       __TRACE("touchoverlap: win2 (%d,%d) to (%d,%d)\n",
+       __CTRACE("touchoverlap: win2 (%d,%d) to (%d,%d)\n",

            win2->begy, win2->begx, win2->begy + win2->maxy,
            win2->begx + win2->maxx);
 #endif
        if (starty >= endy || startx >= endx)
            win2->begy, win2->begx, win2->begy + win2->maxy,
            win2->begx + win2->maxx);
 #endif
        if (starty >= endy || startx >= endx)

-               return (CURSES_OK);
+               return (OK);

        starty -= win2->begy;
        startx -= win2->begx;
        endy -= win2->begy;
        endx -= win2->begx;
        for (--endx, y = starty; y < endy; y++)
                __touchline(win2, y, startx, endx, 0);
        starty -= win2->begy;
        startx -= win2->begx;
        endy -= win2->begy;
        endx -= win2->begx;
        for (--endx, y = starty; y < endy; y++)
                __touchline(win2, y, startx, endx, 0);

-       return (CURSES_OK);
+       return (OK);

 }
 
 }