projects / packages / fbterm.git / blame
| Commit | Line | Data |
|---|---|---|
| 619c17f4 WF |
1 | From 69917d25c6f718572433262d86691bf24e72e4c8 Mon Sep 17 00:00:00 2001 |
| 2 | From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> | |
| 3 | Date: Wed, 13 Jul 2016 12:02:10 +0900 | |
| 4 | Subject: [PATCH] Fix build with gcc-6 | |
| 5 | ||
| 6 | Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> | |
| 7 | --- | |
| 8 | src/lib/vterm.cpp | 4 ++-- | |
| 9 | src/lib/vterm_states.cpp | 18 +++++++++--------- | |
| 10 | 2 files changed, 11 insertions(+), 11 deletions(-) | |
| 11 | ||
| 12 | diff --git a/src/lib/vterm.cpp b/src/lib/vterm.cpp | |
| 13 | index 3a5dcc7..f79f44c 100644 | |
| 14 | --- a/src/lib/vterm.cpp | |
| 15 | +++ b/src/lib/vterm.cpp | |
| 16 | @@ -68,13 +68,13 @@ u8 VTerm::control_map[MAX_CONTROL_CODE], VTerm::escape_map[NR_STATES][MAX_ESCAPE | |
| 17 | ||
| 18 | void VTerm::init_state() | |
| 19 | { | |
| 20 | - for (u8 i = 1; control_sequences[i].code != (u16)-1; i++) { | |
| 21 | + for (u8 i = 1; control_sequences[i].code != (u16)0xFFFF; i++) { | |
| 22 | control_map[control_sequences[i].code] = i; | |
| 23 | } | |
| 24 | ||
| 25 | u8 state = ESnormal; | |
| 26 | for (u8 i = 1; ; i++) { | |
| 27 | - if (escape_sequences[i].code == (u16)-1) { | |
| 28 | + if (escape_sequences[i].code == (u16)0xFFFF) { | |
| 29 | state++; | |
| 30 | if (state == NR_STATES) break; | |
| 31 | } else { | |
| 32 | diff --git a/src/lib/vterm_states.cpp b/src/lib/vterm_states.cpp | |
| 33 | index 49e7588..6aaa8b3 100644 | |
| 34 | --- a/src/lib/vterm_states.cpp | |
| 35 | +++ b/src/lib/vterm_states.cpp | |
| 36 | @@ -39,14 +39,14 @@ const VTerm::Sequence VTerm::control_sequences[] = { | |
| 37 | { 0x1B, 0, ESesc }, | |
| 38 | { 0x7F, 0, ESkeep }, | |
| 39 | { 0x9B, 0, ESsquare }, | |
| 40 | - { -1} | |
| 41 | + { 0xFFFF} | |
| 42 | }; | |
| 43 | ||
| 44 | const VTerm::Sequence VTerm::escape_sequences[] = { | |
| 45 | { 0, 0, ESnormal }, | |
| 46 | ||
| 47 | // ESnormal | |
| 48 | - { -1 }, | |
| 49 | + { 0xFFFF }, | |
| 50 | ||
| 51 | // ESesc | |
| 52 | { '[', &VTerm::clear_param, ESsquare }, | |
| 53 | @@ -65,7 +65,7 @@ const VTerm::Sequence VTerm::escape_sequences[] = { | |
| 54 | { '8', &VTerm::restore_cursor, ESnormal }, | |
| 55 | { '>', &VTerm::keypad_numeric, ESnormal }, | |
| 56 | { '=', &VTerm::keypad_application, ESnormal }, | |
| 57 | - { -1 }, | |
| 58 | + { 0xFFFF }, | |
| 59 | ||
| 60 | // ESsquare | |
| 61 | { '[', 0, ESfunckey }, | |
| 62 | @@ -104,7 +104,7 @@ const VTerm::Sequence VTerm::escape_sequences[] = { | |
| 63 | { '`', &VTerm::cursor_position_col, ESnormal }, | |
| 64 | { ']', &VTerm::linux_specific, ESnormal }, | |
| 65 | { '}', &VTerm::fbterm_specific, ESnormal }, | |
| 66 | - { -1 }, | |
| 67 | + { 0xFFFF }, | |
| 68 | ||
| 69 | // ESnonstd | |
| 70 | { '0' | ADDSAME(9), &VTerm::set_palette, ESkeep }, | |
| 71 | @@ -112,25 +112,25 @@ const VTerm::Sequence VTerm::escape_sequences[] = { | |
| 72 | { 'a' | ADDSAME(5), &VTerm::set_palette, ESkeep }, | |
| 73 | { 'P', &VTerm::begin_set_palette, ESkeep }, | |
| 74 | { 'R', &VTerm::reset_palette, ESnormal }, | |
| 75 | - { -1 }, | |
| 76 | + { 0xFFFF }, | |
| 77 | ||
| 78 | // ESpercent | |
| 79 | { '@', &VTerm::clear_utf8, ESnormal }, | |
| 80 | { 'G', &VTerm::set_utf8, ESnormal }, | |
| 81 | { '8', &VTerm::set_utf8, ESnormal }, | |
| 82 | - { -1 }, | |
| 83 | + { 0xFFFF }, | |
| 84 | ||
| 85 | // EScharset | |
| 86 | { '0', &VTerm::set_charset, ESnormal }, | |
| 87 | { 'B', &VTerm::set_charset, ESnormal }, | |
| 88 | { 'U', &VTerm::set_charset, ESnormal }, | |
| 89 | { 'K', &VTerm::set_charset, ESnormal }, | |
| 90 | - { -1 }, | |
| 91 | + { 0xFFFF }, | |
| 92 | ||
| 93 | // EShash | |
| 94 | { '8', &VTerm::screen_align, ESnormal }, | |
| 95 | - { -1 }, | |
| 96 | + { 0xFFFF }, | |
| 97 | ||
| 98 | // ESfunckey | |
| 99 | - { -1 }, | |
| 100 | + { 0xFFFF }, | |
| 101 | }; | |
| 102 | -- | |
| 103 | 2.8.1 | |
| 104 |