diff options
| author | Roland McGrath <roland@gnu.org> | 2002-03-18 06:57:54 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2002-03-18 06:57:54 +0000 |
| commit | 1b50606eb4feab890f1ecddcf98c135edf190688 (patch) | |
| tree | 4bedda701146a6aa6f9473ca7e7b16f2b8f00e99 /console | |
| parent | e6c63396b19236f97d6a4adc42b22a246fdec019 (diff) | |
2002-03-17 Roland McGrath <roland@frob.com>
* dynafont.c: Include <string.h>.
* focus.c: Likewise.
* vga.c: Likewise.
* vga-display.c: Likewise.
Diffstat (limited to 'console')
| -rw-r--r-- | console/dynafont.c | 3 | ||||
| -rw-r--r-- | console/focus.c | 1 | ||||
| -rw-r--r-- | console/vga-display.c | 13 |
3 files changed, 10 insertions, 7 deletions
diff --git a/console/dynafont.c b/console/dynafont.c index 588457e9..cfae051d 100644 --- a/console/dynafont.c +++ b/console/dynafont.c @@ -22,6 +22,7 @@ #include <malloc.h> #include <wchar.h> #include <hurd/ihash.h> +#include <string.h> #include "vga-hw.h" #include "vga.h" @@ -196,7 +197,7 @@ dynafont_new (bdf_font_t font, int size, dynafont_t *dynafont) } -/* Release a dynafont object and its associated resources. */ +/* Release a dynafont object and its associated resources. */ void dynafont_free (dynafont_t df) { diff --git a/console/focus.c b/console/focus.c index 7eedbd6a..f2f1822d 100644 --- a/console/focus.c +++ b/console/focus.c @@ -1,5 +1,6 @@ #include <argp.h> #include <cthreads.h> +#include <string.h> #include "console.h" #include "input.h" diff --git a/console/vga-display.c b/console/vga-display.c index 6b7dc146..ac1ebcb3 100644 --- a/console/vga-display.c +++ b/console/vga-display.c @@ -23,6 +23,7 @@ #include <unistd.h> #include <iconv.h> #include <argp.h> +#include <string.h> #include <sys/io.h> #include <sys/mman.h> @@ -264,7 +265,7 @@ vga_display_scroll (void *console, int amount) } mutex_unlock (&vga_lock); } - mutex_unlock (&cons->lock); + mutex_unlock (&cons->lock); return 0; } @@ -290,7 +291,7 @@ limit_cursor (struct emu *emu) emu->x = emu->width - 1; else if (emu->x < 0) emu->x = 0; - + if (emu->y >= emu->height) emu->y = emu->height - 1; else if (emu->y < 0) @@ -483,7 +484,7 @@ handle_esc_bracket (struct emu *emu, char op) emu->params[0] ?: 1, emu->attr | ' '); break; case '@': /* insert character(s): <ich1>, <ich> */ - screen_scroll_right (emu->screen, emu->x, emu->y, + screen_scroll_right (emu->screen, emu->x, emu->y, emu->width - emu->x, 1, emu->params[0] ?: 1, emu->attr | ' '); break; @@ -570,7 +571,7 @@ vga_display_output_one (struct vga_display_console *cons, wchar_t chr) } else { - if (cons->current_line == cons->video_buffer_lines - 1) + if (cons->current_line == cons->video_buffer_lines - 1) cons->current_line = 0; else cons->current_line++; @@ -647,7 +648,7 @@ vga_display_output_one (struct vga_display_console *cons, wchar_t chr) int charval = dynafont_lookup (cons->df, chr); int line = (cons->current_line + cons->cursor_y) % cons->video_buffer_lines; - + cons->video_buffer[(line * cons->width + cons->cursor_x) * 2] = charval & 0xff; cons->video_buffer[(line * cons->width + cons->cursor_x) * 2 + 1] @@ -790,7 +791,7 @@ vga_display_output (void *console, char **buffer, size_t *length) /* First process all successfully converted characters. */ for (i = 0; i < CONV_OUTBUF_SIZE - outsize; i++) vga_display_output_one (cons, outbuf[i]); - + if (nconv == (size_t) -1) { /* Conversion didn't work out. */ |