diff options
author | ache <ache@FreeBSD.org> | 1994-09-27 11:40:02 +0000 |
---|---|---|
committer | ache <ache@FreeBSD.org> | 1994-09-27 11:40:02 +0000 |
commit | 066066b3d93d299b0fe7e53a619d4bbcb9039c93 (patch) | |
tree | 1e7890c34240e5ce09c977dd4ba17502bbc923cc /sys | |
parent | e3b14acab7e9a3aedcf6751cd26aed7450d1c6bf (diff) | |
download | FreeBSD-src-066066b3d93d299b0fe7e53a619d4bbcb9039c93.zip FreeBSD-src-066066b3d93d299b0fe7e53a619d4bbcb9039c93.tar.gz |
Bug fixed: cursor shaping in mode swithching produce wrong results for
non-fat cursors, cursor_start goes beyond font size.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/dev/syscons/syscons.c | 7 | ||||
-rw-r--r-- | sys/i386/isa/syscons.c | 7 | ||||
-rw-r--r-- | sys/isa/syscons.c | 7 |
3 files changed, 15 insertions, 6 deletions
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index 0be135f..78806dd 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/syscons.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: syscons.c,v 1.56 1994/09/25 02:06:51 ache Exp $ + * $Id: syscons.c,v 1.57 1994/09/27 01:50:07 ache Exp $ */ #include "sc.h" @@ -2634,7 +2634,10 @@ setup_mode: font_size = *(modetable + 2); /* change cursor type if set */ if (scp->cursor_start != -1 && scp->cursor_end != -1) - cursor_shape(scp->cursor_start, + cursor_shape( + (scp->cursor_start >= font_size) + ? font_size - 1 + : scp->cursor_start, (scp->cursor_end >= font_size) ? font_size - 1 : scp->cursor_end); diff --git a/sys/i386/isa/syscons.c b/sys/i386/isa/syscons.c index 0be135f..78806dd 100644 --- a/sys/i386/isa/syscons.c +++ b/sys/i386/isa/syscons.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: syscons.c,v 1.56 1994/09/25 02:06:51 ache Exp $ + * $Id: syscons.c,v 1.57 1994/09/27 01:50:07 ache Exp $ */ #include "sc.h" @@ -2634,7 +2634,10 @@ setup_mode: font_size = *(modetable + 2); /* change cursor type if set */ if (scp->cursor_start != -1 && scp->cursor_end != -1) - cursor_shape(scp->cursor_start, + cursor_shape( + (scp->cursor_start >= font_size) + ? font_size - 1 + : scp->cursor_start, (scp->cursor_end >= font_size) ? font_size - 1 : scp->cursor_end); diff --git a/sys/isa/syscons.c b/sys/isa/syscons.c index 0be135f..78806dd 100644 --- a/sys/isa/syscons.c +++ b/sys/isa/syscons.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: syscons.c,v 1.56 1994/09/25 02:06:51 ache Exp $ + * $Id: syscons.c,v 1.57 1994/09/27 01:50:07 ache Exp $ */ #include "sc.h" @@ -2634,7 +2634,10 @@ setup_mode: font_size = *(modetable + 2); /* change cursor type if set */ if (scp->cursor_start != -1 && scp->cursor_end != -1) - cursor_shape(scp->cursor_start, + cursor_shape( + (scp->cursor_start >= font_size) + ? font_size - 1 + : scp->cursor_start, (scp->cursor_end >= font_size) ? font_size - 1 : scp->cursor_end); |