author | llornkcor <llornkcor> | 2002-10-31 14:49:24 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-10-31 14:49:24 (UTC) |
commit | c3a6f53669140cf9e3c953772c610cd91d69ab78 (patch) (unidiff) | |
tree | ab8579e66582aedc01da2aea4272e754902e9287 /core/apps/embeddedkonsole | |
parent | 7d8a563125b981718ae963ba6308e3506e870045 (diff) | |
download | opie-c3a6f53669140cf9e3c953772c610cd91d69ab78.zip opie-c3a6f53669140cf9e3c953772c610cd91d69ab78.tar.gz opie-c3a6f53669140cf9e3c953772c610cd91d69ab78.tar.bz2 |
no wrap mode taken from console, gui needs work
-rw-r--r-- | core/apps/embeddedkonsole/TEHistory.cpp | 29 | ||||
-rw-r--r-- | core/apps/embeddedkonsole/TEScreen.cpp | 415 | ||||
-rw-r--r-- | core/apps/embeddedkonsole/TEWidget.cpp | 169 | ||||
-rw-r--r-- | core/apps/embeddedkonsole/TEWidget.h | 15 | ||||
-rw-r--r-- | core/apps/embeddedkonsole/TEmulation.cpp | 43 | ||||
-rw-r--r-- | core/apps/embeddedkonsole/konsole.cpp | 34 |
6 files changed, 491 insertions, 214 deletions
diff --git a/core/apps/embeddedkonsole/TEHistory.cpp b/core/apps/embeddedkonsole/TEHistory.cpp index 317ce57..db9d10c 100644 --- a/core/apps/embeddedkonsole/TEHistory.cpp +++ b/core/apps/embeddedkonsole/TEHistory.cpp | |||
@@ -9,11 +9,11 @@ | |||
9 | /* This file is part of Konsole - an X terminal for KDE */ | 9 | /* This file is part of Konsole - an X terminal for KDE */ |
10 | /* */ | 10 | /* */ |
11 | /* -------------------------------------------------------------------------- */ | 11 | /* -------------------------------------------------------------------------- */ |
12 | /* */ | 12 | /* */ |
13 | /* Ported Konsole to Qt/Embedded */ | 13 | /* Ported Konsole to Qt/Embedded */ |
14 | /* */ | 14 | /* */ |
15 | /* Copyright (C) 2000 by John Ryland <jryland@trolltech.com> */ | 15 | /* Copyright (C) 2000 by John Ryland <jryland@trolltech.com> */ |
16 | /* */ | 16 | /* */ |
17 | /* -------------------------------------------------------------------------- */ | 17 | /* -------------------------------------------------------------------------- */ |
18 | 18 | ||
19 | #include "TEHistory.h" | 19 | #include "TEHistory.h" |
@@ -117,18 +117,24 @@ bool HistoryBuffer::hasScroll() | |||
117 | void HistoryBuffer::add(const unsigned char* bytes, int len) | 117 | void HistoryBuffer::add(const unsigned char* bytes, int len) |
118 | { int rc; | 118 | { int rc; |
119 | assert(hasScroll()); | 119 | assert(hasScroll()); |
120 | rc = lseek(ion,length,SEEK_SET); if (rc < 0) { perror("HistoryBuffer::add.seek"); setScroll(FALSE); return; } | 120 | rc = lseek( ion, length, SEEK_SET); |
121 | rc = write(ion,bytes,len); if (rc < 0) { perror("HistoryBuffer::add.write"); setScroll(FALSE); return; } | 121 | if (rc < 0) { perror("HistoryBuffer::add.seek"); setScroll(FALSE); return; } |
122 | rc = write( ion, bytes, len); | ||
123 | if (rc < 0) { perror("HistoryBuffer::add.write"); setScroll(FALSE); return; } | ||
122 | length += rc; | 124 | length += rc; |
123 | } | 125 | } |
124 | 126 | ||
125 | void HistoryBuffer::get(unsigned char* bytes, int len, int loc) | 127 | void HistoryBuffer::get(unsigned char* bytes, int len, int loc) { |
126 | { int rc; | 128 | int rc; |
127 | assert(hasScroll()); | 129 | assert(hasScroll()); |
130 | // qDebug("history get len %d, loc %d, length %d", len, loc, length); | ||
128 | if (loc < 0 || len < 0 || loc + len > length) | 131 | if (loc < 0 || len < 0 || loc + len > length) |
129 | fprintf(stderr,"getHist(...,%d,%d): invalid args.\n",len,loc); | 132 | fprintf(stderr,"getHist(...,%d,%d): invalid args.\n",len,loc); |
130 | rc = lseek(ion,loc,SEEK_SET); if (rc < 0) { perror("HistoryBuffer::get.seek"); setScroll(FALSE); return; } | 133 | |
131 | rc = read(ion,bytes,len); if (rc < 0) { perror("HistoryBuffer::get.read"); setScroll(FALSE); return; } | 134 | rc = lseek( ion, loc, SEEK_SET); |
135 | if (rc < 0) { perror("HistoryBuffer::get.seek"); setScroll(FALSE); return; } | ||
136 | rc = read( ion, bytes, len); | ||
137 | if (rc < 0) { perror("HistoryBuffer::get.read"); setScroll(FALSE); return; } | ||
132 | } | 138 | } |
133 | 139 | ||
134 | int HistoryBuffer::len() | 140 | int HistoryBuffer::len() |
@@ -195,7 +201,8 @@ int HistoryScroll::startOfLine(int lineno) | |||
195 | void HistoryScroll::getCells(int lineno, int colno, int count, ca res[]) | 201 | void HistoryScroll::getCells(int lineno, int colno, int count, ca res[]) |
196 | { | 202 | { |
197 | assert(hasScroll()); | 203 | assert(hasScroll()); |
198 | cells.get((unsigned char*)res,count*sizeof(ca),startOfLine(lineno)+colno*sizeof(ca)); | 204 | //get(unsigned char* bytes, int len, int loc) |
205 | cells.get( (unsigned char*)res, count * sizeof(ca), startOfLine( lineno) + colno * sizeof(ca) ); | ||
199 | } | 206 | } |
200 | 207 | ||
201 | void HistoryScroll::addCells(ca text[], int count) | 208 | void HistoryScroll::addCells(ca text[], int count) |
diff --git a/core/apps/embeddedkonsole/TEScreen.cpp b/core/apps/embeddedkonsole/TEScreen.cpp index a3d115d..50807d3 100644 --- a/core/apps/embeddedkonsole/TEScreen.cpp +++ b/core/apps/embeddedkonsole/TEScreen.cpp | |||
@@ -9,12 +9,13 @@ | |||
9 | /* This file is part of Konsole - an X terminal for KDE */ | 9 | /* This file is part of Konsole - an X terminal for KDE */ |
10 | /* */ | 10 | /* */ |
11 | /* -------------------------------------------------------------------------- */ | 11 | /* -------------------------------------------------------------------------- */ |
12 | /* */ | 12 | /* */ |
13 | /* Ported Konsole to Qt/Embedded */ | 13 | /* Ported Konsole to Qt/Embedded */ |
14 | /* */ | 14 | /* */ |
15 | /* Copyright (C) 2000 by John Ryland <jryland@trolltech.com> */ | 15 | /* Copyright (C) 2000 by John Ryland <jryland@trolltech.com> */ |
16 | /* */ | 16 | /* */ |
17 | /* -------------------------------------------------------------------------- */ | 17 | /* -------------------------------------------------------------------------- */ |
18 | // enhancements added by L.J. Potter <ljp@llornkcor.com> | ||
18 | 19 | ||
19 | /*! \file | 20 | /*! \file |
20 | */ | 21 | */ |
@@ -50,6 +51,7 @@ | |||
50 | #include <string.h> | 51 | #include <string.h> |
51 | #include <ctype.h> | 52 | #include <ctype.h> |
52 | 53 | ||
54 | #include <qpe/config.h> | ||
53 | #include "TEScreen.h" | 55 | #include "TEScreen.h" |
54 | 56 | ||
55 | #define HERE printf("%s(%d): here\n",__FILE__,__LINE__) | 57 | #define HERE printf("%s(%d): here\n",__FILE__,__LINE__) |
@@ -58,7 +60,7 @@ | |||
58 | //FIXME: see if we can get this from terminfo. | 60 | //FIXME: see if we can get this from terminfo. |
59 | #define BS_CLEARS FALSE | 61 | #define BS_CLEARS FALSE |
60 | 62 | ||
61 | #define loc(X,Y) ((Y)*columns+(X)) | 63 | #define loc(X,Y) ((Y) * columns + (X)) |
62 | 64 | ||
63 | /*! creates a `TEScreen' of `lines' lines and `columns' columns. | 65 | /*! creates a `TEScreen' of `lines' lines and `columns' columns. |
64 | */ | 66 | */ |
@@ -67,11 +69,13 @@ TEScreen::TEScreen(int lines, int columns) | |||
67 | { | 69 | { |
68 | this->lines = lines; | 70 | this->lines = lines; |
69 | this->columns = columns; | 71 | this->columns = columns; |
70 | 72 | // qDebug("Columns %d", columns); | |
73 | |||
71 | image = (ca*) malloc(lines*columns*sizeof(ca)); | 74 | image = (ca*) malloc(lines*columns*sizeof(ca)); |
72 | tabstops = NULL; initTabStops(); | 75 | tabstops = NULL; initTabStops(); |
73 | 76 | ||
74 | histCursor = 0; | 77 | histCursor = 0; |
78 | horzCursor = 0; | ||
75 | 79 | ||
76 | clearSelection(); | 80 | clearSelection(); |
77 | reset(); | 81 | reset(); |
@@ -383,53 +387,49 @@ void TEScreen::restoreCursor() | |||
383 | 387 | ||
384 | void TEScreen::resizeImage(int new_lines, int new_columns) | 388 | void TEScreen::resizeImage(int new_lines, int new_columns) |
385 | { | 389 | { |
386 | 390 | if (cuY > new_lines-1) { | |
387 | if (cuY > new_lines-1) | 391 | // attempt to preserve focus and lines |
388 | { // attempt to preserve focus and lines | 392 | bmargin = lines-1; //FIXME: margin lost |
389 | bmargin = lines-1; //FIXME: margin lost | 393 | for (int i = 0; i < cuY-(new_lines-1); i++) { |
390 | for (int i = 0; i < cuY-(new_lines-1); i++) | 394 | addHistLine(); scrollUp(horzCursor,1); |
391 | { | 395 | } |
392 | addHistLine(); scrollUp(0,1); | ||
393 | } | 396 | } |
394 | } | ||
395 | 397 | ||
396 | // make new image | 398 | // make new image |
397 | ca* newimg = (ca*)malloc(new_lines*new_columns*sizeof(ca)); | 399 | ca* newimg = (ca*)malloc( new_lines * new_columns * sizeof( ca)); |
398 | 400 | ||
399 | clearSelection(); | 401 | clearSelection(); |
400 | |||
401 | // clear new image | ||
402 | for (int y = 0; y < new_lines; y++) | ||
403 | for (int x = 0; x < new_columns; x++) | ||
404 | { | ||
405 | newimg[y*new_columns+x].c = ' '; | ||
406 | newimg[y*new_columns+x].f = DEFAULT_FORE_COLOR; | ||
407 | newimg[y*new_columns+x].b = DEFAULT_BACK_COLOR; | ||
408 | newimg[y*new_columns+x].r = DEFAULT_RENDITION; | ||
409 | } | ||
410 | int cpy_lines = QMIN(new_lines, lines); | ||
411 | int cpy_columns = QMIN(new_columns,columns); | ||
412 | // copy to new image | ||
413 | for (int y = 0; y < cpy_lines; y++) | ||
414 | for (int x = 0; x < cpy_columns; x++) | ||
415 | { | ||
416 | newimg[y*new_columns+x].c = image[loc(x,y)].c; | ||
417 | newimg[y*new_columns+x].f = image[loc(x,y)].f; | ||
418 | newimg[y*new_columns+x].b = image[loc(x,y)].b; | ||
419 | newimg[y*new_columns+x].r = image[loc(x,y)].r; | ||
420 | } | ||
421 | free(image); | ||
422 | image = newimg; | ||
423 | lines = new_lines; | ||
424 | columns = new_columns; | ||
425 | cuX = QMIN(cuX,columns-1); | ||
426 | cuY = QMIN(cuY,lines-1); | ||
427 | 402 | ||
428 | // FIXME: try to keep values, evtl. | 403 | // clear new image |
429 | tmargin=0; | 404 | for (int y = 0; y < new_lines; y++) |
430 | bmargin=lines-1; | 405 | for (int x = 0; x < new_columns; x++) { |
431 | initTabStops(); | 406 | newimg[y*new_columns+x].c = ' '; |
432 | clearSelection(); | 407 | newimg[y*new_columns+x].f = DEFAULT_FORE_COLOR; |
408 | newimg[y*new_columns+x].b = DEFAULT_BACK_COLOR; | ||
409 | newimg[y*new_columns+x].r = DEFAULT_RENDITION; | ||
410 | } | ||
411 | int cpy_lines = QMIN(new_lines, lines); | ||
412 | int cpy_columns = QMIN(new_columns,columns); | ||
413 | // copy to new image | ||
414 | for (int y = 0; y < cpy_lines; y++) | ||
415 | for (int x = 0; x < cpy_columns; x++) { | ||
416 | newimg[y*new_columns+x].c = image[loc(x,y)].c; | ||
417 | newimg[y*new_columns+x].f = image[loc(x,y)].f; | ||
418 | newimg[y*new_columns+x].b = image[loc(x,y)].b; | ||
419 | newimg[y*new_columns+x].r = image[loc(x,y)].r; | ||
420 | } | ||
421 | free(image); | ||
422 | image = newimg; | ||
423 | lines = new_lines; | ||
424 | columns = new_columns; | ||
425 | cuX = QMIN(cuX,columns-1); | ||
426 | cuY = QMIN(cuY,lines-1); | ||
427 | |||
428 | // FIXME: try to keep values, evtl. | ||
429 | tmargin=0; | ||
430 | bmargin=lines-1; | ||
431 | initTabStops(); | ||
432 | clearSelection(); | ||
433 | } | 433 | } |
434 | 434 | ||
435 | /* | 435 | /* |
@@ -505,7 +505,8 @@ void TEScreen::effectiveRendition() | |||
505 | */ | 505 | */ |
506 | 506 | ||
507 | ca* TEScreen::getCookedImage() | 507 | ca* TEScreen::getCookedImage() |
508 | { int x,y; | 508 | { |
509 | int x,y; | ||
509 | ca* merged = (ca*)malloc(lines*columns*sizeof(ca)); | 510 | ca* merged = (ca*)malloc(lines*columns*sizeof(ca)); |
510 | ca dft(' ',DEFAULT_FORE_COLOR,DEFAULT_BACK_COLOR,DEFAULT_RENDITION); | 511 | ca dft(' ',DEFAULT_FORE_COLOR,DEFAULT_BACK_COLOR,DEFAULT_RENDITION); |
511 | 512 | ||
@@ -548,6 +549,65 @@ ca* TEScreen::getCookedImage() | |||
548 | if (getMode(MODE_Cursor) && (cuY+(hist.getLines()-histCursor) < lines)) // cursor visible | 549 | if (getMode(MODE_Cursor) && (cuY+(hist.getLines()-histCursor) < lines)) // cursor visible |
549 | reverseRendition(&merged[loc(cuX,cuY+(hist.getLines()-histCursor))]); | 550 | reverseRendition(&merged[loc(cuX,cuY+(hist.getLines()-histCursor))]); |
550 | return merged; | 551 | return merged; |
552 | |||
553 | /* | ||
554 | int x, y, z; | ||
555 | |||
556 | ca* merged = (ca*)malloc( lines * columns * sizeof( ca)); | ||
557 | |||
558 | ca dft(' ',DEFAULT_FORE_COLOR,DEFAULT_BACK_COLOR,DEFAULT_RENDITION); | ||
559 | |||
560 | // qDebug("hist lines %d, historyCursor %d, minus %d ,lines %d, columns %d", | ||
561 | // hist.getLines(), histCursor, hist.getLines() - histCursor , lines, columns); | ||
562 | for (y = 0; (y < lines) && (y < ( hist.getLines() - histCursor )); y++) { | ||
563 | |||
564 | int len = QMIN( columns, hist.getLineLen( y + histCursor) ); | ||
565 | int yp = y * columns; | ||
566 | int yq = ( y + histCursor) * columns; | ||
567 | // qDebug("horzCursor %d, columns %d, len %d", horzCursor, columns, len); | ||
568 | // qDebug("lineno %d, colno %d, count %d\n", y + histCursor, (horzCursor / 2), len ); | ||
569 | qDebug("Y %d", y); | ||
570 | hist.getCells( y + histCursor, (horzCursor / 2), len, merged + yp); | ||
571 | |||
572 | for (x = len; x < columns; x++) | ||
573 | merged[yp + x] = dft; | ||
574 | for (x = 0; x < columns; x++) { | ||
575 | int p = x + yp; int q = x + yq; | ||
576 | if ( ( q >= sel_TL ) && ( q <= sel_BR ) ) | ||
577 | reverseRendition(&merged[p]); // for selection | ||
578 | } | ||
579 | } | ||
580 | |||
581 | if (lines >= hist.getLines() - histCursor) { | ||
582 | for (y = ( hist.getLines() - histCursor); y < lines ; y++) { | ||
583 | int z = horzCursor; | ||
584 | int yp = y * columns; | ||
585 | int yq = ( y + histCursor) * columns; | ||
586 | int yr = ( y - hist.getLines() + histCursor) * columns; | ||
587 | // qDebug("y %d, yp %d, yq %d, columns %d, z cursor %d", y, yp, yq, columns, z); | ||
588 | for (x = 0; x < columns; x++) { | ||
589 | int p = x + yp; int q = x + yq; int r = (x + (horzCursor/2) ) + yr; | ||
590 | merged[p] = image[r]; | ||
591 | if ( q >= sel_TL && q <= sel_BR ) | ||
592 | reverseRendition( &merged[p]); // for selection | ||
593 | } | ||
594 | } | ||
595 | } | ||
596 | |||
597 | |||
598 | // evtl. inverse display | ||
599 | if (getMode(MODE_Screen)) | ||
600 | { int i, n = lines * columns; | ||
601 | for (i = 0; i < n; i++) | ||
602 | reverseRendition( &merged[i]); // for reverse display | ||
603 | } | ||
604 | if (getMode(MODE_Cursor) && ( cuY + ( hist.getLines() - histCursor) < lines)) // cursor visible | ||
605 | |||
606 | reverseRendition( &merged[ loc( cuX, cuY + ( hist.getLines() - histCursor))] ); | ||
607 | |||
608 | return merged; | ||
609 | */ | ||
610 | |||
551 | } | 611 | } |
552 | 612 | ||
553 | 613 | ||
@@ -556,7 +616,12 @@ ca* TEScreen::getCookedImage() | |||
556 | 616 | ||
557 | void TEScreen::reset() | 617 | void TEScreen::reset() |
558 | { | 618 | { |
619 | Config cfg("Konsole"); | ||
620 | cfg.setGroup("ScrollBar"); | ||
621 | if( !cfg.readBoolEntry("HorzScroll",0) ) | ||
559 | setMode(MODE_Wrap ); saveMode(MODE_Wrap ); // wrap at end of margin | 622 | setMode(MODE_Wrap ); saveMode(MODE_Wrap ); // wrap at end of margin |
623 | |||
624 | |||
560 | resetMode(MODE_Origin); saveMode(MODE_Origin); // position refere to [1,1] | 625 | resetMode(MODE_Origin); saveMode(MODE_Origin); // position refere to [1,1] |
561 | resetMode(MODE_Insert); saveMode(MODE_Insert); // overstroke | 626 | resetMode(MODE_Insert); saveMode(MODE_Insert); // overstroke |
562 | setMode(MODE_Cursor); // cursor visible | 627 | setMode(MODE_Cursor); // cursor visible |
@@ -658,12 +723,13 @@ void TEScreen::ShowCharacter(unsigned short c) | |||
658 | 723 | ||
659 | if (cuX >= columns) | 724 | if (cuX >= columns) |
660 | { | 725 | { |
661 | if (getMode(MODE_Wrap)) NextLine(); else cuX = columns-1; | 726 | if (getMode(MODE_Wrap)) NextLine(); else cuX = columns - 1; |
727 | // comment out for no wrap | ||
662 | } | 728 | } |
663 | 729 | ||
664 | if (getMode(MODE_Insert)) insertChars(1); | 730 | if (getMode(MODE_Insert)) insertChars(1); |
665 | 731 | ||
666 | int i = loc(cuX,cuY); | 732 | int i = loc( cuX, cuY); |
667 | 733 | ||
668 | checkSelection(i, i); // check if selection is still valid. | 734 | checkSelection(i, i); // check if selection is still valid. |
669 | 735 | ||
@@ -685,10 +751,11 @@ void TEScreen::ShowCharacter(unsigned short c) | |||
685 | 751 | ||
686 | void TEScreen::scrollUp(int from, int n) | 752 | void TEScreen::scrollUp(int from, int n) |
687 | { | 753 | { |
688 | if (n <= 0 || from + n > bmargin) return; | 754 | if (n <= 0 || from + n > bmargin) return; |
689 | //FIXME: make sure `tmargin', `bmargin', `from', `n' is in bounds. | 755 | //FIXME: make sure `tmargin', `bmargin', `from', `n' is in bounds. |
690 | moveImage(loc(0,from),loc(0,from+n),loc(columns-1,bmargin)); | 756 | |
691 | clearImage(loc(0,bmargin-n+1),loc(columns-1,bmargin),' '); | 757 | moveImage( loc( 0, from), loc( 0, from + n), loc( columns - 1, bmargin)); |
758 | clearImage( loc( 0, bmargin - n + 1), loc( columns - 1, bmargin), ' '); | ||
692 | } | 759 | } |
693 | 760 | ||
694 | /*! scroll down `n' lines within current region. | 761 | /*! scroll down `n' lines within current region. |
@@ -698,14 +765,18 @@ void TEScreen::scrollUp(int from, int n) | |||
698 | 765 | ||
699 | void TEScreen::scrollDown(int from, int n) | 766 | void TEScreen::scrollDown(int from, int n) |
700 | { | 767 | { |
768 | |||
701 | //FIXME: make sure `tmargin', `bmargin', `from', `n' is in bounds. | 769 | //FIXME: make sure `tmargin', `bmargin', `from', `n' is in bounds. |
702 | if (n <= 0) return; | 770 | if (n <= 0) return; |
703 | if (from > bmargin) return; | 771 | if (from > bmargin) return; |
704 | if (from + n > bmargin) n = bmargin - from; | 772 | if (from + n > bmargin) n = bmargin - from; |
705 | moveImage(loc(0,from+n),loc(0,from),loc(columns-1,bmargin-n)); | 773 | |
774 | moveImage( loc(0,from+n), loc(0,from), loc(columns-1,bmargin-n)); | ||
706 | clearImage(loc(0,from),loc(columns-1,from+n-1),' '); | 775 | clearImage(loc(0,from),loc(columns-1,from+n-1),' '); |
707 | } | 776 | } |
708 | 777 | ||
778 | |||
779 | |||
709 | /*! position the cursor to a specific line and column. */ | 780 | /*! position the cursor to a specific line and column. */ |
710 | void TEScreen::setCursorYX(int y, int x) | 781 | void TEScreen::setCursorYX(int y, int x) |
711 | { | 782 | { |
@@ -871,7 +942,7 @@ void TEScreen::clearToBeginOfLine() | |||
871 | 942 | ||
872 | void TEScreen::clearEntireLine() | 943 | void TEScreen::clearEntireLine() |
873 | { | 944 | { |
874 | clearImage(loc(0,cuY),loc(columns-1,cuY),' '); | 945 | clearImage( loc( 0, cuY),loc( columns - 1, cuY),' '); |
875 | } | 946 | } |
876 | 947 | ||
877 | // Rendition ------------------------------------------------------------------ | 948 | // Rendition ------------------------------------------------------------------ |
@@ -988,17 +1059,17 @@ QString TEScreen::getSelText(const BOOL preserve_line_breaks) | |||
988 | if (sel_begin == -1) | 1059 | if (sel_begin == -1) |
989 | return QString::null; // Selection got clear while selecting. | 1060 | return QString::null; // Selection got clear while selecting. |
990 | 1061 | ||
991 | int *m; // buffer to fill. | 1062 | int *m; // buffer to fill. |
992 | int s, d; // source index, dest. index. | 1063 | int s, d; // source index, dest. index. |
993 | int hist_BR = loc(0, hist.getLines()); | 1064 | int hist_BR = loc(0, hist.getLines()); |
994 | int hY = sel_TL / columns; | 1065 | int hY = sel_TL / columns; |
995 | int hX = sel_TL % columns; | 1066 | int hX = sel_TL % columns; |
996 | int eol; // end of line | 1067 | int eol; // end of line |
997 | 1068 | ||
998 | s = sel_TL; // tracks copy in source. | 1069 | s = sel_TL; // tracks copy in source. |
999 | 1070 | ||
1000 | // allocate buffer for maximum | 1071 | // allocate buffer for maximum |
1001 | // possible size... | 1072 | // possible size... |
1002 | d = (sel_BR - sel_TL) / columns + 1; | 1073 | d = (sel_BR - sel_TL) / columns + 1; |
1003 | m = new int[d * (columns + 1) + 2]; | 1074 | m = new int[d * (columns + 1) + 2]; |
1004 | d = 0; | 1075 | d = 0; |
@@ -1006,103 +1077,103 @@ QString TEScreen::getSelText(const BOOL preserve_line_breaks) | |||
1006 | while (s <= sel_BR) | 1077 | while (s <= sel_BR) |
1007 | { | 1078 | { |
1008 | if (s < hist_BR) | 1079 | if (s < hist_BR) |
1009 | { // get lines from hist.history | 1080 | { // get lines from hist.history |
1010 | // buffer. | 1081 | // buffer. |
1011 | eol = hist.getLineLen(hY); | 1082 | eol = hist.getLineLen(hY); |
1012 | 1083 | ||
1013 | if ((hY == (sel_BR / columns)) && | 1084 | if ((hY == (sel_BR / columns)) && |
1014 | (eol >= (sel_BR % columns))) | 1085 | (eol >= (sel_BR % columns))) |
1015 | { | 1086 | { |
1016 | eol = sel_BR % columns + 1; | 1087 | eol = sel_BR % columns + 1; |
1017 | } | 1088 | } |
1018 | 1089 | ||
1019 | while (hX < eol) | 1090 | while (hX < eol) |
1020 | { | 1091 | { |
1021 | m[d++] = hist.getCell(hY, hX++).c; | 1092 | m[d++] = hist.getCell(hY, hX++).c; |
1022 | s++; | 1093 | s++; |
1023 | } | 1094 | } |
1024 | 1095 | ||
1025 | if (s <= sel_BR) | 1096 | if (s <= sel_BR) |
1026 | { | 1097 | { |
1027 | // The line break handling | 1098 | // The line break handling |
1028 | // It's different from the screen | 1099 | // It's different from the screen |
1029 | // image case! | 1100 | // image case! |
1030 | if (eol % columns == 0) | 1101 | if (eol % columns == 0) |
1031 | { | 1102 | { |
1032 | // That's either a completely filled | 1103 | // That's either a completely filled |
1033 | // line or an empty line | 1104 | // line or an empty line |
1034 | if (eol == 0) | 1105 | if (eol == 0) |
1035 | { | 1106 | { |
1036 | m[d++] = '\n'; | 1107 | m[d++] = '\n'; |
1037 | } | 1108 | } |
1038 | else | 1109 | else |
1039 | { | 1110 | { |
1040 | // We have a full line. | 1111 | // We have a full line. |
1041 | // FIXME: How can we handle newlines | 1112 | // FIXME: How can we handle newlines |
1042 | // at this position?! | 1113 | // at this position?! |
1043 | } | 1114 | } |
1044 | } | 1115 | } |
1045 | else if ((eol + 1) % columns == 0) | 1116 | else if ((eol + 1) % columns == 0) |
1046 | { | 1117 | { |
1047 | // FIXME: We don't know if this was a | 1118 | // FIXME: We don't know if this was a |
1048 | // space at the last position or a | 1119 | // space at the last position or a |
1049 | // short line!! | 1120 | // short line!! |
1050 | m[d++] = ' '; | 1121 | m[d++] = ' '; |
1051 | } | 1122 | } |
1052 | else | 1123 | else |
1053 | { | 1124 | { |
1054 | // We have a short line here. Put a | 1125 | // We have a short line here. Put a |
1055 | // newline or a space into the | 1126 | // newline or a space into the |
1056 | // buffer. | 1127 | // buffer. |
1057 | m[d++] = preserve_line_breaks ? '\n' : ' '; | 1128 | m[d++] = preserve_line_breaks ? '\n' : ' '; |
1058 | } | 1129 | } |
1059 | } | 1130 | } |
1060 | 1131 | ||
1061 | hY++; | 1132 | hY++; |
1062 | hX = 0; | 1133 | hX = 0; |
1063 | s = hY * columns; | 1134 | s = hY * columns; |
1064 | } | 1135 | } |
1065 | else | 1136 | else |
1066 | { // or from screen image. | 1137 | { // or from screen image. |
1067 | eol = (s / columns + 1) * columns - 1; | 1138 | eol = (s / columns + 1) * columns - 1; |
1068 | 1139 | ||
1069 | if (eol < sel_BR) | 1140 | if (eol < sel_BR) |
1070 | { | 1141 | { |
1071 | while ((eol > s) && | 1142 | while ((eol > s) && |
1072 | isspace(image[eol - hist_BR].c)) | 1143 | isspace(image[eol - hist_BR].c)) |
1073 | { | 1144 | { |
1074 | eol--; | 1145 | eol--; |
1075 | } | 1146 | } |
1076 | } | 1147 | } |
1077 | else | 1148 | else |
1078 | { | 1149 | { |
1079 | eol = sel_BR; | 1150 | eol = sel_BR; |
1080 | } | 1151 | } |
1081 | 1152 | ||
1082 | while (s <= eol) | 1153 | while (s <= eol) |
1083 | { | 1154 | { |
1084 | m[d++] = image[s++ - hist_BR].c; | 1155 | m[d++] = image[s++ - hist_BR].c; |
1085 | } | 1156 | } |
1086 | 1157 | ||
1087 | if (eol < sel_BR) | 1158 | if (eol < sel_BR) |
1088 | { | 1159 | { |
1089 | // eol processing see below ... | 1160 | // eol processing see below ... |
1090 | if ((eol + 1) % columns == 0) | 1161 | if ((eol + 1) % columns == 0) |
1091 | { | 1162 | { |
1092 | if (image[eol - hist_BR].c == ' ') | 1163 | if (image[eol - hist_BR].c == ' ') |
1093 | { | 1164 | { |
1094 | m[d++] = ' '; | 1165 | m[d++] = ' '; |
1095 | } | 1166 | } |
1096 | } | 1167 | } |
1097 | else | 1168 | else |
1098 | { | 1169 | { |
1099 | m[d++] = ((preserve_line_breaks || | 1170 | m[d++] = ((preserve_line_breaks || |
1100 | ((eol % columns) == 0)) ? | 1171 | ((eol % columns) == 0)) ? |
1101 | '\n' : ' '); | 1172 | '\n' : ' '); |
1102 | } | 1173 | } |
1103 | } | 1174 | } |
1104 | 1175 | ||
1105 | s = (eol / columns + 1) * columns; | 1176 | s = (eol / columns + 1) * columns; |
1106 | } | 1177 | } |
1107 | } | 1178 | } |
1108 | 1179 | ||
@@ -1129,8 +1200,8 @@ cases: | |||
1129 | are preserved. | 1200 | are preserved. |
1130 | 1201 | ||
1131 | FIXME: | 1202 | FIXME: |
1132 | * this suppresses \n for command output that is | 1203 | * this suppresses \n for command output that is |
1133 | sized to the exact column width of the screen. | 1204 | sized to the exact column width of the screen. |
1134 | 1205 | ||
1135 | 2) eol%columns == 0 --> blank line. | 1206 | 2) eol%columns == 0 --> blank line. |
1136 | insert a \n unconditionally. | 1207 | insert a \n unconditionally. |
@@ -1138,7 +1209,7 @@ FIXME: | |||
1138 | or because it's an ASCII paragraph delimiter, so even when | 1209 | or because it's an ASCII paragraph delimiter, so even when |
1139 | not preserving line_breaks, you want to preserve paragraph breaks. | 1210 | not preserving line_breaks, you want to preserve paragraph breaks. |
1140 | 1211 | ||
1141 | 3) else --> partially filled line | 1212 | 3) else --> partially filled line |
1142 | insert a \n in preserve line break mode, else a space | 1213 | insert a \n in preserve line break mode, else a space |
1143 | The space prevents concatenation of the last word of one | 1214 | The space prevents concatenation of the last word of one |
1144 | line with the first of the next. | 1215 | line with the first of the next. |
@@ -1152,18 +1223,18 @@ void TEScreen::addHistLine() | |||
1152 | // add to hist buffer | 1223 | // add to hist buffer |
1153 | // we have to take care about scrolling, too... | 1224 | // we have to take care about scrolling, too... |
1154 | 1225 | ||
1155 | if (hasScroll()) | 1226 | if (hasScroll()){ |
1156 | { ca dft; | 1227 | ca dft; |
1157 | 1228 | ||
1158 | int end = columns-1; | 1229 | int end = columns - 1; |
1159 | while (end >= 0 && image[end] == dft) | 1230 | while (end >= 0 && image[end] == dft) |
1160 | end -= 1; | 1231 | end -= 1; |
1161 | 1232 | ||
1162 | hist.addCells(image,end+1); | 1233 | hist.addCells( image, end + 1); |
1163 | hist.addLine(); | 1234 | hist.addLine(); |
1164 | 1235 | ||
1165 | // adjust history cursor | 1236 | // adjust history cursor |
1166 | histCursor += (hist.getLines()-1 == histCursor); | 1237 | histCursor += ( hist.getLines() - 1 == histCursor); |
1167 | } | 1238 | } |
1168 | 1239 | ||
1169 | if (!hasScroll()) histCursor = 0; //FIXME: a poor workaround | 1240 | if (!hasScroll()) histCursor = 0; //FIXME: a poor workaround |
@@ -1174,11 +1245,21 @@ void TEScreen::setHistCursor(int cursor) | |||
1174 | histCursor = cursor; //FIXME:rangecheck | 1245 | histCursor = cursor; //FIXME:rangecheck |
1175 | } | 1246 | } |
1176 | 1247 | ||
1248 | void TEScreen::setHorzCursor(int cursor) | ||
1249 | { | ||
1250 | horzCursor = cursor; | ||
1251 | } | ||
1252 | |||
1177 | int TEScreen::getHistCursor() | 1253 | int TEScreen::getHistCursor() |
1178 | { | 1254 | { |
1179 | return histCursor; | 1255 | return histCursor; |
1180 | } | 1256 | } |
1181 | 1257 | ||
1258 | int TEScreen::getHorzCursor() | ||
1259 | { | ||
1260 | return horzCursor; | ||
1261 | } | ||
1262 | |||
1182 | int TEScreen::getHistLines() | 1263 | int TEScreen::getHistLines() |
1183 | { | 1264 | { |
1184 | return hist.getLines(); | 1265 | return hist.getLines(); |
diff --git a/core/apps/embeddedkonsole/TEWidget.cpp b/core/apps/embeddedkonsole/TEWidget.cpp index b1ad008..c10c7a8 100644 --- a/core/apps/embeddedkonsole/TEWidget.cpp +++ b/core/apps/embeddedkonsole/TEWidget.cpp | |||
@@ -52,6 +52,13 @@ | |||
52 | #include "session.h" | 52 | #include "session.h" |
53 | #include <qpe/config.h> | 53 | #include <qpe/config.h> |
54 | 54 | ||
55 | #include <qpe/resource.h> | ||
56 | #include <qpe/sound.h> | ||
57 | |||
58 | #ifdef QWS | ||
59 | #include <qpe/qcopenvelope_qws.h> | ||
60 | #endif | ||
61 | |||
55 | #include <qcursor.h> | 62 | #include <qcursor.h> |
56 | #include <qregexp.h> | 63 | #include <qregexp.h> |
57 | #include <qpainter.h> | 64 | #include <qpainter.h> |
@@ -287,6 +294,13 @@ TEWidget::TEWidget(QWidget *parent, const char *name) : QFrame(parent,name) | |||
287 | scrollbar->setCursor( arrowCursor ); | 294 | scrollbar->setCursor( arrowCursor ); |
288 | connect(scrollbar, SIGNAL(valueChanged(int)), this, SLOT(scrollChanged(int))); | 295 | connect(scrollbar, SIGNAL(valueChanged(int)), this, SLOT(scrollChanged(int))); |
289 | 296 | ||
297 | hScrollbar = new QScrollBar(this); | ||
298 | hScrollbar->setCursor( arrowCursor ); | ||
299 | hScrollbar->setOrientation(QScrollBar::Horizontal); | ||
300 | hScrollbar->setMaximumHeight(16); | ||
301 | |||
302 | connect( hScrollbar, SIGNAL(valueChanged(int)), this, SLOT( hScrollChanged(int))); | ||
303 | |||
290 | Config cfg("Konsole"); | 304 | Config cfg("Konsole"); |
291 | cfg.setGroup("ScrollBar"); | 305 | cfg.setGroup("ScrollBar"); |
292 | switch( cfg.readNumEntry("Position",2)){ | 306 | switch( cfg.readNumEntry("Position",2)){ |
@@ -301,6 +315,8 @@ TEWidget::TEWidget(QWidget *parent, const char *name) : QFrame(parent,name) | |||
301 | break; | 315 | break; |
302 | }; | 316 | }; |
303 | 317 | ||
318 | useHorzScroll=cfg.readBoolEntry("HorzScroll",0); | ||
319 | |||
304 | blinkT = new QTimer(this); | 320 | blinkT = new QTimer(this); |
305 | connect(blinkT, SIGNAL(timeout()), this, SLOT(blinkEvent())); | 321 | connect(blinkT, SIGNAL(timeout()), this, SLOT(blinkEvent())); |
306 | // blinking = FALSE; | 322 | // blinking = FALSE; |
@@ -315,6 +331,7 @@ TEWidget::TEWidget(QWidget *parent, const char *name) : QFrame(parent,name) | |||
315 | font_h = 1; | 331 | font_h = 1; |
316 | font_a = 1; | 332 | font_a = 1; |
317 | word_selection_mode = FALSE; | 333 | word_selection_mode = FALSE; |
334 | hposition = 0; | ||
318 | 335 | ||
319 | setMouseMarks(TRUE); | 336 | setMouseMarks(TRUE); |
320 | setVTFont( QFont("fixed") ); | 337 | setVTFont( QFont("fixed") ); |
@@ -410,10 +427,7 @@ HCNT("setImage"); | |||
410 | int lins = QMIN(this->lines, QMAX(0,lines )); | 427 | int lins = QMIN(this->lines, QMAX(0,lines )); |
411 | int cols = QMIN(this->columns,QMAX(0,columns)); | 428 | int cols = QMIN(this->columns,QMAX(0,columns)); |
412 | QChar *disstrU = new QChar[cols]; | 429 | QChar *disstrU = new QChar[cols]; |
413 | 430 | for (y = 0; y < lins; y++) { | |
414 | //{ static int cnt = 0; printf("setImage %d\n",cnt++); } | ||
415 | for (y = 0; y < lins; y++) | ||
416 | { | ||
417 | const ca* lcl = &image[y*this->columns]; | 431 | const ca* lcl = &image[y*this->columns]; |
418 | const ca* const ext = &newimg[y*columns]; | 432 | const ca* const ext = &newimg[y*columns]; |
419 | if (!resizing) // not while resizing, we're expecting a paintEvent | 433 | if (!resizing) // not while resizing, we're expecting a paintEvent |
@@ -588,11 +602,18 @@ void TEWidget::propagateSize() | |||
588 | /* */ | 602 | /* */ |
589 | /* ------------------------------------------------------------------------- */ | 603 | /* ------------------------------------------------------------------------- */ |
590 | 604 | ||
591 | void TEWidget::scrollChanged(int) | 605 | void TEWidget::scrollChanged(int) { |
592 | { | ||
593 | emit changedHistoryCursor(scrollbar->value()); //expose | 606 | emit changedHistoryCursor(scrollbar->value()); //expose |
594 | } | 607 | } |
595 | 608 | ||
609 | void TEWidget::hScrollChanged(int loc) { | ||
610 | hposition = loc; | ||
611 | propagateSize(); | ||
612 | update(); | ||
613 | |||
614 | // emit changedHorzCursor( hScrollbar->value()); //expose | ||
615 | } | ||
616 | |||
596 | void TEWidget::setScroll(int cursor, int slines) | 617 | void TEWidget::setScroll(int cursor, int slines) |
597 | { | 618 | { |
598 | disconnect(scrollbar, SIGNAL(valueChanged(int)), this, SLOT(scrollChanged(int))); | 619 | disconnect(scrollbar, SIGNAL(valueChanged(int)), this, SLOT(scrollChanged(int))); |
@@ -697,6 +718,7 @@ void TEWidget::mouseMoveEvent(QMouseEvent* ev) | |||
697 | int tLx = tL.x(); | 718 | int tLx = tL.x(); |
698 | int tLy = tL.y(); | 719 | int tLy = tL.y(); |
699 | int scroll = scrollbar->value(); | 720 | int scroll = scrollbar->value(); |
721 | // int hScroll = hScrollbar->value(); | ||
700 | 722 | ||
701 | // we're in the process of moving the mouse with the left button pressed | 723 | // we're in the process of moving the mouse with the left button pressed |
702 | // the mouse cursor will kept catched within the bounds of the text in | 724 | // the mouse cursor will kept catched within the bounds of the text in |
@@ -973,6 +995,10 @@ void TEWidget::doScroll(int lines) | |||
973 | scrollbar->setValue(scrollbar->value()+lines); | 995 | scrollbar->setValue(scrollbar->value()+lines); |
974 | } | 996 | } |
975 | 997 | ||
998 | void TEWidget::doHScroll(int lines) { | ||
999 | hScrollbar->setValue( hScrollbar->value()+lines); | ||
1000 | } | ||
1001 | |||
976 | bool TEWidget::eventFilter( QObject *obj, QEvent *e ) | 1002 | bool TEWidget::eventFilter( QObject *obj, QEvent *e ) |
977 | { | 1003 | { |
978 | if ( (e->type() == QEvent::Accel || | 1004 | if ( (e->type() == QEvent::Accel || |
@@ -1078,7 +1104,17 @@ void TEWidget::frameChanged() | |||
1078 | 1104 | ||
1079 | void TEWidget::Bell() | 1105 | void TEWidget::Bell() |
1080 | { | 1106 | { |
1081 | QApplication::beep(); | 1107 | //#ifdef QT_QWS_CUSTOM |
1108 | //# ifndef QT_NO_COP | ||
1109 | QCopEnvelope( "QPE/TaskBar", "soundAlarm()" ); | ||
1110 | //# endif | ||
1111 | //#else | ||
1112 | //# ifndef QT_NO_SOUND | ||
1113 | // QSound::play(Resource::findSound("alarm")); | ||
1114 | //# endif | ||
1115 | //#endif | ||
1116 | |||
1117 | // QApplication::beep(); | ||
1082 | } | 1118 | } |
1083 | 1119 | ||
1084 | /* ------------------------------------------------------------------------- */ | 1120 | /* ------------------------------------------------------------------------- */ |
@@ -1105,10 +1141,80 @@ void TEWidget::clearImage() | |||
1105 | 1141 | ||
1106 | void TEWidget::calcGeometry() | 1142 | void TEWidget::calcGeometry() |
1107 | { | 1143 | { |
1108 | //FIXME: set rimX == rimY == 0 when running in full screen mode. | 1144 | int showhscrollbar = 1; |
1145 | int hwidth = 0; | ||
1146 | int dcolumns; | ||
1147 | Config cfg("Konsole"); | ||
1148 | cfg.setGroup("ScrollBar"); | ||
1149 | useHorzScroll=cfg.readBoolEntry("HorzScroll",0); | ||
1150 | |||
1151 | if(vcolumns == 0) showhscrollbar = 0; | ||
1152 | if(showhscrollbar == 1) hwidth = QApplication::style().scrollBarExtent().width(); | ||
1153 | |||
1154 | scrollbar->resize(QApplication::style().scrollBarExtent().width(), | ||
1155 | contentsRect().height() - hwidth); | ||
1156 | |||
1157 | switch(scrollLoc) { | ||
1158 | case SCRNONE : | ||
1159 | columns = ( contentsRect().width() - 2 * rimX ) / font_w; | ||
1160 | dcolumns = columns; | ||
1161 | if(vcolumns) columns = vcolumns; | ||
1162 | blX = (contentsRect().width() - (columns*font_w) ) / 2; | ||
1163 | if(showhscrollbar) | ||
1164 | blX = -hposition * font_w; | ||
1165 | brX = blX; | ||
1166 | scrollbar->hide(); | ||
1167 | break; | ||
1168 | case SCRLEFT : | ||
1169 | columns = ( contentsRect().width() - 2 * rimX - scrollbar->width()) / font_w; | ||
1170 | dcolumns = columns; | ||
1171 | if(vcolumns) columns = vcolumns; | ||
1172 | brX = (contentsRect().width() - (columns*font_w) - scrollbar->width() ) / 2; | ||
1173 | if(showhscrollbar) | ||
1174 | brX = -hposition * font_w; | ||
1175 | blX = brX + scrollbar->width(); | ||
1176 | scrollbar->move(contentsRect().topLeft()); | ||
1177 | scrollbar->show(); | ||
1178 | break; | ||
1179 | case SCRRIGHT: | ||
1180 | columns = ( contentsRect().width() - 2 * rimX - scrollbar->width()) / font_w; | ||
1181 | dcolumns = columns; | ||
1182 | if(vcolumns) columns = vcolumns; | ||
1183 | blX = (contentsRect().width() - (columns*font_w) - scrollbar->width() ) / 2; | ||
1184 | if(showhscrollbar) | ||
1185 | blX = -hposition * font_w; | ||
1186 | brX = blX; | ||
1187 | scrollbar->move(contentsRect().topRight() - QPoint(scrollbar->width()-1,0)); | ||
1188 | scrollbar->show(); | ||
1189 | break; | ||
1190 | } | ||
1191 | //FIXME: support 'rounding' styles | ||
1192 | lines = ( contentsRect().height() - 2 * rimY ) / font_h; | ||
1193 | bY = (contentsRect().height() - (lines *font_h)) / 2; | ||
1109 | 1194 | ||
1110 | scrollbar->resize(QApplication::style().scrollBarExtent().width(), | 1195 | if(showhscrollbar == 1) { |
1196 | hScrollbar->resize(contentsRect().width() - hwidth, hwidth); | ||
1197 | hScrollbar->setRange(0, vcolumns - dcolumns); | ||
1198 | |||
1199 | QPoint p = contentsRect().bottomLeft(); | ||
1200 | hScrollbar->move(QPoint(p.x(), p.y() - hwidth)); | ||
1201 | hScrollbar->show(); | ||
1202 | } | ||
1203 | else hScrollbar->hide(); | ||
1204 | |||
1205 | if(showhscrollbar == 1) { | ||
1206 | lines = lines - (hwidth / font_h) - 1; | ||
1207 | if(lines < 1) lines = 1; | ||
1208 | } | ||
1209 | |||
1210 | /*//FIXME: set rimX == rimY == 0 when running in full screen mode. | ||
1211 | Config cfg("Konsole"); | ||
1212 | cfg.setGroup("ScrollBar"); | ||
1213 | useHorzScroll=cfg.readBoolEntry("HorzScroll",0); | ||
1214 | |||
1215 | scrollbar->resize( QApplication::style().scrollBarExtent().width(), | ||
1111 | contentsRect().height()); | 1216 | contentsRect().height()); |
1217 | qDebug("font_w %d", font_w); | ||
1112 | switch(scrollLoc) | 1218 | switch(scrollLoc) |
1113 | { | 1219 | { |
1114 | case SCRNONE : | 1220 | case SCRNONE : |
@@ -1119,22 +1225,47 @@ void TEWidget::calcGeometry() | |||
1119 | break; | 1225 | break; |
1120 | case SCRLEFT : | 1226 | case SCRLEFT : |
1121 | columns = ( contentsRect().width() - 2 * rimX - scrollbar->width()) / font_w; | 1227 | columns = ( contentsRect().width() - 2 * rimX - scrollbar->width()) / font_w; |
1228 | if(useHorzScroll) columns = columns * (font_w/2); | ||
1122 | brX = (contentsRect().width() - (columns*font_w) - scrollbar->width() ) / 2; | 1229 | brX = (contentsRect().width() - (columns*font_w) - scrollbar->width() ) / 2; |
1123 | blX = brX + scrollbar->width(); | 1230 | blX = brX + scrollbar->width(); |
1124 | scrollbar->move(contentsRect().topLeft()); | 1231 | scrollbar->move(contentsRect().topLeft()); |
1125 | scrollbar->show(); | 1232 | scrollbar->show(); |
1126 | break; | 1233 | break; |
1127 | case SCRRIGHT: | 1234 | case SCRRIGHT: |
1128 | columns = ( contentsRect().width() - 2 * rimX - scrollbar->width()) / font_w; | 1235 | columns = ( contentsRect().width() - 2 * rimX - scrollbar->width() ) / font_w; |
1129 | blX = (contentsRect().width() - (columns*font_w) - scrollbar->width() ) / 2; | 1236 | if(useHorzScroll) columns = columns * (font_w/2); |
1130 | brX = blX; | 1237 | blX = (contentsRect().width() - (columns*font_w) - scrollbar->width() ) / 2; |
1131 | scrollbar->move(contentsRect().topRight() - QPoint(scrollbar->width()-1,0)); | 1238 | if(useHorzScroll) { |
1239 | brX = blX =2; | ||
1240 | } else { | ||
1241 | brX=blX; | ||
1242 | } | ||
1243 | scrollbar->move(contentsRect().topRight() - QPoint(scrollbar->width()-1,0) ); | ||
1132 | scrollbar->show(); | 1244 | scrollbar->show(); |
1133 | break; | 1245 | break; |
1134 | } | 1246 | } |
1247 | |||
1248 | if( !scrollbar->isHidden()) | ||
1249 | hScrollbar->resize( contentsRect().width()-SCRWIDTH, QApplication::style() | ||
1250 | .scrollBarExtent().height()); | ||
1251 | else | ||
1252 | hScrollbar->resize( contentsRect().width(), QApplication::style() | ||
1253 | .scrollBarExtent().height()); | ||
1254 | |||
1255 | hScrollbar->move( 0, contentsRect().height() - SCRWIDTH); | ||
1256 | |||
1257 | |||
1258 | if(useHorzScroll) { | ||
1259 | hScrollbar->show(); | ||
1260 | lines = ( (contentsRect().height() - SCRWIDTH) - 2 * rimY ) / font_h; | ||
1261 | bY = ((contentsRect().height() - SCRWIDTH) - (lines *font_h)) / 2; | ||
1262 | } else { | ||
1263 | hScrollbar->hide(); | ||
1264 | lines = (contentsRect().height() - 2 * rimY ) / font_h; | ||
1265 | bY = (contentsRect().height() - (lines *font_h)) / 2; | ||
1266 | } | ||
1267 | */ | ||
1135 | //FIXME: support 'rounding' styles | 1268 | //FIXME: support 'rounding' styles |
1136 | lines = ( contentsRect().height() - 2 * rimY ) / font_h; | ||
1137 | bY = (contentsRect().height() - (lines *font_h)) / 2; | ||
1138 | } | 1269 | } |
1139 | 1270 | ||
1140 | void TEWidget::makeImage() | 1271 | void TEWidget::makeImage() |
@@ -1266,3 +1397,11 @@ void TEWidget::drop_menu_activated(int item) | |||
1266 | #endif | 1397 | #endif |
1267 | } | 1398 | } |
1268 | 1399 | ||
1400 | void TEWidget::setWrapAt(int columns) | ||
1401 | { | ||
1402 | vcolumns = columns; | ||
1403 | propagateSize(); | ||
1404 | update(); | ||
1405 | } | ||
1406 | |||
1407 | |||
diff --git a/core/apps/embeddedkonsole/TEWidget.h b/core/apps/embeddedkonsole/TEWidget.h index 40e1aea..a480d45 100644 --- a/core/apps/embeddedkonsole/TEWidget.h +++ b/core/apps/embeddedkonsole/TEWidget.h | |||
@@ -60,7 +60,11 @@ public: | |||
60 | void setScroll(int cursor, int lines); | 60 | void setScroll(int cursor, int lines); |
61 | void doScroll(int lines); | 61 | void doScroll(int lines); |
62 | 62 | ||
63 | void doHScroll(int lines); | ||
64 | |||
65 | |||
63 | void emitSelection(); | 66 | void emitSelection(); |
67 | void setWrapAt(int columns); | ||
64 | 68 | ||
65 | public: | 69 | public: |
66 | 70 | ||
@@ -76,6 +80,7 @@ public: | |||
76 | QSize sizeHint() const; | 80 | QSize sizeHint() const; |
77 | 81 | ||
78 | public: | 82 | public: |
83 | bool useHorzScroll; | ||
79 | 84 | ||
80 | void Bell(); | 85 | void Bell(); |
81 | void emitText(QString text); | 86 | void emitText(QString text); |
@@ -87,6 +92,7 @@ signals: | |||
87 | void mouseSignal(int cb, int cx, int cy); | 92 | void mouseSignal(int cb, int cx, int cy); |
88 | void changedImageSizeSignal(int lines, int columns); | 93 | void changedImageSizeSignal(int lines, int columns); |
89 | void changedHistoryCursor(int value); | 94 | void changedHistoryCursor(int value); |
95 | void changedHorzCursor(int value); | ||
90 | void configureRequest( TEWidget*, int state, int x, int y ); | 96 | void configureRequest( TEWidget*, int state, int x, int y ); |
91 | 97 | ||
92 | void clearSelectionSignal(); | 98 | void clearSelectionSignal(); |
@@ -96,7 +102,6 @@ signals: | |||
96 | 102 | ||
97 | 103 | ||
98 | protected: | 104 | protected: |
99 | |||
100 | virtual void styleChange( QStyle& ); | 105 | virtual void styleChange( QStyle& ); |
101 | 106 | ||
102 | bool eventFilter( QObject *, QEvent * ); | 107 | bool eventFilter( QObject *, QEvent * ); |
@@ -147,6 +152,7 @@ public slots: | |||
147 | protected slots: | 152 | protected slots: |
148 | 153 | ||
149 | void scrollChanged(int value); | 154 | void scrollChanged(int value); |
155 | void hScrollChanged(int value); | ||
150 | void blinkEvent(); | 156 | void blinkEvent(); |
151 | 157 | ||
152 | private: | 158 | private: |
@@ -180,9 +186,12 @@ private: | |||
180 | BOOL preserve_line_breaks; | 186 | BOOL preserve_line_breaks; |
181 | 187 | ||
182 | QClipboard* cb; | 188 | QClipboard* cb; |
183 | QScrollBar* scrollbar; | 189 | QScrollBar* scrollbar, *hScrollbar; |
184 | int scrollLoc; | 190 | |
191 | int scrollLoc, hScrollLoc; | ||
192 | int hposition, vcolumns; | ||
185 | 193 | ||
194 | |||
186 | //#define SCRNONE 0 | 195 | //#define SCRNONE 0 |
187 | //#define SCRLEFT 1 | 196 | //#define SCRLEFT 1 |
188 | //#define SCRRIGHT 2 | 197 | //#define SCRRIGHT 2 |
diff --git a/core/apps/embeddedkonsole/TEmulation.cpp b/core/apps/embeddedkonsole/TEmulation.cpp index 6f3ad32..c19f2a1 100644 --- a/core/apps/embeddedkonsole/TEmulation.cpp +++ b/core/apps/embeddedkonsole/TEmulation.cpp | |||
@@ -9,11 +9,11 @@ | |||
9 | /* This file is part of Konsole - an X terminal for KDE */ | 9 | /* This file is part of Konsole - an X terminal for KDE */ |
10 | /* */ | 10 | /* */ |
11 | /* -------------------------------------------------------------------------- */ | 11 | /* -------------------------------------------------------------------------- */ |
12 | /* */ | 12 | /* */ |
13 | /* Ported Konsole to Qt/Embedded */ | 13 | /* Ported Konsole to Qt/Embedded */ |
14 | /* */ | 14 | /* */ |
15 | /* Copyright (C) 2000 by John Ryland <jryland@trolltech.com> */ | 15 | /* Copyright (C) 2000 by John Ryland <jryland@trolltech.com> */ |
16 | /* */ | 16 | /* */ |
17 | /* -------------------------------------------------------------------------- */ | 17 | /* -------------------------------------------------------------------------- */ |
18 | 18 | ||
19 | /*! \class TEmulation | 19 | /*! \class TEmulation |
@@ -103,20 +103,30 @@ TEmulation::TEmulation(TEWidget* gui) | |||
103 | connected = FALSE; | 103 | connected = FALSE; |
104 | 104 | ||
105 | QObject::connect(&bulk_timer, SIGNAL(timeout()), this, SLOT(showBulk()) ); | 105 | QObject::connect(&bulk_timer, SIGNAL(timeout()), this, SLOT(showBulk()) ); |
106 | |||
106 | QObject::connect(gui,SIGNAL(changedImageSizeSignal(int,int)), | 107 | QObject::connect(gui,SIGNAL(changedImageSizeSignal(int,int)), |
107 | this,SLOT(onImageSizeChange(int,int))); | 108 | this,SLOT(onImageSizeChange(int,int))); |
109 | |||
108 | QObject::connect(gui,SIGNAL(changedHistoryCursor(int)), | 110 | QObject::connect(gui,SIGNAL(changedHistoryCursor(int)), |
109 | this,SLOT(onHistoryCursorChange(int))); | 111 | this,SLOT(onHistoryCursorChange(int))); |
112 | |||
113 | QObject::connect(gui,SIGNAL(changedHorzCursor(int)), | ||
114 | this,SLOT(onHorzCursorChange(int))); | ||
115 | |||
110 | QObject::connect(gui,SIGNAL(keyPressedSignal(QKeyEvent*)), | 116 | QObject::connect(gui,SIGNAL(keyPressedSignal(QKeyEvent*)), |
111 | this,SLOT(onKeyPress(QKeyEvent*))); | 117 | this,SLOT(onKeyPress(QKeyEvent*))); |
118 | |||
112 | QObject::connect(gui,SIGNAL(beginSelectionSignal(const int,const int)), | 119 | QObject::connect(gui,SIGNAL(beginSelectionSignal(const int,const int)), |
113 | this,SLOT(onSelectionBegin(const int,const int)) ); | 120 | this,SLOT(onSelectionBegin(const int,const int)) ); |
121 | |||
114 | QObject::connect(gui,SIGNAL(extendSelectionSignal(const int,const int)), | 122 | QObject::connect(gui,SIGNAL(extendSelectionSignal(const int,const int)), |
115 | this,SLOT(onSelectionExtend(const int,const int)) ); | 123 | this,SLOT(onSelectionExtend(const int,const int)) ); |
124 | |||
116 | QObject::connect(gui,SIGNAL(endSelectionSignal(const BOOL)), | 125 | QObject::connect(gui,SIGNAL(endSelectionSignal(const BOOL)), |
117 | this,SLOT(setSelection(const BOOL)) ); | 126 | this,SLOT(setSelection(const BOOL)) ); |
127 | |||
118 | QObject::connect(gui,SIGNAL(clearSelectionSignal()), | 128 | QObject::connect(gui,SIGNAL(clearSelectionSignal()), |
119 | this,SLOT(clearSelection()) ); | 129 | this,SLOT(clearSelection()) ); |
120 | } | 130 | } |
121 | 131 | ||
122 | /*! | 132 | /*! |
@@ -299,8 +309,10 @@ void TEmulation::showBulk() | |||
299 | scr->getLines(), | 309 | scr->getLines(), |
300 | scr->getColumns()); // actual refresh | 310 | scr->getColumns()); // actual refresh |
301 | free(image); | 311 | free(image); |
302 | //FIXME: check that we do not trigger other draw event here. | 312 | |
313 | //FIXME: check that we do not trigger other draw event here. | ||
303 | gui->setScroll(scr->getHistCursor(),scr->getHistLines()); | 314 | gui->setScroll(scr->getHistCursor(),scr->getHistLines()); |
315 | |||
304 | } | 316 | } |
305 | } | 317 | } |
306 | 318 | ||
@@ -339,8 +351,7 @@ void TEmulation::setConnect(bool c) | |||
339 | and to the related serial line. | 351 | and to the related serial line. |
340 | */ | 352 | */ |
341 | 353 | ||
342 | void TEmulation::onImageSizeChange(int lines, int columns) | 354 | void TEmulation::onImageSizeChange(int lines, int columns) { |
343 | { | ||
344 | if (!connected) return; | 355 | if (!connected) return; |
345 | screen[0]->resizeImage(lines,columns); | 356 | screen[0]->resizeImage(lines,columns); |
346 | screen[1]->resizeImage(lines,columns); | 357 | screen[1]->resizeImage(lines,columns); |
@@ -348,15 +359,19 @@ void TEmulation::onImageSizeChange(int lines, int columns) | |||
348 | emit ImageSizeChanged(lines,columns); // propagate event to serial line | 359 | emit ImageSizeChanged(lines,columns); // propagate event to serial line |
349 | } | 360 | } |
350 | 361 | ||
351 | void TEmulation::onHistoryCursorChange(int cursor) | 362 | void TEmulation::onHistoryCursorChange(int cursor) { |
352 | { | ||
353 | if (!connected) return; | 363 | if (!connected) return; |
354 | scr->setHistCursor(cursor); | 364 | scr->setHistCursor(cursor); |
355 | showBulk(); | 365 | showBulk(); |
356 | } | 366 | } |
357 | 367 | ||
358 | void TEmulation::setColumns(int columns) | 368 | void TEmulation::onHorzCursorChange(int cursor) { |
359 | { | 369 | if (!connected) return; |
370 | scr->setHorzCursor(cursor); | ||
371 | showBulk(); | ||
372 | } | ||
373 | |||
374 | void TEmulation::setColumns(int columns) { | ||
360 | //FIXME: this goes strange ways. | 375 | //FIXME: this goes strange ways. |
361 | // Can we put this straight or explain it at least? | 376 | // Can we put this straight or explain it at least? |
362 | emit changeColumns(columns); | 377 | emit changeColumns(columns); |
diff --git a/core/apps/embeddedkonsole/konsole.cpp b/core/apps/embeddedkonsole/konsole.cpp index a8ddc99..3c87ad4 100644 --- a/core/apps/embeddedkonsole/konsole.cpp +++ b/core/apps/embeddedkonsole/konsole.cpp | |||
@@ -358,8 +358,20 @@ void Konsole::init(const char* _pgm, QStrList & _args) | |||
358 | scrollMenu->insertItem(tr( "None" )); | 358 | scrollMenu->insertItem(tr( "None" )); |
359 | scrollMenu->insertItem(tr( "Left" )); | 359 | scrollMenu->insertItem(tr( "Left" )); |
360 | scrollMenu->insertItem(tr( "Right" )); | 360 | scrollMenu->insertItem(tr( "Right" )); |
361 | scrollMenu->insertSeparator(4); | ||
362 | scrollMenu->insertItem(tr( "Horizontal" )); | ||
363 | |||
361 | configMenu->insertItem(tr( "ScrollBar" ),scrollMenu); | 364 | configMenu->insertItem(tr( "ScrollBar" ),scrollMenu); |
362 | 365 | //scrollMenuSelected(-29); | |
366 | // cfg.setGroup("ScrollBar"); | ||
367 | // if(cfg.readBoolEntry("HorzScroll",0)) { | ||
368 | // if(cfg.readNumEntry("Position",2) == 0) | ||
369 | // te->setScrollbarLocation(1); | ||
370 | // else | ||
371 | // te->setScrollbarLocation(0); | ||
372 | // te->setScrollbarLocation( cfg.readNumEntry("Position",2)); | ||
373 | // te->setWrapAt(120); | ||
374 | // } | ||
363 | // create applications ///////////////////////////////////////////////////// | 375 | // create applications ///////////////////////////////////////////////////// |
364 | setCentralWidget(tab); | 376 | setCentralWidget(tab); |
365 | 377 | ||
@@ -372,7 +384,7 @@ void Konsole::init(const char* _pgm, QStrList & _args) | |||
372 | 384 | ||
373 | se_pgm = _pgm; | 385 | se_pgm = _pgm; |
374 | se_args = _args; | 386 | se_args = _args; |
375 | 387 | se_args.prepend("--login"); | |
376 | parseCommandLine(); | 388 | parseCommandLine(); |
377 | // read and apply default values /////////////////////////////////////////// | 389 | // read and apply default values /////////////////////////////////////////// |
378 | resize(321, 321); // Dummy. | 390 | resize(321, 321); // Dummy. |
@@ -508,6 +520,8 @@ QSize Konsole::calcSize(int columns, int lines) { | |||
508 | 520 | ||
509 | void Konsole::setColLin(int columns, int lines) | 521 | void Konsole::setColLin(int columns, int lines) |
510 | { | 522 | { |
523 | qDebug("konsole::setColLin:: Columns %d", columns); | ||
524 | |||
511 | if ((columns==0) || (lines==0)) | 525 | if ((columns==0) || (lines==0)) |
512 | { | 526 | { |
513 | if (defaultSize.isEmpty()) // not in config file : set default value | 527 | if (defaultSize.isEmpty()) // not in config file : set default value |
@@ -552,6 +566,7 @@ void Konsole::setFont(int fontno) | |||
552 | 566 | ||
553 | void Konsole::changeColumns(int columns) | 567 | void Konsole::changeColumns(int columns) |
554 | { | 568 | { |
569 | qDebug("change columns"); | ||
555 | TEWidget* te = getTe(); | 570 | TEWidget* te = getTe(); |
556 | if (te != 0) { | 571 | if (te != 0) { |
557 | setColLin(columns,te->Lines()); | 572 | setColLin(columns,te->Lines()); |
@@ -800,8 +815,7 @@ void Konsole::setColor() | |||
800 | 815 | ||
801 | void Konsole::scrollMenuSelected(int index) | 816 | void Konsole::scrollMenuSelected(int index) |
802 | { | 817 | { |
803 | // QString temp; | 818 | qDebug( "scrollbar menu %d",index); |
804 | // qDebug( temp.sprintf("scrollbar menu %d",index)); | ||
805 | TEWidget* te = getTe(); | 819 | TEWidget* te = getTe(); |
806 | Config cfg("Konsole"); | 820 | Config cfg("Konsole"); |
807 | cfg.setGroup("ScrollBar"); | 821 | cfg.setGroup("ScrollBar"); |
@@ -818,6 +832,18 @@ void Konsole::scrollMenuSelected(int index) | |||
818 | te->setScrollbarLocation(2); | 832 | te->setScrollbarLocation(2); |
819 | cfg.writeEntry("Position",2); | 833 | cfg.writeEntry("Position",2); |
820 | break; | 834 | break; |
835 | case -29: { | ||
836 | bool b=cfg.readBoolEntry("HorzScroll",0); | ||
837 | cfg.writeEntry("HorzScroll", !b ); | ||
838 | cfg.write(); | ||
839 | if(cfg.readNumEntry("Position",2) == 0) | ||
840 | te->setScrollbarLocation(1); | ||
841 | else | ||
842 | te->setScrollbarLocation(0); | ||
843 | te->setScrollbarLocation( cfg.readNumEntry("Position",2)); | ||
844 | te->setWrapAt(120); | ||
845 | } | ||
846 | break; | ||
821 | }; | 847 | }; |
822 | 848 | ||
823 | } | 849 | } |