[svn-upgrade] Integrating new upstream version, ion3 (20070506)

[ion3.git] / ioncore / regbind.h

diff --git a/ioncore/regbind.h b/ioncore/regbind.h
index ad1fe6d968718a83bc1e4710cf506876e926869e..adf78ff279497f7cde2d3b89cb1634ac0bc7e3c9 100644 (file)
--- a/ioncore/regbind.h
+++ b/ioncore/regbind.h
@@ -3,10 +3,7 @@
  *
  * Copyright (c) Tuomo Valkonen 1999-2007. 
  *
- * Ion is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
+ * See the included file LICENSE for details.
  */
 
 #ifndef ION_IONCORE_REGBIND_H
@@ -21,6 +18,8 @@
 DECLSTRUCT(WSubmapState){
     uint key, state;
     WSubmapState *next;
+    /* ExtlFn leave; */
+    /* Watch leave_reg; */
 };
 
 
@@ -29,7 +28,8 @@ extern void region_remove_bindmap(WRegion *reg, WBindmap *bindmap);
 
 extern void region_remove_bindings(WRegion *reg);
 
-extern WBinding *region_lookup_keybinding(WRegion *reg, const XKeyEvent *ev,
+extern WBinding *region_lookup_keybinding(WRegion *reg, 
+                                          int act, uint state, uint kcb, 
                                           const WSubmapState *sc,
                                           WRegion **binding_owner_ret);
 extern WBinding *region_lookup_binding(WRegion *reg, int act, uint state,