Changeset a01ed7c for owl.h


Ignore:
Timestamp:
Oct 27, 2009, 2:15:08 PM (12 years ago)
Author:
Alejandro R. Sedeño <asedeno@mit.edu>
Branches:
master, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9
Children:
7ca5d3e
Parents:
e7f5970 (diff), f1a2736 (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 'io_dispatch_rewrite'
File:
1 edited

Legend:

Unmodified
Added
Removed
  • owl.h

    r68c572a ra01ed7c  
    107107#define OWL_MESSAGE_DIRECTION_OUT   2
    108108
    109 #define OWL_MUX_READ   1
    110 #define OWL_MUX_WRITE  2
    111 #define OWL_MUX_EXCEPT 4
     109#define OWL_IO_READ   1
     110#define OWL_IO_WRITE  2
     111#define OWL_IO_EXCEPT 4
    112112
    113113#define OWL_DIRECTION_NONE      0
     
    503503} owl_obarray;
    504504
    505 typedef struct _owl_dispatch {
    506   int fd;                                 /* FD to watch for dispatch. */
     505typedef struct _owl_io_dispatch {
     506  int fd;                                     /* FD to watch for dispatch. */
     507  int mode;
    507508  int needs_gc;
    508   void (*cfunc)(struct _owl_dispatch*);  /* C function to dispatch to. */
    509   void (*destroy)(struct _owl_dispatch*); /* Destructor */
     509  void (*callback)(const struct _owl_io_dispatch *, void *); /* C function to dispatch to. */
     510  void (*destroy)(const struct _owl_io_dispatch *); /* Destructor */
    510511  void *data;
    511 } owl_dispatch;
     512} owl_io_dispatch;
    512513
    513514typedef struct _owl_ps_action {
     
    523524  int winactive;
    524525  pid_t pid;                    /* or 0 if it has terminated */
    525   owl_dispatch dispatch;
     526  const owl_io_dispatch *dispatch;
    526527} owl_popexec;
    527528
     
    596597  struct termios startup_tio;
    597598  owl_obarray obarray;
    598   owl_list dispatchlist;
     599  owl_list io_dispatch_list;
    599600  owl_list psa_list;
    600601  GList *timerlist;
Note: See TracChangeset for help on using the changeset viewer.