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

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

diff --git a/ioncore/frame-pointer.c b/ioncore/frame-pointer.c
index 1d9a1968c2f9bc9453e3cb6668beff5219309abb..09f1c0aa43f2d25dc0a22419437ff3cf2cfd1503 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-2006. 
+ * 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
@@ -138,7 +138,7 @@ static bool tabdrag_kbd_handler(WRegion *reg, XEvent *xev)
     
     assert(reg!=NULL);
 
-    binding=bindmap_lookup_binding(ioncore_rootwin_bindmap, BINDING_KEYPRESS,
+    binding=bindmap_lookup_binding(ioncore_screen_bindmap, BINDING_KEYPRESS,
                                    ev->state&~BUTTONS_MASK, ev->keycode);
     
     if(binding!=NULL && binding->func!=extl_fn_none()){
@@ -173,9 +173,7 @@ static void setup_dragwin(WFrame *frame, uint tab)
     if(tabdrag_infowin==NULL)
         return;
     
-    infowin_set_attr2(tabdrag_infowin, (REGION_IS_ACTIVE(frame) 
-                                        ? "active" : "inactive"),
-                      frame->titles[tab].attr);
+    frame_setup_dragwin_style(frame, infowin_stylespec(tabdrag_infowin), tab);
     
     if(frame->titles[tab].text!=NULL){
         char *buf=INFOWIN_BUFFER(tabdrag_infowin);