/****************************************************************************
- * Copyright 2020 Thomas E. Dickey *
+ * Copyright 2020,2021 Thomas E. Dickey *
* *
* Permission is hereby granted, free of charge, to any person obtaining a *
* copy of this software and associated documentation files (the *
* authorization. *
****************************************************************************/
/*
- * $Id: move_field.c,v 1.5 2020/03/21 22:04:03 tom Exp $
+ * $Id: move_field.c,v 1.9 2021/06/12 21:30:34 tom Exp $
*
* Demonstrate move_field().
*/
#include <edit_field.h>
#include <popup_msg.h>
+#ifdef HAVE_NETBSD_FORM_H
+#define form_field_row(field) (field)->form_row
+#define form_field_col(field) (field)->form_col
+#else /* e.g., SVr4, ncurses */
+#define form_field_row(field) (field)->frow
+#define form_field_col(field) (field)->fcol
+#endif
+
#define DO_DEMO CTRL('F') /* actual key for toggling demo-mode */
#define MY_DEMO EDIT_FIELD('f') /* internal request-code */
static char empty[] = "";
static FIELD *all_fields[100];
-
/* *INDENT-OFF* */
static struct {
int code;
int status;
FIELD *before;
unsigned n;
- int length;
int before_row;
int before_col;
int before_off = offset_in_field(form);
if (status == E_OK) {
bool modified = TRUE;
+ int length = buffer_length(before);
- length = buffer_length(before);
if (length < before_off)
length = before_off;
switch (*result) {
}
static FIELD **
-copy_fields(FIELD **source, int length)
+copy_fields(FIELD **source, size_t length)
{
FIELD **target = calloc(length + 1, sizeof(FIELD *));
memcpy(target, source, length * sizeof(FIELD *));
getyx(stdscr, currow, curcol);
mvprintw(LINES - 1, 0,
"Field at [%d,%d]. Press %s to quit moving.",
- getbegy(sub) + field->frow,
- getbegx(sub) + field->fcol,
+ getbegy(sub) + form_field_row(field),
+ getbegx(sub) + form_field_col(field),
keyname(DO_DEMO));
clrtobot();
move(currow, curcol);
FIELD *my_field = current_field(form);
if (count > 0 && my_field != NULL) {
- FIELD **old_fields = copy_fields(form_fields(form), count);
- FIELD **new_fields = copy_fields(form_fields(form), count);
- int ch;
+ size_t needed = (size_t) count;
+ FIELD **old_fields = copy_fields(form_fields(form), needed);
+ FIELD **new_fields = copy_fields(form_fields(form), needed);
if (old_fields != NULL && new_fields != NULL) {
bool found = FALSE;
+ int ch;
/* TODO: move the label too, in parallel with the editing field */
getyx(stdscr, currow, curcol);
show_status(form, my_field);
- ch = '?';
while ((ch = wgetch(form_win(form))) != DO_DEMO) {
- int field_y = my_field->frow;
- int field_x = my_field->fcol;
+ int field_y = form_field_row(my_field);
+ int field_x = form_field_col(my_field);
switch (ch) {
case 'h':
refresh();
}
}
+ free(old_fields);
free(new_fields);
}
}