Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correct cursor-movement bounds check in ifdef'ed out code, as

Browse Source 
for revision 1.7 of sys/arch/pmax/dev/ims332.c:
 >Bound x motion by framebuffer width, not height.
 >Bound y motion by framebuffer height, not width.
This commit is contained in:
jonathan 1997-07-20 03:57:18 +00:00
parent 623d454fe0
commit 59b1c9add9
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/arch/pmax/dev/bt459.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: bt459.c,v 1.7 1997/06/16 02:53:23 jonathan Exp $ */
/* $NetBSD: bt459.c,v 1.8 1997/07/20 03:57:19 jonathan Exp $ */
/*-
* Copyright (c) 1992, 1993
@ -332,12 +332,12 @@ bt459PosCursor(fi, x, y)
#ifdef MELLON
if (y < 0)
y = 0;
else if (y > fi -> fi_type.fb_width - fi -> fi_cursor.width - 1)
y = fi -> fi_type.fb_width - fi -> fi_cursor.width - 1;
else if (y > fi -> fi_type.fb_height - fi -> fi_cursor.height - 1)
y = fi -> fi_type.fb_height - fi -> fi_cursor.height - 1;
if (x < 0)
x = 0;
else if (x > fi -> fi_type.fb_height - fi -> fi_cursor.height - 1)
x = fi -> fi_type.fb_height - fi -> fi_cursor.height - 1;
else if (x > fi -> fi_type.fb_width - fi -> fi_cursor.width - 1)
x = fi -> fi_type.fb_width - fi -> fi_cursor.width - 1;
#else /* old-style pmax glass tty */
if (y < fbu->scrInfo.min_cur_y || y > fbu->scrInfo.max_cur_y)
@ -346,7 +346,6 @@ bt459PosCursor(fi, x, y)
x = fbu->scrInfo.max_cur_x;
#endif
fi -> fi_cursor.x = x;
fi -> fi_cursor.y = y;

10
sys/arch/pmax/dev/mfb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mfb.c,v 1.27 1997/06/30 22:09:01 jonathan Exp $ */
/* $NetBSD: mfb.c,v 1.28 1997/07/20 03:57:18 jonathan Exp $ */
/*-
* Copyright (c) 1992, 1993
@ -481,12 +481,12 @@ mfbPosCursor(fi, x, y)
#ifdef MELLON
if (y < 0)
y = 0;
else if (y > fi -> fi_type.fb_width - fi -> fi_cursor.width - 1)
y = fi -> fi_type.fb_width - fi -> fi_cursor.width - 1;
else if (y > fi -> fi_type.fb_height - fi -> fi_cursor.height - 1)
y = fi -> fi_type.fb_height - fi -> fi_cursor.height - 1;
if (x < 0)
x = 0;
else if (x > fi -> fi_type.fb_height - fi -> fi_cursor.height - 1)
x = fi -> fi_type.fb_height - fi -> fi_cursor.height - 1;
else if (x > fi -> fi_type.fb_width - fi -> fi_cursor.width - 1)
x = fi -> fi_type.fb_width - fi -> fi_cursor.width - 1;
#else /* old-style pmax glass tty */
if (y < fi->fi_fbu->scrInfo.min_cur_y ||