/****************************************************************************
- * Copyright (c) 2007 Free Software Foundation, Inc. *
+ * Copyright (c) 2007-2008,2010 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 *
* authorization. *
****************************************************************************/
/*
- * $Id: demo_panels.c,v 1.22 2007/06/30 21:38:08 tom Exp $
+ * $Id: demo_panels.c,v 1.37 2010/05/01 22:19:02 tom Exp $
*
* Demonstrate a variety of functions from the panel library.
*/
#include <panel.h>
+#define LAST_POS '@'
+#define TEMP_POS '>'
+
typedef void (*InitPanel) (void);
typedef void (*FillPanel) (PANEL *);
{
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;
}
}
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;
}
{
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);
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);
}
}
+#undef MIN
#define MIN(a,b) ((a) < (b) ? (a) : (b))
#define ABS(a) ((a) < 0 ? -(a) : (a))
{
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;
}
static void
-my_move_panel(PANEL ** pans, int which)
+my_move_panel(PANEL ** pans, int which, bool continuous)
{
if (pans[which] != 0) {
int code;
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);
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);
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++) {
" 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"
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) {
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);
{
int which = cmd[1] - '0';
+ if (which < 1 || which > MAX_PANELS) {
+ beep();
+ return;
+ }
+
if (log_in != 0) {
pflush();
- (void) wgetch(stdscr);
}
saywhat(cmd);
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);
static bool
ok_letter(int ch)
{
- return isalpha(UChar(ch)) && strchr("bcdhmrst", ch) != 0;
+ return isalpha(UChar(ch)) && strchr("bcdhmMrst", ch) != 0;
}
static bool
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 (;;) {
} 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();
}
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);
}
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");
projects / ncurses.git / blobdiff