Changes in owl.h [987cf3f:5cc7e5e]

File:

• owl.h (modified) (10 diffs)

owl.h

@@ -60 +60 @@
 typedef void HV;
 #endif
+
+#include "window.h"
 
 #ifdef  GIT_VERSION
@@ -308 +310 @@
   void *data;           /* determined by mode */
   char *keymap;
+  owl_window *cursor;
 } owl_context;
 
@@ -344 +347 @@
 
 typedef struct _owl_zwrite {
-  char *cmd;
   char *zwriteline;
   char *class;
@@ -395 +397 @@
   int lasttruncated;
   int lastdisplayed;
+  owl_window *window;
 } owl_mainwin;
 
@@ -402 +405 @@
   int topline;
   int rightshift;
-  int winlines, wincols;
-  WINDOW *curswin;
+  owl_window *window;
+  gulong sig_redraw_id;
   void (*onclose_hook) (struct _owl_viewwin *vwin, void *data);
   void *onclose_hook_data;
@@ -409 +412 @@
   
 typedef struct _owl_popwin {
-  PANEL *borderpanel;
-  PANEL *poppanel;
-  int lines;
-  int cols;
+  owl_window *border;
+  owl_window *content;
   int active;
 } owl_popwin;
+  
+typedef struct _owl_msgwin {
+  char *msg;
+  owl_window *window;
+  gulong redraw_id;
+} owl_msgwin;
 
 typedef struct _owl_messagelist {
@@ -464 +471 @@
 typedef struct _owl_editwin_excursion owl_editwin_excursion;
 
+typedef struct _owl_mainpanel {
+  owl_window *panel;
+  owl_window *typwin;
+  owl_window *sepwin;
+  owl_window *msgwin;
+  owl_window *recwin;
+  int recwinlines;
+} owl_mainpanel;
+
 typedef struct _owl_keybinding {
   int  *keys;                   /* keypress stack */
@@ -547 +563 @@
 } owl_popexec;
 
+typedef struct _OwlGlobalNotifier OwlGlobalNotifier;
+
 typedef struct _owl_global {
   owl_mainwin mw;
   owl_popwin pw;
+  owl_msgwin msgwin;
   owl_history cmdhist;          /* command history */
   owl_history msghist;          /* outgoing message history */
@@ -567 +586 @@
   owl_messagelist msglist;
   WINDOW *input_pad;
-  PANEL *recpan, *seppan, *msgpan, *typpan;
-  int needrefresh;
+  owl_mainpanel mainpanel;
+  gulong typwin_erase_id;
   int rightshift;
   volatile sig_atomic_t resizepending;
-  int relayoutpending;
-  int recwinlines;
   char *thishost;
   char *homedir;
@@ -596 +613 @@
   owl_colorpair_mgr cpmgr;
   pid_t newmsgproc_pid;
+  int malloced, freed;
   owl_regex search_re;
   aim_session_t aimsess;