author | llornkcor <llornkcor> | 2002-04-28 23:08:31 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-04-28 23:08:31 (UTC) |
commit | 3a7ed24bd010b3313b2260a35c68cfc3b49125b2 (patch) (unidiff) | |
tree | 1e478a7ab2bf05539d6f570db771ccab4d06da81 /core/apps/embeddedkonsole | |
parent | 28d8806d21ec8fbc806d80614fd496f6b5ca6b55 (diff) | |
download | opie-3a7ed24bd010b3313b2260a35c68cfc3b49125b2.zip opie-3a7ed24bd010b3313b2260a35c68cfc3b49125b2.tar.gz opie-3a7ed24bd010b3313b2260a35c68cfc3b49125b2.tar.bz2 |
debug
-rw-r--r-- | core/apps/embeddedkonsole/TEWidget.cpp | 20 | ||||
-rw-r--r-- | core/apps/embeddedkonsole/main.cpp | 1 |
2 files changed, 9 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 | |||
@@ -850,12 +850,13 @@ void TEWidget::mouseDoubleClickEvent(QMouseEvent* ev) | |||
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 | { |
@@ -972,21 +973,19 @@ void TEWidget::doScroll(int lines) | |||
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; |
@@ -1021,37 +1020,34 @@ bool TEWidget::eventFilter( QObject *obj, QEvent *e ) | |||
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 | ||
diff --git a/core/apps/embeddedkonsole/main.cpp b/core/apps/embeddedkonsole/main.cpp index e3ba346..b3c0453 100644 --- a/core/apps/embeddedkonsole/main.cpp +++ b/core/apps/embeddedkonsole/main.cpp | |||
@@ -35,12 +35,13 @@ int main(int argc, char* argv[]) | |||
35 | { | 35 | { |
36 | setuid(getuid()); setgid(getgid()); // drop privileges | 36 | setuid(getuid()); setgid(getgid()); // drop privileges |
37 | 37 | ||
38 | QPEApplication a( argc, argv ); | 38 | QPEApplication a( argc, argv ); |
39 | 39 | ||
40 | #ifdef FAKE_CTRL_AND_ALT | 40 | #ifdef FAKE_CTRL_AND_ALT |
41 | qDebug("Fake Ctrl and Alt defined"); | ||
41 | QPEApplication::grabKeyboard(); // for CTRL and ALT | 42 | QPEApplication::grabKeyboard(); // for CTRL and ALT |
42 | #endif | 43 | #endif |
43 | 44 | ||
44 | QStrList tmp; | 45 | QStrList tmp; |
45 | const char* shell = getenv("SHELL"); | 46 | const char* shell = getenv("SHELL"); |
46 | if (shell == NULL || *shell == '\0') | 47 | if (shell == NULL || *shell == '\0') |