| -rw-r--r-- | inputmethods/jumpx/config.in | 2 | ||||
| -rw-r--r-- | inputmethods/jumpx/jumpx.pro | 2 | ||||
| -rw-r--r-- | inputmethods/jumpx/keyboard.cpp | 18 | ||||
| -rw-r--r-- | inputmethods/jumpx/opie-jumpx.control | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/inputmethods/jumpx/config.in b/inputmethods/jumpx/config.in index f2779f8..33645d9 100644 --- a/inputmethods/jumpx/config.in +++ b/inputmethods/jumpx/config.in @@ -1,4 +1,4 @@ config JUMPX boolean "opie-jumpx (keyboard optimized for single finger/stylus input)" default "y" - depends ( LIBQPE || LIBQPE-X11 ) + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE diff --git a/inputmethods/jumpx/jumpx.pro b/inputmethods/jumpx/jumpx.pro index c8b2185..e13deb9 100644 --- a/inputmethods/jumpx/jumpx.pro +++ b/inputmethods/jumpx/jumpx.pro @@ -1,15 +1,15 @@ TEMPLATE = lib CONFIG += qt plugin warn_on release HEADERS = keyboard.h \ keyboardimpl.h SOURCES = keyboard.cpp \ keyboardimpl.cpp TARGET = qjumpx DESTDIR = ../../plugins/inputmethods INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe +LIBS += -lqpe -lopiecore2 VERSION = 1.0.0 include( $(OPIEDIR)/include.pro ) target.path = $$prefix/plugins/inputmethods diff --git a/inputmethods/jumpx/keyboard.cpp b/inputmethods/jumpx/keyboard.cpp index 0cfb4be..79f0d5d 100644 --- a/inputmethods/jumpx/keyboard.cpp +++ b/inputmethods/jumpx/keyboard.cpp @@ -1,286 +1,286 @@ /**************************************************************************************94x78** ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** *********************************************************************************************/ #include "keyboard.h" -#include <qpe/resource.h> +#include <opie2/oresource.h> //#include <iostream.h> static const int autorepeatDelaytime = 500; // ms static const int autorepeatRate = 20; // chars per second static const int mod1x1 = 0; static const int mod1x2 = 23; static const int mod1w = mod1x2 - mod1x1; static const int letterx1 = 27; static const int letterx2 = 129; static const int letterw = 17; static const int letterh = 14; static const int num1x1 = 130; static const int num1x2 = 137; static const int num1w = num1x2 - num1x1; static const int specialx1 = 138; static const int specialx2 = 170; static const int specialw = 16; static const int num2x1 = 171; static const int num2x2 = 178; static const int num2w = num2x2 - num2x1; static const int mod2x1 = 179; static const int mod2x2 = 203; static const int mod2w = mod2x2 - mod2x1; static const int cursorx1 = 207; static const int cursorw = 16; static const int myParenID = -10; typedef struct mapElement { int qcode; ushort unicode; }; static const mapElement mod1Map[] = { { Qt::Key_Escape, 27 }, { Qt::Key_Tab, 9 }, { Qt::Key_Return, 13 }, { Qt::Key_Alt, 0 }, { Qt::Key_Control, 0 }, }; static const uchar *const letterMap[] = { (const uchar *const)"zvchwk", (const uchar *const)"fitaly", (const uchar *const)" ne ", (const uchar *const)"gdorsb", (const uchar *const)"qjumpx", }; static const uchar *const letterMapShift[] = { (const uchar *const)"ZVCHWK", (const uchar *const)"FITALY", (const uchar *const)" NE ", (const uchar *const)"GDORSB", (const uchar *const)"QJUMPX", }; static const uchar *const num1Map = (const uchar *const)"12345"; static const uchar *const specialMap[] = { (const uchar *const)"-+", (const uchar *const)"*!", (const uchar *const)",'", (const uchar *const)".%", (const uchar *const)"/$", }; static const uchar *const specialMapShift[] = { (const uchar *const)"_=", (const uchar *const)"#?", (const uchar *const)";\"", (const uchar *const)":|", (const uchar *const)"\\&", }; static const uchar *const specialMapParen[] = { (const uchar *const)"()", (const uchar *const)"[]", (const uchar *const)"{}", (const uchar *const)"<>", (const uchar *const)"@~", }; static const uchar *const num2Map = (const uchar *const)"67890"; static const mapElement mod2Map[] = { { Qt::Key_Backspace, 8 }, { Qt::Key_Delete, 0 }, { Qt::Key_Return, 13 }, { Qt::Key_Shift, 0 }, { myParenID, 0 }, }; static const int cursorMap[][2] = { { Qt::Key_Home, Qt::Key_PageUp }, { Qt::Key_End, Qt::Key_PageDown }, { Qt::Key_Up, Qt::Key_Up }, { Qt::Key_Left, Qt::Key_Right }, { Qt::Key_Down, Qt::Key_Down }, }; using namespace JumpX; Keyboard::Keyboard(QWidget* parent, const char* name, WFlags f) : QFrame(parent, name, f), shift(0), paren(0), ctrl(0), alt(0), pressedKeyUnicode(0), pressedKeyQcode(0), pressedMod(0), isnoncont(false), slideKeyUnicodeH(0), slideKeyQcodeH(0), slideKeyUnicodeV(0), slideKeyQcodeV(0), enableMouseTracking(false), slidePix(NULL), slidePixH(NULL), slidePixV(NULL), releasedPix(NULL), pressedPix(NULL) { //setPalette(QPalette(QColor(240,240,230))); // Beige! - releasedPlain = releasedShift = releasedParen = Resource::loadPixmap("jumpx/released"); - pressedPlain = pressedShift = pressedParen = Resource::loadPixmap("jumpx/pressed"); - pressedDigit = Resource::loadPixmap("jumpx/pressed"); + releasedPlain = releasedShift = releasedParen = Opie::Core::OResource::loadPixmap("jumpx/released"); + pressedPlain = pressedShift = pressedParen = Opie::Core::OResource::loadPixmap("jumpx/pressed"); + pressedDigit = Opie::Core::OResource::loadPixmap("jumpx/pressed"); QPixmap tmp; - tmp = Resource::loadPixmap("jumpx/releasedShift"); + tmp = Opie::Core::OResource::loadPixmap("jumpx/releasedShift"); bitBlt(&releasedShift, letterx1, 0, &tmp); - tmp = Resource::loadPixmap("jumpx/releasedParen"); + tmp = Opie::Core::OResource::loadPixmap("jumpx/releasedParen"); bitBlt(&releasedParen, specialx1, 0, &tmp); - tmp = Resource::loadPixmap("jumpx/pressedShift"); + tmp = Opie::Core::OResource::loadPixmap("jumpx/pressedShift"); bitBlt(&pressedShift, letterx1, 0, &tmp); - tmp = Resource::loadPixmap("jumpx/pressedParen"); + tmp = Opie::Core::OResource::loadPixmap("jumpx/pressedParen"); bitBlt(&pressedParen, specialx1, 0, &tmp); - tmp = Resource::loadPixmap("jumpx/pressedDigit"); + tmp = Opie::Core::OResource::loadPixmap("jumpx/pressedDigit"); bitBlt(&pressedDigit, specialx1, 0, &tmp); offscreen = QPixmap( releasedPlain ); releasedPix = &releasedPlain; pressedPix = &pressedPlain; slidePix = &pressedPlain; delayTimer = new QTimer(this); rateTimer = new QTimer(this); connect( delayTimer, SIGNAL( timeout() ), this, SLOT( delayTimerDone() ) ); connect( rateTimer, SIGNAL( timeout() ), this, SLOT( rateTimerDone() ) ); } void Keyboard::resizeEvent(QResizeEvent*) { //cout << "resizeEvent()" << endl; } void Keyboard::paintEvent(QPaintEvent*) { bitBlt(this, 0, 0, &offscreen); } void Keyboard::mousePressEvent(QMouseEvent *e) { pressedx = -1; pressedKeyUnicode = pressedKeyQcode = pressedMod = 0; int x = e->x(); int y = e->y(); int row = (y - 1) / letterh; if ( x <= mod1x2 ) // mod1 { pressedx = mod1x1; pressedy = row * letterh; pressedw = mod1w + 1; pressedh = letterh + 1; if ( row == 2 ) // return { pressed2x = mod2x1; pressed2y = 2 * letterh; pressed2w = mod2w + 1; pressed2h = letterh + 1; isnoncont = true; } else if ( row == 3 ) // alt alt = 1; else if ( row == 4 ) // ctrl ctrl = 1; pressedKeyUnicode = mod1Map[row].unicode; pressedKeyQcode = mod1Map[row].qcode; } else if ( x >= letterx1 && x <= letterx2 ) // letter { int column = (x - letterx1 - 1) / letterw; QChar temp; if ( shift ) temp = QChar( letterMapShift[row][column] ); else temp = QChar( letterMap[row][column] ); if ( temp == ' ' ) // space { if ( column < 3 ) { pressedx = letterx1; pressed2x = letterx1 + letterw * 4; } else { pressedx = letterx1 + letterw * 4; pressed2x = letterx1; } pressedy = pressed2y = row * letterh; pressedw = pressed2w = letterw * 2 + 1; pressedh = pressed2h = letterh + 1; isnoncont = true; } else { pressedx = letterx1 + column * letterw; pressedy = row * letterh; pressedw = letterw + 1; pressedh = letterh + 1; } pressedKeyUnicode = temp.unicode(); pressedKeyQcode = slideKeyQcodeH = slideKeyQcodeV = temp.upper().unicode(); if ( temp == ' ' ) { slideKeyUnicodeH = slideKeyUnicodeV = 8; slideKeyQcodeH = slideKeyQcodeV = Qt::Key_Backspace; } else if ( temp == temp.lower() ) { slideKeyUnicodeH = slideKeyUnicodeV = temp.upper().unicode(); slidePixH = slidePixV = &pressedShift; } else { slideKeyUnicodeH = slideKeyUnicodeV = temp.lower().unicode(); slidePixH = slidePixV = &pressedPlain; } enableMouseTracking = true; } else if ( x >= num1x1 && x <= num1x2 ) // num1 { pressedx = num1x1; pressedy = row * letterh; pressedw = num1w + 1; pressedh = letterh + 1; QChar temp = QChar( num1Map[row] ); pressedKeyUnicode = pressedKeyQcode = temp.unicode(); } else if ( x >= specialx1 && x <= specialx2 ) // special { int column = (x - specialx1 - 1) / specialw; pressedx = specialx1 + column * specialw; pressedy = row * letterh; pressedw = specialw + 1; pressedh = letterh + 1; QChar temp; if ( shift ) temp = QChar( specialMapShift[row][column] ); else if ( paren ) temp = QChar( specialMapParen[row][column] ); else diff --git a/inputmethods/jumpx/opie-jumpx.control b/inputmethods/jumpx/opie-jumpx.control index b8664cc..30771b1 100644 --- a/inputmethods/jumpx/opie-jumpx.control +++ b/inputmethods/jumpx/opie-jumpx.control @@ -1,11 +1,11 @@ Package: opie-jumpx Files: plugins/inputmethods/libqjumpx.so* pics/jumpx Priority: optional Section: opie/inputmethods Maintainer: Markus Gritsch <gritsch@iue.tuwien.ac.at> Architecture: arm -Depends: task-opie-minimal +Depends: task-opie-minimal, libopiecore2 License: GPL Description: JumpX input method Keyboard-like input method for the Opie environment. Version: $QPE_VERSION$EXTRAVERSION |