Actually move the kde files that were renamed in the last commit

1 files changed, 201 insertions, 0 deletions

diff --git a/tdecore/kkeynative_x11.cpp b/tdecore/kkeynative_x11.cpp
new file mode 100644
index 000000000..8fed59deb
--- /dev/null
+++ b/tdecore/kkeynative_x11.cpp
@@ -0,0 +1,201 @@
+/*
+    Copyright (C) 2001 Ellis Whitehead <ellis@kde.org>
+
+    Win32 port:
+    Copyright (C) 2004 Jaroslaw Staniek <js@iidea.pl>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
+
+#include <tqnamespace.h>
+#include <tqwindowdefs.h>
+
+#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
+
+#include "kkeynative.h"
+#include "kkeyserver_x11.h"
+
+#include <tqmap.h>
+#include <tqstringlist.h>
+#include "kckey.h"
+#include <kdebug.h>
+#include <klocale.h>
+
+#ifdef Q_WS_X11
+#define XK_MISCELLANY
+#define XK_XKB_KEYS
+#include <X11/X.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/keysymdef.h>
+#include <ctype.h>
+#endif
+
+//---------------------------------------------------------------------
+
+static KKeyNative* gx_pkey = 0;
+
+//---------------------------------------------------------------------
+// KKeyNative
+//---------------------------------------------------------------------
+
+KKeyNative::KKeyNative()                           { clear(); }
+KKeyNative::KKeyNative( const KKey& key )          { init( key ); }
+KKeyNative::KKeyNative( const KKeyNative& key )    { init( key ); }
+#ifdef Q_WS_X11
+KKeyNative::KKeyNative( const XEvent* pEvent )     { init( pEvent ); }
+#endif
+
+KKeyNative::KKeyNative( uint code, uint mod, uint sym )
+{
+	m_code = code;
+	m_mod = mod;
+	m_sym = sym;
+}
+
+KKeyNative::~KKeyNative()
+	{ }
+
+void KKeyNative::clear()
+{
+	m_code = 0;
+	m_mod = 0;
+	m_sym = 0;
+}
+
+#ifdef Q_WS_X11
+bool KKeyNative::init( const XEvent* pEvent )
+{
+	KeySym keySym;
+	m_code = pEvent->xkey.keycode;
+	m_mod = pEvent->xkey.state;
+	XLookupString( (XKeyEvent*) pEvent, 0, 0, &keySym, 0 );
+	m_sym = (uint) keySym;
+	return true;
+}
+#endif
+
+bool KKeyNative::init( const KKey& key )
+{
+#ifdef Q_WS_WIN
+	m_sym = key.sym();
+	m_code = m_sym; //key.keyCodeQt();
+	m_mod = key.m_mod;
+#elif !defined(Q_WS_WIN) && !defined(Q_WS_MACX)
+	// Get any extra mods required by the sym.
+	//  E.g., XK_Plus requires SHIFT on the en layout.
+	m_sym = key.sym();
+	uint modExtra = KKeyServer::Sym(m_sym).getModsRequired();
+	// Get the X modifier equivalent.
+	if( !m_sym || !KKeyServer::modToModX( key.modFlags() | modExtra, m_mod ) ) {
+		m_sym = m_mod = 0;
+		m_code = 0;
+		return false;
+	}
+
+	// XKeysymToKeycode returns the wrong keycode for XK_Print and XK_Break.
+	// Specifically, it returns the code for SysReq instead of Print
+	// Only do this for the default Xorg layout, other keycode mappings
+	// (e.g. evdev) don't need or want it.
+	if( m_sym == XK_Print && !(m_mod & Mod1Mask) &&
+                XKeycodeToKeysym( qt_xdisplay(), 111, 0 ) == XK_Print )
+		m_code = 111; // code for Print
+	else if( m_sym == XK_Break || (m_sym == XK_Pause && (m_mod & ControlMask)) &&
+                XKeycodeToKeysym( qt_xdisplay(), 114, 0 ) == XK_Pause )
+		m_code = 114;
+	else
+		m_code = XKeysymToKeycode( qt_xdisplay(), m_sym );
+
+	if( !m_code && m_sym )
+		kdDebug(125) << "Couldn't get code for sym" << endl;
+	// Now get the true sym formed by the modifiers
+	//  E.g., Shift+Equal => Plus on the en layout.
+	if( key.modFlags() && ( ( m_sym < XK_Home || m_sym > XK_Begin ) && 
+				  m_sym != XK_Insert && m_sym != XK_Delete ))
+		KKeyServer::codeXToSym( m_code, m_mod, m_sym );
+#endif
+	return true;
+}
+
+bool KKeyNative::init( const KKeyNative& key )
+{
+	m_code = key.m_code;
+	m_mod = key.m_mod;
+	m_sym = key.m_sym;
+	return true;
+}
+
+uint KKeyNative::code() const { return m_code; }
+uint KKeyNative::mod() const  { return m_mod; }
+uint KKeyNative::sym() const  { return m_sym; }
+
+bool KKeyNative::isNull() const
+{
+	return m_sym == 0;
+}
+
+int KKeyNative::compare( const KKeyNative& key ) const
+{
+	if( m_sym != key.m_sym )   return m_sym - key.m_sym;
+	if( m_mod != key.m_mod )   return m_mod - key.m_mod;
+	if( m_code != key.m_code ) return m_code - key.m_code;
+	return 0;
+}
+
+KKeyNative& KKeyNative::null()
+{
+	if( !gx_pkey )
+		gx_pkey = new KKeyNative;
+	if( !gx_pkey->isNull() )
+		gx_pkey->clear();
+	return *gx_pkey;
+}
+
+KKey KKeyNative::key() const
+{
+#ifdef Q_WS_WIN
+	return KKey( m_sym, m_mod );
+#else
+	uint modSpec;
+	if( KKeyServer::modXToMod( m_mod, modSpec ) )
+		return KKey( m_sym, modSpec );
+	else
+		return KKey();
+#endif
+}
+
+int KKeyNative::keyCodeQt() const
+{
+	int keyQt = KKeyServer::Sym(m_sym).qt(), modQt;
+
+	if( keyQt != TQt::Key_unknown && KKeyServer::modXToModQt( m_mod, modQt ) )
+		return keyQt | modQt;
+
+	return 0;
+}
+
+bool KKeyNative::keyboardHasWinKey()           { return KKeyServer::keyboardHasWinKey(); }
+
+#ifdef Q_WS_X11
+uint KKeyNative::modX( KKey::ModFlag modFlag ) { return KKeyServer::modX( modFlag ); }
+uint KKeyNative::accelModMaskX()               { return KKeyServer::accelModMaskX(); }
+uint KKeyNative::modXNumLock()                 { return KKeyServer::modXNumLock(); }
+uint KKeyNative::modXLock()                    { return KKeyServer::modXLock(); }
+uint KKeyNative::modXScrollLock()              { return KKeyServer::modXScrollLock(); }
+uint KKeyNative::modXModeSwitch()              { return KKeyServer::modXModeSwitch(); }
+#endif
+
+#endif // Q_WS_X11