/****************************************************************************
- * Copyright (c) 2003-2007,2008 Free Software Foundation, Inc. *
+ * Copyright (c) 2003-2010,2011 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_forms.c,v 1.31 2008/12/20 19:23:00 tom Exp $
+ * $Id: demo_forms.c,v 1.38 2011/01/15 18:15:11 tom Exp $
*
* Demonstrate a variety of functions from the form library.
* Thomas Dickey - 2003/4/26
if (f) {
set_field_buffer(f, 0, label);
- set_field_opts(f, (int) (field_opts(f) & ~O_ACTIVE));
+ set_field_opts(f, (int) ((unsigned) field_opts(f) & ~O_ACTIVE));
}
return (f);
}
static void
show_insert_mode(bool insert_mode)
{
- mvaddstr(5, 57, (insert_mode
+ MvAddStr(5, 57, (insert_mode
? "form_status: insert "
: "form_status: overlay"));
}
case MY_EDT_MODE:
if ((field = current_field(form)) != 0) {
set_current_field(form, another_field(form, field));
- if (field_opts(field) & O_EDIT) {
+ if ((unsigned) field_opts(field) & O_EDIT) {
field_opts_off(field, O_EDIT);
set_field_status(field, 0);
} else {
char *buffer;
int nbuf;
int field_rows, field_cols, field_max;
+ int currow, curcol;
if (has_colors()) {
wbkgd(win, COLOR_PAIR(1));
}
werase(win);
- wprintw(win, "Cursor: %d,%d", form->currow, form->curcol);
+ form_getyx(form, currow, curcol);
+ wprintw(win, "Cursor: %d,%d", currow, curcol);
if (data_ahead(form))
waddstr(win, " ahead");
if (data_behind(form))
waddstr(win, "other");
}
- if (field_opts(field) & O_EDIT)
+ if ((unsigned) field_opts(field) & O_EDIT)
waddstr(win, " editable");
else
waddstr(win, " readonly");
}
waddch(win, ' ');
- wattrset(win, field_fore(field));
+ (void) wattrset(win, field_fore(field));
waddstr(win, "fore");
wattroff(win, field_fore(field));
waddch(win, '/');
- wattrset(win, field_back(field));
+ (void) wattrset(win, field_back(field));
waddstr(win, "back");
wattroff(win, field_back(field));
for (nbuf = 0; nbuf <= 2; ++nbuf) {
if ((buffer = field_buffer(field, nbuf)) != 0) {
wprintw(win, "buffer %d:", nbuf);
- wattrset(win, A_REVERSE);
+ (void) wattrset(win, A_REVERSE);
waddstr(win, buffer);
wattroff(win, A_REVERSE);
waddstr(win, "\n");
help_edit_field();
- mvaddstr(4, 57, "Forms Entry Test");
+ MvAddStr(4, 57, "Forms Entry Test");
show_insert_mode(TRUE);
refresh();
set_field_buffer(f[n - 1], 1, "Hello\nWorld!");
}
- f[n++] = (FIELD *) 0;
+ f[n] = (FIELD *) 0;
if ((form = new_form(f)) != 0) {
free_form(form);
}
- for (c = 0; f[c] != 0; c++)
+ for (c = 0; f[c] != 0; c++) {
+ void *ptr = field_userptr(f[c]);
+ free(ptr);
free_field(f[c]);
+ }
noraw();
nl();