[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdelibs/kinit
From:       Luboš Luňák <l.lunak () kde ! org>
Date:       2004-05-26 9:23:11
Message-ID: 20040526092311.7E6EA735 () office ! kde ! org
[Download RAW message or body]

CVS commit by lunakl: 

ASN startup id now includes timestamp.


  M +5 -18     kinit.cpp   1.138


--- kdelibs/kinit/kinit.cpp  #1.137:1.138
@@ -250,20 +250,14 @@ static void setup_tty( const char* tty )
 
 // from kdecore/netwm.cpp
-static void get_current_desktop_and_timestamp( Display* disp,
-    int& desktop, long& timestamp )
+static int get_current_desktop( Display* disp )
 {
+    int desktop = 0; // no desktop by default
 #if defined Q_WS_X11 && ! defined K_WS_QTONLY
 //#ifdef Q_WS_X11 // Only X11 supports multiple desktops
     Atom net_current_desktop = XInternAtom( disp, "_NET_CURRENT_DESKTOP", False );
-    unsigned char data[ 1 ];
-    XSelectInput( disp, DefaultRootWindow( disp ), PropertyChangeMask );
-    // only touch the property to get PropertyNotify with timestamp
-    XChangeProperty( disp, DefaultRootWindow( disp ), net_current_desktop, XA_CARDINAL,
-        32, PropModeAppend, data, 0 );
     Atom type_ret;
     int format_ret;
     unsigned char *data_ret;
     unsigned long nitems_ret, unused;
-    desktop = 0; // no desktop by default
     if( XGetWindowProperty( disp, DefaultRootWindow( disp ), net_current_desktop,
         0l, 1l, False, XA_CARDINAL, &type_ret, &format_ret, &nitems_ret, &unused, &data_ret )
@@ -273,9 +267,6 @@ static void get_current_desktop_and_time
             desktop = *((long *) data_ret) + 1;
     }
-    XEvent ev;
-    XWindowEvent( disp, DefaultRootWindow( disp ), PropertyChangeMask, &ev );
-    timestamp = ev.xproperty.time;
-    XSelectInput( disp, DefaultRootWindow( disp ), NoEventMask );
 #endif
+    return desktop;
 }
 
@@ -311,11 +302,7 @@ static void init_startup_info( KStartupI
     X11_startup_notify_fd = XConnectionNumber( X11_startup_notify_display );
     KStartupInfoData data;
-    int desktop;
-    long timestamp;
-    get_current_desktop_and_timestamp( X11_startup_notify_display,
-        desktop, timestamp );
+    int desktop = get_current_desktop( X11_startup_notify_display );
     data.setDesktop( desktop );
     data.setBin( bin );
-    data.setTimestamp( timestamp );
     KStartupInfo::sendStartupX( X11_startup_notify_display, id, data );
     XFlush( X11_startup_notify_display );


[prev in list] [next in list] [prev in thread] [next in thread]