Changes in functions.c [8bba1ae:d12a8c7]

File:

• functions.c (modified) (28 diffs)

functions.c

@@ -216 +216 @@
   /* redisplay etc. */
   owl_mainwin_redisplay(owl_global_get_mainwin(&g));
+  owl_global_set_needrefresh(&g);
 }
 
@@ -292 +293 @@
   owl_editwin_set_cbdata(e, data, cleanup);
   owl_editwin_set_callback(e, callback);
-  owl_global_push_context(&g, OWL_CTX_EDITMULTI, e, "editmulti", owl_global_get_typwin_window(&g));
+  owl_global_push_context(&g, OWL_CTX_EDITMULTI, e, "editmulti");
 }
 
@@ -807 +808 @@
 {
   owl_global_set_rightshift(&g, owl_global_get_rightshift(&g)+10);
+  owl_mainwin_redisplay(owl_global_get_mainwin(&g));
+  owl_global_set_needrefresh(&g);
 }
 
@@ -816 +819 @@
   if (shift > 0) {
     owl_global_set_rightshift(&g, MAX(shift - 10, 0));
+    owl_mainwin_redisplay(owl_global_get_mainwin(&g));
+    owl_global_set_needrefresh(&g);
   } else {
     owl_function_beep();
@@ -1199 +1204 @@
     return;
 
-  file = fopen(owl_global_get_debug_file(&g), "a");
+  file = owl_global_get_debug_file_handle(&g);
   if (!file) /* XXX should report this */
     return;
@@ -1209 +1214 @@
   vfprintf(file, fmt, ap);
   putc('\n', file);
-  fclose(file);
+  fflush(file);
 
   va_end(ap);
@@ -1218 +1223 @@
   if (owl_global_is_bell(&g)) {
     beep();
+    owl_global_set_needrefresh(&g); /* do we really need this? */
   }
 }
@@ -1246 +1252 @@
 }
 
-static void _dirty_everything(owl_window *w) {
-  if (!owl_window_is_realized(w))
-    return;
-  owl_window_dirty(w);
-  owl_window_children_foreach(w, (GFunc)_dirty_everything, NULL);
+void owl_function_set_cursor(WINDOW *win)
+{
+  /* Be careful that this window is actually empty, otherwise panels get confused */
+  if (is_wintouched(win)) {
+    owl_function_debugmsg("Warning: owl_function_set_cursor called on dirty window");
+    update_panels();
+  }
+  wnoutrefresh(win);
 }
 
 void owl_function_full_redisplay(void)
 {
-  _dirty_everything(owl_window_get_screen());
+  touchwin(owl_global_get_curs_recwin(&g));
+  touchwin(owl_global_get_curs_sepwin(&g));
+  touchwin(owl_global_get_curs_typwin(&g));
+  touchwin(owl_global_get_curs_msgwin(&g));
+
+  sepbar("");
+  owl_function_makemsg("");
+
+  owl_global_set_needrefresh(&g);
 }
 
@@ -1267 +1284 @@
 
   owl_popwin_up(pw);
-  owl_global_push_context(&g, OWL_CTX_POPLESS, v, "popless", NULL);
-  owl_viewwin_init_text(v, owl_popwin_get_content(pw), text);
+  owl_global_push_context(&g, OWL_CTX_POPLESS, v, "popless");
+  owl_viewwin_init_text(v, owl_popwin_get_curswin(pw),
+                        owl_popwin_get_lines(pw), owl_popwin_get_cols(pw),
+                        text);
+  owl_viewwin_redisplay(v);
+  owl_global_set_needrefresh(&g);
 }
 
@@ -1280 +1301 @@
 
   owl_popwin_up(pw);
-  owl_global_push_context(&g, OWL_CTX_POPLESS, v, "popless", NULL);
-  owl_viewwin_init_fmtext(v, owl_popwin_get_content(pw), fm);
+  owl_global_push_context(&g, OWL_CTX_POPLESS, v, "popless");
+  owl_viewwin_init_fmtext(v, owl_popwin_get_curswin(pw),
+                   owl_popwin_get_lines(pw), owl_popwin_get_cols(pw),
+                   fm);
+  owl_viewwin_redisplay(v);
+  owl_global_set_needrefresh(&g);
 }
 
@@ -1541 +1566 @@
   /* redisplay */
   owl_mainwin_redisplay(owl_global_get_mainwin(&g));
+  owl_global_set_needrefresh(&g);
 }
 
@@ -1546 +1572 @@
 {
   owl_global_set_typwin_lines(&g, newsize);
-  owl_mainpanel_layout_contents(&g.mainpanel);
+  owl_global_set_relayout_pending(&g);
 }
 
@@ -1660 +1686 @@
     }
     owl_mainwin_redisplay(owl_global_get_mainwin(&g));
+    owl_global_set_needrefresh(&g);
   } else {
     owl_function_error("No message with id %d: unable to mark for (un)delete",id);
@@ -1695 +1722 @@
   owl_mainwin_redisplay(owl_global_get_mainwin(&g));
   owl_function_makemsg("%i messages marked for deletion", count);
+  owl_global_set_needrefresh(&g);
 }
 
@@ -1899 +1927 @@
 
   owl_editwin_set_locktext(tw, "command: ");
+  owl_global_set_needrefresh(&g);
 
   owl_editwin_insert_string(tw, line);
-
-  owl_global_push_context(&g, OWL_CTX_EDITLINE, tw, "editline", owl_global_get_typwin_window(&g));
+  owl_editwin_redisplay(tw);
+
+  owl_global_push_context(&g, OWL_CTX_EDITLINE, tw, "editline");
   owl_editwin_set_callback(tw, owl_callback_command);
 }
