Changeset 12505e3 for owl.h


Ignore:
Timestamp:
Jun 21, 2011, 11:19:48 PM (13 years ago)
Author:
GitHub Merge Button <merge-button@github.com>
Parents:
937a00e9 (diff), f0d5ef5 (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 f0d5ef52c48abd4954c21397e5fba9605d8f713f into 937a00e96102f86412b6844575901e57be238546
File:
1 edited

Legend:

Unmodified
Added
Removed
  • owl.h

    r24a791f r12505e3  
    121121#define OWL_MESSAGE_DIRECTION_IN    1
    122122#define OWL_MESSAGE_DIRECTION_OUT   2
    123 
    124 #define OWL_IO_READ   1
    125 #define OWL_IO_WRITE  2
    126 #define OWL_IO_EXCEPT 4
    127123
    128124#define OWL_DIRECTION_NONE      0
     
    517513} owl_zbuddylist;
    518514
    519 typedef struct _owl_timer {
    520   time_t time;
    521   int interval;
    522   void (*callback)(struct _owl_timer *, void *);
    523   void (*destroy)(struct _owl_timer *);
    524   void *data;
    525   char *name;
    526 } owl_timer;
    527 
    528515typedef struct _owl_errqueue {
    529516  owl_list errlist;
     
    536523} owl_colorpair_mgr;
    537524
    538 typedef struct _owl_io_dispatch {
    539   int fd;                                     /* FD to watch for dispatch. */
    540   int mode;
    541   bool valid;
    542   int needs_gc;
    543   void (*callback)(const struct _owl_io_dispatch *, void *); /* C function to dispatch to. */
    544   void (*destroy)(const struct _owl_io_dispatch *);  /* Destructor */
    545   void *data;
    546   GPollFD pollfd;
    547 } owl_io_dispatch;
    548 
    549525typedef struct _owl_popexec {
    550526  int refcount;
     
    552528  int winactive;
    553529  pid_t pid;                    /* or 0 if it has terminated */
    554   const owl_io_dispatch *dispatch;
     530  guint io_watch;
    555531} owl_popexec;
    556532
     
    616592  int pseudologin_notify;
    617593  struct termios startup_tio;
    618   owl_list io_dispatch_list;
    619   GList *timerlist;
    620   owl_timer *aim_nop_timer;
     594  guint aim_nop_timer;
    621595  int load_initial_subs;
    622596  FILE *debug_file;
Note: See TracChangeset for help on using the changeset viewer.