summaryrefslogtreecommitdiff
authorzecke <zecke>2004-10-13 19:50:45 (UTC)
committer zecke <zecke>2004-10-13 19:50:45 (UTC)
commit2e51b60e861912fa525597f6b9de6b83c9cedf94 (patch) (unidiff)
treec212077850c4cdf9570f7d47bb2805fe33d6bfe6
parent43fdc7bdf61f0e16be759c4083bd340afcf826f8 (diff)
downloadopie-2e51b60e861912fa525597f6b9de6b83c9cedf94.zip
opie-2e51b60e861912fa525597f6b9de6b83c9cedf94.tar.gz
opie-2e51b60e861912fa525597f6b9de6b83c9cedf94.tar.bz2
Remove odebug/owarn
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/widget.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/noncore/apps/opie-console/widget.cpp b/noncore/apps/opie-console/widget.cpp
index c51983f..4a578be 100644
--- a/noncore/apps/opie-console/widget.cpp
+++ b/noncore/apps/opie-console/widget.cpp
@@ -966,108 +966,103 @@ void Widget::onClearSelection()
966// or reenters the screen to/from another application. 966// or reenters the screen to/from another application.
967// 967//
968// Troll says one needs to change focusInEvent() and focusOutEvent(), 968// Troll says one needs to change focusInEvent() and focusOutEvent(),
969// which would also let you have an in-focus cursor and an out-focus 969// which would also let you have an in-focus cursor and an out-focus
970// cursor like xterm does. 970// cursor like xterm does.
971 971
972// for the auto-hide cursor feature, I added empty focusInEvent() and 972// for the auto-hide cursor feature, I added empty focusInEvent() and
973// focusOutEvent() so that update() isn't called. 973// focusOutEvent() so that update() isn't called.
974// For auto-hide, we need to get keypress-events, but we only get them when 974// For auto-hide, we need to get keypress-events, but we only get them when
975// we have focus. 975// we have focus.
976 976
977void Widget::doScroll(int lines) 977void Widget::doScroll(int lines)
978{ 978{
979 scrollbar->setValue(scrollbar->value()+lines); 979 scrollbar->setValue(scrollbar->value()+lines);
980} 980}
981 981
982bool Widget::eventFilter( QObject *obj, QEvent *e ) 982bool Widget::eventFilter( QObject *obj, QEvent *e )
983{ 983{
984 if ( (e->type() == QEvent::Accel || 984 if ( (e->type() == QEvent::Accel ||
985 e->type() == QEvent::AccelAvailable ) && qApp->focusWidget() == this ) { 985 e->type() == QEvent::AccelAvailable ) && qApp->focusWidget() == this ) {
986 static_cast<QKeyEvent *>( e )->ignore(); 986 static_cast<QKeyEvent *>( e )->ignore();
987 return true; 987 return true;
988 } 988 }
989 if ( obj != this /* when embedded */ && obj != parent() /* when standalone */ ) 989 if ( obj != this /* when embedded */ && obj != parent() /* when standalone */ )
990 return FALSE; // not us 990 return FALSE; // not us
991 if ( e->type() == QEvent::Wheel) { 991 if ( e->type() == QEvent::Wheel) {
992 QApplication::sendEvent(scrollbar, e); 992 QApplication::sendEvent(scrollbar, e);
993 } 993 }
994 994
995#ifdef FAKE_CTRL_AND_ALT 995#ifdef FAKE_CTRL_AND_ALT
996 static bool control = FALSE; 996 static bool control = FALSE;
997 static bool alt = FALSE; 997 static bool alt = FALSE;
998// odebug << " Has a keyboard with no CTRL and ALT keys, but we fake it:" << oendl;
999 bool dele=FALSE; 998 bool dele=FALSE;
1000 if ( e->type() == QEvent::KeyPress || e->type() == QEvent::KeyRelease ) { 999 if ( e->type() == QEvent::KeyPress || e->type() == QEvent::KeyRelease ) {
1001 QKeyEvent* ke = (QKeyEvent*)e; 1000 QKeyEvent* ke = (QKeyEvent*)e;
1002 bool keydown = e->type() == QEvent::KeyPress || ke->isAutoRepeat(); 1001 bool keydown = e->type() == QEvent::KeyPress || ke->isAutoRepeat();
1003 switch (ke->key()) { 1002 switch (ke->key()) {
1004 case Key_F9: // let this be "Control" 1003 case Key_F9: // let this be "Control"
1005 control = keydown; 1004 control = keydown;
1006 e = new QKeyEvent(QEvent::KeyPress, Key_Control, 0, ke->state()); 1005 e = new QKeyEvent(QEvent::KeyPress, Key_Control, 0, ke->state());
1007 dele=TRUE; 1006 dele=TRUE;
1008 break; 1007 break;
1009 case Key_F13: // let this be "Alt" 1008 case Key_F13: // let this be "Alt"
1010 alt = keydown; 1009 alt = keydown;
1011 e = new QKeyEvent(QEvent::KeyPress, Key_Alt, 0, ke->state()); 1010 e = new QKeyEvent(QEvent::KeyPress, Key_Alt, 0, ke->state());
1012 dele=TRUE; 1011 dele=TRUE;
1013 break; 1012 break;
1014 default: 1013 default:
1015 if ( control ) { 1014 if ( control ) {
1016 int a = toupper(ke->ascii())-64; 1015 int a = toupper(ke->ascii())-64;
1017 if ( a >= 0 && a < ' ' ) { 1016 if ( a >= 0 && a < ' ' ) {
1018 e = new QKeyEvent(e->type(), ke->key(), 1017 e = new QKeyEvent(e->type(), ke->key(),
1019 a, ke->state()|ControlButton, QChar(a,0)); 1018 a, ke->state()|ControlButton, QChar(a,0));
1020 dele=TRUE; 1019 dele=TRUE;
1021 } 1020 }
1022 } 1021 }
1023 if ( alt ) { 1022 if ( alt ) {
1024 e = new QKeyEvent(e->type(), ke->key(), 1023 e = new QKeyEvent(e->type(), ke->key(),
1025 ke->ascii(), ke->state()|AltButton, ke->text()); 1024 ke->ascii(), ke->state()|AltButton, ke->text());
1026 dele=TRUE; 1025 dele=TRUE;
1027 } 1026 }
1028 } 1027 }
1029 } 1028 }
1030#endif 1029#endif
1031 1030
1032 if ( e->type() == QEvent::KeyPress ) { 1031 if ( e->type() == QEvent::KeyPress ) {
1033 QKeyEvent* ke = (QKeyEvent*)e; 1032 QKeyEvent* ke = (QKeyEvent*)e;
1034 actSel=0; // Key stroke implies a screen update, so Widget won't 1033 actSel=0; // Key stroke implies a screen update, so Widget won't
1035 // know where the current selection is. 1034 // know where the current selection is.
1036 1035
1037// odebug << "key pressed is 0x" << ke->key() << "" << oendl;
1038
1039 if( ke->state() == ShiftButton && ke->key() == Key_Tab) { //lets hardcode this sucker 1036 if( ke->state() == ShiftButton && ke->key() == Key_Tab) { //lets hardcode this sucker
1040
1041// odebug << "key pressed 2 is 0x" << ke->key() << "" << oendl;
1042 emitText("\\"); // expose 1037 emitText("\\"); // expose
1043 } else 1038 } else
1044 emit keyPressedSignal(ke); // expose 1039 emit keyPressedSignal(ke); // expose
1045 ke->accept(); 1040 ke->accept();
1046#ifdef FAKE_CTRL_AND_ALT 1041#ifdef FAKE_CTRL_AND_ALT
1047 if ( dele ) delete e; 1042 if ( dele ) delete e;
1048#endif 1043#endif
1049 return true; // stop the event 1044 return true; // stop the event
1050 } 1045 }
1051 if ( e->type() == QEvent::Enter ) { 1046 if ( e->type() == QEvent::Enter ) {
1052 QObject::disconnect( (QObject*)cb, SIGNAL(dataChanged()), 1047 QObject::disconnect( (QObject*)cb, SIGNAL(dataChanged()),
1053 this, SLOT(onClearSelection()) ); 1048 this, SLOT(onClearSelection()) );
1054 } 1049 }
1055 if ( e->type() == QEvent::Leave ) { 1050 if ( e->type() == QEvent::Leave ) {
1056 QObject::connect( (QObject*)cb, SIGNAL(dataChanged()), 1051 QObject::connect( (QObject*)cb, SIGNAL(dataChanged()),
1057 this, SLOT(onClearSelection()) ); 1052 this, SLOT(onClearSelection()) );
1058 } 1053 }
1059 return QFrame::eventFilter( obj, e ); 1054 return QFrame::eventFilter( obj, e );
1060} 1055}
1061 1056
1062/* ------------------------------------------------------------------------- */ 1057/* ------------------------------------------------------------------------- */
1063/* */ 1058/* */
1064/* Frame */ 1059/* Frame */
1065/* */ 1060/* */
1066/* ------------------------------------------------------------------------- */ 1061/* ------------------------------------------------------------------------- */
1067 1062
1068void Widget::frameChanged() 1063void Widget::frameChanged()
1069{ 1064{
1070 propagateSize(); 1065 propagateSize();
1071 update(); 1066 update();
1072} 1067}
1073 1068