Diffstat (limited to 'core/apps/embeddedkonsole/TEWidget.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/apps/embeddedkonsole/TEWidget.cpp | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/core/apps/embeddedkonsole/TEWidget.cpp b/core/apps/embeddedkonsole/TEWidget.cpp index 350ab3a..0cd7ed1 100644 --- a/core/apps/embeddedkonsole/TEWidget.cpp +++ b/core/apps/embeddedkonsole/TEWidget.cpp | |||
@@ -844,24 +844,25 @@ void TEWidget::mouseDoubleClickEvent(QMouseEvent* ev) | |||
844 | while( x < columns-1 && charClass(image[i+1].c) == selClass ) | 844 | while( x < columns-1 && charClass(image[i+1].c) == selClass ) |
845 | { i++; x++ ; } | 845 | { i++; x++ ; } |
846 | endSel.setX(x); | 846 | endSel.setX(x); |
847 | actSel = 2; // within selection | 847 | actSel = 2; // within selection |
848 | emit extendSelectionSignal( endSel.x(), endSel.y() ); | 848 | emit extendSelectionSignal( endSel.x(), endSel.y() ); |
849 | emit endSelectionSignal(preserve_line_breaks); | 849 | emit endSelectionSignal(preserve_line_breaks); |
850 | preserve_line_breaks = TRUE; | 850 | preserve_line_breaks = TRUE; |
851 | } | 851 | } |
852 | } | 852 | } |
853 | 853 | ||
854 | void TEWidget::focusInEvent( QFocusEvent * ) | 854 | void TEWidget::focusInEvent( QFocusEvent * ) |
855 | { | 855 | { |
856 | |||
856 | // do nothing, to prevent repainting | 857 | // do nothing, to prevent repainting |
857 | } | 858 | } |
858 | 859 | ||
859 | 860 | ||
860 | void TEWidget::focusOutEvent( QFocusEvent * ) | 861 | void TEWidget::focusOutEvent( QFocusEvent * ) |
861 | { | 862 | { |
862 | // do nothing, to prevent repainting | 863 | // do nothing, to prevent repainting |
863 | } | 864 | } |
864 | 865 | ||
865 | bool TEWidget::focusNextPrevChild( bool next ) | 866 | bool TEWidget::focusNextPrevChild( bool next ) |
866 | { | 867 | { |
867 | if (next) | 868 | if (next) |
@@ -966,33 +967,31 @@ void TEWidget::onClearSelection() | |||
966 | // focusOutEvent() so that update() isn't called. | 967 | // focusOutEvent() so that update() isn't called. |
967 | // For auto-hide, we need to get keypress-events, but we only get them when | 968 | // For auto-hide, we need to get keypress-events, but we only get them when |
968 | // we have focus. | 969 | // we have focus. |
969 | 970 | ||
970 | void TEWidget::doScroll(int lines) | 971 | void TEWidget::doScroll(int lines) |
971 | { | 972 | { |
972 | scrollbar->setValue(scrollbar->value()+lines); | 973 | scrollbar->setValue(scrollbar->value()+lines); |
973 | } | 974 | } |
974 | 975 | ||
975 | bool TEWidget::eventFilter( QObject *obj, QEvent *e ) | 976 | bool TEWidget::eventFilter( QObject *obj, QEvent *e ) |
976 | { | 977 | { |
977 | if ( (e->type() == QEvent::Accel || | 978 | if ( (e->type() == QEvent::Accel || |
978 | e->type() == QEvent::AccelAvailable ) && qApp->focusWidget() == this ) | 979 | e->type() == QEvent::AccelAvailable ) && qApp->focusWidget() == this ) { |
979 | { | ||
980 | static_cast<QKeyEvent *>( e )->ignore(); | 980 | static_cast<QKeyEvent *>( e )->ignore(); |
981 | return true; | 981 | return true; |
982 | } | 982 | } |
983 | if ( obj != this /* when embedded */ && obj != parent() /* when standalone */ ) | 983 | if ( obj != this /* when embedded */ && obj != parent() /* when standalone */ ) |
984 | return FALSE; // not us | 984 | return FALSE; // not us |
985 | if ( e->type() == QEvent::Wheel) | 985 | if ( e->type() == QEvent::Wheel) { |
986 | { | ||
987 | QApplication::sendEvent(scrollbar, e); | 986 | QApplication::sendEvent(scrollbar, e); |
988 | } | 987 | } |
989 | 988 | ||
990 | #ifdef FAKE_CTRL_AND_ALT | 989 | #ifdef FAKE_CTRL_AND_ALT |
991 | static bool control = FALSE; | 990 | static bool control = FALSE; |
992 | static bool alt = FALSE; | 991 | static bool alt = FALSE; |
993 | qDebug(" Has a keyboard with no CTRL and ALT keys, but we fake it:"); | 992 | qDebug(" Has a keyboard with no CTRL and ALT keys, but we fake it:"); |
994 | bool dele=FALSE; | 993 | bool dele=FALSE; |
995 | if ( e->type() == QEvent::KeyPress || e->type() == QEvent::KeyRelease ) { | 994 | if ( e->type() == QEvent::KeyPress || e->type() == QEvent::KeyRelease ) { |
996 | QKeyEvent* ke = (QKeyEvent*)e; | 995 | QKeyEvent* ke = (QKeyEvent*)e; |
997 | bool keydown = e->type() == QEvent::KeyPress || ke->isAutoRepeat(); | 996 | bool keydown = e->type() == QEvent::KeyPress || ke->isAutoRepeat(); |
998 | switch (ke->key()) { | 997 | switch (ke->key()) { |
@@ -1015,49 +1014,46 @@ bool TEWidget::eventFilter( QObject *obj, QEvent *e ) | |||
1015 | dele=TRUE; | 1014 | dele=TRUE; |
1016 | } | 1015 | } |
1017 | } | 1016 | } |
1018 | if ( alt ) { | 1017 | if ( alt ) { |
1019 | e = new QKeyEvent(e->type(), ke->key(), | 1018 | e = new QKeyEvent(e->type(), ke->key(), |
1020 | ke->ascii(), ke->state()|AltButton, ke->text()); | 1019 | ke->ascii(), ke->state()|AltButton, ke->text()); |
1021 | dele=TRUE; | 1020 | dele=TRUE; |
1022 | } | 1021 | } |
1023 | } | 1022 | } |
1024 | } | 1023 | } |
1025 | #endif | 1024 | #endif |
1026 | 1025 | ||
1027 | if ( e->type() == QEvent::KeyPress ) | 1026 | if ( e->type() == QEvent::KeyPress ) { |
1028 | { | ||
1029 | QKeyEvent* ke = (QKeyEvent*)e; | 1027 | QKeyEvent* ke = (QKeyEvent*)e; |
1030 | actSel=0; // Key stroke implies a screen update, so TEWidget won't | 1028 | actSel=0; // Key stroke implies a screen update, so TEWidget won't |
1031 | // know where the current selection is. | 1029 | // know where the current selection is. |
1032 | 1030 | ||
1033 | // qDebug("key pressed is 0x%x",ke->key()); | 1031 | qDebug("key pressed is 0x%x",ke->key()); |
1034 | if( ke->state() == ShiftButton && ke->key() == Key_Tab) { //lets hardcode this sucker | 1032 | if( ke->state() == ShiftButton && ke->key() == Key_Tab) { //lets hardcode this sucker |
1035 | // qDebug("key pressed 2 is 0x%x",ke->key()); | 1033 | qDebug("key pressed 2 is 0x%x",ke->key()); |
1036 | emitText("\\"); // expose | 1034 | emitText("\\"); // expose |
1037 | } else | 1035 | } else |
1038 | emit keyPressedSignal(ke); // expose | 1036 | emit keyPressedSignal(ke); // expose |
1039 | ke->accept(); | 1037 | ke->accept(); |
1040 | #ifdef FAKE_CTRL_AND_ALT | 1038 | #ifdef FAKE_CTRL_AND_ALT |
1041 | if ( dele ) delete e; | 1039 | if ( dele ) delete e; |
1042 | #endif | 1040 | #endif |
1043 | return true; // stop the event | 1041 | return true; // stop the event |
1044 | } | 1042 | } |
1045 | if ( e->type() == QEvent::Enter ) | 1043 | if ( e->type() == QEvent::Enter ) { |
1046 | { | ||
1047 | QObject::disconnect( (QObject*)cb, SIGNAL(dataChanged()), | 1044 | QObject::disconnect( (QObject*)cb, SIGNAL(dataChanged()), |
1048 | this, SLOT(onClearSelection()) ); | 1045 | this, SLOT(onClearSelection()) ); |
1049 | } | 1046 | } |
1050 | if ( e->type() == QEvent::Leave ) | 1047 | if ( e->type() == QEvent::Leave ) { |
1051 | { | ||
1052 | QObject::connect( (QObject*)cb, SIGNAL(dataChanged()), | 1048 | QObject::connect( (QObject*)cb, SIGNAL(dataChanged()), |
1053 | this, SLOT(onClearSelection()) ); | 1049 | this, SLOT(onClearSelection()) ); |
1054 | } | 1050 | } |
1055 | return QFrame::eventFilter( obj, e ); | 1051 | return QFrame::eventFilter( obj, e ); |
1056 | } | 1052 | } |
1057 | 1053 | ||
1058 | /* ------------------------------------------------------------------------- */ | 1054 | /* ------------------------------------------------------------------------- */ |
1059 | /* */ | 1055 | /* */ |
1060 | /* Frame */ | 1056 | /* Frame */ |
1061 | /* */ | 1057 | /* */ |
1062 | /* ------------------------------------------------------------------------- */ | 1058 | /* ------------------------------------------------------------------------- */ |
1063 | 1059 | ||