(g2-UU+5B73): Add `=decomposition@hanyo-denshi'.

[chise/xemacs-chise.git.1] / src / gpmevent.c

diff --git a/src/gpmevent.c b/src/gpmevent.c
index 64df9ab..d42c9ae 100644 (file)
--- a/src/gpmevent.c
+++ b/src/gpmevent.c
@@ -112,7 +112,7 @@ This function is the process handler for the GPM connection.
        Gpm_Event ev;
        int modifiers = 0;
        int button = 1;
-       Lisp_Object fake_event;
+       Lisp_Object fake_event = Qnil;
        Lisp_Event *event = NULL;
        struct gcpro gcpro1;
        static int num_events;
@@ -217,9 +217,9 @@ tty_get_foreign_selection (Lisp_Object selection_symbol, Lisp_Object target_type
        struct device *d = decode_device (Qnil);
        int fd = DEVICE_INFD (d);
        char c = 3;
-       Lisp_Object output_stream;
-       Lisp_Object terminal_stream;
-       Lisp_Object output_string;
+       Lisp_Object output_stream = Qnil;
+       Lisp_Object terminal_stream = Qnil ;
+       Lisp_Object output_string = Qnil;
        struct gcpro gcpro1,gcpro2,gcpro3;
 
        GCPRO3(output_stream,terminal_stream,output_string);
@@ -272,8 +272,8 @@ tty_get_foreign_selection (Lisp_Object selection_symbol, Lisp_Object target_type
        while (1)
        {
                Bufbyte tempbuf[1024]; /* some random amount */
-               ssize_t i;
-               ssize_t size_in_bytes =
+               Lstream_data_count i;
+               Lstream_data_count size_in_bytes =
                  Lstream_read (XLSTREAM (terminal_stream),
                                tempbuf, sizeof (tempbuf));
 
@@ -309,7 +309,7 @@ tty_get_foreign_selection (Lisp_Object selection_symbol, Lisp_Object target_type
 }
 
 static Lisp_Object
-tty_selection_exists_p (Lisp_Object selection)
+tty_selection_exists_p (Lisp_Object selection, Lisp_Object selection_type)
 {
        return (Qt);
 }
@@ -317,7 +317,8 @@ tty_selection_exists_p (Lisp_Object selection)
 
 #if 0
 static Lisp_Object
-tty_own_selection (Lisp_Object selection_name, Lisp_Object selection_value)
+tty_own_selection (Lisp_Object selection_name, Lisp_Object selection_value,
+                  Lisp_Object how_to_add, Lisp_Object selection_type)
 {
        /* There is no way to do this cleanly - the GPM selection
        ** 'protocol' (actually the TIOCLINUX ioctl) requires a start and
@@ -569,7 +570,7 @@ Toggle accepting of GPM mouse events.
        conn.maxMod = ((1<<KG_SHIFT)|(1<<KG_ALT)|(1<<KG_CTRL));
 
        /* Reset some silly static variables so that multiple Gpm_Open()
-       ** calls have even a sligh chance of working
+       ** calls have even a slight chance of working
        */
        gpm_tried = 0;
        gpm_flag = 0;
@@ -634,8 +635,8 @@ void vars_of_gpmevent (void)
        gpm_event_queue_tail = Qnil;
        staticpro (&gpm_event_queue);
        staticpro (&gpm_event_queue_tail);
-       pdump_wire (&gpm_event_queue);
-       pdump_wire (&gpm_event_queue_tail);
+       dump_add_root_object (&gpm_event_queue);
+       dump_add_root_object (&gpm_event_queue_tail);
 }
 
 void syms_of_gpmevent (void)