Changeset d296c9a for owl.h


Ignore:
Timestamp:
Jul 18, 2010, 4:48:15 PM (11 years ago)
Author:
David Benjamin <davidben@mit.edu>
Branches:
master, 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:
1 edited

Legend:

Unmodified
Added
Removed
  • owl.h

    r987cf3f rd296c9a  
    6060typedef void HV;
    6161#endif
     62
     63#include "window.h"
    6264
    6365#ifdef  GIT_VERSION
     
    308310  void *data;           /* determined by mode */
    309311  char *keymap;
     312  owl_window *cursor;
    310313} owl_context;
    311314
     
    395398  int lasttruncated;
    396399  int lastdisplayed;
     400  owl_window *window;
    397401} owl_mainwin;
    398402
     
    402406  int topline;
    403407  int rightshift;
    404   int winlines, wincols;
    405   WINDOW *curswin;
     408  owl_window *window;
     409  gulong sig_redraw_id;
    406410  void (*onclose_hook) (struct _owl_viewwin *vwin, void *data);
    407411  void *onclose_hook_data;
     
    409413 
    410414typedef struct _owl_popwin {
    411   PANEL *borderpanel;
    412   PANEL *poppanel;
    413   int lines;
    414   int cols;
     415  owl_window *border;
     416  owl_window *content;
    415417  int active;
    416418} owl_popwin;
     419 
     420typedef struct _owl_msgwin {
     421  char *msg;
     422  owl_window *window;
     423  gulong redraw_id;
     424} owl_msgwin;
    417425
    418426typedef struct _owl_messagelist {
     
    464472typedef struct _owl_editwin_excursion owl_editwin_excursion;
    465473
     474typedef struct _owl_mainpanel {
     475  owl_window *panel;
     476  owl_window *typwin;
     477  owl_window *sepwin;
     478  owl_window *msgwin;
     479  owl_window *recwin;
     480  int recwinlines;
     481} owl_mainpanel;
     482
    466483typedef struct _owl_keybinding {
    467484  int  *keys;                   /* keypress stack */
     
    547564} owl_popexec;
    548565
     566typedef struct _OwlGlobalNotifier OwlGlobalNotifier;
     567
    549568typedef struct _owl_global {
    550569  owl_mainwin mw;
    551570  owl_popwin pw;
     571  owl_msgwin msgwin;
    552572  owl_history cmdhist;          /* command history */
    553573  owl_history msghist;          /* outgoing message history */
     
    567587  owl_messagelist msglist;
    568588  WINDOW *input_pad;
    569   PANEL *recpan, *seppan, *msgpan, *typpan;
    570   int needrefresh;
     589  owl_mainpanel mainpanel;
     590  gulong typwin_erase_id;
    571591  int rightshift;
    572592  volatile sig_atomic_t resizepending;
    573   int relayoutpending;
    574   int recwinlines;
    575593  char *thishost;
    576594  char *homedir;
Note: See TracChangeset for help on using the changeset viewer.