diff options
| author | Flavio Cruz <flaviocruz@gmail.com> | 2015-12-29 17:35:00 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2015-12-29 20:47:40 +0100 |
| commit | cc3e97aa0141410eb8b05cab34aecf65f44a164c (patch) | |
| tree | f7b72d19129e8172cdde52706634b3935f329f61 /console-client/pc-kbd.c | |
| parent | b4cf10f408d50e4caaeda6d2bc9df2db3398a9cd (diff) | |
fix compiler warnings in hurd/console-client
console-client: Fix several compiler warnings.
* console-client/bdf.c: Use size_t instead of int.
* console-client/driver.c: Remove unused variable errstring.
* console-client/pc-kbd.c: Cast sc to scancode_x1 before comparing with enum
values.
* console-client/vga-dynacolor.h: Use an explicit if in reference counting.
* console-client/vga-dynafont.c: Use usigned char for bitmaps.
* console-client/vga-support.c: Use unsigned char instead of char.
* console-client/vga-support.h: Likewise.
* console-client/vga.c: Use conchar_attr_equal instead of casting structures to
integers.
* hurd/console.h: Add conchar_attr_equal to compare conchar_attr_t structures.
Diffstat (limited to 'console-client/pc-kbd.c')
| -rw-r--r-- | console-client/pc-kbd.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/console-client/pc-kbd.c b/console-client/pc-kbd.c index 21c09876..6f2d827a 100644 --- a/console-client/pc-kbd.c +++ b/console-client/pc-kbd.c @@ -1100,10 +1100,11 @@ input_loop (void *unused) } else if (state.extended == 1) { + const enum scancode_x1 scx1 = (enum scancode_x1) sc; state.extended = 0; - if (sc == SC_X1_RIGHT_CTRL) + if (scx1 == SC_X1_RIGHT_CTRL) state.right_ctrl = down; - else if (sc == SC_X1_RIGHT_ALT) + else if (scx1 == SC_X1_RIGHT_ALT) { state.right_alt = down; @@ -1139,23 +1140,23 @@ input_loop (void *unused) } } } - else if (state.right_alt && down && sc == SC_X1_PAD_SLASH) /* XXX */ + else if (state.right_alt && down && scx1 == SC_X1_PAD_SLASH) /* XXX */ state.direct = (state.direct << 4) | 0xb; - else if (state.right_alt && down && sc == SC_X1_PAD_ENTER) /* XXX */ + else if (state.right_alt && down && scx1 == SC_X1_PAD_ENTER) /* XXX */ state.direct = (state.direct << 4) | 0xf; - else if (state.left_alt && down && sc == SC_X1_RIGHT) /* XXX */ + else if (state.left_alt && down && scx1 == SC_X1_RIGHT) /* XXX */ console_switch (0, 1); - else if (state.left_alt && down && sc == SC_X1_LEFT) /* XXX */ + else if (state.left_alt && down && scx1 == SC_X1_LEFT) /* XXX */ console_switch (0, -1); - else if (state.left_alt && down && sc == SC_X1_UP) /* XXX */ + else if (state.left_alt && down && scx1 == SC_X1_UP) /* XXX */ console_scrollback (CONS_SCROLL_DELTA_LINES, 1); - else if (state.left_alt && down && sc == SC_X1_DOWN) /* XXX */ + else if (state.left_alt && down && scx1 == SC_X1_DOWN) /* XXX */ console_scrollback (CONS_SCROLL_DELTA_LINES, -1); else if ((state.right_shift || state.left_shift) - && down && sc == SC_X1_PGUP) /* XXX */ + && down && scx1 == SC_X1_PGUP) /* XXX */ console_scrollback (CONS_SCROLL_DELTA_SCREENS, 0.5); else if ((state.right_shift || state.left_shift) - && down && sc == SC_X1_PGDN) /* XXX */ + && down && scx1 == SC_X1_PGDN) /* XXX */ console_scrollback (CONS_SCROLL_DELTA_SCREENS, -0.5); else if (down && sc < sizeof (sc_x1_to_kc)/sizeof (sc_x1_to_kc[0])) { |