aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-07-28 20:10:05 (GMT)
committerfluxgen <fluxgen>2003-07-28 20:10:05 (GMT)
commit8c26f29b2fecdda9f414e287e1fbcbfbab0e9c36 (patch)
treef21a25c3d4db52f8718d909dd82eb75c4b63d26f /src
parent1e0f8ef8f3994401431fdb2e6389ca00b1c1bca4 (diff)
downloadfluxbox_pavel-8c26f29b2fecdda9f414e287e1fbcbfbab0e9c36.zip
fluxbox_pavel-8c26f29b2fecdda9f414e287e1fbcbfbab0e9c36.tar.bz2
moved kde dockapp test to screen
Diffstat (limited to 'src')
-rw-r--r--src/fluxbox.cc47
1 files changed, 1 insertions, 46 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 2e37a46..8eb6995 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.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: fluxbox.cc,v 1.176 2003/07/28 15:06:35 rathnor Exp $ 25// $Id: fluxbox.cc,v 1.177 2003/07/28 20:10:05 fluxgen Exp $
26 26
27#include "fluxbox.hh" 27#include "fluxbox.hh"
28 28
@@ -786,51 +786,6 @@ void Fluxbox::handleEvent(XEvent * const e) {
786 } 786 }
787 break; 787 break;
788 case MapRequest: { 788 case MapRequest: {
789#ifdef SLIT
790#ifdef KDE
791 //Check and see if client is KDE dock applet.
792 //If so add to Slit
793 bool iskdedockapp = false;
794 Atom ajunk;
795 int ijunk;
796 unsigned long *data = (unsigned long *) 0, uljunk;
797 Display *disp = FbTk::App::instance()->display();
798 // Check if KDE v2.x dock applet
799 if (XGetWindowProperty(disp, e->xmaprequest.window,
800 m_kwm2_dockwindow, 0l, 1l, False,
801 XA_WINDOW, &ajunk, &ijunk, &uljunk,
802 &uljunk, (unsigned char **) &data) == Success) {
803
804 if (data)
805 iskdedockapp = True;
806 XFree((void *) data);
807 data = 0;
808 }
809
810 // Check if KDE v1.x dock applet
811 if (!iskdedockapp) {
812 if (XGetWindowProperty(disp, e->xmaprequest.window,
813 m_kwm1_dockwindow, 0l, 1l, False,
814 m_kwm1_dockwindow, &ajunk, &ijunk, &uljunk,
815 &uljunk, (unsigned char **) &data) == Success && data) {
816 iskdedockapp = (data && data[0] != 0);
817 XFree((void *) data);
818 data = 0;
819 }
820 }
821
822 if (iskdedockapp) {
823 XSelectInput(disp, e->xmaprequest.window, StructureNotifyMask);
824 ScreenList::iterator it = m_screen_list.begin();
825 for (; (*it) == m_screen_list.back(); ++it) {
826 if ((*it)->slit())
827 (*it)->slit()->addClient(e->xmaprequest.window);
828 }
829
830 return; // dont create a FluxboxWindow for this one
831 }
832#endif // KDE
833#endif // SLIT
834 789
835#ifdef DEBUG 790#ifdef DEBUG
836 cerr<<"MapRequest for 0x"<<hex<<e->xmaprequest.window<<dec<<endl; 791 cerr<<"MapRequest for 0x"<<hex<<e->xmaprequest.window<<dec<<endl;