From f60e8dc9ab2948e2ad70b6a347a0550c0d7a802d Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Sun, 7 Mar 2004 00:27:08 +0000 Subject: 2004-03-07 Marco Gerards * bdf.c (bdf_read): Change the types of has_size, has_fbbx, has_metricset, glyph_has_encoding, glyph_has_bbx, glyph_bwidth, glyph_bheight and glyph_blines to unsigned int. * bell.h (struct bell_ops): Change the type of the argument KEY of the interface `deprecated' to unsigned int. All callers changed. * display.h (struct display_ops): Changed the type of the arguments width and height to unsigned int. All callers changed. * driver.c (driver_fini): Change the type of `i' to unsigned int to silence a gcc warning. (driver_start): Likewise. (driver_remove): Likewise. (ADD_REMOVE_COMPONENT): Likewise. (driver_add): Likewise. * generic-speaker.c (beep_on): Cup pitch at 20000, not 327677. Also silences a gcc warning. * ncursesw.c: Changed all calls to the function `ncurses_refresh' to `refresh_screen'. (current_width): Changed type to unsigned int. (current_height): Likewise. (padx): Likewise. (pady): Likewise. (refresh_screen): Cast LINES and COLS to unsigned int. (input_loop): Change `i' from int to unsigned int to silence a gcc warning. * vga.c (current_width): Changed type to unsigned int to silence a gcc warning. (current_heigh): Likewise. (struct vga_display): Changed the type of the members `width' and `height' to unsigned int to silence a gcc warning. (vga_display_change_font): Disabled the unused code for now. --- console-client/vga.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'console-client/vga.c') diff --git a/console-client/vga.c b/console-client/vga.c index 7f666494..ae32049f 100644 --- a/console-client/vga.c +++ b/console-client/vga.c @@ -75,8 +75,8 @@ static struct mutex vga_display_lock; static struct display_ops vga_display_ops; /* The current width and height the ncursesw driver is using. */ -static int current_width; -static int current_height; +static unsigned int current_width; +static unsigned int current_height; /* The cursor state to restore the state to. */ static int cursor_state; @@ -102,8 +102,8 @@ struct vga_display /* The color palette. */ dynacolor_t dc; - int width; - int height; + unsigned int width; + unsigned int height; /* Current attribute. */ int cur_conchar_attr_init; @@ -441,7 +441,7 @@ vga_display_scroll (void *handle, int delta) return 0; } - +#if 0 /* Change the font on the console CONSOLE to font. The old font will not be accessed by the vga console subsystem anymore after this call completed. */ @@ -452,6 +452,7 @@ vga_display_change_font (void *handle, bdf_font_t font) dynafont_change_font (disp->df, font); } +#endif static inline char @@ -667,7 +668,7 @@ vga_display_write (void *handle, conchar_t *str, size_t length, } static error_t -vga_set_dimension (void *handle, int width, int height) +vga_set_dimension (void *handle, unsigned int width, unsigned int height) { if (current_width && current_height) vga_display_clear (handle, current_width * current_height, 0, 0); -- cgit v1.2.3