author | waspe <waspe> | 2004-02-22 12:57:58 (UTC) |
---|---|---|
committer | waspe <waspe> | 2004-02-22 12:57:58 (UTC) |
commit | 5bc4dbd932fcfa64773b6e17fe57c665bdcd50b8 (patch) (side-by-side diff) | |
tree | b97f5281b807b4218f437150a4e9082694e7a642 /core/apps/embeddedkonsole/TEWidget.cpp | |
parent | 908f9c9f0c68d1c3e5a620a69bbf0d05684e2ab3 (diff) | |
download | opie-5bc4dbd932fcfa64773b6e17fe57c665bdcd50b8.zip opie-5bc4dbd932fcfa64773b6e17fe57c665bdcd50b8.tar.gz opie-5bc4dbd932fcfa64773b6e17fe57c665bdcd50b8.tar.bz2 |
merged changes form qkonsole back into opie-embeddedkonsole (most likely not bugfree !)
Diffstat (limited to 'core/apps/embeddedkonsole/TEWidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/apps/embeddedkonsole/TEWidget.cpp | 148 |
1 files changed, 104 insertions, 44 deletions
diff --git a/core/apps/embeddedkonsole/TEWidget.cpp b/core/apps/embeddedkonsole/TEWidget.cpp index ec1b30c..98c3cdf 100644 --- a/core/apps/embeddedkonsole/TEWidget.cpp +++ b/core/apps/embeddedkonsole/TEWidget.cpp @@ -61,16 +61,17 @@ #include <qcursor.h> #include <qregexp.h> #include <qpainter.h> #include <qclipboard.h> #include <qstyle.h> #include <qfile.h> #include <qdragobject.h> +#include <qnamespace.h> #include <stdio.h> #include <stdlib.h> #include <unistd.h> #include <ctype.h> #include <sys/stat.h> #include <sys/types.h> #include <signal.h> @@ -239,33 +240,27 @@ static QChar identicalMap(QChar c) { return c; } void TEWidget::fontChange(const QFont &) { QFontMetrics fm(font()); font_h = fm.height(); - - // font_w = max width of ASCII chars (U.B.) - font_w = 0; - int fw; - for (int i = 0x20; i < 0x80; i++) { - if (isprint(i) && font_w < (fw = fm.width(i))) { - font_w = fw; - } - } - //font_w = fm.maxWidth(); - - font_a = fm.ascent(); -//printf("font_h: %d\n",font_h); -//printf("font_w: %d\n",font_w); -//printf("font_a: %d\n",font_a); -//printf("charset: %s\n",QFont::encodingName(font().charSet()).ascii()); -//printf("rawname: %s\n",font().rawName().ascii()); + // font_w = fm.maxWidth(); + font_w = fm.width("m"); + font_a = fm.ascent(); + printf("font h=%d max_width=%d width_m=%d assent=%d\n", font_h, + fm.maxWidth(), font_w, font_a); + + //printf("font_h: %d\n",font_h); + //printf("font_w: %d\n",font_w); + //printf("font_a: %d\n",font_a); + //printf("charset: %s\n",QFont::encodingName(font().charSet()).ascii()); + //printf("rawname: %s\n",font().rawName().ascii()); fontMap = #if QT_VERSION < 300 strcmp(QFont::encodingName(font().charSet()).ascii(),"iso10646") ? vt100extended : #endif identicalMap; propagateSize(); @@ -302,21 +297,21 @@ TEWidget::TEWidget(QWidget *parent, const char *name) : QFrame(parent,name) scrollbar = new QScrollBar(this); scrollbar->setCursor( arrowCursor ); connect(scrollbar, SIGNAL(valueChanged(int)), this, SLOT(scrollChanged(int))); hScrollbar = new QScrollBar(this); hScrollbar->setCursor( arrowCursor ); hScrollbar->setOrientation(QScrollBar::Horizontal); - hScrollbar->setMaximumHeight(16); + // hScrollbar->setMaximumHeight(16); connect( hScrollbar, SIGNAL(valueChanged(int)), this, SLOT( hScrollChanged(int))); - Config cfg("Konsole"); + Config cfg("Qkonsole"); cfg.setGroup("ScrollBar"); switch( cfg.readNumEntry("Position",2)){ case 0: scrollLoc = SCRNONE; break; case 1: scrollLoc = SCRLEFT; break; @@ -679,23 +674,26 @@ void TEWidget::setScrollbarLocation(int loc) void TEWidget::mousePressEvent(QMouseEvent* ev) { //printf("press [%d,%d] %d\n",ev->x()/font_w,ev->y()/font_h,ev->button()); if ( !contentsRect().contains(ev->pos()) ) return; QPoint tL = contentsRect().topLeft(); int tLx = tL.x(); int tLy = tL.y(); - word_selection_mode = FALSE; + mouse_down_x = ev->x(); + mouse_down_y = ev->y(); //printf("press top left [%d,%d] by=%d\n",tLx,tLy, bY); if ( ev->button() == LeftButton) { QPoint pos = QPoint((ev->x()-tLx-blX)/font_w,(ev->y()-tLy-bY)/font_h); + word_selection_mode = (ev->state() & ShiftButton); + if ( ev->state() & ControlButton ) preserve_line_breaks = FALSE ; if (mouse_marks || (ev->state() & ShiftButton)) { emit clearSelectionSignal(); iPntSel = pntSel = pos; actSel = 1; // left mouse button pressed but nothing selected yet. grabMouse( /*crossCursor*/ ); // handle with care! @@ -810,16 +808,22 @@ void TEWidget::mouseMoveEvent(QMouseEvent* ev) emit extendSelectionSignal( here.x(), here.y() ); } void TEWidget::mouseReleaseEvent(QMouseEvent* ev) { //printf("release [%d,%d] %d\n",ev->x()/font_w,ev->y()/font_h,ev->button()); if ( ev->button() == LeftButton) { + if (QABS(ev->x() - mouse_down_x) < 3 + && QABS(ev->y() - mouse_down_y) < 3 + && ev->y() < qApp->desktop()->height()/8) { + emit setFullScreen(false); + } + if ( actSel > 1 ) emit endSelectionSignal(preserve_line_breaks); preserve_line_breaks = TRUE; actSel = 0; //FIXME: emits a release event even if the mouse is // outside the range. The procedure used in `mouseMoveEvent' // applies here, too. @@ -1025,17 +1029,16 @@ bool TEWidget::eventFilter( QObject *obj, QEvent *e ) QApplication::sendEvent(scrollbar, e); } #ifdef FAKE_CTRL_AND_ALT static bool control = FALSE; static bool alt = FALSE; // qDebug(" Has a keyboard with no CTRL and ALT keys, but we fake it:"); bool dele=FALSE; - if ( e->type() == QEvent::KeyPress || e->type() == QEvent::KeyRelease ) { QKeyEvent* ke = (QKeyEvent*)e; bool keydown = e->type() == QEvent::KeyPress || ke->isAutoRepeat(); switch (ke->key()) { case Key_F9: // let this be "Control" control = keydown; e = new QKeyEvent(QEvent::KeyPress, Key_Control, 0, ke->state()); dele=TRUE; @@ -1064,35 +1067,93 @@ bool TEWidget::eventFilter( QObject *obj, QEvent *e ) #endif if ( e->type() == QEvent::KeyPress ) { QKeyEvent* ke = (QKeyEvent*)e; actSel=0; // Key stroke implies a screen update, so TEWidget won't // know where the current selection is. // qDebug("key pressed is 0x%x, ascii is 0x%x, state %d", ke->key(), ke->ascii(), ke->state()); - if(ke->key() == Key_Escape) { - qDebug("key pressed is 0x%x, ascii is 0x%x, state %d", ke->key(), ke->ascii(), ke->state()); - - } - - if( ke->state() == ShiftButton && ke->key() == Key_Tab) { - //lets hardcode this sucker - -// qDebug("key pressed 2 is 0x%x", ke->key()); - emitText("\\"); // expose - } - else if( ke->state() == ControlButton && ke->key() == Key_V) { - pasteClipboard(); - } -// else if( ke->state() == ControlButton && ke->key() == Key_C) { -// pasteClipboard(); -// } - else - emit keyPressedSignal(ke); // expose + + bool special_function = true; + switch(ke->key()) { + // case 0x201b: // fn-5 + // case Key_F1: + // switch sessions (?) + // emitText("\\"); // expose (??) + // break; + + case 0x2016: // fn-p + case Key_F2: + pasteClipboard(); + break; + + case 0x2018: // fn-S + case Key_F3: + emit changeSession(1); + break; + + case 0x2019: // fn-n + emit newSession(); + break; + + case Qt::Key_Tab: + if (ke->state() == ControlButton) { + emit changeSession(1); + } else { + special_function = false; + } + break; + +#if 0 + case Qt::Key_Left: + if (vcolumns == 0) { + emit changeSession(-1); + } else { + special_function = false; + } + break; + + case Qt::Key_Right: + if (vcolumns == 0) { + emit changeSession(1); + } else { + special_function = false; + } + break; +#endif + + case 0x201b: // fn-5 + case Key_F4: + emit toggleFullScreen(); + break; + + case 0x200f: // fn-1 magnify minus + case Key_F5: + emit changeFontSize(-1); + break; + + case 0x2010: // fn-2 magnify plus + case Key_F6: + emit changeFontSize(1); + break; + + default: + special_function = false; + } + if (special_function) { + return true; + } + // else if( ke->state() == ControlButton && ke->key() == Key_V) { + // pasteClipboard(); + // } + // else if( ke->state() == ControlButton && ke->key() == Key_C) { + // pasteClipboard(); + // } + emit keyPressedSignal(ke); // expose ke->accept(); #ifdef FAKE_CTRL_AND_ALT if ( dele ) delete e; #endif return true; // stop the event } if ( e->type() == QEvent::Enter ) { QObject::disconnect( (QObject*)cb, SIGNAL(dataChanged()), @@ -1111,17 +1172,16 @@ bool TEWidget::eventFilter( QObject *obj, QEvent *e ) /* */ /* ------------------------------------------------------------------------- */ void TEWidget::frameChanged() { propagateSize(); update(); } - /* ------------------------------------------------------------------------- */ /* */ /* Sound */ /* */ /* ------------------------------------------------------------------------- */ void TEWidget::Bell() { @@ -1162,17 +1222,17 @@ void TEWidget::clearImage() // Create Image /////////////////////////////////////////////////////// void TEWidget::calcGeometry() { int showhscrollbar = 1; int hwidth = 0; int dcolumns; - Config cfg("Konsole"); + Config cfg("Qkonsole"); cfg.setGroup("ScrollBar"); useHorzScroll=cfg.readBoolEntry("HorzScroll",0); if(vcolumns == 0) showhscrollbar = 0; if(showhscrollbar == 1) hwidth = QApplication::style().scrollBarExtent().width(); scrollbar->resize(QApplication::style().scrollBarExtent().width(), contentsRect().height() - hwidth); @@ -1363,11 +1423,11 @@ void TEWidget::drop_menu_activated(int item) break; } #endif } void TEWidget::setWrapAt(int columns) { vcolumns = columns; - propagateSize(); - update(); + propagateSize(); + update(); } |