Changeset fac5463

Timestamp:

Jan 11, 2008, 2:46:52 PM (16 years ago)

Author:

Alejandro R. Sedeño <asedeno@mit.edu>

Branches:

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

Children:

cde4a71

Parents:

a827529

Message:

fixing post-processing in the editwin.

Files:

• editwin.c (modified) (4 diffs)
• keys.c (modified) (2 diffs)

editwin.c

@@ -568 +568 @@
   c = g_utf8_get_char(p);
   while (c) {
-    owl_editwin_process_char(e, c);
+    _owl_editwin_process_char(e, c);
     p = g_utf8_next_char(p);
     c = g_utf8_get_char(p);
@@ -1075 +1075 @@
 }
 
-void owl_editwin_post_process_char(owl_editwin *e, gunichar j)
+void owl_editwin_post_process_char(owl_editwin *e, owl_input j)
 {
   /* check if we need to scroll down */
@@ -1081 +1081 @@
     e->topline+=e->winlines/2;
   }
-  if ((j==13 || j==10) && owl_editwin_check_dotsend(e)) {
+  if ((j.ch==13 || j.ch==10) && owl_editwin_check_dotsend(e)) {
     owl_command_editmulti_done(e);
     return;
@@ -1088 +1088 @@
 }
 
-void owl_editwin_process_char(owl_editwin *e, gunichar j)
-{
-  if (j == ERR) return;
-  if (g_unichar_iscntrl(j) && (j != 10) && (j != 13)) {
-    return;
-  }
-  else {
+void _owl_editwin_process_char(owl_editwin *e, gunichar j)
+{
+  if (!(g_unichar_iscntrl(j) && (j != 10) && (j != 13))) {
     owl_editwin_insert_char(e, j);
+  }
+}
+
+
+void owl_editwin_process_char(owl_editwin *e, owl_input j)
+{
+  if (j.ch == ERR) return;
+  /* Ignore ncurses control characters. */
+  if (j.ch < 0x100) { 
+    _owl_editwin_process_char(e, j.uch);
   }
 }

keys.c

@@ -301 +301 @@
 void owl_keys_editwin_default(owl_input j) {
   owl_editwin *e;
-  if (NULL != (e=owl_global_get_typwin(&g))
-      && j.ch < 0x100) {
-       owl_editwin_process_char(e, j.uch);
+  if (NULL != (e=owl_global_get_typwin(&g))) {
+       owl_editwin_process_char(e, j);
   }
 }
@@ -309 +308 @@
 void owl_keys_editwin_postalways(owl_input j) {
   owl_editwin *e;
-  if (NULL != (e=owl_global_get_typwin(&g))
-      && j.ch < 0x100) {
-    owl_editwin_post_process_char(e, j.uch);
-  }  
+  if (NULL != (e=owl_global_get_typwin(&g))) {
+    owl_editwin_post_process_char(e, j);
+  }
   owl_global_set_needrefresh(&g);
 }