Changeset bbb7876 for owl.c

Timestamp:

Jun 22, 2011, 12:37:21 AM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.8, release-1.9

Children:

2244836

Parents:

bcde7926

git-author:

David Benjamin <davidben@mit.edu> (05/24/11 01:32:37)

git-committer:

David Benjamin <davidben@mit.edu> (06/22/11 00:37:21)

Message:

Replace the stdin reader with a GIOChannel watch

We ignore the channel itself as ncurses expects to do its own thing.

File:

• owl.c (modified) (5 diffs)

owl.c

@@ -302 +302 @@
 }
 
-void owl_process_input(const owl_io_dispatch *d, void *data)
+gboolean owl_process_input(GIOChannel *source, GIOCondition condition, void *data)
 {
+  owl_global *g = data;
   owl_input j;
 
   while (1) {
-    j.ch = wgetch(g.input_pad);
-    if (j.ch == ERR) return;
+    j.ch = wgetch(g->input_pad);
+    if (j.ch == ERR) return TRUE;
 
     j.uch = '\0';
@@ -330 +331 @@
       
       for (i = 1; i < bytes; i++) {
-        int tmp = wgetch(g.input_pad);
+        int tmp = wgetch(g->input_pad);
         /* If what we got was not a byte, or not a continuation byte */
         if (tmp > 0xff || !(tmp & 0x80 && ~tmp & 0x40)) {
@@ -357 +358 @@
     owl_process_input_char(j);
   }
+  return TRUE;
 }
 
@@ -485 +487 @@
   owl_options opts;
   GSource *source;
+  GIOChannel *channel;
 
   argc_copy = argc;
@@ -510 +513 @@
 
   /* register STDIN dispatch; throw away return, we won't need it */
-  owl_select_add_io_dispatch(STDIN_FILENO, OWL_IO_READ, &owl_process_input, NULL, NULL);
+  channel = g_io_channel_unix_new(STDIN_FILENO);
+  g_io_add_watch(channel, G_IO_IN | G_IO_HUP | G_IO_ERR, &owl_process_input, &g);
+  g_io_channel_unref(channel);
   owl_zephyr_initialize();