Imported Upstream version 20090110

[ion3.git] / ioncore / frame-pointer.c

diff --git a/ioncore/frame-pointer.c b/ioncore/frame-pointer.c
index 494a7b2a3f5b54082afce1a400bbfb94e778666f..6340dd0d2ccfebdd692bcf999bce243f46565ab6 100644 (file)
--- a/ioncore/frame-pointer.c
+++ b/ioncore/frame-pointer.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/frame-pointer.c
  *
- * Copyright (c) Tuomo Valkonen 1999-2007. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 
  *
  * See the included file LICENSE for details.
  */
@@ -63,7 +63,8 @@ int frame_press(WFrame *frame, XButtonEvent *ev, WRegion **reg_ret)
         g.y=0;
     }
 
-    if(rectangle_contains(&g, ev->x, ev->y)){
+    if(frame->barmode!=FRAME_BAR_NONE && 
+       rectangle_contains(&g, ev->x, ev->y)){
         p_tabnum=frame_tab_at_x(frame, ev->x);
 
         region_rootpos((WRegion*)frame, &p_tab_x, &p_tab_y);
@@ -363,19 +364,22 @@ void frame_p_tabdrag(WFrame *frame)
 EXTL_EXPORT_MEMBER
 void frame_p_switch_tab(WFrame *frame)
 {
-    WRegion *sub;
+    /*WRegion *sub;*/
     
     if(ioncore_pointer_grab_region()!=(WRegion*)frame)
         return;
     
+    /*
     sub=sub_at_tab(frame);
-    
     if(sub!=NULL){
         bool mcf=region_may_control_focus((WRegion*)frame);
         region_goto_flags(sub, (mcf 
                                 ? REGION_GOTO_FOCUS|REGION_GOTO_NOWARP 
                                 : 0));
     }
+    */
+    
+    mplex_switch_nth((WMPlex*)frame, p_tabnum);
 }