projects
/
apps
/
madtty.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Support cursor, be an rxvt, fix emacs, vim, screen, and mutt.
[apps/madtty.git]
/
demo
/
boxshell.c
diff --git
a/demo/boxshell.c
b/demo/boxshell.c
index
b3c8f2d
..
7c9512d
100644
(file)
--- a/
demo/boxshell.c
+++ b/
demo/boxshell.c
@@
-6,10
+6,13
@@
*/
#include <ncurses.h>
*/
#include <ncurses.h>
-#include <stdio.h>
+
#include <signal.h>
#include <signal.h>
+#include <stdio.h>
#include <string.h>
#include <string.h>
+#include <sys/ioctl.h>
#include <sys/time.h>
#include <sys/time.h>
+#include <termios.h>
#include <time.h>
#include <madtty/madtty.h>
#include <time.h>
#include <madtty/madtty.h>
@@
-18,17
+21,24
@@
static unsigned char getout = 0;
static int screen_w, screen_h;
static WINDOW *term_win;
static int screen_w, screen_h;
static WINDOW *term_win;
-void
sigchld(int signo __attribute__((unused))
)
+void
handler(int signo
)
{
{
- getout = 1;
+ switch (signo) {
+ case SIGCHLD:
+ getout = 1;
+ break;
+ case SIGWINCH:
+ break;
+ }
}
int main(void)
{
}
int main(void)
{
- struct timeval next = { 0, 0 };
madtty_t *rt;
madtty_t *rt;
+ int dirty = 0;
- signal(SIGCHLD, sigchld);
+ signal(SIGCHLD, handler);
+ signal(SIGWINCH, handler);
madtty_initialize();
getmaxyx(stdscr, screen_h, screen_w);
madtty_initialize();
getmaxyx(stdscr, screen_h, screen_w);
@@
-47,31
+57,40
@@
int main(void)
* also, redraw the terminal to the window at each iteration */
while (!getout) {
fd_set rfds;
* also, redraw the terminal to the window at each iteration */
while (!getout) {
fd_set rfds;
- struct timeval tv = { 0
, 1000 }, t
;
+ struct timeval tv = { 0
, 1000 * 1000 / 50 }
;
int ch;
FD_ZERO(&rfds);
FD_SET(rt->pty, &rfds);
if (select(rt->pty + 1, &rfds, NULL, NULL, &tv) > 0) {
int ch;
FD_ZERO(&rfds);
FD_SET(rt->pty, &rfds);
if (select(rt->pty + 1, &rfds, NULL, NULL, &tv) > 0) {
- if (madtty_process(rt))
- break;
+ if (FD_ISSET(rt->pty, &rfds)) {
+ madtty_process(rt);
+ dirty = 1;
+ }
}
while ((ch = getch()) != ERR) {
}
while ((ch = getch()) != ERR) {
+#if 0
+ if (ch == KEY_F(3)) {
+ struct winsize ws = {
+ .ws_row = --rt->rows,
+ .ws_col = --rt->cols,
+ };
+
+ erase();
+ ioctl(rt->pty, TIOCSWINSZ, &ws);
+ wresize(term_win, rt->rows, rt->cols);
+ }
+#endif
madtty_keypress(rt, ch); /* pass the keypress for handling */
madtty_keypress(rt, ch); /* pass the keypress for handling */
+ dirty = 1;
}
}
- gettimeofday(&t, NULL);
- if (timercmp(&t, &next, >=)) {
+ if (dirty) {
madtty_draw(rt, term_win, 0, 0);
wrefresh(term_win);
madtty_draw(rt, term_win, 0, 0);
wrefresh(term_win);
- gettimeofday(&next, NULL);
- next.tv_usec += 1000 * 1000 / 50;
- if (next.tv_usec > 1000 * 1000) {
- next.tv_usec -= 1000 * 1000;
- next.tv_sec++;
- }
+ dirty = 0;
}
}
}
}