Changeset 385fda9

Timestamp:

Jun 1, 2010, 9:54:19 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:

a5a9572

Parents:

f06baef

git-author:

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

git-committer:

David Benjamin <davidben@mit.edu> (06/01/10 21:54:19)

Message:

A fairly hacky job of porting sepbar to owl_window

We now use the new framework, but the sepbar isn't being marked dirty at
the appropriate times. It'll want to be redone later to take advantage
of the new signals.

The 'in' parameter was also dropped. It was being unused. At best it
provided a strange bug when resizing with appendtosepbar set.

Also revert the attempt at cleaning up the cursor. We still have a hack,
but using owl_window. The cursor probably needs integration with the
context stack or some such.

Files:

• cmd.c (modified) (2 diffs)
• functions.c (modified) (1 diff)
• global.c (modified) (5 diffs)
• owl.c (modified) (3 diffs)
• util.c (modified) (4 diffs)

cmd.c

@@ -89 +89 @@
   if (argc < 0) {
     owl_free(tmpbuff);
-    sepbar(NULL);
+    sepbar_dirty();
     owl_function_makemsg("Unbalanced quotes");
     return NULL;
@@ -104 +104 @@
   owl_parse_delete(argv, argc);
   owl_free(tmpbuff);
-  sepbar(NULL);
+  sepbar_dirty();
   return retval;
 }

functions.c

@@ -1248 +1248 @@
 }
 
-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)
 {
   touchwin(owl_global_get_curs_recwin(&g));
-  touchwin(owl_global_get_curs_sepwin(&g));
-
-  sepbar("");
+
+  sepbar_dirty();
 
   owl_global_set_needrefresh(&g);

global.c

@@ -98 +98 @@
   owl_popwin_init(&(g->pw));
   owl_msgwin_init(&(g->msgwin), g->mainpanel.msgwin);
+  g_signal_connect(g->mainpanel.sepwin, "redraw", G_CALLBACK(sepbar_redraw), NULL);
 
   g->aim_screenname=NULL;
@@ -293 +294 @@
 }
 
-WINDOW *owl_global_get_curs_sepwin(const owl_global *g) {
-  return panel_window(g->seppan);
+owl_window *owl_global_get_curs_sepwin(const owl_global *g) {
+  return g->mainpanel.sepwin;
 }
 
@@ -367 +368 @@
                           style,
                           hist);
-  owl_window_set_cursor(owl_global_get_curs_typwin(g));
   return g->tw;
 }
@@ -381 +381 @@
   }
   owl_window_dirty(owl_global_get_curs_typwin(g));
-  /* owl_window_set_cursor(owl_global_get_curs_sepwin(g)); */
 
   g->tw = NULL;
@@ -521 +520 @@
   /* refresh stuff */
   owl_mainwin_redisplay(&(g->mw));
-  sepbar(NULL);
+  sepbar_dirty();
 
   owl_function_full_redisplay();

owl.c

@@ -302 +302 @@
     /* this should be optimized to not run if the new messages won't be displayed */
     owl_mainwin_redisplay(owl_global_get_mainwin(&g));
-    sepbar(NULL);
+    sepbar_dirty();
   }
   return newmsgs;
@@ -464 +464 @@
   if (owl_global_is_needrefresh(&g)) {
     /* Redraw the screen */
-    owl_window_redraw_scheduled();
-
-    /* these are here in case a relayout changes the windows */
-    WINDOW *sepwin = owl_global_get_curs_sepwin(&g);
-
-    /* move the cursor to unmanaged window if necessary */
+
+    /* HACK: move the cursor to unmanaged window if necessary; these should be
+     * associated with the context or something. */
     if (!owl_popwin_is_active(owl_global_get_popwin(&g))
         && owl_global_get_typwin(&g)) {
-      /* owl_function_set_cursor(typwin); */
+      owl_window_set_cursor(owl_global_get_curs_typwin(&g));
     } else {
-      owl_function_set_cursor(sepwin);
-    }
+      owl_window_set_cursor(owl_global_get_curs_sepwin(&g));
+    }
+
+    owl_window_redraw_scheduled();
     doupdate();
     owl_global_set_noneedrefresh(&g);
@@ -594 +593 @@
     "-----------------------------------------------------------------m-m---\n"
   );
-  sepbar(NULL);
 
   /* process the startup file */

util.c

@@ -10 +10 @@
 #include <glib-object.h>
 
-void sepbar(const char *in)
-{
-  WINDOW *sepwin;
+void sepbar_dirty(void)
+{
+  owl_window_dirty(owl_global_get_curs_sepwin(&g));
+}
+
+void sepbar_redraw(owl_window *w, WINDOW *sepwin, void *user_data)
+{
   const owl_messagelist *ml;
   const owl_view *v;
@@ -18 +22 @@
   const char *foo, *appendtosepbar;
 
-  sepwin=owl_global_get_curs_sepwin(&g);
   ml=owl_global_get_msglist(&g);
   v=owl_global_get_current_view(&g);
@@ -101 +104 @@
     wattroff(sepwin, A_BOLD);
   }
-  
-  if (in) {
-    getyx(sepwin, y, x);
-    wmove(sepwin, y, x+2);
-    waddstr(sepwin, in);
-  }
 
   appendtosepbar = owl_global_get_appendtosepbar(&g);
@@ -122 +119 @@
   wattroff(sepwin, A_BOLD);
   wattroff(sepwin, A_REVERSE);
-  owl_global_set_needrefresh(&g);
 }