X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fdemo_panels.c;h=2adc690e11c750ee02df97af51ff67c33056ebab;hp=0ac704073f2171f638f90c48c1161e9cdb8484b3;hb=396a05943b7da5039dd15d79c4385c7d2a75d6d4;hpb=574a94bc3d70682bde48f7f10d3c12a58e581e27 diff --git a/test/demo_panels.c b/test/demo_panels.c index 0ac70407..2adc690e 100755 --- a/test/demo_panels.c +++ b/test/demo_panels.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 2007 Free Software Foundation, Inc. * + * Copyright (c) 2007,2008 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.16 2007/06/23 21:24:23 tom Exp $ + * $Id: demo_panels.c,v 1.30 2008/04/12 21:59:49 tom Exp $ * * Demonstrate a variety of functions from the panel library. */ @@ -37,10 +37,14 @@ #include +#define LAST_POS '@' +#define TEMP_POS '>' + typedef void (*InitPanel) (void); typedef void (*FillPanel) (PANEL *); -static bool use_colors; +static bool use_colors = FALSE; +static bool unboxed = FALSE; static FILE *log_in; static FILE *log_out; @@ -112,6 +116,7 @@ get_position(NCURSES_CONST char *text, { int result = 0; int x1, y1; + char cmd; WINDOW *win; getyx(stdscr, y1, x1); @@ -120,9 +125,21 @@ get_position(NCURSES_CONST char *text, 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; } @@ -169,11 +186,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; } @@ -183,7 +205,7 @@ 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); @@ -197,7 +219,7 @@ mkpanel(short color, int rows, int cols, int tly, int tlx) init_pair(color, fg, bg); wbkgdset(win, (chtype) (COLOR_PAIR(color) | ' ')); - } else { + } else if (!unboxed) { wbkgdset(win, A_BOLD | ' '); } } @@ -207,12 +229,12 @@ mkpanel(short color, int rows, int cols, int tly, int tlx) } static void -remove_panel(PANEL ** pans, int which) +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); @@ -226,7 +248,7 @@ remove_panel(PANEL ** pans, int which) #define ABS(a) ((a) < 0 ? -(a) : (a)) static void -create_panel(PANEL ** pans, int which, FillPanel myFill) +my_create_panel(PANEL ** pans, int which, FillPanel myFill) { PANEL *pan = 0; int code; @@ -238,7 +260,7 @@ create_panel(PANEL ** pans, int which, FillPanel myFill) init_pair(pair, fg, bg); /* remove the old panel, if any */ - remove_panel(pans, which); + my_remove_panel(pans, which); /* get the position of one corner */ wmove(stdscr, getmaxy(stdscr) / 2, getmaxx(stdscr) / 2); @@ -270,55 +292,63 @@ 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) { - int code; - int y0, x0; - int y1, x1; - WINDOW *win = panel_window(pans[which]); - char also[80]; + if (pans[which] != 0) { + int code; + int y0, x0; + int y1, x1; + WINDOW *win = panel_window(pans[which]); + char also[80]; - getbegyx(win, y0, x0); - sprintf(also, " (start %d,%d)", y0, x0); - wmove(stdscr, y0, x0); - while ((code = get_position("Move panel", also, which, &x1, &y1)) == 0) { - ; - } - if (code > 0) { - move_panel(pans[which], y1, x1); + getbegyx(win, y0, x0); + 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); + } } } static void -resize_panel(PANEL ** pans, int which, FillPanel myFill) +my_resize_panel(PANEL ** pans, int which, FillPanel myFill) { - int code; - int y0, x0; - int y1, x1; - WINDOW *win = panel_window(pans[which]); - char also[80]; + if (pans[which] != 0) { + int code; + int y0, x0; + int y1, x1; + WINDOW *win = panel_window(pans[which]); + char also[80]; - getbegyx(win, y0, x0); - sprintf(also, " (start %d,%d)", y0, x0); - wmove(stdscr, y0, x0); - while ((code = get_position("Resize panel", also, which, &x1, &y1)) == 0) { - ; - } - if (code > 0) { - WINDOW *next = newwin(ABS(y1 - y0) + 1, - ABS(x1 - x0) + 1, - MIN(y0, y1), - MIN(x0, x1)); - if (next != 0) { - keypad(next, TRUE); - if (use_colors) { - wbkgdset(next, (chtype) (COLOR_PAIR(which) | ' ')); - } else { - wbkgdset(next, A_BOLD | ' '); + getbegyx(win, y0, x0); + sprintf(also, " (start %d,%d)", y0, x0); + wmove(stdscr, y0, x0); + while ((code = get_position("Resize panel", + also, which, &x1, &y1)) == 0) { + ; + } + if (code > 0) { + WINDOW *next = newwin(ABS(y1 - y0) + 1, + ABS(x1 - x0) + 1, + MIN(y0, y1), + MIN(x0, x1)); + if (next != 0) { + keypad(next, TRUE); + if (use_colors) { + wbkgdset(next, (chtype) (COLOR_PAIR(which) | ' ')); + } else if (!unboxed) { + wbkgdset(next, A_BOLD | ' '); + } + replace_panel(pans[which], next); + myFill(pans[which]); + delwin(win); } - replace_panel(pans[which], next); - myFill(pans[which]); - delwin(win); } } } @@ -353,6 +383,21 @@ fill_panel(PANEL * pan) } } +static void +fill_unboxed(PANEL * pan) +{ + WINDOW *win = panel_window(pan); + int num = ((const char *) panel_userptr(pan))[1]; + int y, x; + + for (y = 0; y < getmaxy(win); y++) { + for (x = 0; x < getmaxx(win); x++) { + wmove(win, y, x); + waddch(win, UChar(num)); + } + } +} + #if USE_WIDEC_SUPPORT static void make_fullwidth_digit(cchar_t *target, int digit) @@ -429,7 +474,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" @@ -491,6 +536,22 @@ show_panels(PANEL * px[MAX_PANELS + 1]) } } +#define wrapper(func) \ +static int my_##func(PANEL *pan) \ +{ \ + int code = ERR; \ + if (pan != 0) { \ + code = func(pan); \ + } \ + return code; \ +} +/* *INDENT-OFF* */ +wrapper(bottom_panel) +wrapper(hide_panel) +wrapper(show_panel) +wrapper(top_panel) +/* *INDENT-ON* */ + static void do_panel(PANEL * px[MAX_PANELS + 1], NCURSES_CONST char *cmd, @@ -498,36 +559,43 @@ 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); switch (*cmd) { case 'b': - bottom_panel(px[which]); + my_bottom_panel(px[which]); break; case 'c': - create_panel(px, which, myFill); + my_create_panel(px, which, myFill); break; case 'd': - remove_panel(px, which); + my_remove_panel(px, which); break; case 'h': - hide_panel(px[which]); + 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': - resize_panel(px, which, myFill); + my_resize_panel(px, which, myFill); break; case 's': - show_panel(px[which]); + my_show_panel(px[which]); break; case 't': - top_panel(px[which]); + my_top_panel(px[which]); break; } } @@ -535,7 +603,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 @@ -564,14 +632,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])) + while (length > 0 && isspace(UChar(buffer[length - 1]))) buffer[--length] = '\0'; + waddstr(win, buffer); } else { close_input(); } + (void) wgetch(win); } else { c0 = 0; for (;;) { @@ -579,6 +648,8 @@ get_command(PANEL * px[MAX_PANELS + 1], char *buffer, int limit) if (ch == ERR || ch == QUIT || ch == ESCAPE) { buffer[0] = '\0'; break; + } else if (ch == CTRL('L')) { + wrefresh(curscr); } else if (ch == '\n' || ch == KEY_ENTER) { break; } else if (ch == '?') { @@ -651,7 +722,7 @@ demo_panels(InitPanel myInit, FillPanel myFill) } #if NO_LEAKS for (itmp = 1; itmp <= MAX_PANELS; ++itmp) { - remove_panel(px, itmp); + my_remove_panel(px, itmp); } #endif } @@ -670,6 +741,7 @@ usage(void) #if USE_WIDEC_SUPPORT ," -w use wide-characters in panels and background" #endif + ," -x do not enclose panels in boxes" }; size_t n; for (n = 0; n < SIZEOF(tbl); n++) @@ -685,7 +757,9 @@ main(int argc, char *argv[]) InitPanel myInit = init_panel; FillPanel myFill = fill_panel; - while ((c = getopt(argc, argv, "i:o:mw")) != EOF) { + setlocale(LC_ALL, ""); + + while ((c = getopt(argc, argv, "i:o:mwx")) != -1) { switch (c) { case 'i': log_in = fopen(optarg, "r"); @@ -702,10 +776,15 @@ main(int argc, char *argv[]) myFill = fill_wide_panel; break; #endif + case 'x': + unboxed = TRUE; + break; default: usage(); } } + if (unboxed) + myFill = fill_unboxed; initscr(); cbreak();