summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/comm/keypebble/krfbdecoder.cpp79
1 files changed, 34 insertions, 45 deletions
diff --git a/noncore/comm/keypebble/krfbdecoder.cpp b/noncore/comm/keypebble/krfbdecoder.cpp
index 2c9ad71..db95154 100644
--- a/noncore/comm/keypebble/krfbdecoder.cpp
+++ b/noncore/comm/keypebble/krfbdecoder.cpp
@@ -209,7 +209,7 @@ void KRFBDecoder::gotDesktopName()
209 209
210 qWarning( "Got desktop name" ); 210 qWarning( "Got desktop name" );
211 211
212 disconnect( con, SIGNAL( gotEnoughData() ), 212 disconnect( con, SIGNAL( gotEnoughData() ),
213 this, SLOT( gotDesktopName() ) ); 213 this, SLOT( gotDesktopName() ) );
214 214
215 char *buf = new char[ info->nameLength + 1 ]; 215 char *buf = new char[ info->nameLength + 1 ];
@@ -263,7 +263,7 @@ void KRFBDecoder::decidePixelFormat()
263 "eight bit %d, chosenDepth=%d", 263 "eight bit %d, chosenDepth=%d",
264 screenDepth, 264 screenDepth,
265 info->depth, 265 info->depth,
266 bestDepth, 266 bestDepth,
267 con->options()->colors256, chosenDepth ); 267 con->options()->colors256, chosenDepth );
268 268
269 format->depth = chosenDepth; 269 format->depth = chosenDepth;
@@ -373,7 +373,7 @@ void KRFBDecoder::gotUpdateHeader()
373 373
374 // qWarning( "Got update header" ); 374 // qWarning( "Got update header" );
375 375
376 disconnect( con, SIGNAL( gotEnoughData() ), 376 disconnect( con, SIGNAL( gotEnoughData() ),
377 this, SLOT( gotUpdateHeader() ) ); 377 this, SLOT( gotUpdateHeader() ) );
378 378
379 CARD8 msgType; 379 CARD8 msgType;
@@ -397,7 +397,7 @@ void KRFBDecoder::gotUpdateHeader()
397 currentState = Error; 397 currentState = Error;
398 emit error( protocolError ); 398 emit error( protocolError );
399 } 399 }
400 return; 400 return;
401 } 401 }
402 402
403 CARD8 padding; 403 CARD8 padding;
@@ -420,7 +420,7 @@ void KRFBDecoder::gotRectHeader()
420 420
421 // qWarning( "Got rect header" ); 421 // qWarning( "Got rect header" );
422 422
423 disconnect( con, SIGNAL( gotEnoughData() ), 423 disconnect( con, SIGNAL( gotEnoughData() ),
424 this, SLOT( gotRectHeader() ) ); 424 this, SLOT( gotRectHeader() ) );
425 425
426 con->read( &x, 2 ); 426 con->read( &x, 2 );
@@ -436,7 +436,7 @@ void KRFBDecoder::gotRectHeader()
436 con->read( &encoding, 4 ); 436 con->read( &encoding, 4 );
437 437
438 // CARD32 encodingLocal = Swap32IfLE( encoding ); 438 // CARD32 encodingLocal = Swap32IfLE( encoding );
439 // qWarning( "Rect: x=%d, y= %d, w=%d, h=%d, encoding=%ld", 439 // qWarning( "Rect: x=%d, y= %d, w=%d, h=%d, encoding=%ld",
440 // x, y, w, h, encodingLocal ); 440 // x, y, w, h, encodingLocal );
441 441
442 // 442 //
@@ -520,7 +520,7 @@ void KRFBDecoder::gotRawRectChunk()
520{ 520{
521 assert( currentState == AwaitingRawRectChunk ); 521 assert( currentState == AwaitingRawRectChunk );
522 522
523 disconnect( con, SIGNAL( gotEnoughData() ), 523 disconnect( con, SIGNAL( gotEnoughData() ),
524 this, SLOT( gotRawRectChunk() ) ); 524 this, SLOT( gotRawRectChunk() ) );
525 525
526 // qWarning( "Got raw rect chunk" ); 526 // qWarning( "Got raw rect chunk" );
@@ -528,7 +528,7 @@ void KRFBDecoder::gotRawRectChunk()
528 // 528 //
529 // Read the rect data and copy it to the buffer. 529 // Read the rect data and copy it to the buffer.
530 // 530 //
531 531
532 // TODO: Replace this! 532 // TODO: Replace this!
533 int count = lines * w * format->bpp / 8; 533 int count = lines * w * format->bpp / 8;
534 char *hack = new char[ count ]; 534 char *hack = new char[ count ];
@@ -720,7 +720,7 @@ void KRFBDecoder::gotServerCutText()
720 cutbuf[ serverCutTextLen ] = '\0'; 720 cutbuf[ serverCutTextLen ] = '\0';
721 721
722 /* For some reason QApplication::clipboard()->setText() segfaults when called 722 /* For some reason QApplication::clipboard()->setText() segfaults when called
723 * from within keypebble's mass of signals and slots 723 * from within keypebble's mass of signals and slots
724 qWarning( "Server cut: %s", cutbuf ); 724 qWarning( "Server cut: %s", cutbuf );
725 725
726 QString cutText( cutbuf ); // DANGER!! 726 QString cutText( cutbuf ); // DANGER!!
@@ -798,44 +798,33 @@ void KRFBDecoder::sendKeyReleaseEvent( QKeyEvent *event )
798} 798}
799 799
800 800
801
802
803//
804// The RFB protocol spec says 'For most ordinary keys, the 'keysym'
805// is the same as the corresponding ASCII value.', but doesn't
806// elaborate what the most ordinary keys are. The spec also lists
807// a set (possibly subset, it's unspecified) of mappings for
808// "other common keys" (backspace, tab, return, escape, etc).
809//
801int KRFBDecoder::toKeySym( QKeyEvent *k ) 810int KRFBDecoder::toKeySym( QKeyEvent *k )
802{ 811{
803 int ke = 0;
804
805 ke = k->ascii();
806 // Markus: Crappy hack. I dont know why lower case letters are
807 // not defined in qkeydefs.h. The key() for e.g. 'l' == 'L'.
808 // This sucks. :-(
809
810 if ( (ke == 'a') || (ke == 'b') || (ke == 'c') || (ke == 'd')
811 || (ke == 'e') || (ke == 'f') || (ke == 'g') || (ke == 'h')
812 || (ke == 'i') || (ke == 'j') || (ke == 'k') || (ke == 'l')
813 || (ke == 'm') || (ke == 'n') || (ke == 'o') || (ke == 'p')
814 || (ke == 'q') || (ke == 'r') || (ke == 's') || (ke == 't')
815 || (ke == 'u') || (ke == 'v') ||( ke == 'w') || (ke == 'x')
816 || (ke == 'y') || (ke == 'z') ) {
817 ke = k->key();
818 ke = ke + 0x20;
819 return ke;
820 }
821 812
822 // qkeydefs = xkeydefs! :-) 813 //
823 if ( ( k->key() >= 0x0a0 ) && k->key() <= 0x0ff ) 814 // Try and map these "other common keys" first.
824 return k->key(); 815 //
825 816 if ((k->key() >= Qt::Key_Escape) && (k->key() <= Qt::Key_F12)) {
826 if ( ( k->key() >= 0x20 ) && ( k->key() <= 0x7e ) ) 817 for(int i = 0; keyMap[i].keycode != 0; i++) {
827 return k->key(); 818 if (k->key() == keyMap[i].keycode) {
828 819 return keyMap[i].keysym;
829 // qkeydefs != xkeydefs! :-( 820 }
830 // This is gonna suck :-( 821 }
831 822 }
832 int i = 0;
833 while ( keyMap[i].keycode ) {
834 if ( k->key() == keyMap[i].keycode )
835 return keyMap[i].keysym;
836 i++;
837 }
838 823
839 return 0; 824 //
825 // If these keys aren't matched, return the ascii code and let the
826 // server figure it out. We don't return k->key(), as the data in
827 // key differs between input methods, and we don't want special cases.
828 //
829 return k->ascii();
840} 830}
841