@@ -1913 +1943 @@
 
   owl_editwin_set_locktext(tw, line);
-
-  owl_global_push_context(&g, OWL_CTX_EDITRESPONSE, tw, "editresponse", owl_global_get_typwin_window(&g));
+  owl_global_set_needrefresh(&g);
+
+  owl_editwin_redisplay(tw);
+
+  owl_global_push_context(&g, OWL_CTX_EDITRESPONSE, tw, "editresponse");
   return tw;
 }
@@ -1927 +1960 @@
 
   owl_editwin_set_locktext(tw, line);
-
-  owl_global_push_context(&g, OWL_CTX_EDITRESPONSE, tw, "editresponse", owl_global_get_typwin_window(&g));
+  owl_global_set_needrefresh(&g);
+
+  owl_editwin_redisplay(tw);
+
+  owl_global_push_context(&g, OWL_CTX_EDITRESPONSE, tw, "editresponse");
   return tw;
 }
@@ -1963 +1999 @@
     pclose(p);
     
-    if (type == OWL_OUTPUT_RETURN) {
+    if (type == OWL_OUTPUT_POPUP) {
+      owl_function_popless_text(out);
+    } else if (type == OWL_OUTPUT_RETURN) {
       owl_free(newbuff);
       return out;
     } else if (type == OWL_OUTPUT_ADMINMSG) {
       owl_function_adminmsg(buff, out);
+    } else {
+      owl_function_popless_text(out);
     }
     owl_free(out);
@@ -2000 +2040 @@
     } else if (type == OWL_OUTPUT_RETURN) {
       return perlout;
+    } else {
+      owl_function_popless_text(perlout);
     }
     owl_free(perlout);
@@ -2091 +2133 @@
     }
     owl_filter_set_fgcolor(f, owl_util_string_to_color(argv[3]));
+    owl_global_set_needrefresh(&g);
     owl_mainwin_redisplay(owl_global_get_mainwin(&g));
     return;
@@ -2105 +2148 @@
     }
     owl_filter_set_bgcolor(f, owl_util_string_to_color(argv[3]));
+    owl_global_set_needrefresh(&g);
     owl_mainwin_redisplay(owl_global_get_mainwin(&g));
     return;
@@ -2133 +2177 @@
     owl_function_change_currentview_filter(argv[1]);
   }
+  owl_global_set_needrefresh(&g);
   owl_mainwin_redisplay(owl_global_get_mainwin(&g));
 }
@@ -2460 +2505 @@
 
   owl_mainwin_redisplay(owl_global_get_mainwin(&g));  
-}
-
-static char *owl_function_smartfilter_cc(const owl_message *m) {
-  const char *ccs;
-  char *filtname;
-  char *text;
-  owl_filter *f;
-
-  ccs = owl_message_get_attribute_value(m, "zephyr_ccs");
-
-  filtname = owl_sprintf("conversation-%s", ccs);
-  owl_text_tr(filtname, ' ', '-');
-
-  if (owl_global_get_filter(&g, filtname)) {
-    return filtname;
-  }
-
-  text = owl_sprintf("type ^zephyr$ and filter personal and "
-                     "zephyr_ccs ^%s%s%s$",
-                     owl_getquoting(ccs), ccs, owl_getquoting(ccs));
-
-  f = owl_filter_new_fromstring(filtname, text);
-
-  owl_global_add_filter(&g, f);
-
-  owl_free(text);
-
-  return filtname;
 }
 
@@ -2543 +2560 @@
   if (owl_message_is_type_zephyr(m)) {
     if (owl_message_is_personal(m) || owl_message_is_loginout(m)) {
-      if (owl_message_get_attribute_value(m, "zephyr_ccs") != NULL) {
-        return owl_function_smartfilter_cc(m);
-      }
-
       if (owl_message_is_direction_in(m)) {
         zperson=short_zuser(owl_message_get_sender(m));
@@ -2676 +2689 @@
   owl_filter_set_fgcolor(f, owl_util_string_to_color(fgcolor));
   
+  owl_global_set_needrefresh(&g);
   owl_mainwin_redisplay(owl_global_get_mainwin(&g));
   return(0);
@@ -2839 +2853 @@
     km = owl_keyhandler_get_keymap(kh, kmname);
     owl_fmtext_append_bold(&fm, "\n\n----------------------------------------------------------------------------------------------------\n\n");
-    owl_keymap_get_details(km, &fm, 0);
+    owl_keymap_get_details(km, &fm);    
   }
   owl_fmtext_append_normal(&fm, "\n");
@@ -2865 +2879 @@
   km = owl_keyhandler_get_keymap(owl_global_get_keyhandler(&g), name);
   if (km) {
-    owl_keymap_get_details(km, &fm, 1);
+    owl_keymap_get_details(km, &fm);
   } else {
     owl_fmtext_append_normal(&fm, "No such keymap...\n");
@@ -3389 +3403 @@
 {
   va_list ap;
-  char *str;
+  char buff[2048];
+
+  if (!owl_global_get_curs_msgwin(&g)) return;
 
   va_start(ap, fmt);
-  str = g_strdup_vprintf(fmt, ap);
+  werase(owl_global_get_curs_msgwin(&g));
+  
+  vsnprintf(buff, 2048, fmt, ap);
+  owl_function_debugmsg("makemsg: %s", buff);
+  waddstr(owl_global_get_curs_msgwin(&g), buff);  
+  owl_global_set_needrefresh(&g);
   va_end(ap);
-
-  owl_function_debugmsg("makemsg: %s", str);
-  owl_msgwin_set_text(&g.msgwin, str);
 }