[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdelibs
From: Benjamin Reed <ranger () befunk ! com>
Date: 2006-03-31 21:07:30
Message-ID: 1143839250.693099.24299.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 525125 by reed:
well, it doesn't *work* but at least it doesn't *fail* on OSX :)
D kdecore/kglobalaccel_mac.h
M +7 -3 kdeui/CMakeLists.txt
A kdeui/kglobalaccel_mac.cpp [License: LGPL (v2+) (wrong address)]
A kdeui/kglobalaccel_mac.h kdecore/kglobalaccel_mac.h#525051 [License: \
no copyright] M +29 -22 kdeui/kkeyserver_x11.cpp
--- trunk/KDE/kdelibs/kdeui/CMakeLists.txt #525124:525125
@@ -131,9 +131,13 @@
kglobalaccel.cpp
)
-if (UNIX AND NOT APPLE)
- set(kdeui_LIB_SRCS ${kdeui_LIB_SRCS} kglobalaccel_x11.cpp kkeyserver_x11.cpp )
-endif (UNIX AND NOT APPLE)
+if (UNIX)
+ if (APPLE)
+ set(kdeui_LIB_SRCS ${kdeui_LIB_SRCS} kglobalaccel_mac.cpp kkeyserver_x11.cpp )
+ else (APPLE)
+ set(kdeui_LIB_SRCS ${kdeui_LIB_SRCS} kglobalaccel_x11.cpp kkeyserver_x11.cpp )
+ endif (APPLE)
+endif (UNIX)
kde4_automoc(${kdeui_LIB_SRCS})
--- trunk/KDE/kdelibs/kdeui/kkeyserver_x11.cpp #525124:525125
@@ -26,7 +26,7 @@
#include <qwindowdefs.h>
#include <QFlags>
-#if defined(Q_WS_X11) || defined(Q_WS_WIN) || defined(Q_WS_MACX) // Only compile \
this module if we're compiling for X11, mac or win32 +#if defined(Q_WS_X11) || \
defined(Q_WS_WIN) || defined(Q_WS_MAC) // Only compile this module if we're compiling \
for X11 or win32
#include "kkeyserver_x11.h"
#include "kshortcut.h"
@@ -391,6 +391,8 @@
return true;
}
+#endif //Q_WS_X11
+
static void intializeKKeyLabels()
{
KConfigGroup cg( KGlobal::config(), "Keyboard" );
@@ -402,8 +404,6 @@
g_bInitializedKKeyLabels = true;
}
-#endif //Q_WS_X11
-
//---------------------------------------------------------------------
// Public functions
//---------------------------------------------------------------------
@@ -421,6 +421,22 @@
uint modXModeSwitch() { if( !g_bInitializedMods ) { initializeMods(); } return \
g_modXModeSwitch; }
bool keyboardHasMetaKey() { return modXMeta() != 0; }
+
+#else
+
+/* FIXME: why is this stuff still all tied to X11 interfaces? Is it used anywhere \
other than the +X11-specific portions of kglobalaccel? */
+
+uint modXShift() { return 0; }
+uint modXCtrl() { return 0; }
+uint modXAlt() { return 0; }
+uint modXMeta() { return 0; }
+
+uint modXNumLock() { return 0; }
+uint modXLock() { return 0; }
+uint modXScrollLock() { return 0; }
+uint modXModeSwitch() { return 0; }
+
#endif //Q_WS_X11
bool keyQtToX( int keyQt, int& keySym )
@@ -435,7 +451,7 @@
#ifdef Q_WS_WIN
keySym = symQt;
return true;
-#elif defined(Q_WS_MACX)
+#elif defined(Q_WS_MAC)
keySym = symQt;
return true;
#elif defined(Q_WS_X11)
@@ -462,7 +478,7 @@
else
keyQt = keySym;
}
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN) || defined(Q_WS_MAC)
else if( keySym < 0x3000 )
keyQt = keySym;
#elif defined(Q_WS_X11)
@@ -481,8 +497,12 @@
return (keyQt != Qt::Key_unknown);
}
+/* are these things actually used anywhere? there's no way
+ they can do anything on non-X11 */
+
bool keyQtToModX( int modQt, uint & modX )
{
+#ifdef Q_WS_X11
if( !g_bInitializedMods )
initializeMods();
@@ -493,11 +513,13 @@
continue;
}
}
+#endif
return true;
}
bool modXToQt( uint modX, int& modQt )
{
+#ifdef Q_WS_X11
if( !g_bInitializedMods )
initializeMods();
@@ -508,6 +530,7 @@
continue;
}
}
+#endif
return true;
}
@@ -532,22 +555,6 @@
return true;
}
-#elif defined(Q_WS_MACX)
-
-bool modXToModQt(uint modX, int& modQt)
-{
- return modToModQt( modX, modQt );
-}
-
-bool keyboardHasWinKey() {
-//! TODO - A win key on the Mac...?
- return false;
-}
-
-bool modXToMod( uint , uint& )
-{
- return false;
-}
#elif defined(Q_WS_X11)
bool codeXToSym( uchar codeX, uint modX, uint& sym )
@@ -608,4 +615,4 @@
} // end of namespace KKeyServer block
-#endif //Q_WS_X11 || Q_WS_WIN
+#endif //Q_WS_X11 || Q_WS_WIN || Q_WS_MAC
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic