Changeset d296c9a for owl.h

Timestamp:

Jul 18, 2010, 4:48:15 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:

205e164

Parents:

1cc9b615 (diff), 8bba1ae (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'owl_window'

Conflicts:
	global.c

File:

• owl.h (modified) (8 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;
 
@@ -395 +398 @@
   int lasttruncated;
   int lastdisplayed;
+  owl_window *window;
 } owl_mainwin;
 
@@ -402 +406 @@
   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 +413 @@
   
 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 +472 @@
 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 +564 @@
 } 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 +587 @@
   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;