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

List:       kde-commits
Subject:    KDE/kdebase/workspace/kdm
From:       Oswald Buddenhagen <ossi () kde ! org>
Date:       2007-11-10 15:58:05
Message-ID: 1194710285.854396.15632.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 734970 by ossi:

no need to bother with XkbSetPerClientControls any more - Qt4 does


 M  +0 -2      ConfigureChecks.cmake  
 M  +0 -3      config-kdm.h.cmake  
 M  +0 -13     kfrontend/kdm_greet.c  


--- trunk/KDE/kdebase/workspace/kdm/ConfigureChecks.cmake #734969:734970
@@ -158,8 +158,6 @@
 option(KDE4_KDM_XCONSOLE "Build KDM with built-in xconsole" OFF)
 macro_bool_to_01(KDE4_KDM_XCONSOLE WITH_KDM_XCONSOLE)
 
-check_library_exists(X11 XkbSetPerClientControls "" HAVE_XKBSETPERCLIENTCONTROLS)
-
 check_function_exists(getifaddrs  HAVE_GETIFADDRS)
 check_function_exists(getloadavg  HAVE_GETLOADAVG)
 check_function_exists(setproctitle HAVE_SETPROCTITLE)
--- trunk/KDE/kdebase/workspace/kdm/config-kdm.h.cmake #734969:734970
@@ -87,9 +87,6 @@
 /* Build kdm with built-in xconsole */
 #cmakedefine WITH_KDM_XCONSOLE 1
 
-/* Define if you have XkbSetPerClientControls */
-#cmakedefine HAVE_XKBSETPERCLIENTCONTROLS 1
-
 /* Define to 1 if you have the `getifaddrs' function. */
 #cmakedefine HAVE_GETIFADDRS 1
 
--- trunk/KDE/kdebase/workspace/kdm/kfrontend/kdm_greet.c #734969:734970
@@ -406,19 +406,6 @@
 		XSync( dpy, 0 );
 	}
 	debug( "secureDisplay %s done\n", dname );
-#if defined(HAVE_XKB) && defined(HAVE_XKBSETPERCLIENTCONTROLS)
-	/*
-	 * Activate the correct mapping for modifiers in XKB extension as
-	 * grabbed keyboard has its own mapping by default
-	 */
-	{
-		int opcode, evbase, errbase, majret, minret;
-		unsigned int value = XkbPCF_GrabsUseXKBStateMask;
-		if (XkbQueryExtension( dpy, &opcode, &evbase,
-		                       &errbase, &majret, &minret ))
-			XkbSetPerClientControls( dpy, value, &value );
-	}
-#endif
 }
 
 void
[prev in list] [next in list] [prev in thread] [next in thread]