summaryrefslogtreecommitdiff
authortreke <treke>2002-12-22 00:58:46 (UTC)
committer treke <treke>2002-12-22 00:58:46 (UTC)
commit17d7f11b16b650f6ee2b5c440506167ea41fbfe5 (patch) (unidiff)
treecd5924c9e374a82c1cac6433dce098f3f45f4286
parent6853d02989fc01e5a65048aca9749c20e0f5d095 (diff)
downloadopie-17d7f11b16b650f6ee2b5c440506167ea41fbfe5.zip
opie-17d7f11b16b650f6ee2b5c440506167ea41fbfe5.tar.gz
opie-17d7f11b16b650f6ee2b5c440506167ea41fbfe5.tar.bz2
1) Fixed a bug where double clicking a blank spot on the bookmark list
caused a segfault. 2) Removed support for copying from the server. Trying to setText in the clipboard would segfault everytime from within the KRFBDecoder. Doesnt seem to like being called from within a slot.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/comm/keypebble/krfbcanvas.cpp4
-rw-r--r--noncore/comm/keypebble/krfbdecoder.cpp5
-rw-r--r--noncore/comm/keypebble/kvnc.cpp3
3 files changed, 6 insertions, 6 deletions
diff --git a/noncore/comm/keypebble/krfbcanvas.cpp b/noncore/comm/keypebble/krfbcanvas.cpp
index 049bbd4..bc71c90 100644
--- a/noncore/comm/keypebble/krfbcanvas.cpp
+++ b/noncore/comm/keypebble/krfbcanvas.cpp
@@ -18,196 +18,192 @@
18KRFBCanvas::KRFBCanvas( QWidget *parent, const char *name ) 18KRFBCanvas::KRFBCanvas( QWidget *parent, const char *name )
19 : QScrollView( parent, name ) 19 : QScrollView( parent, name )
20{ 20{
21 connection_ = new KRFBConnection(); 21 connection_ = new KRFBConnection();
22 connect( connection_, SIGNAL( loggedIn() ), 22 connect( connection_, SIGNAL( loggedIn() ),
23 this, SLOT( loggedIn() ) ); 23 this, SLOT( loggedIn() ) );
24 24
25 loggedIn_ = false; 25 loggedIn_ = false;
26 26
27 //QPEApplication::setStylusOperation(viewport(), QPEApplication::RightOnHold); 27 //QPEApplication::setStylusOperation(viewport(), QPEApplication::RightOnHold);
28 28
29 viewport()->setFocusPolicy( QWidget::StrongFocus ); 29 viewport()->setFocusPolicy( QWidget::StrongFocus );
30 viewport()->setFocus(); 30 viewport()->setFocus();
31 31
32 nextRightClick=0; 32 nextRightClick=0;
33 nextDoubleClick=0; 33 nextDoubleClick=0;
34} 34}
35 35
36KRFBCanvas::~KRFBCanvas() 36KRFBCanvas::~KRFBCanvas()
37{ 37{
38} 38}
39 39
40 40
41void KRFBCanvas::openConnection(KRFBServer server) 41void KRFBCanvas::openConnection(KRFBServer server)
42{ 42{
43 43
44 44
45 QCString host = server.hostname.latin1(); 45 QCString host = server.hostname.latin1();
46 password=server.password; 46 password=server.password;
47 connection_->connectTo( server); 47 connection_->connectTo( server);
48} 48}
49 49
50 50
51void KRFBCanvas::openURL( const QUrl &url ) 51void KRFBCanvas::openURL( const QUrl &url )
52{ 52{
53 if ( loggedIn_ ) { 53 if ( loggedIn_ ) {
54 qWarning( "openURL invoked when logged in\n" ); 54 qWarning( "openURL invoked when logged in\n" );
55 return; 55 return;
56 } 56 }
57 57
58 QCString host = url.host().latin1(); 58 QCString host = url.host().latin1();
59 int display = url.port(); 59 int display = url.port();
60 60
61// connection_->connectTo( host, display ); 61// connection_->connectTo( host, display );
62} 62}
63 63
64void KRFBCanvas::closeConnection() 64void KRFBCanvas::closeConnection()
65{ 65{
66 loggedIn_ = false; 66 loggedIn_ = false;
67 connection_->disconnect(); 67 connection_->disconnect();
68 68
69 viewport()->setMouseTracking( false ); 69 viewport()->setMouseTracking( false );
70 viewport()->setBackgroundMode( PaletteDark ); 70 viewport()->setBackgroundMode( PaletteDark );
71 setBackgroundMode( PaletteDark ); 71 setBackgroundMode( PaletteDark );
72 update(); 72 update();
73} 73}
74 74
75 75
76void KRFBCanvas::bell() 76void KRFBCanvas::bell()
77{ 77{
78 if ( connection_->options()->deIconify ) { 78 if ( connection_->options()->deIconify ) {
79 topLevelWidget()->raise(); 79 topLevelWidget()->raise();
80 topLevelWidget()->show(); 80 topLevelWidget()->show();
81 } 81 }
82} 82}
83 83
84void KRFBCanvas::loggedIn() 84void KRFBCanvas::loggedIn()
85{ 85{
86 qWarning( "Ok, we're logged in" ); 86 qWarning( "Ok, we're logged in" );
87 87
88 // 88 //
89 // Get ready for action 89 // Get ready for action
90 // 90 //
91 loggedIn_ = true; 91 loggedIn_ = true;
92 viewport()->setMouseTracking( true ); 92 viewport()->setMouseTracking( true );
93 viewport()->setBackgroundMode( NoBackground ); 93 viewport()->setBackgroundMode( NoBackground );
94 setBackgroundMode( NoBackground ); 94 setBackgroundMode( NoBackground );
95 95
96 // Start using the buffer 96 // Start using the buffer
97 connect( connection_->buffer(), SIGNAL( sizeChanged( int, int ) ), 97 connect( connection_->buffer(), SIGNAL( sizeChanged( int, int ) ),
98 this, SLOT( resizeContents(int,int) ) ); 98 this, SLOT( resizeContents(int,int) ) );
99 connect( connection_->buffer(), SIGNAL( updated( int, int, int, int ) ), 99 connect( connection_->buffer(), SIGNAL( updated( int, int, int, int ) ),
100 this, SLOT( viewportUpdate(int,int,int,int) ) ); 100 this, SLOT( viewportUpdate(int,int,int,int) ) );
101 connect( connection_->buffer(), SIGNAL( bell() ), 101 connect( connection_->buffer(), SIGNAL( bell() ),
102 this, SLOT( bell() ) ); 102 this, SLOT( bell() ) );
103 connect( qApp->clipboard(), SIGNAL( dataChanged() ), 103 connect( qApp->clipboard(), SIGNAL( dataChanged() ),
104 this, SLOT( clipboardChanged() ) ); 104 this, SLOT( clipboardChanged() ) );
105} 105}
106 106
107void KRFBCanvas::viewportPaintEvent( QPaintEvent *e ) 107void KRFBCanvas::viewportPaintEvent( QPaintEvent *e )
108{ 108{
109 QRect r = e->rect(); 109 QRect r = e->rect();
110 110
111 if ( loggedIn_ ) { 111 if ( loggedIn_ ) {
112 QPixmap p; 112 QPixmap p;
113 113
114 bitBlt( viewport(), r.x(), r.y(), 114 bitBlt( viewport(), r.x(), r.y(),
115 connection_->buffer()->pixmap(), 115 connection_->buffer()->pixmap(),
116 r.x() + contentsX(), r.y() + contentsY(), 116 r.x() + contentsX(), r.y() + contentsY(),
117 r.width(), r.height() ); 117 r.width(), r.height() );
118 } 118 }
119 else { 119 else {
120 QScrollView::viewportPaintEvent( e ); 120 QScrollView::viewportPaintEvent( e );
121 } 121 }
122} 122}
123 123
124void KRFBCanvas::viewportUpdate( int x, int y, int w, int h ) 124void KRFBCanvas::viewportUpdate( int x, int y, int w, int h )
125{ 125{
126 updateContents( x, y, w, h ); 126 updateContents( x, y, w, h );
127} 127}
128 128
129void KRFBCanvas::contentsMousePressEvent( QMouseEvent *e ) 129void KRFBCanvas::contentsMousePressEvent( QMouseEvent *e )
130{ 130{
131 131
132 if (nextDoubleClick) { 132 if (nextDoubleClick) {
133 connection_->buffer()->mouseEvent( &QMouseEvent(QEvent::MouseButtonPress, e->pos(),LeftButton,LeftButton)); 133 connection_->buffer()->mouseEvent( &QMouseEvent(QEvent::MouseButtonPress, e->pos(),LeftButton,LeftButton));
134 connection_->buffer()->mouseEvent( &QMouseEvent(QEvent::MouseButtonRelease, e->pos(),LeftButton,0)); 134 connection_->buffer()->mouseEvent( &QMouseEvent(QEvent::MouseButtonRelease, e->pos(),LeftButton,0));
135 connection_->buffer()->mouseEvent( &QMouseEvent(QEvent::MouseButtonRelease, e->pos(),LeftButton,0)); 135 connection_->buffer()->mouseEvent( &QMouseEvent(QEvent::MouseButtonRelease, e->pos(),LeftButton,0));
136 connection_->buffer()->mouseEvent( &QMouseEvent(QEvent::MouseButtonPress, e->pos(),NoButton,NoButton)); 136 connection_->buffer()->mouseEvent( &QMouseEvent(QEvent::MouseButtonPress, e->pos(),NoButton,NoButton));
137 connection_->buffer()->mouseEvent( &QMouseEvent(QEvent::MouseButtonRelease, e->pos(),NoButton,0)); 137 connection_->buffer()->mouseEvent( &QMouseEvent(QEvent::MouseButtonRelease, e->pos(),NoButton,0));
138 } if (nextRightClick) { 138 } if (nextRightClick) {
139 connection_->buffer()->mouseEvent( &QMouseEvent(QEvent::MouseButtonPress, e->pos(),RightButton,RightButton)); 139 connection_->buffer()->mouseEvent( &QMouseEvent(QEvent::MouseButtonPress, e->pos(),RightButton,RightButton));
140 connection_->buffer()->mouseEvent( &QMouseEvent(QEvent::MouseButtonRelease, e->pos(),RightButton,0)); 140 connection_->buffer()->mouseEvent( &QMouseEvent(QEvent::MouseButtonRelease, e->pos(),RightButton,0));
141 connection_->buffer()->mouseEvent( &QMouseEvent(QEvent::MouseButtonPress, e->pos(),NoButton,NoButton)); 141 connection_->buffer()->mouseEvent( &QMouseEvent(QEvent::MouseButtonPress, e->pos(),NoButton,NoButton));
142 connection_->buffer()->mouseEvent( &QMouseEvent(QEvent::MouseButtonRelease, e->pos(),NoButton,0)); 142 connection_->buffer()->mouseEvent( &QMouseEvent(QEvent::MouseButtonRelease, e->pos(),NoButton,0));
143 } else if ( loggedIn_ ) 143 } else if ( loggedIn_ )
144 connection_->buffer()->mouseEvent( e ); 144 connection_->buffer()->mouseEvent( e );
145 145
146 qDebug("Press");
147 qDebug(QString::number(e->type()==QEvent::MouseButtonPress));
148} 146}
149 147
150void KRFBCanvas::contentsMouseReleaseEvent( QMouseEvent *e ) 148void KRFBCanvas::contentsMouseReleaseEvent( QMouseEvent *e )
151{ 149{
152 if ( loggedIn_ && !nextRightClick && !nextDoubleClick) { 150 if ( loggedIn_ && !nextRightClick && !nextDoubleClick) {
153 connection_->buffer()->mouseEvent( e ); 151 connection_->buffer()->mouseEvent( e );
154 } 152 }
155 153
156 nextRightClick=0; 154 nextRightClick=0;
157 nextDoubleClick=0; 155 nextDoubleClick=0;
158 qDebug("Release");
159 qDebug(QString::number(e->button()));
160} 156}
161 157
162void KRFBCanvas::contentsMouseMoveEvent( QMouseEvent *e ) 158void KRFBCanvas::contentsMouseMoveEvent( QMouseEvent *e )
163{ 159{
164 if ( loggedIn_ ) 160 if ( loggedIn_ )
165 connection_->buffer()->mouseEvent( e ); 161 connection_->buffer()->mouseEvent( e );
166} 162}
167 163
168void KRFBCanvas::keyPressEvent( QKeyEvent *e ) 164void KRFBCanvas::keyPressEvent( QKeyEvent *e )
169{ 165{
170 if ( loggedIn_ ) 166 if ( loggedIn_ )
171 connection_->buffer()->keyPressEvent( e ); 167 connection_->buffer()->keyPressEvent( e );
172} 168}
173 169
174void KRFBCanvas::keyReleaseEvent( QKeyEvent *e ) 170void KRFBCanvas::keyReleaseEvent( QKeyEvent *e )
175{ 171{
176 if ( loggedIn_ ) 172 if ( loggedIn_ )
177 connection_->buffer()->keyReleaseEvent( e ); 173 connection_->buffer()->keyReleaseEvent( e );
178} 174}
179 175
180void KRFBCanvas::refresh() 176void KRFBCanvas::refresh()
181{ 177{
182 if ( loggedIn_ ) 178 if ( loggedIn_ )
183 connection_->refresh(); 179 connection_->refresh();
184} 180}
185 181
186void KRFBCanvas::clipboardChanged() 182void KRFBCanvas::clipboardChanged()
187{ 183{
188 if ( loggedIn_ ) { 184 if ( loggedIn_ ) {
189 connection_->sendCutText( qApp->clipboard()->text() ); 185 connection_->sendCutText( qApp->clipboard()->text() );
190 } 186 }
191} 187}
192void KRFBCanvas::sendCtlAltDel( void) 188void KRFBCanvas::sendCtlAltDel( void)
193{ 189{
194 190
195 if ( loggedIn_ ) { 191 if ( loggedIn_ ) {
196 connection_->buffer()->keyPressEvent( &QKeyEvent(QEvent::KeyPress,Qt::Key_Control, 0,0)); 192 connection_->buffer()->keyPressEvent( &QKeyEvent(QEvent::KeyPress,Qt::Key_Control, 0,0));
197 connection_->buffer()->keyPressEvent( &QKeyEvent(QEvent::KeyPress,Qt::Key_Alt, 0,0)); 193 connection_->buffer()->keyPressEvent( &QKeyEvent(QEvent::KeyPress,Qt::Key_Alt, 0,0));
198 connection_->buffer()->keyPressEvent( &QKeyEvent(QEvent::KeyPress,Qt::Key_Delete, 0,0)); 194 connection_->buffer()->keyPressEvent( &QKeyEvent(QEvent::KeyPress,Qt::Key_Delete, 0,0));
199 connection_->buffer()->keyPressEvent( &QKeyEvent(QEvent::KeyRelease,Qt::Key_Control, 0,0)); 195 connection_->buffer()->keyPressEvent( &QKeyEvent(QEvent::KeyRelease,Qt::Key_Control, 0,0));
200 connection_->buffer()->keyPressEvent( &QKeyEvent(QEvent::KeyRelease,Qt::Key_Alt, 0,0)); 196 connection_->buffer()->keyPressEvent( &QKeyEvent(QEvent::KeyRelease,Qt::Key_Alt, 0,0));
201 connection_->buffer()->keyPressEvent( &QKeyEvent(QEvent::KeyRelease,Qt::Key_Delete, 0,0)); 197 connection_->buffer()->keyPressEvent( &QKeyEvent(QEvent::KeyRelease,Qt::Key_Delete, 0,0));
202 } 198 }
203} 199}
204 200
205void KRFBCanvas::markDoubleClick( void) 201void KRFBCanvas::markDoubleClick( void)
206{ 202{
207 nextRightClick=1; 203 nextRightClick=1;
208} 204}
209 205
210void KRFBCanvas::markRightClick( void) 206void KRFBCanvas::markRightClick( void)
211{ 207{
212 nextRightClick=1; 208 nextRightClick=1;
213} 209}
diff --git a/noncore/comm/keypebble/krfbdecoder.cpp b/noncore/comm/keypebble/krfbdecoder.cpp
index 94e3b79..33418ae 100644
--- a/noncore/comm/keypebble/krfbdecoder.cpp
+++ b/noncore/comm/keypebble/krfbdecoder.cpp
@@ -582,260 +582,263 @@ void KRFBDecoder::gotCopyRectPos()
582 582
583 CARD16 srcX; 583 CARD16 srcX;
584 CARD16 srcY; 584 CARD16 srcY;
585 585
586 con->read( &srcX, 2 ); 586 con->read( &srcX, 2 );
587 con->read( &srcY, 2 ); 587 con->read( &srcY, 2 );
588 588
589 srcX = Swap16IfLE( srcX ); 589 srcX = Swap16IfLE( srcX );
590 srcY = Swap16IfLE( srcY ); 590 srcY = Swap16IfLE( srcY );
591 591
592 buf->copyRect( srcX, srcY, x, y, w, h ); 592 buf->copyRect( srcX, srcY, x, y, w, h );
593 593
594 noRects--; 594 noRects--;
595 595
596 // qWarning( "There are %d rects left", noRects ); 596 // qWarning( "There are %d rects left", noRects );
597 597
598 if ( noRects ) { 598 if ( noRects ) {
599 currentState = AwaitingRectHeader; 599 currentState = AwaitingRectHeader;
600 connect( con, SIGNAL( gotEnoughData() ), SLOT( gotRectHeader() ) ); 600 connect( con, SIGNAL( gotEnoughData() ), SLOT( gotRectHeader() ) );
601 con->waitForData( RectHeaderLength ); 601 con->waitForData( RectHeaderLength );
602 } 602 }
603 else 603 else
604 currentState = Idle; 604 currentState = Idle;
605} 605}
606 606
607void KRFBDecoder::handleRRERect() 607void KRFBDecoder::handleRRERect()
608{ 608{
609 qWarning( "RRE not implemented" ); 609 qWarning( "RRE not implemented" );
610} 610}
611 611
612void KRFBDecoder::handleCoRRERect() 612void KRFBDecoder::handleCoRRERect()
613{ 613{
614 qWarning( "CoRRE not implemented" ); 614 qWarning( "CoRRE not implemented" );
615} 615}
616 616
617void KRFBDecoder::handleHexTileRect() 617void KRFBDecoder::handleHexTileRect()
618{ 618{
619 qWarning( "HexTile not implemented" ); 619 qWarning( "HexTile not implemented" );
620} 620}
621 621
622void KRFBDecoder::sendMouseEvent( QMouseEvent *e ) 622void KRFBDecoder::sendMouseEvent( QMouseEvent *e )
623{ 623{
624 // Deal with the buttons 624 // Deal with the buttons
625 if ( e->type() != QEvent::MouseMove ) { 625 if ( e->type() != QEvent::MouseMove ) {
626 buttonMask = 0; 626 buttonMask = 0;
627 if ( e->type() == QEvent::MouseButtonPress ) { 627 if ( e->type() == QEvent::MouseButtonPress ) {
628 if ( e->button() & LeftButton ) 628 if ( e->button() & LeftButton )
629 buttonMask |= 0x01; 629 buttonMask |= 0x01;
630 if ( e->button() & MidButton ) 630 if ( e->button() & MidButton )
631 buttonMask |= 0x04; 631 buttonMask |= 0x04;
632 if ( e->button() & RightButton ) 632 if ( e->button() & RightButton )
633 buttonMask |= 0x02; 633 buttonMask |= 0x02;
634 } 634 }
635 else if ( e->type() == QEvent::MouseButtonRelease ) { 635 else if ( e->type() == QEvent::MouseButtonRelease ) {
636 if ( e->button() & LeftButton ) 636 if ( e->button() & LeftButton )
637 buttonMask &= 0x06; 637 buttonMask &= 0x06;
638 if ( e->button() & MidButton ) 638 if ( e->button() & MidButton )
639 buttonMask |= 0x03; 639 buttonMask |= 0x03;
640 if ( e->button() & RightButton ) 640 if ( e->button() & RightButton )
641 buttonMask |= 0x05; 641 buttonMask |= 0x05;
642 } 642 }
643 } 643 }
644 644
645 // HACK: Scaling 645 // HACK: Scaling
646 CARD16 x = Swap16IfLE( e->x() * con->options()->scaleFactor ); 646 CARD16 x = Swap16IfLE( e->x() * con->options()->scaleFactor );
647 CARD16 y = Swap16IfLE( e->y() *con->options()->scaleFactor ); 647 CARD16 y = Swap16IfLE( e->y() *con->options()->scaleFactor );
648 648
649 con->write( &PointerEventId, 1 ); 649 con->write( &PointerEventId, 1 );
650 con->write( &buttonMask, 1 ); 650 con->write( &buttonMask, 1 );
651 con->write( &x, 2 ); 651 con->write( &x, 2 );
652 con->write( &y, 2 ); 652 con->write( &y, 2 );
653} 653}
654 654
655 655
656void KRFBDecoder::sendCutEvent( const QString &unicode ) 656void KRFBDecoder::sendCutEvent( const QString &unicode )
657{ 657{
658 // 658 //
659 // Warning: There is a bug in the RFB protocol because there is no way to find 659 // Warning: There is a bug in the RFB protocol because there is no way to find
660 // out the codepage in use on the remote machine. This could be fixed by requiring 660 // out the codepage in use on the remote machine. This could be fixed by requiring
661 // the remote server to use utf8 etc. but for now we have to assume they're the 661 // the remote server to use utf8 etc. but for now we have to assume they're the
662 // same. I've reported this problem to the ORL guys, but they apparantly have no 662 // same. I've reported this problem to the ORL guys, but they apparantly have no
663 // immediate plans to fix the issue. :-( (rich) 663 // immediate plans to fix the issue. :-( (rich)
664 // 664 //
665 665
666 CARD8 padding[3]; 666 CARD8 padding[3];
667 QCString text = unicode.local8Bit(); 667 QCString text = unicode.local8Bit();
668 CARD32 length = text.length(); 668 CARD32 length = text.length();
669 length = Swap32IfLE( length ); 669 length = Swap32IfLE( length );
670 670
671 con->write( &ClientCutTextId, 1 ); 671 con->write( &ClientCutTextId, 1 );
672 con->write( &padding, 3 ); 672 con->write( &padding, 3 );
673 con->write( &length, 4 ); 673 con->write( &length, 4 );
674 con->write( text.data(), length ); 674 con->write( text.data(), length );
675} 675}
676 676
677void KRFBDecoder::gotServerCut() 677void KRFBDecoder::gotServerCut()
678{ 678{
679 qWarning( "Got server cut" ); 679 qWarning( "Got server cut" );
680 680
681 currentState = AwaitingServerCutLength; 681 currentState = AwaitingServerCutLength;
682 connect( con, SIGNAL( gotEnoughData() ), SLOT( gotServerCutLength() ) ); 682 connect( con, SIGNAL( gotEnoughData() ), SLOT( gotServerCutLength() ) );
683 con->waitForData( ServerCutLenLength ); 683 con->waitForData( ServerCutLenLength );
684} 684}
685 685
686void KRFBDecoder::gotServerCutLength() 686void KRFBDecoder::gotServerCutLength()
687{ 687{
688 assert( currentState = AwaitingServerCutLength ); 688 assert( currentState = AwaitingServerCutLength );
689 disconnect( con, SIGNAL( gotEnoughData() ), 689 disconnect( con, SIGNAL( gotEnoughData() ),
690 this, SLOT( gotServerCutLength() ) ); 690 this, SLOT( gotServerCutLength() ) );
691 691
692 CARD8 padding[3]; 692 CARD8 padding[3];
693 con->read( padding, 3 ); 693 con->read( padding, 3 );
694 694
695 con->read( &serverCutTextLen, 4 ); 695 con->read( &serverCutTextLen, 4 );
696 serverCutTextLen = Swap32IfLE( serverCutTextLen ); 696 serverCutTextLen = Swap32IfLE( serverCutTextLen );
697 697
698 currentState = AwaitingServerCutText; 698 currentState = AwaitingServerCutText;
699 connect( con, SIGNAL( gotEnoughData() ), SLOT( gotServerCutText() ) ); 699 connect( con, SIGNAL( gotEnoughData() ), SLOT( gotServerCutText() ) );
700 con->waitForData( serverCutTextLen ); 700 con->waitForData( serverCutTextLen );
701} 701}
702 702
703void KRFBDecoder::gotServerCutText() 703void KRFBDecoder::gotServerCutText()
704{ 704{
705 assert( currentState = AwaitingServerCutText ); 705 assert( currentState = AwaitingServerCutText );
706 706
707 disconnect( con, SIGNAL( gotEnoughData() ), 707 disconnect( con, SIGNAL( gotEnoughData() ),
708 this, SLOT( gotServerCutText() ) ); 708 this, SLOT( gotServerCutText() ) );
709 709
710
710 // 711 //
711 // Warning: There is a bug in the RFB protocol because there is no way to find 712 // Warning: There is a bug in the RFB protocol because there is no way to find
712 // out the codepage in use on the remote machine. This could be fixed by requiring 713 // out the codepage in use on the remote machine. This could be fixed by requiring
713 // the remote server to use utf8 etc. but for now we have to assume they're the 714 // the remote server to use utf8 etc. but for now we have to assume they're the
714 // same. I've reported this problem to the ORL guys, but they apparantly have no 715 // same. I've reported this problem to the ORL guys, but they apparantly have no
715 // immediate plans to fix the issue. :-( (rich) 716 // immediate plans to fix the issue. :-( (rich)
716 // 717 //
717 718
718 char *cutbuf = new char[ serverCutTextLen + 1 ]; 719 char *cutbuf = new char[ serverCutTextLen + 1 ];
719 CHECK_PTR( cutbuf ); 720 CHECK_PTR( cutbuf );
720 721
721 con->read( cutbuf, serverCutTextLen ); 722 con->read( cutbuf, serverCutTextLen );
722 cutbuf[ serverCutTextLen ] = '\0'; 723 cutbuf[ serverCutTextLen ] = '\0';
723 724
725 /* For some reason QApplication::clipboard()->setText() segfaults when called
726 * from within keypebble's mass of signals and slots
724 qWarning( "Server cut: %s", cutbuf ); 727 qWarning( "Server cut: %s", cutbuf );
725 728
726 QString cutText( cutbuf ); // DANGER!! 729 QString cutText( cutbuf ); // DANGER!!
727 qApp->clipboard()->setText( cutText ); 730 qApp->clipboard()->setText( cutText );
731 */
728 732
729 delete cutbuf; 733 delete cutbuf;
730
731 // Now wait for the update (again) 734 // Now wait for the update (again)
732 if ( oldState == AwaitingUpdate ) { 735 if ( oldState == AwaitingUpdate ) {
733 currentState = AwaitingUpdate; 736 currentState = AwaitingUpdate;
734 connect( con, SIGNAL( gotEnoughData() ), SLOT( gotUpdateHeader() ) ); 737 connect( con, SIGNAL( gotEnoughData() ), SLOT( gotUpdateHeader() ) );
735 con->waitForData( UpdateHeaderLength ); 738 con->waitForData( UpdateHeaderLength );
736 } 739 }
737 else if ( oldState == Idle ) { 740 else if ( oldState == Idle ) {
738 currentState = Idle; 741 currentState = Idle;
739 } 742 }
740 else { 743 else {
741 qWarning( "Async handled in weird state" ); 744 qWarning( "Async handled in weird state" );
742 currentState = oldState; 745 currentState = oldState;
743 }; 746 };
744} 747}
745 748
746void KRFBDecoder::gotBell() 749void KRFBDecoder::gotBell()
747{ 750{
748 qWarning( "Got server bell" ); 751 qWarning( "Got server bell" );
749 buf->soundBell(); 752 buf->soundBell();
750 753
751 // Now wait for the update (again) 754 // Now wait for the update (again)
752 if ( oldState == AwaitingUpdate ) { 755 if ( oldState == AwaitingUpdate ) {
753 currentState = AwaitingUpdate; 756 currentState = AwaitingUpdate;
754 connect( con, SIGNAL( gotEnoughData() ), SLOT( gotUpdateHeader() ) ); 757 connect( con, SIGNAL( gotEnoughData() ), SLOT( gotUpdateHeader() ) );
755 con->waitForData( UpdateHeaderLength ); 758 con->waitForData( UpdateHeaderLength );
756 } 759 }
757 else if ( oldState == Idle ) { 760 else if ( oldState == Idle ) {
758 currentState = Idle; 761 currentState = Idle;
759 } 762 }
760 else { 763 else {
761 qWarning( "Async handled in weird state" ); 764 qWarning( "Async handled in weird state" );
762 currentState = oldState; 765 currentState = oldState;
763 }; 766 };
764} 767}
765 768
766void KRFBDecoder::sendKeyPressEvent( QKeyEvent *event ) 769void KRFBDecoder::sendKeyPressEvent( QKeyEvent *event )
767{ 770{
768 int key; 771 int key;
769 key = toKeySym( event ); 772 key = toKeySym( event );
770 if ( key ) { 773 if ( key ) {
771 key = Swap32IfLE( key ); 774 key = Swap32IfLE( key );
772 775
773 CARD8 mask = true; 776 CARD8 mask = true;
774 777
775 CARD16 padding = 0; 778 CARD16 padding = 0;
776 con->write( &KeyEventId, 1 ); 779 con->write( &KeyEventId, 1 );
777 con->write( &mask, 1 ); 780 con->write( &mask, 1 );
778 con->write( &padding, 2 ); 781 con->write( &padding, 2 );
779 con->write( &key, 4 ); 782 con->write( &key, 4 );
780 } 783 }
781} 784}
782 785
783void KRFBDecoder::sendKeyReleaseEvent( QKeyEvent *event ) 786void KRFBDecoder::sendKeyReleaseEvent( QKeyEvent *event )
784{ 787{
785 int key; 788 int key;
786 key = toKeySym( event ); 789 key = toKeySym( event );
787 if ( key ) { 790 if ( key ) {
788 key = Swap32IfLE( key ); 791 key = Swap32IfLE( key );
789 792
790 CARD8 mask = false; 793 CARD8 mask = false;
791 794
792 CARD16 padding = 0; 795 CARD16 padding = 0;
793 con->write( &KeyEventId, 1 ); 796 con->write( &KeyEventId, 1 );
794 con->write( &mask, 1 ); 797 con->write( &mask, 1 );
795 con->write( &padding, 2 ); 798 con->write( &padding, 2 );
796 con->write( &key, 4 ); 799 con->write( &key, 4 );
797 } 800 }
798} 801}
799 802
800 803
801int KRFBDecoder::toKeySym( QKeyEvent *k ) 804int KRFBDecoder::toKeySym( QKeyEvent *k )
802{ 805{
803 int ke = 0; 806 int ke = 0;
804 807
805 ke = k->ascii(); 808 ke = k->ascii();
806 // Markus: Crappy hack. I dont know why lower case letters are 809 // Markus: Crappy hack. I dont know why lower case letters are
807 // not defined in qkeydefs.h. The key() for e.g. 'l' == 'L'. 810 // not defined in qkeydefs.h. The key() for e.g. 'l' == 'L'.
808 // This sucks. :-( 811 // This sucks. :-(
809 812
810 if ( (ke == 'a') || (ke == 'b') || (ke == 'c') || (ke == 'd') 813 if ( (ke == 'a') || (ke == 'b') || (ke == 'c') || (ke == 'd')
811 || (ke == 'e') || (ke == 'f') || (ke == 'g') || (ke == 'h') 814 || (ke == 'e') || (ke == 'f') || (ke == 'g') || (ke == 'h')
812 || (ke == 'i') || (ke == 'j') || (ke == 'k') || (ke == 'l') 815 || (ke == 'i') || (ke == 'j') || (ke == 'k') || (ke == 'l')
813 || (ke == 'm') || (ke == 'n') || (ke == 'o') || (ke == 'p') 816 || (ke == 'm') || (ke == 'n') || (ke == 'o') || (ke == 'p')
814 || (ke == 'q') || (ke == 'r') || (ke == 's') || (ke == 't') 817 || (ke == 'q') || (ke == 'r') || (ke == 's') || (ke == 't')
815 || (ke == 'u') || (ke == 'v') ||( ke == 'w') || (ke == 'x') 818 || (ke == 'u') || (ke == 'v') ||( ke == 'w') || (ke == 'x')
816 || (ke == 'y') || (ke == 'z') ) { 819 || (ke == 'y') || (ke == 'z') ) {
817 ke = k->key(); 820 ke = k->key();
818 ke = ke + 0x20; 821 ke = ke + 0x20;
819 return ke; 822 return ke;
820 } 823 }
821 824
822 // qkeydefs = xkeydefs! :-) 825 // qkeydefs = xkeydefs! :-)
823 if ( ( k->key() >= 0x0a0 ) && k->key() <= 0x0ff ) 826 if ( ( k->key() >= 0x0a0 ) && k->key() <= 0x0ff )
824 return k->key(); 827 return k->key();
825 828
826 if ( ( k->key() >= 0x20 ) && ( k->key() <= 0x7e ) ) 829 if ( ( k->key() >= 0x20 ) && ( k->key() <= 0x7e ) )
827 return k->key(); 830 return k->key();
828 831
829 // qkeydefs != xkeydefs! :-( 832 // qkeydefs != xkeydefs! :-(
830 // This is gonna suck :-( 833 // This is gonna suck :-(
831 834
832 int i = 0; 835 int i = 0;
833 while ( keyMap[i].keycode ) { 836 while ( keyMap[i].keycode ) {
834 if ( k->key() == keyMap[i].keycode ) 837 if ( k->key() == keyMap[i].keycode )
835 return keyMap[i].keysym; 838 return keyMap[i].keysym;
836 i++; 839 i++;
837 } 840 }
838 841
839 return 0; 842 return 0;
840} 843}
841 844
diff --git a/noncore/comm/keypebble/kvnc.cpp b/noncore/comm/keypebble/kvnc.cpp
index 5b1dc9f..48a442c 100644
--- a/noncore/comm/keypebble/kvnc.cpp
+++ b/noncore/comm/keypebble/kvnc.cpp
@@ -34,257 +34,258 @@ static int get_unique_id()
34 34
35 35
36/* XPM */ 36/* XPM */
37static char * menu_xpm[] = { 37static char * menu_xpm[] = {
38"12 12 5 1", 38"12 12 5 1",
39 " c None", 39 " c None",
40 ".c #000000", 40 ".c #000000",
41 "+c #FFFDAD", 41 "+c #FFFDAD",
42 "@c #FFFF00", 42 "@c #FFFF00",
43 "#c #E5E100", 43 "#c #E5E100",
44" ", 44" ",
45" ", 45" ",
46" ......... ", 46" ......... ",
47" .+++++++. ", 47" .+++++++. ",
48" .+@@@@#. ", 48" .+@@@@#. ",
49" .+@@@#. ", 49" .+@@@#. ",
50" .+@@#. ", 50" .+@@#. ",
51" .+@#. ", 51" .+@#. ",
52" .+#. ", 52" .+#. ",
53" .+. ", 53" .+. ",
54" .. ", 54" .. ",
55" "}; 55" "};
56 56
57const int StatusTextId = 0; 57const int StatusTextId = 0;
58 58
59KVNC::KVNC( const char *name ) : QMainWindow( 0, name ,WStyle_ContextHelp) 59KVNC::KVNC( const char *name ) : QMainWindow( 0, name ,WStyle_ContextHelp)
60{ 60{
61 setCaption( tr("VNC Viewer") ); 61 setCaption( tr("VNC Viewer") );
62 fullscreen = false; 62 fullscreen = false;
63 63
64 stack = new QWidgetStack( this ); 64 stack = new QWidgetStack( this );
65 setCentralWidget( stack ); 65 setCentralWidget( stack );
66 66
67 bookmarkSelector=new KVNCBookmarkDlg(); 67 bookmarkSelector=new KVNCBookmarkDlg();
68 stack->addWidget(bookmarkSelector,get_unique_id()); 68 stack->addWidget(bookmarkSelector,get_unique_id());
69 stack->raiseWidget( bookmarkSelector ); 69 stack->raiseWidget( bookmarkSelector );
70 70
71 canvas = new KRFBCanvas( stack, "canvas" ); 71 canvas = new KRFBCanvas( stack, "canvas" );
72 stack->addWidget(canvas,get_unique_id()); 72 stack->addWidget(canvas,get_unique_id());
73 setCentralWidget( stack ); 73 setCentralWidget( stack );
74 74
75 75
76 connect( bookmarkSelector->bookmarkList, SIGNAL(clicked(QListBoxItem *)), 76 connect( bookmarkSelector->bookmarkList, SIGNAL(clicked(QListBoxItem *)),
77 this, SLOT(openConnection(QListBoxItem *)) ); 77 this, SLOT(openConnection(QListBoxItem *)) );
78 connect( canvas->connection(), SIGNAL(statusChanged(const QString &)), 78 connect( canvas->connection(), SIGNAL(statusChanged(const QString &)),
79 this, SLOT(statusMessage(const QString &)) ); 79 this, SLOT(statusMessage(const QString &)) );
80 connect( canvas->connection(), SIGNAL(error(const QString &)), 80 connect( canvas->connection(), SIGNAL(error(const QString &)),
81 this, SLOT(error(const QString &)) ); 81 this, SLOT(error(const QString &)) );
82 connect( canvas->connection(), SIGNAL(connected()), this, SLOT(connected()) ); 82 connect( canvas->connection(), SIGNAL(connected()), this, SLOT(connected()) );
83 connect( canvas->connection(), SIGNAL(loggedIn()), this, SLOT(loggedIn()) ); 83 connect( canvas->connection(), SIGNAL(loggedIn()), this, SLOT(loggedIn()) );
84 connect( canvas->connection(), SIGNAL(disconnected()), this, SLOT(disconnected()) ); 84 connect( canvas->connection(), SIGNAL(disconnected()), this, SLOT(disconnected()) );
85 85
86 setupActions(); 86 setupActions();
87 87
88 cornerButton = new QPushButton( this ); 88 cornerButton = new QPushButton( this );
89 cornerButton->setPixmap( QPixmap( (const char**)menu_xpm ) ); 89 cornerButton->setPixmap( QPixmap( (const char**)menu_xpm ) );
90 connect( cornerButton, SIGNAL(pressed()), this, SLOT(showMenu()) ); 90 connect( cornerButton, SIGNAL(pressed()), this, SLOT(showMenu()) );
91 canvas->setCornerWidget( cornerButton ); 91 canvas->setCornerWidget( cornerButton );
92 92
93 stack->raiseWidget( bookmarkSelector ); 93 stack->raiseWidget( bookmarkSelector );
94 94
95 95
96 bar= new QToolBar( this ); 96 bar= new QToolBar( this );
97 setToolBarsMovable( false ); 97 setToolBarsMovable( false );
98 setRightJustification(false); 98 setRightJustification(false);
99 99
100 100
101 QAction *n = new QAction( tr( "New Connection" ), Resource::loadPixmap( "new" ), 101 QAction *n = new QAction( tr( "New Connection" ), Resource::loadPixmap( "new" ),
102 QString::null, 0, this, 0 ); 102 QString::null, 0, this, 0 );
103 connect( n, SIGNAL( activated() ), 103 connect( n, SIGNAL( activated() ),
104 this, SLOT( newConnection() ) ); 104 this, SLOT( newConnection() ) );
105 n->addTo( bar ); 105 n->addTo( bar );
106 106
107 QAction *o = new QAction( tr( "Open Bookmark" ), Resource::loadPixmap( "fileopen" ), 107 QAction *o = new QAction( tr( "Open Bookmark" ), Resource::loadPixmap( "fileopen" ),
108 QString::null, 0, this, 0 ); 108 QString::null, 0, this, 0 );
109 connect( o, SIGNAL( activated() ), 109 connect( o, SIGNAL( activated() ),
110 this, SLOT( openConnection() ) ); 110 this, SLOT( openConnection() ) );
111 o->addTo( bar ); 111 o->addTo( bar );
112 112
113 QAction *d = new QAction( tr( "Delete Bookmark" ), Resource::loadPixmap( "trash" ), 113 QAction *d = new QAction( tr( "Delete Bookmark" ), Resource::loadPixmap( "trash" ),
114 QString::null, 0, this, 0 ); 114 QString::null, 0, this, 0 );
115 connect( d, SIGNAL( activated() ), 115 connect( d, SIGNAL( activated() ),
116 this, SLOT( deleteBookmark() ) ); 116 this, SLOT( deleteBookmark() ) );
117 d->addTo( bar ); 117 d->addTo( bar );
118} 118}
119 119
120KVNC::~KVNC() 120KVNC::~KVNC()
121{ 121{
122 122
123} 123}
124 124
125void KVNC::newConnection() 125void KVNC::newConnection()
126{ 126{
127 curServer=new KRFBServer; 127 curServer=new KRFBServer;
128 128
129 KVNCConnDlg dlg( curServer,this); 129 KVNCConnDlg dlg( curServer,this);
130 dlg.showMaximized(); 130 dlg.showMaximized();
131 if (dlg.exec()) { 131 if (dlg.exec()) {
132 if (!curServer->name.isEmpty()) 132 if (!curServer->name.isEmpty())
133 bookmarkSelector->addBookmark(curServer); 133 bookmarkSelector->addBookmark(curServer);
134 canvas->openConnection(*curServer); 134 canvas->openConnection(*curServer);
135 } else 135 } else
136 curServer=0; 136 curServer=0;
137} 137}
138 138
139void KVNC::openConnection( QString name) 139void KVNC::openConnection( QString name)
140{ 140{
141 curServer=bookmarkSelector->getServer(name); 141 curServer=bookmarkSelector->getServer(name);
142 142
143 if (curServer) { 143 if (curServer) {
144 KVNCConnDlg dlg( curServer,this); 144 KVNCConnDlg dlg( curServer,this);
145 dlg.showMaximized(); 145 dlg.showMaximized();
146 146
147 if ( dlg.exec() ) { 147 if ( dlg.exec() ) {
148 canvas->openConnection(*curServer); 148 canvas->openConnection(*curServer);
149 bookmarkSelector->writeBookmarks(); 149 bookmarkSelector->writeBookmarks();
150 } else 150 } else
151 curServer=0; 151 curServer=0;
152 } 152 }
153} 153}
154 154
155void KVNC::openConnection( void ) 155void KVNC::openConnection( void )
156{ 156{
157 openConnection( bookmarkSelector->selectedBookmark()); 157 openConnection( bookmarkSelector->selectedBookmark());
158} 158}
159 159
160void KVNC::openConnection( QListBoxItem * item) 160void KVNC::openConnection( QListBoxItem * item)
161{ 161{
162 openConnection(item->text()); 162 if (item)
163 openConnection(item->text());
163} 164}
164 165
165void KVNC::setupActions() 166void KVNC::setupActions()
166{ 167{
167 cornerMenu = new QPopupMenu( this ); 168 cornerMenu = new QPopupMenu( this );
168 169
169 fullScreenAction = new QAction( tr("Full Screen"), QString::null, 0, 0 ); 170 fullScreenAction = new QAction( tr("Full Screen"), QString::null, 0, 0 );
170 connect( fullScreenAction, SIGNAL(activated()), 171 connect( fullScreenAction, SIGNAL(activated()),
171 this, SLOT( toggleFullScreen() ) ); 172 this, SLOT( toggleFullScreen() ) );
172 fullScreenAction->addTo( cornerMenu ); 173 fullScreenAction->addTo( cornerMenu );
173 fullScreenAction->setEnabled( false ); 174 fullScreenAction->setEnabled( false );
174 175
175 ctlAltDelAction = new QAction( tr("Send Contrl-Alt-Delete"), QString::null, 0, 0 ); 176 ctlAltDelAction = new QAction( tr("Send Contrl-Alt-Delete"), QString::null, 0, 0 );
176 connect( ctlAltDelAction, SIGNAL(activated()), 177 connect( ctlAltDelAction, SIGNAL(activated()),
177 canvas, SLOT( sendCtlAltDel() ) ); 178 canvas, SLOT( sendCtlAltDel() ) );
178 ctlAltDelAction->addTo( cornerMenu ); 179 ctlAltDelAction->addTo( cornerMenu );
179 ctlAltDelAction->setEnabled( false ); 180 ctlAltDelAction->setEnabled( false );
180 181
181 disconnectAction = new QAction( tr("Disconnect"), QString::null, 0, 0 ); 182 disconnectAction = new QAction( tr("Disconnect"), QString::null, 0, 0 );
182 connect( disconnectAction, SIGNAL(activated()), 183 connect( disconnectAction, SIGNAL(activated()),
183 this, SLOT( closeConnection() ) ); 184 this, SLOT( closeConnection() ) );
184 disconnectAction->addTo( cornerMenu ); 185 disconnectAction->addTo( cornerMenu );
185 disconnectAction->setEnabled( false ); 186 disconnectAction->setEnabled( false );
186 187
187 doubleClickAction = new QAction( tr("Next Click is Double Click"), QString::null, 0, 0 ); 188 doubleClickAction = new QAction( tr("Next Click is Double Click"), QString::null, 0, 0 );
188 connect( doubleClickAction, SIGNAL(activated()), 189 connect( doubleClickAction, SIGNAL(activated()),
189 canvas, SLOT( markDoubleClick() ) ); 190 canvas, SLOT( markDoubleClick() ) );
190 doubleClickAction->addTo( cornerMenu ); 191 doubleClickAction->addTo( cornerMenu );
191 doubleClickAction->setEnabled( false ); 192 doubleClickAction->setEnabled( false );
192 193
193 rightClickAction = new QAction( tr("Next Click is Right Click"), QString::null, 0, 0 ); 194 rightClickAction = new QAction( tr("Next Click is Right Click"), QString::null, 0, 0 );
194 connect( rightClickAction, SIGNAL(activated()), 195 connect( rightClickAction, SIGNAL(activated()),
195 canvas, SLOT( markRightClick() ) ); 196 canvas, SLOT( markRightClick() ) );
196 rightClickAction->addTo( cornerMenu ); 197 rightClickAction->addTo( cornerMenu );
197 rightClickAction->setEnabled( false ); 198 rightClickAction->setEnabled( false );
198} 199}
199 200
200void KVNC::toggleFullScreen() 201void KVNC::toggleFullScreen()
201{ 202{
202 if ( fullscreen ) { 203 if ( fullscreen ) {
203 canvas->releaseKeyboard(); 204 canvas->releaseKeyboard();
204 canvas->reparent( stack, 0, QPoint(0,0), false ); 205 canvas->reparent( stack, 0, QPoint(0,0), false );
205 canvas->setFrameStyle( QFrame::Panel | QFrame::Sunken ); 206 canvas->setFrameStyle( QFrame::Panel | QFrame::Sunken );
206 setCentralWidget( stack ); 207 setCentralWidget( stack );
207 stack->addWidget(canvas,get_unique_id()); 208 stack->addWidget(canvas,get_unique_id());
208 stack->raiseWidget(canvas); 209 stack->raiseWidget(canvas);
209 canvas->show(); 210 canvas->show();
210 stack->show(); 211 stack->show();
211 fullScreenAction->setText( tr("Full Screen") ); 212 fullScreenAction->setText( tr("Full Screen") );
212 } else { 213 } else {
213 canvas->setFrameStyle( QFrame::NoFrame ); 214 canvas->setFrameStyle( QFrame::NoFrame );
214 stack->removeWidget(canvas); 215 stack->removeWidget(canvas);
215 canvas->reparent( 0,WStyle_Tool | WStyle_Customize | WStyle_StaysOnTop, 216 canvas->reparent( 0,WStyle_Tool | WStyle_Customize | WStyle_StaysOnTop,
216 QPoint(0,0),false); 217 QPoint(0,0),false);
217 canvas->resize(qApp->desktop()->width(), qApp->desktop()->height()); 218 canvas->resize(qApp->desktop()->width(), qApp->desktop()->height());
218 canvas->raise(); 219 canvas->raise();
219 canvas->setFocus(); 220 canvas->setFocus();
220 canvas->grabKeyboard(); 221 canvas->grabKeyboard();
221 canvas->show(); 222 canvas->show();
222 223
223 fullScreenAction->setText( tr("Stop Full Screen") ); 224 fullScreenAction->setText( tr("Stop Full Screen") );
224 } 225 }
225 226
226 227
227 fullscreen = !fullscreen; 228 fullscreen = !fullscreen;
228} 229}
229 230
230void KVNC::closeConnection() 231void KVNC::closeConnection()
231{ 232{
232 if ( fullscreen ) 233 if ( fullscreen )
233 toggleFullScreen(); 234 toggleFullScreen();
234 canvas->closeConnection(); 235 canvas->closeConnection();
235} 236}
236 237
237void KVNC::showMenu() 238void KVNC::showMenu()
238{ 239{
239 QPoint pt = mapToGlobal(cornerButton->pos()); 240 QPoint pt = mapToGlobal(cornerButton->pos());
240 QSize s = cornerMenu->sizeHint(); 241 QSize s = cornerMenu->sizeHint();
241 pt.ry() -= s.height(); 242 pt.ry() -= s.height();
242 pt.rx() -= s.width(); 243 pt.rx() -= s.width();
243 cornerMenu->popup( pt ); 244 cornerMenu->popup( pt );
244} 245}
245 246
246void KVNC::connected() 247void KVNC::connected()
247{ 248{
248 static QString msg = tr( "Connected to remote host" ); 249 static QString msg = tr( "Connected to remote host" );
249 statusMessage( msg ); 250 statusMessage( msg );
250 ctlAltDelAction->setEnabled(true); 251 ctlAltDelAction->setEnabled(true);
251 disconnectAction->setEnabled( true ); 252 disconnectAction->setEnabled( true );
252 fullScreenAction->setEnabled( true ); 253 fullScreenAction->setEnabled( true );
253 doubleClickAction->setEnabled( false ); 254 doubleClickAction->setEnabled( false );
254 rightClickAction->setEnabled( true ); 255 rightClickAction->setEnabled( true );
255 stack->raiseWidget(canvas); 256 stack->raiseWidget(canvas);
256 bar->hide(); 257 bar->hide();
257} 258}
258 259
259void KVNC::loggedIn() 260void KVNC::loggedIn()
260{ 261{
261 static QString msg = tr( "Logged in to remote host" ); 262 static QString msg = tr( "Logged in to remote host" );
262 statusMessage( msg ); 263 statusMessage( msg );
263} 264}
264 265
265void KVNC::disconnected() 266void KVNC::disconnected()
266{ 267{
267 268
268 if ( fullscreen ) 269 if ( fullscreen )
269 toggleFullScreen(); 270 toggleFullScreen();
270 static QString msg = tr( "Connection closed" ); 271 static QString msg = tr( "Connection closed" );
271 statusMessage( msg ); 272 statusMessage( msg );
272 ctlAltDelAction->setEnabled(false); 273 ctlAltDelAction->setEnabled(false);
273 disconnectAction->setEnabled( false ); 274 disconnectAction->setEnabled( false );
274 fullScreenAction->setEnabled( false ); 275 fullScreenAction->setEnabled( false );
275 doubleClickAction->setEnabled( false ); 276 doubleClickAction->setEnabled( false );
276 rightClickAction->setEnabled( false ); 277 rightClickAction->setEnabled( false );
277 stack->raiseWidget(bookmarkSelector); 278 stack->raiseWidget(bookmarkSelector);
278 bar->show(); 279 bar->show();
279} 280}
280 281
281void KVNC::statusMessage( const QString &m ) 282void KVNC::statusMessage( const QString &m )
282{ 283{
283 Global::statusMessage( m ); 284 Global::statusMessage( m );
284} 285}
285 286
286void KVNC::error( const QString &msg ) 287void KVNC::error( const QString &msg )
287{ 288{
288 statusMessage( msg ); 289 statusMessage( msg );
289 QMessageBox::warning( this, tr("VNC Viewer"), msg ); 290 QMessageBox::warning( this, tr("VNC Viewer"), msg );
290} 291}