/****************************************************************************
- * Copyright (c) 2007 Free Software Foundation, Inc. *
+ * Copyright (c) 2007,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: inch_wide.c,v 1.4 2007/06/09 21:25:54 tom Exp $
+ * $Id: inch_wide.c,v 1.7 2010/05/01 19:13:46 tom Exp $
*/
/*
int in_wch(cchar_t *wcval);
if ((fp = fopen(argv[level], "r")) != 0) {
while ((j = fgetc(fp)) != EOF) {
- if (waddch(txtwin, j) != OK) {
+ if (waddch(txtwin, UChar(j)) != OK) {
break;
}
}
+ fclose(fp);
} else {
wprintw(txtwin, "Cannot open:\n%s", argv[1]);
}
- fclose(fp);
while (!Quit(j = mvwgetch(txtwin, txt_y, txt_x))) {
switch (j) {
break;
}
- mvwprintw(chrwin, 0, 0, "char:");
+ MvWPrintw(chrwin, 0, 0, "char:");
wclrtoeol(chrwin);
if (txtwin != stdscr) {
}
wnoutrefresh(chrwin);
- mvwprintw(strwin, 0, 0, "text:");
+ MvWPrintw(strwin, 0, 0, "text:");
wclrtobot(strwin);
limit = getmaxx(strwin) - 5;
if (txtwin != stdscr) {
wmove(txtwin, txt_y, txt_x);
if (win_wchstr(txtwin, text) != ERR) {
- mvwadd_wchstr(strwin, 0, 5, text);
+ (void) mvwadd_wchstr(strwin, 0, 5, text);
}
wmove(txtwin, txt_y, txt_x);
if (win_wchnstr(txtwin, text, limit) != ERR) {
- mvwadd_wchstr(strwin, 1, 5, text);
+ (void) mvwadd_wchstr(strwin, 1, 5, text);
}
if (mvwin_wchstr(txtwin, txt_y, txt_x, text) != ERR) {
- mvwadd_wchstr(strwin, 2, 5, text);
+ (void) mvwadd_wchstr(strwin, 2, 5, text);
}
if (mvwin_wchnstr(txtwin, txt_y, txt_x, text, limit) != ERR) {
- mvwadd_wchstr(strwin, 3, 5, text);
+ (void) mvwadd_wchstr(strwin, 3, 5, text);
}
} else {
move(txt_y, txt_x);
if (in_wchstr(text) != ERR) {
- mvwadd_wchstr(strwin, 0, 5, text);
+ (void) mvwadd_wchstr(strwin, 0, 5, text);
}
move(txt_y, txt_x);
if (in_wchnstr(text, limit) != ERR) {
- mvwadd_wchstr(strwin, 1, 5, text);
+ (void) mvwadd_wchstr(strwin, 1, 5, text);
}
if (mvin_wchstr(txt_y, txt_x, text) != ERR) {
- mvwadd_wchstr(strwin, 2, 5, text);
+ (void) mvwadd_wchstr(strwin, 2, 5, text);
}
if (mvin_wchnstr(txt_y, txt_x, text, limit) != ERR) {
- mvwadd_wchstr(strwin, 3, 5, text);
+ (void) mvwadd_wchstr(strwin, 3, 5, text);
}
}
test_inchs(1, argv, chrwin, strwin);
endwin();
- return EXIT_SUCCESS;
+ ExitProgram(EXIT_SUCCESS);
}
#else
int