BSD 4_4 release

[unix-history] / usr / src / sys / hp300 / dev / ite_rb.c

diff --git a/usr/src/sys/hp300/dev/ite_rb.c b/usr/src/sys/hp300/dev/ite_rb.c
index ea976c5..7a6e3c2 100644 (file)
--- a/usr/src/sys/hp300/dev/ite_rb.c
+++ b/usr/src/sys/hp300/dev/ite_rb.c
@@ -1,38 +1,64 @@
 /*
  * Copyright (c) 1988 University of Utah.
 /*
  * Copyright (c) 1988 University of Utah.

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

  *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
  *
  *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.

  *
  *

- * from: Utah $Hdr: ite_rb.c 1.17 92/01/21$
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  *
  *

- *     @(#)ite_rb.c    7.6 (Berkeley) %G%
+ * from: Utah $Hdr: ite_rb.c 1.19 93/06/25$
+ *
+ *     @(#)ite_rb.c    8.1 (Berkeley) 7/8/93

  */
 
 #include "ite.h"
 #if NITE > 0
 
  */
 
 #include "ite.h"
 #if NITE > 0
 

-#include "param.h"
-#include "conf.h"
-#include "proc.h"
-#include "ioctl.h"
-#include "tty.h"
-#include "systm.h"
+#include <sys/param.h>
+#include <sys/conf.h>
+#include <sys/proc.h>
+#include <sys/ioctl.h>
+#include <sys/tty.h>
+#include <sys/systm.h>

 
 

-#include "hp/dev/itevar.h"
-#include "hp/dev/itereg.h"
-#include "grf_rbreg.h"
+#include <hp/dev/itevar.h>
+#include <hp/dev/itereg.h>
+#include <hp300/dev/grf_rbreg.h>

 
 

-#include "machine/cpu.h"
+#include <machine/cpu.h>

 
 /* XXX */
 
 /* XXX */

-#include "hp/dev/grfioctl.h"
-#include "hp/dev/grfvar.h"
+#include <hp/dev/grfioctl.h>
+#include <hp/dev/grfvar.h>

 
 #define REGBASE                ((struct rboxfb *)(ip->regbase))
 #define WINDOWMOVER    rbox_windowmove
 
 #define REGBASE                ((struct rboxfb *)(ip->regbase))
 #define WINDOWMOVER    rbox_windowmove


@@ -52,6 +78,17 @@ rbox_init(ip)
                ip->fbheight = gp->g_display.gd_fbheight;
                ip->dwidth = gp->g_display.gd_dwidth;
                ip->dheight = gp->g_display.gd_dheight;
                ip->fbheight = gp->g_display.gd_fbheight;
                ip->dwidth = gp->g_display.gd_dwidth;
                ip->dheight = gp->g_display.gd_dheight;

+               /*
+                * XXX some displays (e.g. the davinci) appear
+                * to return a display height greater than the
+                * returned FB height.  Guess we should go back
+                * to getting the display dimensions from the
+                * fontrom...
+                */
+               if (ip->dwidth > ip->fbwidth)
+                       ip->dwidth = ip->fbwidth;
+               if (ip->dheight > ip->fbheight)
+                       ip->dheight = ip->fbheight;

        }
 
        rb_waitbusy(ip->regbase);
        }
 
        rb_waitbusy(ip->regbase);


@@ -176,8 +213,6 @@ rbox_scroll(ip, sy, sx, count, dir)
        register int height = 1;
        register int width = ip->cols;
 
        register int height = 1;
        register int width = ip->cols;
 

-       rbox_cursor(ip, ERASE_CURSOR);
-

        if (dir == SCROLL_UP) {
                dy = sy - count;
                height = ip->rows - sy;
        if (dir == SCROLL_UP) {
                dy = sy - count;
                height = ip->rows - sy;