Changeset 12505e3 for owl.h

Timestamp:

Jun 21, 2011, 11:19:48 PM (14 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:

• owl.h (modified) (5 diffs)

owl.h

@@ -121 +121 @@
 #define OWL_MESSAGE_DIRECTION_IN    1
 #define OWL_MESSAGE_DIRECTION_OUT   2
-
-#define OWL_IO_READ   1
-#define OWL_IO_WRITE  2
-#define OWL_IO_EXCEPT 4
 
 #define OWL_DIRECTION_NONE      0
@@ -517 +513 @@
 } owl_zbuddylist;
 
-typedef struct _owl_timer {
-  time_t time;
-  int interval;
-  void (*callback)(struct _owl_timer *, void *);
-  void (*destroy)(struct _owl_timer *);
-  void *data;
-  char *name;
-} owl_timer;
-
 typedef struct _owl_errqueue {
   owl_list errlist;
@@ -536 +523 @@
 } owl_colorpair_mgr;
 
-typedef struct _owl_io_dispatch {
-  int fd;                                     /* FD to watch for dispatch. */
-  int mode;
-  bool valid;
-  int needs_gc;
-  void (*callback)(const struct _owl_io_dispatch *, void *); /* C function to dispatch to. */
-  void (*destroy)(const struct _owl_io_dispatch *);  /* Destructor */
-  void *data;
-  GPollFD pollfd;
-} owl_io_dispatch;
-
 typedef struct _owl_popexec {
   int refcount;
@@ -552 +528 @@
   int winactive;
   pid_t pid;                    /* or 0 if it has terminated */
-  const owl_io_dispatch *dispatch;
+  guint io_watch;
 } owl_popexec;
 
@@ -616 +592 @@
   int pseudologin_notify;
   struct termios startup_tio;
-  owl_list io_dispatch_list;
-  GList *timerlist;
-  owl_timer *aim_nop_timer;
+  guint aim_nop_timer;
   int load_initial_subs;
   FILE *debug_file;