[PATCH 8/11] prevent quick switch to windows in tray

this adds a new option to prevent quickswitching to windows in the tray

bert wesarg

---
diff -urp old/src/default.h new/src/default.h
--- old/src/default.h   2006-11-12 19:20:22.208975915 +0100
+++ new/src/default.h   2006-11-12 19:27:25.059627521 +0100
@@ -46,6 +46,7 @@ XIV(int, taskBarButtonWidthDivisor,
 #ifdef CONFIG_TRAY
 XIV(bool, taskBarShowTray,                      true)
 XIV(bool, trayShowAllWindows,                   true)
+XIV(bool, quickSwitchToTray,                    true)
 #endif
 XIV(bool, taskBarShowTransientWindows,          false)
 XIV(bool, taskBarShowAllWindows,                false)
@@ -254,6 +255,7 @@ cfoption icewm_preferences[] = {
 #ifdef CONFIG_TRAY
     OBV("TaskBarShowTray",                      &taskBarShowTray,              
 "Show windows in the tray"),
     OBV("TrayShowAllWindows",                   &trayShowAllWindows,           
 "Show windows from all workspaces on tray"),
+    OBV("QuickSwitchToTray",                    &quickSwitchToTray,            
 "Alt+Tab to windows in the tray"),
 #endif
     OBV("TaskBarShowTransientWindows",          &taskBarShowTransientWindows,  
 "Show transient (dialogs, ...) windows on task bar"),
     OBV("TaskBarShowAllWindows",                &taskBarShowAllWindows,        
 "Show windows from all workspaces on task bar"),
diff -urp old/src/wmmgr.cc new/src/wmmgr.cc
--- old/src/wmmgr.cc    2006-09-10 18:12:11.000000000 +0200
+++ new/src/wmmgr.cc    2006-11-12 19:27:29.114780838 +0100
@@ -1622,6 +1622,10 @@ YFrameWindow *YWindowManager::getLastFoc
                     continue;
                 if (w->isHidden())
                     continue;
+#ifdef CONFIG_TRAY
+                if (w->getTrayOption() != WinTrayIgnore)
+                     continue;
+#endif
                 if (!w->visibleOn(workspace))
                     continue;
                 if (w->avoidFocus() || pass == 1)
diff -urp old/src/wmswitch.cc new/src/wmswitch.cc
--- old/src/wmswitch.cc 2006-09-10 18:12:11.000000000 +0200
+++ new/src/wmswitch.cc 2006-11-12 19:27:29.115780629 +0100
@@ -435,7 +435,7 @@ int SwitchWindow::GetZListWorkspace(YFra
                                     bool workspaceOnly, int workspace)
 {
     int count = 0;
-    for (int pass = 0; pass <= 5; pass++) {
+    for (int pass = 0; pass <= 6; pass++) {
         YFrameWindow *w = fRoot->lastFocusFrame();

         while (w) {
@@ -472,6 +472,12 @@ int SwitchWindow::GetZListWorkspace(YFra
                 if (pass == 4)
                     if (quickSwitchToHidden)
                         list[count++] = w;
+#ifdef CONFIG_TRAY
+            } else if (w->getTrayOption() != WinTrayIgnore) {
+                if (pass == 6)
+                    if (quickSwitchToTray)
+                        list[count++] = w;
+#endif
             } else if (w->isMinimized()) {
                 if (pass == 3)
                     if (quickSwitchToMinimized)


-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642