INTEGRATION: CWS geordi2q01 (1.7.126); FILE MERGED

2003/08/18 13:37:58 hr 1.7.126.1: #i18350#: join changes from CWS ooo11rc3

1 files changed, 13 insertions, 2 deletions

diff --git a/vcl/unx/source/app/keysymnames.cxx b/vcl/unx/source/app/keysymnames.cxx
index 42d543643125..9131a54ee58e 100644
--- a/vcl/unx/source/app/keysymnames.cxx
+++ b/vcl/unx/source/app/keysymnames.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: keysymnames.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: vg $ $Date: 2003-04-15 16:08:13 $
+ *  last change: $Author: hjs $ $Date: 2003-08-18 15:15:31 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -608,7 +608,18 @@ const char* SalDisplay::GetKeyboardName( BOOL bRefresh )
         {
             XkbDescPtr pXkbDesc = NULL;
             // try X keyboard extension
+        #ifdef MACOSX
+            // FIXME
+            // XDarwin doesn't yet have very good support for the Xkeyboard extension.
+            // When we call XkbGetKeyboard(), the XServer throws a message up in the
+            // console about xkbcomp and files for geometry include.  The side effect of
+            // this is _very_ noticable lag when drawing menus.  The file menu, for example,
+            // takes about 1s to come down on my G4/450 DP and you can see it draw.  Therefore
+            // we are disabling it for the moment until better XDarwin support exists.
+            if ( 0 )
+        #else
             if( pXkbDesc = XkbGetKeyboard( GetDisplay(), XkbAllComponentsMask, XkbUseCoreKbd ) )
+        #endif
             {
                 const char* pAtom = NULL;
                 if( pXkbDesc->names->groups[0] )