ignores all EARLY and LATE events

diff --git a/button.c b/button.c
index f29c30cdad70dc7b5fac7df91354dc5f9ee1f416..b1aaa27e7ec04e87ef0a9b2298070a023b108d33 100644 (file)
--- a/button.c
+++ b/button.c
@@ -96,32 +96,35 @@ static struct eventResult buttonEvent(struct newtComponent * co,
                                      struct event ev) {
     struct eventResult er;
 
-    switch (ev.event) {
-      case EV_FOCUS:
-       buttonDrawIt(co, 1, 0);
-       er.result = ER_SWALLOWED;
-       break;
-
-      case EV_UNFOCUS:
-       buttonDrawIt(co, 0, 0);
-       er.result = ER_SWALLOWED;
-       break;
-
-      case EV_KEYPRESS:
-       if (ev.u.key == ' ' || ev.u.key == '\r') {
-           /* look pushed */
-           buttonDrawIt(co, 1, 1);
-           newtRefresh();
-           newtDelay(300000);
+    if (ev.when == EV_NORMAL) {
+       switch (ev.event) {
+         case EV_FOCUS:
            buttonDrawIt(co, 1, 0);
-           newtRefresh();
-           newtDelay(300000);
-
-           er.result = ER_EXITFORM;
-       } else 
-           er.result = ER_IGNORED;
-       break;
-    }
-
-   return er;
+           er.result = ER_SWALLOWED;
+           break;
+
+         case EV_UNFOCUS:
+           buttonDrawIt(co, 0, 0);
+           er.result = ER_SWALLOWED;
+           break;
+
+         case EV_KEYPRESS:
+           if (ev.u.key == ' ' || ev.u.key == '\r') {
+               /* look pushed */
+               buttonDrawIt(co, 1, 1);
+               newtRefresh();
+               newtDelay(300000);
+               buttonDrawIt(co, 1, 0);
+               newtRefresh();
+               newtDelay(300000);
+
+               er.result = ER_EXITFORM;
+           } else 
+               er.result = ER_IGNORED;
+           break;
+       }
+    } else 
+       er.result = ER_IGNORED;
+
+    return er;
 }

diff --git a/checkbox.c b/checkbox.c
index b728a32057231cab9b86750f655c18a30a292e0d..0cb912f88164c2c557f51c4d8b88141084c64044 100644 (file)
--- a/checkbox.c
+++ b/checkbox.c
@@ -159,47 +159,50 @@ struct eventResult cbEvent(struct newtComponent * co, struct event ev) {
     struct eventResult er;
     char * cur;
 
-    switch (ev.event) {
-      case EV_FOCUS:
-       if (cb->type == LISTITEM)
-           makeActive(co);
-       else 
-           cbDrawIt(co, 1);
-       
-       er.result = ER_SWALLOWED;
-       break;
-
-      case EV_UNFOCUS:
-       cbDrawIt(co, 0);
-       er.result = ER_SWALLOWED;
-       break;
-
-      case EV_KEYPRESS:
-       if (ev.u.key == ' ' || ev.u.key == '\r') {
-           if (cb->type == RADIO) {
+    if (ev.when == EV_NORMAL) {
+       switch (ev.event) {
+         case EV_FOCUS:
+           if (cb->type == LISTITEM)
                makeActive(co);
-           } else if (cb->type == CHECK) {
-               cur = strchr(cb->seq, *cb->result);
-               if (!cur)
-                   *cb->result = *cb->seq;
-               else {
-                   cur++;
-                   if (! *cur) 
+           else 
+               cbDrawIt(co, 1);
+           
+           er.result = ER_SWALLOWED;
+           break;
+
+         case EV_UNFOCUS:
+           cbDrawIt(co, 0);
+           er.result = ER_SWALLOWED;
+           break;
+
+         case EV_KEYPRESS:
+           if (ev.u.key == ' ' || ev.u.key == '\r') {
+               if (cb->type == RADIO) {
+                   makeActive(co);
+               } else if (cb->type == CHECK) {
+                   cur = strchr(cb->seq, *cb->result);
+                   if (!cur)
                        *cb->result = *cb->seq;
-                   else
-                       *cb->result = *cur;
+                   else {
+                       cur++;
+                       if (! *cur) 
+                           *cb->result = *cb->seq;
+                       else
+                           *cb->result = *cur;
+                   }
+                   cbDrawIt(co, 1);
+                   er.result = ER_SWALLOWED;
+               } else {
+                   er.result = ER_IGNORED;
                }
-               cbDrawIt(co, 1);
-               er.result = ER_SWALLOWED;
            } else {
                er.result = ER_IGNORED;
            }
-       } else {
-           er.result = ER_IGNORED;
        }
-    }
+    } else 
+       er.result = ER_IGNORED;
 
-   return er;
+    return er;
 }
 
 static void makeActive(newtComponent co) {

diff --git a/entry.c b/entry.c
index 799f526a47154b9ea019ef8140ea25aeadff34a9..9e9f9faf114f14708e032abb6ca8775010acf910 100644 (file)
--- a/entry.c
+++ b/entry.c
@@ -126,23 +126,27 @@ static struct eventResult entryEvent(struct newtComponent * co,
     struct entry * en = co->data;
     struct eventResult er;
 
-    switch (ev.event) {
-      case EV_FOCUS:
-       /*SLtt_set_cursor_visibility(0);*/
-       newtGotorc(co->top, co->left + (en->cursorPosition - en->firstChar));
-       er.result = ER_SWALLOWED;
-       break;
-
-      case EV_UNFOCUS:
-       /*SLtt_set_cursor_visibility(1);*/
-       newtGotorc(0, 0);
-       er.result = ER_SWALLOWED;
-       break;
-
-      case EV_KEYPRESS:
-       er = entryHandleKey(co, ev.u.key);
-       break;
-    }
+    if (ev.when == EV_NORMAL) {
+       switch (ev.event) {
+         case EV_FOCUS:
+           /*SLtt_set_cursor_visibility(0);*/
+           newtGotorc(co->top, co->left + 
+                               (en->cursorPosition - en->firstChar));
+           er.result = ER_SWALLOWED;
+           break;
+
+         case EV_UNFOCUS:
+           /*SLtt_set_cursor_visibility(1);*/
+           newtGotorc(0, 0);
+           er.result = ER_SWALLOWED;
+           break;
+
+         case EV_KEYPRESS:
+           er = entryHandleKey(co, ev.u.key);
+           break;
+       }
+    } else
+       er.result = ER_IGNORED;
 
     return er;
 }
@@ -249,7 +253,7 @@ static struct eventResult entryHandleKey(struct newtComponent * co, int key) {
        } else {
            er.result = ER_IGNORED;
        }
-    }
+    } 
 
     entryDraw(co);