summaryrefslogtreecommitdiff
path: root/inputmethods/keyboard
authorharlekin <harlekin>2002-05-02 10:59:23 (UTC)
committer harlekin <harlekin>2002-05-02 10:59:23 (UTC)
commit3e4ce540942b6342a00c272dac171e729ae2b08b (patch) (unidiff)
tree9251a7389328a4d581b9e1c9848f8d6dc139a555 /inputmethods/keyboard
parent9b22572f07ec954e9dda33e99f7fc681e3c50827 (diff)
downloadopie-3e4ce540942b6342a00c272dac171e729ae2b08b.zip
opie-3e4ce540942b6342a00c272dac171e729ae2b08b.tar.gz
opie-3e4ce540942b6342a00c272dac171e729ae2b08b.tar.bz2
removed the hack that limited the bad influence of the sticky bug on ipaq, since it is not needed any more. Sticky bug is fixed in 2.4.18-rmk3 hh6
Diffstat (limited to 'inputmethods/keyboard') (more/less context) (ignore whitespace changes)
-rw-r--r--inputmethods/keyboard/keyboard.cpp72
1 files changed, 36 insertions, 36 deletions
diff --git a/inputmethods/keyboard/keyboard.cpp b/inputmethods/keyboard/keyboard.cpp
index a04c45a..0f0b188 100644
--- a/inputmethods/keyboard/keyboard.cpp
+++ b/inputmethods/keyboard/keyboard.cpp
@@ -56,12 +56,12 @@ Keyboard::Keyboard(QWidget* parent, const char* _name, WFlags f) :
56 // on ipaq. 56 // on ipaq.
57 struct utsname name; 57// struct utsname name;
58 if (uname(&name) != -1) 58// if (uname(&name) != -1)
59 { 59 // {
60 QString release=name.release; 60 //QString release=name.release;
61 qWarning("System release: %s\n", name.release); 61 //qWarning("System release: %s\n", name.release);
62 if(release.find("embedix",0,TRUE) !=-1) 62 //if(release.find("embedix",0,TRUE) !=-1)
63 { 63 // {
64 connect( repeatTimer, SIGNAL(timeout()), this, SLOT(repeat()) ); 64 connect( repeatTimer, SIGNAL(timeout()), this, SLOT(repeat()) );
65 } 65 // }
66 } 66 // }
67} 67}
@@ -121,3 +121,3 @@ void KeyboardConfig::generateText(const QString &s)
121 Format: length, code, length, code, ..., 0 121 Format: length, code, length, code, ..., 0
122 122
123 length is measured in half the width of a standard key. 123 length is measured in half the width of a standard key.
@@ -125,3 +125,3 @@ void KeyboardConfig::generateText(const QString &s)
125 starting with scancode code. 125 starting with scancode code.
126 126
127 Special keys are hardcoded, one at a time, with length of key 127 Special keys are hardcoded, one at a time, with length of key
@@ -129,6 +129,6 @@ void KeyboardConfig::generateText(const QString &s)
129 up in specialM[]. (The special keys are not keymappable.) 129 up in specialM[]. (The special keys are not keymappable.)
130 130
131 */ 131 */
132 132
133static const uchar * const keyboard_opti[5] = { 133static const uchar * const keyboard_opti[5] = {
134 (const uchar *const) "\001\223\003\240\002\20\002\41\002\26\002\62\002\56\002\45\002\54\003\200\001\223\002\226\002\235\002\234\002\236", 134 (const uchar *const) "\001\223\003\240\002\20\002\41\002\26\002\62\002\56\002\45\002\54\003\200\001\223\002\226\002\235\002\234\002\236",
@@ -154,3 +154,3 @@ static const uchar * const keyboard_standard[5] = {
154 (const uchar *const)"\004\202\002a\002s\002d\002f\002g\002h\002j\002k\002l\002;\002'\004\203", 154 (const uchar *const)"\004\202\002a\002s\002d\002f\002g\002h\002j\002k\002l\002;\002'\004\203",
155 //CAPS + asdf.. + RETURN 155 //CAPS + asdf.. + RETURN
156 156
@@ -159,5 +159,5 @@ static const uchar * const keyboard_standard[5] = {
159 159
160 (const uchar *const)"\003\205\003\206\022\207\003\206\003\205\002\223\002\212\002\213\002\214" 160 (const uchar *const)"\003\205\003\206\022\207\003\206\003\205\002\223\002\212\002\213\002\214"
161 //CTRL + ALT + SPACE //+ LEFT + DOWN + RIGHT 161 //CTRL + ALT + SPACE //+ LEFT + DOWN + RIGHT
162 162
163}; 163};
@@ -396,3 +396,3 @@ static const char * const escape_xpm[]={
396 396
397enum { BSCode = 0x80, TabCode, CapsCode, RetCode, 397enum { BSCode = 0x80, TabCode, CapsCode, RetCode,
398 ShiftCode, CtrlCode, AltCode, SpaceCode, BackSlash, 398 ShiftCode, CtrlCode, AltCode, SpaceCode, BackSlash,
@@ -437,3 +437,3 @@ static const SpecialMap specialM[] = {
437 { ResetDict, 0,"R", NULL }, 437 { ResetDict, 0,"R", NULL },
438 438
439 // number pad stuff 439 // number pad stuff
@@ -457,3 +457,3 @@ static int keycode( int i2, int j, const uchar **keyboard )
457 return 0; 457 return 0;
458 458
459 const uchar *row = keyboard[j]; 459 const uchar *row = keyboard[j];
@@ -466,3 +466,3 @@ static int keycode( int i2, int j, const uchar **keyboard )
466 if ( !*row ) return 0; 466 if ( !*row ) return 0;
467 467
468 int k; 468 int k;
@@ -473,3 +473,3 @@ static int keycode( int i2, int j, const uchar **keyboard )
473 } 473 }
474 474
475 return k; 475 return k;
@@ -481,3 +481,3 @@ static int keycode( int i2, int j, const uchar **keyboard )
481 or next key on current row if \a j < 0. 481 or next key on current row if \a j < 0.
482 482
483*/ 483*/
@@ -489,3 +489,3 @@ int Keyboard::getKey( int &w, int j ) {
489 static int half = 0; 489 static int half = 0;
490 490
491 if ( j >= 0 && j < 5 ) { 491 if ( j >= 0 && j < 5 ) {
@@ -499,3 +499,3 @@ int Keyboard::getKey( int &w, int j ) {
499 if ( !row || !*row ) { 499 if ( !row || !*row ) {
500 return 0; 500 return 0;
501 } else if ( row[1] >= 0x80 ) { 501 } else if ( row[1] >= 0x80 ) {
@@ -514,3 +514,3 @@ int Keyboard::getKey( int &w, int j ) {
514} 514}
515 515
516 516
@@ -542,3 +542,3 @@ void Keyboard::drawKeyboard( QPainter &p, int key )
542 int margin = threeD ? 1 : 0; 542 int margin = threeD ? 1 : 0;
543 543
544// p.fillRect( 0, , kw-1, keyHeight-2, keycolor_pressed ); 544// p.fillRect( 0, , kw-1, keyHeight-2, keycolor_pressed );
@@ -556,3 +556,3 @@ void Keyboard::drawKeyboard( QPainter &p, int key )
556 const char * const * xpm = NULL; 556 const char * const * xpm = NULL;
557 557
558 if ( k >= 0x80 ) { 558 if ( k >= 0x80 ) {
@@ -561,3 +561,3 @@ void Keyboard::drawKeyboard( QPainter &p, int key )
561 xpm = specialM[k - 0x80].xpm; 561 xpm = specialM[k - 0x80].xpm;
562 562
563 if ( k == ShiftCode ) { 563 if ( k == ShiftCode ) {
@@ -570,3 +570,3 @@ void Keyboard::drawKeyboard( QPainter &p, int key )
570 pressed = alt; 570 pressed = alt;
571 } 571 }
572 } else { 572 } else {
@@ -574,3 +574,3 @@ void Keyboard::drawKeyboard( QPainter &p, int key )
574/* 574/*
575 s = QChar( shift^lock ? QWSServer::keyMap()[k].shift_unicode : 575 s = QChar( shift^lock ? QWSServer::keyMap()[k].shift_unicode :
576 QWSServer::keyMap()[k].unicode); 576 QWSServer::keyMap()[k].unicode);
@@ -623,3 +623,3 @@ void Keyboard::drawKeyboard( QPainter &p, int key )
623 } 623 }
624 624
625 if ( threeD ) { 625 if ( threeD ) {
@@ -632,3 +632,3 @@ void Keyboard::drawKeyboard( QPainter &p, int key )
632 p.drawLine( x, y+keyHeight-1, x+kw-1, y+keyHeight-1 ); 632 p.drawLine( x, y+keyHeight-1, x+kw-1, y+keyHeight-1 );
633 633
634 } else { 634 } else {
@@ -691,3 +691,3 @@ void Keyboard::mousePressEvent(QMouseEvent *e)
691 u = QWSServer::keyMap()[k].shift_unicode; 691 u = QWSServer::keyMap()[k].shift_unicode;
692 else 692 else
693 u = QWSServer::keyMap()[k].unicode; 693 u = QWSServer::keyMap()[k].unicode;
@@ -777,3 +777,3 @@ void Keyboard::repeat()
777{ 777{
778 778
779 repeatTimer->start( 200 ); 779 repeatTimer->start( 200 );
@@ -800,3 +800,3 @@ QSize Keyboard::sizeHint() const
800 keyHeight += 1; 800 keyHeight += 1;
801 801
802 return QSize( 320, keyHeight * 5 + picks->sizeHint().height() + 1 ); 802 return QSize( 320, keyHeight * 5 + picks->sizeHint().height() + 1 );