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

[ion3.git] / ioncore / regbind.c

diff --git a/ioncore/regbind.c b/ioncore/regbind.c
index 0b2f371d5912009df44ba98b629075bc0b200582..68ef792cc12dded46d414d87ce282d2e6f472928 100644 (file)
--- a/ioncore/regbind.c
+++ b/ioncore/regbind.c
@@ -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.
  */
 
 #include <string.h>
@@ -199,7 +196,8 @@ void region_remove_bindings(WRegion *reg)
 }
 
 
-WBinding *region_lookup_keybinding(WRegion *reg, const XKeyEvent *ev,
+WBinding *region_lookup_keybinding(WRegion *reg, 
+                                   int act, uint state, uint kcb, 
                                    const WSubmapState *sc,
                                    WRegion **binding_owner_ret)
 {
@@ -233,7 +231,7 @@ WBinding *region_lookup_keybinding(WRegion *reg, const XKeyEvent *ev,
             continue;
         }
 
-        binding=bindmap_lookup_binding(bindmap, BINDING_KEYPRESS, ev->state, ev->keycode);
+        binding=bindmap_lookup_binding(bindmap, act, state, kcb);
         
         if(binding!=NULL)
             break;