Changeset d70f45f

Timestamp:

Jun 1, 2010, 3:19:58 PM (15 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.7, release-1.8, release-1.9

Children:

69873f7

Parents:

e294783

Message:

Port the msgwin to owl_window

I feel kind of silly making a new file for this, but meh.

Files:

• Makefile.am (modified) (1 diff)
• functions.c (modified) (2 diffs)
• global.c (modified) (4 diffs)
• msgwin.c (added)
• owl.h (modified) (3 diffs)

Makefile.am

@@ -50 +50 @@
      aim.c buddy.c buddylist.c style.c errqueue.c \
      zbuddylist.c popexec.c select.c wcwidth.c \
-     glib_compat.c mainpanel.c
+     glib_compat.c mainpanel.c msgwin.c
 
 NORMAL_SRCS = filterproc.c window.c

functions.c

@@ -1262 +1262 @@
   touchwin(owl_global_get_curs_recwin(&g));
   touchwin(owl_global_get_curs_sepwin(&g));
-  touchwin(owl_global_get_curs_msgwin(&g));
 
   sepbar("");
-  owl_function_makemsg("");
 
   owl_global_set_needrefresh(&g);
@@ -3401 +3399 @@
 {
   va_list ap;
-  char buff[2048];
+  char *str;
 
   if (!owl_global_get_curs_msgwin(&g)) return;
 
   va_start(ap, fmt);
-  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);
+  str = g_strdup_vprintf(fmt, ap);
   va_end(ap);
+
+  owl_function_debugmsg("makemsg: %s", str);
+  owl_msgwin_set_text(&g.msgwin, str);
 }
 

global.c

@@ -95 +95 @@
   owl_mainwin_init(&(g->mw));
   owl_popwin_init(&(g->pw));
+  owl_msgwin_init(&(g->msgwin), g->mainpanel.msgwin);
 
   g->aim_screenname=NULL;
@@ -167 +168 @@
   _owl_panel_set_window(&g->recpan, newwin(recwinlines, cols, 0, 0));
   _owl_panel_set_window(&g->seppan, newwin(1, cols, recwinlines, 0));
-  _owl_panel_set_window(&g->msgpan, newwin(1, cols, recwinlines+1, 0));
 }
 
@@ -295 +295 @@
 }
 
-WINDOW *owl_global_get_curs_msgwin(const owl_global *g) {
-  return panel_window(g->msgpan);
+owl_window *owl_global_get_curs_msgwin(const owl_global *g) {
+  return g->msgwin.window;
 }
 
@@ -517 +517 @@
 
   /* refresh stuff */
-  g->needrefresh=1;
   owl_mainwin_redisplay(&(g->mw));
   sepbar(NULL);
 
   owl_function_full_redisplay();
-
-  owl_function_makemsg("");
 }
 

owl.h

@@ -414 +414 @@
   int active;
 } owl_popwin;
+  
+typedef struct _owl_msgwin {
+  char *msg;
+  owl_window *window;
+  gulong redraw_id;
+} owl_msgwin;
 
 typedef struct _owl_messagelist {
@@ -558 +564 @@
   owl_mainwin mw;
   owl_popwin pw;
+  owl_msgwin msgwin;
   owl_history cmdhist;          /* command history */
   owl_history msghist;          /* outgoing message history */
@@ -577 +584 @@
   owl_mainpanel mainpanel;
   gulong typwin_erase_id;
-  PANEL *recpan, *seppan, *msgpan;
+  PANEL *recpan, *seppan;
   int needrefresh;
   int rightshift;