diff options
Diffstat (limited to 'konsole')
24 files changed, 26 insertions, 1 deletions
diff --git a/konsole/konsole/TEWidget.cpp b/konsole/konsole/TEWidget.cpp index f151044fc..52cd1236b 100644 --- a/konsole/konsole/TEWidget.cpp +++ b/konsole/konsole/TEWidget.cpp @@ -340,6 +340,8 @@ TEWidget::TEWidget(TQWidget *parent, const char *name) ,font_h(1) ,font_w(1) ,font_a(1) +,screen_num(0) +,screen(NULL) ,lines(1) ,columns(1) ,contentHeight(1) @@ -1694,7 +1696,22 @@ void TEWidget::wheelEvent( TQWheelEvent* ev ) return; if ( mouse_marks ) - TQApplication::sendEvent(scrollbar, ev); + { + if (!screen || screen->hasScroll() || (scrollbar->maxValue() == 0 && screen_num == 0)) + { + // Send event to scroll bar + TQApplication::sendEvent(scrollbar, ev); + } + else + { + // Terminal window can not be scrolled, so emulate key up/key down when mouse wheel is used + TQKeyEvent ke(TQEvent::KeyPress, ev->delta() > 0 ? TQt::Key_Up : TQt::Key_Down, 0, TQt::NoButton); + for (int i = 0; i < TQApplication::wheelScrollLines(); ++i) + { + emit keyPressedSignal(&ke); + } + } + } else { TQPoint tL = contentsRect().topLeft(); diff --git a/konsole/konsole/TEWidget.h b/konsole/konsole/TEWidget.h index 2baa2531c..967896082 100644 --- a/konsole/konsole/TEWidget.h +++ b/konsole/konsole/TEWidget.h @@ -32,6 +32,7 @@ #include <tdepopupmenu.h> #include "TECommon.h" +#include "TEScreen.h" extern unsigned short vt100_graphics[32]; @@ -142,6 +143,8 @@ public: void setRim(int rim) { rimX=rim; rimY=rim; } + void setScreen(int num, TEScreen *scr) { screen_num = num & 0x01; screen = scr; } + public slots: void setSelectionEnd(); @@ -241,6 +244,10 @@ private: int bX; // offset int bY; // offset + // Required to handle mouse wheel events correctly in all cases + int screen_num; // Screen number (0 or 1) + TEScreen *screen; // Pointer to current screen. No ownership!! + int lines; int columns; int contentHeight; diff --git a/konsole/konsole/TEmulation.cpp b/konsole/konsole/TEmulation.cpp index 7576e9688..943d2f205 100644 --- a/konsole/konsole/TEmulation.cpp +++ b/konsole/konsole/TEmulation.cpp @@ -197,6 +197,7 @@ void TEmulation::setScreen(int n) { TEScreen *old = scr; scr = screen[n&1]; + gui->setScreen(n&1, scr); if (scr != old) old->setBusySelecting(false); } diff --git a/konsole/other/hi128-app-konsole.png b/konsole/other/hi128-app-konsole.png Binary files differindex a7f21faa5..4539203ff 100644 --- a/konsole/other/hi128-app-konsole.png +++ b/konsole/other/hi128-app-konsole.png diff --git a/konsole/other/hi16-app-konsole.png b/konsole/other/hi16-app-konsole.png Binary files differindex e4fabb297..249d8a553 100644 --- a/konsole/other/hi16-app-konsole.png +++ b/konsole/other/hi16-app-konsole.png diff --git a/konsole/other/hi22-app-konsole.png b/konsole/other/hi22-app-konsole.png Binary files differindex 9033d420f..197234c91 100644 --- a/konsole/other/hi22-app-konsole.png +++ b/konsole/other/hi22-app-konsole.png diff --git a/konsole/other/hi32-app-konsole.png b/konsole/other/hi32-app-konsole.png Binary files differindex 81b85b5c4..b1a2af965 100644 --- a/konsole/other/hi32-app-konsole.png +++ b/konsole/other/hi32-app-konsole.png diff --git a/konsole/other/hi48-app-konsole.png b/konsole/other/hi48-app-konsole.png Binary files differindex 97498f6d3..a2db33cd0 100644 --- a/konsole/other/hi48-app-konsole.png +++ b/konsole/other/hi48-app-konsole.png diff --git a/konsole/other/hi64-app-konsole.png b/konsole/other/hi64-app-konsole.png Binary files differindex 0b443d5ad..edb52329e 100644 --- a/konsole/other/hi64-app-konsole.png +++ b/konsole/other/hi64-app-konsole.png diff --git a/konsole/other/icons/cr16-action-activity.png b/konsole/other/icons/cr16-action-activity.png Binary files differindex 8d72794dd..502126dec 100644 --- a/konsole/other/icons/cr16-action-activity.png +++ b/konsole/other/icons/cr16-action-activity.png diff --git a/konsole/other/icons/cr16-action-konsoleblue.png b/konsole/other/icons/cr16-action-konsoleblue.png Binary files differindex eb53b8ece..7669299a7 100644 --- a/konsole/other/icons/cr16-action-konsoleblue.png +++ b/konsole/other/icons/cr16-action-konsoleblue.png diff --git a/konsole/other/icons/cr16-action-konsolered.png b/konsole/other/icons/cr16-action-konsolered.png Binary files differindex 7b8a66a00..d823890ea 100644 --- a/konsole/other/icons/cr16-action-konsolered.png +++ b/konsole/other/icons/cr16-action-konsolered.png diff --git a/konsole/other/icons/cr16-action-opentermblue.png b/konsole/other/icons/cr16-action-opentermblue.png Binary files differindex 36d9a28ff..dd5a5578e 100644 --- a/konsole/other/icons/cr16-action-opentermblue.png +++ b/konsole/other/icons/cr16-action-opentermblue.png diff --git a/konsole/other/icons/cr16-action-opentermred.png b/konsole/other/icons/cr16-action-opentermred.png Binary files differindex 49ff19fe3..13ea0a2c9 100644 --- a/konsole/other/icons/cr16-action-opentermred.png +++ b/konsole/other/icons/cr16-action-opentermred.png diff --git a/konsole/other/icons/cr16-action-silence.png b/konsole/other/icons/cr16-action-silence.png Binary files differindex a89226b3b..db8090abb 100644 --- a/konsole/other/icons/cr16-action-silence.png +++ b/konsole/other/icons/cr16-action-silence.png diff --git a/konsole/other/icons/cr22-action-konsoleblue.png b/konsole/other/icons/cr22-action-konsoleblue.png Binary files differindex 5c463804f..ede285965 100644 --- a/konsole/other/icons/cr22-action-konsoleblue.png +++ b/konsole/other/icons/cr22-action-konsoleblue.png diff --git a/konsole/other/icons/cr22-action-konsolered.png b/konsole/other/icons/cr22-action-konsolered.png Binary files differindex 2602d9842..873130fae 100644 --- a/konsole/other/icons/cr22-action-konsolered.png +++ b/konsole/other/icons/cr22-action-konsolered.png diff --git a/konsole/other/icons/cr22-action-opentermblue.png b/konsole/other/icons/cr22-action-opentermblue.png Binary files differindex 54051f6d5..813c9cfda 100644 --- a/konsole/other/icons/cr22-action-opentermblue.png +++ b/konsole/other/icons/cr22-action-opentermblue.png diff --git a/konsole/other/icons/cr22-action-opentermred.png b/konsole/other/icons/cr22-action-opentermred.png Binary files differindex a349d4376..e0edf6512 100644 --- a/konsole/other/icons/cr22-action-opentermred.png +++ b/konsole/other/icons/cr22-action-opentermred.png diff --git a/konsole/other/icons/cr32-action-konsoleblue.png b/konsole/other/icons/cr32-action-konsoleblue.png Binary files differindex 778cafb25..221aeb6da 100644 --- a/konsole/other/icons/cr32-action-konsoleblue.png +++ b/konsole/other/icons/cr32-action-konsoleblue.png diff --git a/konsole/other/icons/cr32-action-konsolered.png b/konsole/other/icons/cr32-action-konsolered.png Binary files differindex 6776c141d..3f4d5dd8a 100644 --- a/konsole/other/icons/cr32-action-konsolered.png +++ b/konsole/other/icons/cr32-action-konsolered.png diff --git a/konsole/other/icons/cr32-action-opentermblue.png b/konsole/other/icons/cr32-action-opentermblue.png Binary files differindex a394401dd..dedbe1a17 100644 --- a/konsole/other/icons/cr32-action-opentermblue.png +++ b/konsole/other/icons/cr32-action-opentermblue.png diff --git a/konsole/other/icons/cr32-action-opentermred.png b/konsole/other/icons/cr32-action-opentermred.png Binary files differindex e7e6134d2..892d93fa1 100644 --- a/konsole/other/icons/cr32-action-opentermred.png +++ b/konsole/other/icons/cr32-action-opentermred.png diff --git a/konsole/other/wallpapers/Metric-Monospace-14.png b/konsole/other/wallpapers/Metric-Monospace-14.png Binary files differindex 2cdb9eedf..73e52d634 100644 --- a/konsole/other/wallpapers/Metric-Monospace-14.png +++ b/konsole/other/wallpapers/Metric-Monospace-14.png |
