From 27fc71a32cc474d7e657d2731e2f2308c9a4d8e3 Mon Sep 17 00:00:00 2001 From: dam Date: Tue, 4 Apr 2023 22:51:28 +0100 Subject: Fixed KEY_* values which were octal but I assumed decimals. --- curses.jai | 190 ++++++++++++++++++++++++++++++------------------------------- sizeof.c | 2 + ttt.jai | 8 +-- 3 files changed, 100 insertions(+), 100 deletions(-) diff --git a/curses.jai b/curses.jai index 532054a..ef9ff96 100644 --- a/curses.jai +++ b/curses.jai @@ -179,7 +179,6 @@ ACS_PI :: #run A_ALTCHARSET | #char "{"; /* Pi */ ACS_NEQUAL :: #run A_ALTCHARSET | #char "|"; /* not equal */ ACS_STERLING :: #run A_ALTCHARSET | #char "}"; /* UK pound sign */ - COLOR_PAIR :: (n: s32) -> s32 #foreign ncurses; COLOR_BLACK :: 0; @@ -194,99 +193,98 @@ COLOR_WHITE :: 7; ERR :: -1; OK :: 0; - -KEY_CODE_YES :: 0400; -KEY_MIN :: 0401; -KEY_BREAK :: 0401; -KEY_SRESET :: 0530; -KEY_RESET :: 0531; -KEY_DOWN :: 0402; -KEY_UP :: 0403; -KEY_LEFT :: 0404; -KEY_RIGHT :: 0405; -KEY_HOME :: 0406; -KEY_BACKSPACE :: 0407; -KEY_F0 :: 0410; +KEY_CODE_YES :: 256; +KEY_MIN :: 257; +KEY_BREAK :: 257; +KEY_SRESET :: 344; +KEY_RESET :: 345; +KEY_DOWN :: 258; +KEY_UP :: 259; +KEY_LEFT :: 260; +KEY_RIGHT :: 261; +KEY_HOME :: 262; +KEY_BACKSPACE :: 263; +KEY_F0 :: 264; KEY_F :: inline (n: s32) -> s32 { return KEY_F0+n; }; -KEY_DL :: 0510; -KEY_IL :: 0511; -KEY_DC :: 0512; -KEY_IC :: 0513; -KEY_EIC :: 0514; -KEY_CLEAR :: 0515; -KEY_EOS :: 0516; -KEY_EOL :: 0517; -KEY_SF :: 0520; -KEY_SR :: 0521; -KEY_NPAGE :: 0522; -KEY_PPAGE :: 0523; -KEY_STAB :: 0524; -KEY_CTAB :: 0525; -KEY_CATAB :: 0526; -KEY_ENTER :: 0527; -KEY_PRINT :: 0532; -KEY_LL :: 0533; -KEY_A1 :: 0534; -KEY_A3 :: 0535; -KEY_B2 :: 0536; -KEY_C1 :: 0537; -KEY_C3 :: 0540; -KEY_BTAB :: 0541; -KEY_BEG :: 0542; -KEY_CANCEL :: 0543; -KEY_CLOSE :: 0544; -KEY_COMMAND :: 0545; -KEY_COPY :: 0546; -KEY_CREATE :: 0547; -KEY_END :: 0550; -KEY_EXIT :: 0551; -KEY_FIND :: 0552; -KEY_HELP :: 0553; -KEY_MARK :: 0554; -KEY_MESSAGE :: 0555; -KEY_MOVE :: 0556; -KEY_NEXT :: 0557; -KEY_OPEN :: 0560; -KEY_OPTIONS :: 0561; -KEY_PREVIOUS :: 0562; -KEY_REDO :: 0563; -KEY_REFERENCE :: 0564; -KEY_REFRESH :: 0565; -KEY_REPLACE :: 0566; -KEY_RESTART :: 0567; -KEY_RESUME :: 0570; -KEY_SAVE :: 0571; -KEY_SBEG :: 0572; -KEY_SCANCEL :: 0573; -KEY_SCOMMAND :: 0574; -KEY_SCOPY :: 0575; -KEY_SCREATE :: 0576; -KEY_SDC :: 0577; -KEY_SDL :: 0600; -KEY_SELECT :: 0601; -KEY_SEND :: 0602; -KEY_SEOL :: 0603; -KEY_SEXIT :: 0604; -KEY_SFIND :: 0605; -KEY_SHELP :: 0606; -KEY_SHOME :: 0607; -KEY_SIC :: 0610; -KEY_SLEFT :: 0611; -KEY_SMESSAGE :: 0612; -KEY_SMOVE :: 0613; -KEY_SNEXT :: 0614; -KEY_SOPTIONS :: 0615; -KEY_SPREVIOUS :: 0616; -KEY_SPRINT :: 0617; -KEY_SREDO :: 0620; -KEY_SREPLACE :: 0621; -KEY_SRIGHT :: 0622; -KEY_SRSUME :: 0623; -KEY_SSAVE :: 0624; -KEY_SSUSPEND :: 0625; -KEY_SUNDO :: 0626; -KEY_SUSPEND :: 0627; -KEY_UNDO :: 0630; -KEY_MOUSE :: 0631; -KEY_RESIZE :: 0632; -KEY_MAX :: 0777; +KEY_DL :: 328; +KEY_IL :: 329; +KEY_DC :: 330; +KEY_IC :: 331; +KEY_EIC :: 332; +KEY_CLEAR :: 333; +KEY_EOS :: 334; +KEY_EOL :: 335; +KEY_SF :: 336; +KEY_SR :: 337; +KEY_NPAGE :: 338; +KEY_PPAGE :: 339; +KEY_STAB :: 340; +KEY_CTAB :: 341; +KEY_CATAB :: 342; +KEY_ENTER :: 343; +KEY_PRINT :: 346; +KEY_LL :: 347; +KEY_A1 :: 348; +KEY_A3 :: 349; +KEY_B2 :: 350; +KEY_C1 :: 351; +KEY_C3 :: 352; +KEY_BTAB :: 353; +KEY_BEG :: 354; +KEY_CANCEL :: 355; +KEY_CLOSE :: 356; +KEY_COMMAND :: 357; +KEY_COPY :: 358; +KEY_CREATE :: 359; +KEY_END :: 360; +KEY_EXIT :: 361; +KEY_FIND :: 362; +KEY_HELP :: 363; +KEY_MARK :: 364; +KEY_MESSAGE :: 365; +KEY_MOVE :: 366; +KEY_NEXT :: 367; +KEY_OPEN :: 368; +KEY_OPTIONS :: 369; +KEY_PREVIOUS :: 370; +KEY_REDO :: 371; +KEY_REFERENCE :: 372; +KEY_REFRESH :: 373; +KEY_REPLACE :: 374; +KEY_RESTART :: 375; +KEY_RESUME :: 376; +KEY_SAVE :: 377; +KEY_SBEG :: 378; +KEY_SCANCEL :: 379; +KEY_SCOMMAND :: 380; +KEY_SCOPY :: 381; +KEY_SCREATE :: 382; +KEY_SDC :: 383; +KEY_SDL :: 384; +KEY_SELECT :: 385; +KEY_SEND :: 386; +KEY_SEOL :: 387; +KEY_SEXIT :: 388; +KEY_SFIND :: 389; +KEY_SHELP :: 390; +KEY_SHOME :: 391; +KEY_SIC :: 392; +KEY_SLEFT :: 393; +KEY_SMESSAGE :: 394; +KEY_SMOVE :: 395; +KEY_SNEXT :: 396; +KEY_SOPTIONS :: 397; +KEY_SPREVIOUS :: 398; +KEY_SPRINT :: 399; +KEY_SREDO :: 400; +KEY_SREPLACE :: 401; +KEY_SRIGHT :: 402; +KEY_SRSUME :: 403; +KEY_SSAVE :: 404; +KEY_SSUSPEND :: 405; +KEY_SUNDO :: 406; +KEY_SUSPEND :: 407; +KEY_UNDO :: 408; +KEY_MOUSE :: 409; +KEY_RESIZE :: 410; +KEY_MAX :: 511; diff --git a/sizeof.c b/sizeof.c index 4844cba..9025f78 100644 --- a/sizeof.c +++ b/sizeof.c @@ -31,6 +31,8 @@ int main(int argc, char **argv) { memset(str, 0, 64); sprintf(str, "x,y : %dx%d\n", w_size_x, w_size_y); mvaddstr(2, 2, str); + sprintf(str, "resize:%d\n", KEY_RESIZE); + mvaddstr(3, 2, str); unsigned m = ACS_DIAMOND; fprintf(stderr, "sizeof ACS %d\n", sizeof(ACS_DIAMOND)); diff --git a/ttt.jai b/ttt.jai index b5fb59d..8f4b801 100644 --- a/ttt.jai +++ b/ttt.jai @@ -1069,8 +1069,9 @@ draw_tui :: (db: *Database, layout: *Layout) { // Draw table grids. y = 0; x = 0; - for layout.columns { - x += 1 + it.width; + for 0..layout.columns.count-2 { + column := layout.columns[it]; + x += 1 + column.width; mvaddch(xx y, xx x, ACS_TTEE); for row: 1..size_y-1 { mvaddch(xx row, xx x, ACS_VLINE); @@ -1515,7 +1516,7 @@ main :: () { } // When terminal is resized. - case KEY_RESIZE; // BUG KEY_RESIZE is not happening. + case KEY_RESIZE; clear(); getmaxyx(stdscr, *size_y, *size_x); is_terminal_too_small = size_x < 60 || size_y < 3; @@ -1889,7 +1890,6 @@ main :: () { exit(xx ifx error_saving then 1 else 0); } - /* main :: () { -- cgit v1.2.3