Changeset 0881cdd

Timestamp:

May 11, 2010, 7:42:13 PM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.7, release-1.8, release-1.9

Children:

88e425f

Parents:

bcff94d

git-author:

David Benjamin <davidben@mit.edu> (05/06/10 01:46:48)

git-committer:

David Benjamin <davidben@mit.edu> (05/11/10 19:42:13)

Message:

Use a separate pad for input

wgetch calls a wrefresh on regular windows. I imagine this is for
echo(), which we do not use. Instead, we make a pad and only ever
wgetch on it.

This also means that the various nodelay settings on other windows are
unnecessary.

Files:

• global.c (modified) (2 diffs)
• owl.c (modified) (2 diffs)
• owl.h (modified) (1 diff)
• popwin.c (modified) (1 diff)

global.c

@@ -120 +120 @@
   g->timerlist = NULL;
   g->interrupted = FALSE;
+
+  /* set up a pad for input */
+  g->input_pad = newpad(1, 1);
+  nodelay(g->input_pad, 1);
+  keypad(g->input_pad, 1);
+  meta(g->input_pad, 1);
 }
 
@@ -179 +185 @@
   idlok(owl_global_get_curs_msgwin(g), FALSE);
 
-  nodelay(owl_global_get_curs_typwin(g), 1);
-  keypad(owl_global_get_curs_typwin(g), TRUE);
   wmove(owl_global_get_curs_typwin(g), 0, 0);
-
-  meta(owl_global_get_curs_typwin(g), TRUE);
 }
 

owl.c

@@ -311 +311 @@
 {
   owl_input j;
-  WINDOW *typwin;
-
-  typwin = owl_global_get_curs_typwin(&g);
 
   while (1) {
-    j.ch = wgetch(typwin);
+    j.ch = wgetch(g.input_pad);
     if (j.ch == ERR) return;
 
@@ -339 +336 @@
       
       for (i = 1; i < bytes; i++) {
-        int tmp =  wgetch(typwin);
+        int tmp = wgetch(g.input_pad);
         /* If what we got was not a byte, or not a continuation byte */
         if (tmp > 0xff || !(tmp & 0x80 && ~tmp & 0x40)) {

owl.h

@@ -565 +565 @@
   owl_view current_view;
   owl_messagelist msglist;
+  WINDOW *input_pad;
   PANEL *recpan, *seppan, *msgpan, *typpan;
   int needrefresh;

popwin.c

@@ -28 +28 @@
   popwin = newwin(pw->lines-2, pw->cols-2, startline+1, startcol+1);
   pw->poppanel = new_panel(popwin);
-  
-  meta(popwin,TRUE);
-  nodelay(popwin, 1);
-  keypad(popwin, TRUE);
 
   werase(popwin);