diff options
author | fluxgen <fluxgen> | 2003-07-23 10:43:30 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2003-07-23 10:43:30 (GMT) |
commit | cc062647d04ced5cc825cda04f77b27eaa1917d0 (patch) | |
tree | 8cc96cd45e1518c219e79488a638d3897ba9cb0d /src/Slit.cc | |
parent | 906a6b239589af29624bca151172c5e6a436bfc8 (diff) | |
download | fluxbox-cc062647d04ced5cc825cda04f77b27eaa1917d0.zip fluxbox-cc062647d04ced5cc825cda04f77b27eaa1917d0.tar.bz2 |
fixed kde dockapp bug
Diffstat (limited to 'src/Slit.cc')
-rw-r--r-- | src/Slit.cc | 41 |
1 files changed, 1 insertions, 40 deletions
diff --git a/src/Slit.cc b/src/Slit.cc index da2b860..18a4c31 100644 --- a/src/Slit.cc +++ b/src/Slit.cc | |||
@@ -22,7 +22,7 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: Slit.cc,v 1.73 2003/07/19 11:55:49 rathnor Exp $ | 25 | // $Id: Slit.cc,v 1.74 2003/07/23 10:42:12 fluxgen Exp $ |
26 | 26 | ||
27 | #include "Slit.hh" | 27 | #include "Slit.hh" |
28 | 28 | ||
@@ -969,45 +969,6 @@ void Slit::handleEvent(XEvent &event) { | |||
969 | removeClient(event.xdestroywindow.window, false); | 969 | removeClient(event.xdestroywindow.window, false); |
970 | } else if (event.type == UnmapNotify) { | 970 | } else if (event.type == UnmapNotify) { |
971 | removeClient(event.xunmap.window); | 971 | removeClient(event.xunmap.window); |
972 | } else if (event.type == MapRequest) { | ||
973 | #ifdef KDE | ||
974 | //Check and see if client is KDE dock applet. | ||
975 | //If so add to Slit | ||
976 | bool iskdedockapp = false; | ||
977 | Atom ajunk; | ||
978 | int ijunk; | ||
979 | unsigned long *data = (unsigned long *) 0, uljunk; | ||
980 | Display *disp = FbTk::App::instance()->display(); | ||
981 | // Check if KDE v2.x dock applet | ||
982 | if (XGetWindowProperty(disp, event.xmaprequest.window, | ||
983 | m_kwm2_dockwindow, 0l, 1l, False, | ||
984 | XA_WINDOW, &ajunk, &ijunk, &uljunk, | ||
985 | &uljunk, (unsigned char **) &data) == Success) { | ||
986 | |||
987 | if (data) | ||
988 | iskdedockapp = True; | ||
989 | XFree((void *) data); | ||
990 | data = 0; | ||
991 | } | ||
992 | |||
993 | // Check if KDE v1.x dock applet | ||
994 | if (!iskdedockapp) { | ||
995 | if (XGetWindowProperty(disp, event.xmaprequest.window, | ||
996 | m_kwm1_dockwindow, 0l, 1l, False, | ||
997 | m_kwm1_dockwindow, &ajunk, &ijunk, &uljunk, | ||
998 | &uljunk, (unsigned char **) &data) == Success && data) { | ||
999 | iskdedockapp = (data && data[0] != 0); | ||
1000 | XFree((void *) data); | ||
1001 | data = 0; | ||
1002 | } | ||
1003 | } | ||
1004 | |||
1005 | if (iskdedockapp) { | ||
1006 | XSelectInput(disp, event.xmaprequest.window, StructureNotifyMask); | ||
1007 | addClient(event.xmaprequest.window); | ||
1008 | } | ||
1009 | #endif //KDE | ||
1010 | |||
1011 | } | 972 | } |
1012 | } | 973 | } |
1013 | 974 | ||