Changeset 1fd4cd3e

Timestamp:

Dec 1, 2003, 2:22:36 PM (20 years ago)

Author:

Erik Nygren <nygren@mit.edu>

Branches:

master, barnowl_perlaim, debian, owl, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

2e76340

Parents:

3162c8a

Message:

Replace the main loop continue in the keyboard handler with an else.

Files:

• ChangeLog (modified) (1 diff)
• owl.c (modified) (2 diffs)

ChangeLog

@@ -14 +14 @@
                 the password.  ;)
         Un-word-wrap text when sending AIM messages.
+        Replace the main loop continue in the keyboard handler with an else.
         
 2.0.12

owl.c

@@ -557 +557 @@
     if (j==ERR) {
       usleep(10);
-      continue;
-    }
-    /* find and activate the current keymap.
-     * TODO: this should really get fixed by activating
-     * keymaps as we switch between windows... 
-     */
-    if (pw && owl_popwin_is_active(pw) && owl_global_get_viewwin(&g)) {
-      owl_context_set_popless(owl_global_get_context(&g), 
-                              owl_global_get_viewwin(&g));
-      owl_function_activate_keymap("popless");
-    } else if (owl_global_is_typwin_active(&g) 
-               && owl_editwin_get_style(tw)==OWL_EDITWIN_STYLE_ONELINE) {
-      /*
-      owl_context_set_editline(owl_global_get_context(&g), tw);
-      owl_function_activate_keymap("editline");
-      */
-    } else if (owl_global_is_typwin_active(&g) 
-               && owl_editwin_get_style(tw)==OWL_EDITWIN_STYLE_MULTILINE) {
-      owl_context_set_editmulti(owl_global_get_context(&g), tw);
-      owl_function_activate_keymap("editmulti");
     } else {
-      owl_context_set_recv(owl_global_get_context(&g));
-      owl_function_activate_keymap("recv");
-    }
-    /* now actually handle the keypress */
-    ret = owl_keyhandler_process(owl_global_get_keyhandler(&g), j);
-    if (ret!=0 && ret!=1) {
-      owl_function_makemsg("Unable to handle keypress");
+      /* find and activate the current keymap.
+       * TODO: this should really get fixed by activating
+       * keymaps as we switch between windows... 
+       */
+      if (pw && owl_popwin_is_active(pw) && owl_global_get_viewwin(&g)) {
+        owl_context_set_popless(owl_global_get_context(&g), 
+                                owl_global_get_viewwin(&g));
+        owl_function_activate_keymap("popless");
+      } else if (owl_global_is_typwin_active(&g) 
+                 && owl_editwin_get_style(tw)==OWL_EDITWIN_STYLE_ONELINE) {
+        /*
+          owl_context_set_editline(owl_global_get_context(&g), tw);
+          owl_function_activate_keymap("editline");
+        */
+      } else if (owl_global_is_typwin_active(&g) 
+                 && owl_editwin_get_style(tw)==OWL_EDITWIN_STYLE_MULTILINE) {
+        owl_context_set_editmulti(owl_global_get_context(&g), tw);
+        owl_function_activate_keymap("editmulti");
+      } else {
+        owl_context_set_recv(owl_global_get_context(&g));
+        owl_function_activate_keymap("recv");
+      }
+      /* now actually handle the keypress */
+      ret = owl_keyhandler_process(owl_global_get_keyhandler(&g), j);
+      if (ret!=0 && ret!=1) {
+        owl_function_makemsg("Unable to handle keypress");
+      }
     }
 
@@ -601 +601 @@
       }
     }
+
+    owl_function_debugmsg("main loop iteration end");
 
   }