Sync with r21-2-35.

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

diff --git a/src/gpmevent.c b/src/gpmevent.c
index 1c879d4..4c8b809 100644 (file)
--- a/src/gpmevent.c
+++ b/src/gpmevent.c
@@ -140,10 +140,10 @@ This function is the process handler for the GPM connection.
        /* Whow, wouldn't named defines be NICE!?!?! */
        modifiers = 0;
 
-       if (ev.modifiers & 1)   modifiers |= MOD_SHIFT;
-       if (ev.modifiers & 2)   modifiers |= MOD_META;
-       if (ev.modifiers & 4)   modifiers |= MOD_CONTROL;
-       if (ev.modifiers & 8)   modifiers |= MOD_META;
+       if (ev.modifiers & 1)   modifiers |= XEMACS_MOD_SHIFT;
+       if (ev.modifiers & 2)   modifiers |= XEMACS_MOD_META;
+       if (ev.modifiers & 4)   modifiers |= XEMACS_MOD_CONTROL;
+       if (ev.modifiers & 8)   modifiers |= XEMACS_MOD_META;
 
        if (ev.buttons & GPM_B_LEFT)
        {
@@ -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