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

[ion3.git] / ioncore / pointer.c

diff --git a/ioncore/pointer.c b/ioncore/pointer.c
index 671af84835cce79f6b4bed427ec111b4df3e25e3..4d5e26ea1205a116307767ae45aa87fff281616a 100644 (file)
--- a/ioncore/pointer.c
+++ b/ioncore/pointer.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 "common.h"
@@ -137,7 +134,8 @@ static void call_button(WBinding *binding, XButtonEvent *ev)
         return;
 
     p_curr_event=(XEvent*)ev;
-    extl_call(binding->func, "oo", NULL, p_reg, p_subreg);
+    extl_call(binding->func, "ooo", NULL, p_reg, p_subreg, 
+              (p_reg!=NULL ? p_reg->active_sub : NULL));
     p_curr_event=NULL;
 }
 
@@ -235,17 +233,6 @@ bool ioncore_do_handle_buttonpress(XButtonEvent *ev)
     if(reg==NULL)
         return FALSE;
 
-    if(ev->subwindow!=None){
-        XButtonEvent ev2=*ev;
-        ev2.window=ev->subwindow;
-        if(XTranslateCoordinates(ioncore_g.dpy, ev->window, ev2.window,
-                                 ev->x, ev->y, &(ev2.x), &(ev2.y),
-                                 &(ev2.subwindow))){
-            if(ioncore_do_handle_buttonpress(&ev2))
-                return TRUE;
-        }
-    }
-
     dblclick=(p_clickcnt==1 && time_in_threshold(ev->time) && 
               p_button==button && p_state==state && reg==p_reg);