X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fdemo_panels.c;h=041b5bb12ca98d16209dd5bcc1ed789fd7d1e8c0;hp=8d5bac2bb6f1797bf19a1240a6a60609f2ef37e5;hb=21c8ffa0edf2e389f3f674f0c08009002c6f357d;hpb=eb312e0bb90463a33aa8a53f825b32dc189af023 diff --git a/test/demo_panels.c b/test/demo_panels.c old mode 100755 new mode 100644 index 8d5bac2b..041b5bb1 --- a/test/demo_panels.c +++ b/test/demo_panels.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 2007 Free Software Foundation, Inc. * + * Copyright (c) 2007-2010,2014 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -26,7 +26,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: demo_panels.c,v 1.22 2007/06/30 21:38:08 tom Exp $ + * $Id: demo_panels.c,v 1.38 2014/08/02 17:24:07 tom Exp $ * * Demonstrate a variety of functions from the panel library. */ @@ -37,6 +37,9 @@ #include +#define LAST_POS '@' +#define TEMP_POS '>' + typedef void (*InitPanel) (void); typedef void (*FillPanel) (PANEL *); @@ -113,17 +116,29 @@ get_position(NCURSES_CONST char *text, { int result = 0; int x1, y1; - WINDOW *win; + char cmd; getyx(stdscr, y1, x1); - win = statusline(); + (void) statusline(); show_position(text, also, which, y1, x1); if (log_in != 0) { - (void) wgetch(stdscr); - if (fscanf(log_in, "@%d,%d\n", &y1, &x1) == 2) { - result = 1; + if (fscanf(log_in, "%c%d,%d\n", &cmd, &y1, &x1) == 3) { + switch (cmd) { + case LAST_POS: + result = 1; + (void) wgetch(stdscr); + break; + case TEMP_POS: + result = 0; + wrefresh(stdscr); + napms(100); + break; + default: + result = -1; + break; + } } else { result = -1; } @@ -170,11 +185,16 @@ get_position(NCURSES_CONST char *text, } wmove(stdscr, y1, x1); - if (result > 0) { + *ypos = y1; + *xpos = x1; + + if (result >= 0) { if (log_out) - fprintf(log_out, "@%d,%d\n", y1, x1); - *ypos = y1; - *xpos = x1; + fprintf(log_out, "%c%d,%d\n", + ((result > 0) + ? LAST_POS + : TEMP_POS), + y1, x1); } return result; } @@ -184,16 +204,16 @@ mkpanel(short color, int rows, int cols, int tly, int tlx) { WINDOW *win; PANEL *pan = 0; - char *userdata = malloc(3); + char *userdata = typeMalloc(char, 3); if ((win = newwin(rows, cols, tly, tlx)) != 0) { keypad(win, TRUE); if ((pan = new_panel(win)) == 0) { delwin(win); } else if (use_colors) { - short fg = ((color == COLOR_BLUE) - ? COLOR_WHITE - : COLOR_BLACK); + short fg = (short) ((color == COLOR_BLUE) + ? COLOR_WHITE + : COLOR_BLACK); short bg = color; init_pair(color, fg, bg); @@ -213,7 +233,7 @@ my_remove_panel(PANEL ** pans, int which) if (pans[which] != 0) { PANEL *pan = pans[which]; WINDOW *win = panel_window(pan); - char *user = panel_userptr(pan); + char *user = (char *) panel_userptr(pan); free(user); del_panel(pan); @@ -223,6 +243,7 @@ my_remove_panel(PANEL ** pans, int which) } } +#undef MIN #define MIN(a,b) ((a) < (b) ? (a) : (b)) #define ABS(a) ((a) < 0 ? -(a) : (a)) @@ -231,8 +252,8 @@ my_create_panel(PANEL ** pans, int which, FillPanel myFill) { PANEL *pan = 0; int code; - int pair = which; - short fg = (pair == COLOR_BLUE) ? COLOR_WHITE : COLOR_BLACK; + short pair = (short) which; + short fg = (short) ((pair == COLOR_BLUE) ? COLOR_WHITE : COLOR_BLACK); short bg = pair; int x0, y0, x1, y1; @@ -271,7 +292,7 @@ my_create_panel(PANEL ** pans, int which, FillPanel myFill) } static void -my_move_panel(PANEL ** pans, int which) +my_move_panel(PANEL ** pans, int which, bool continuous) { if (pans[which] != 0) { int code; @@ -284,7 +305,10 @@ my_move_panel(PANEL ** pans, int which) sprintf(also, " (start %d,%d)", y0, x0); wmove(stdscr, y0, x0); while ((code = get_position("Move panel", also, which, &x1, &y1)) == 0) { - ; + if (continuous) { + move_panel(pans[which], y1, x1); + pflush(); + } } if (code > 0) { move_panel(pans[which], y1, x1); @@ -344,7 +368,8 @@ static void fill_panel(PANEL * pan) { WINDOW *win = panel_window(pan); - int num = ((const char *) panel_userptr(pan))[1]; + const char *userptr = (const char *) panel_userptr(pan); + int num = (userptr && *userptr) ? userptr[1] : '?'; int y, x; wmove(win, 1, 1); @@ -363,7 +388,8 @@ static void fill_unboxed(PANEL * pan) { WINDOW *win = panel_window(pan); - int num = ((const char *) panel_userptr(pan))[1]; + const char *userptr = (const char *) panel_userptr(pan); + int num = (userptr && *userptr) ? userptr[1] : '?'; int y, x; for (y = 0; y < getmaxy(win); y++) { @@ -380,7 +406,7 @@ make_fullwidth_digit(cchar_t *target, int digit) { wchar_t source[2]; - source[0] = digit + 0xff10; + source[0] = (wchar_t) (digit + 0xff10); source[1] = 0; setcchar(target, source, A_NORMAL, 0, 0); } @@ -450,7 +476,7 @@ show_panels(PANEL * px[MAX_PANELS + 1]) " c - create the panel", " d - delete the panel", " h - hide the panel", - " m - move the panel", + " m - move the panel (M for continuous move)", " r - resize the panel", " s - show the panel", " b - put the panel on the top of the stack" @@ -467,6 +493,7 @@ show_panels(PANEL * px[MAX_PANELS + 1]) PANEL *pan; int j; + memset(table, 0, sizeof(table)); for (j = 1; j <= MAX_PANELS; ++j) { table[j].valid = (px[j] != 0); if (table[j].valid) { @@ -480,7 +507,7 @@ show_panels(PANEL * px[MAX_PANELS + 1]) keypad(win, TRUE); if ((pan = new_panel(win)) != 0) { werase(win); - mvwprintw(win, 0, 0, "Panels:\n"); + MvWPrintw(win, 0, 0, "Panels:\n"); for (j = 1; j <= MAX_PANELS; ++j) { if (table[j].valid) { wprintw(win, " %d:", j); @@ -535,9 +562,13 @@ do_panel(PANEL * px[MAX_PANELS + 1], { int which = cmd[1] - '0'; + if (which < 1 || which > MAX_PANELS) { + beep(); + return; + } + if (log_in != 0) { pflush(); - (void) wgetch(stdscr); } saywhat(cmd); @@ -555,7 +586,10 @@ do_panel(PANEL * px[MAX_PANELS + 1], my_hide_panel(px[which]); break; case 'm': - my_move_panel(px, which); + my_move_panel(px, which, FALSE); + break; + case 'M': + my_move_panel(px, which, TRUE); break; case 'r': my_resize_panel(px, which, myFill); @@ -572,7 +606,7 @@ do_panel(PANEL * px[MAX_PANELS + 1], static bool ok_letter(int ch) { - return isalpha(UChar(ch)) && strchr("bcdhmrst", ch) != 0; + return isalpha(UChar(ch)) && strchr("bcdhmMrst", ch) != 0; } static bool @@ -601,14 +635,15 @@ get_command(PANEL * px[MAX_PANELS + 1], char *buffer, int limit) buffer[length = 0] = '\0'; if (log_in != 0) { - (void) wgetch(win); if (fgets(buffer, limit - 3, log_in) != 0) { - length = strlen(buffer); - while (length > 0 && isspace(buffer[length - 1])) + length = (int) strlen(buffer); + while (length > 0 && isspace(UChar(buffer[length - 1]))) buffer[--length] = '\0'; + waddstr(win, buffer); } else { close_input(); } + (void) wgetch(win); } else { c0 = 0; for (;;) { @@ -631,22 +666,22 @@ get_command(PANEL * px[MAX_PANELS + 1], char *buffer, int limit) } else if (isdigit(UChar(c0))) { wprintw(win, " %c", ch); buffer[length++] = ' '; - buffer[length++] = c0 = ch; + buffer[length++] = (char) (c0 = ch); } else { wprintw(win, "%c", ch); - buffer[length++] = c0 = ch; + buffer[length++] = (char) (c0 = ch); } } else if (ok_digit(ch)) { if (isalpha(UChar(c0))) { wprintw(win, "%c", ch); - buffer[length++] = c0 = ch; + buffer[length++] = (char) (c0 = ch); } else { beep(); } } else if (ch == ' ') { if (isdigit(UChar(c0))) { wprintw(win, "%c", ch); - buffer[length++] = c0 = ch; + buffer[length++] = (char) (c0 = ch); } else { beep(); } @@ -682,7 +717,7 @@ demo_panels(InitPanel myInit, FillPanel myFill) memset(px, 0, sizeof(px)); while (get_command(px, buffer, sizeof(buffer))) { - int limit = strlen(buffer); + int limit = (int) strlen(buffer); for (itmp = 0; itmp < limit; itmp += 3) { do_panel(px, buffer + itmp, myFill); } @@ -727,7 +762,7 @@ main(int argc, char *argv[]) setlocale(LC_ALL, ""); - while ((c = getopt(argc, argv, "i:o:mwx")) != EOF) { + while ((c = getopt(argc, argv, "i:o:mwx")) != -1) { switch (c) { case 'i': log_in = fopen(optarg, "r");