merged changes form qkonsole back into opie-embeddedkonsole (most likely not bugfree !)

1 files changed, 12 insertions, 2 deletions

diff --git a/core/apps/embeddedkonsole/TEWidget.h b/core/apps/embeddedkonsole/TEWidget.h
index 5597f27..792b109 100644
--- a/core/apps/embeddedkonsole/TEWidget.h
+++ b/core/apps/embeddedkonsole/TEWidget.h
@@ -28,25 +28,26 @@
 #include <qpopupmenu.h>
 
 #include "TECommon.h"
 
 extern unsigned short vt100_graphics[32];
 
 class TESession;
 
 // class Konsole;
 
 class TEWidget : public QFrame
 // a widget representing attributed text
-{ Q_OBJECT
+{ 
+  Q_OBJECT
 
 //  friend class Konsole;
 
 public:
 
     TEWidget(QWidget *parent=0, const char *name=0);
     virtual ~TEWidget();
 
 public:
 
     QColor getDefaultBackColor();
 
@@ -65,43 +66,49 @@ public:
 
     int  Lines()   { return lines;   }
     int  Columns() { return columns; }
 
     void calcGeometry();
     void propagateSize();
     QSize calcSize(int cols, int lins) const;
 
     QSize sizeHint() const;
 
     bool useHorzScroll;
     bool useBeep;
+    int color_menu_item;
 
     void Bell();
     void emitText(QString text);
     void pasteClipboard();
 
 signals:
 
     void keyPressedSignal(QKeyEvent *e);
     void mouseSignal(int cb, int cx, int cy);
     void changedImageSizeSignal(int lines, int columns);
     void changedHistoryCursor(int value);
     void changedHorzCursor(int value);
     void configureRequest( TEWidget*, int state, int x, int y );
 
     void clearSelectionSignal();
     void beginSelectionSignal( const int x, const int y );
     void extendSelectionSignal( const int x, const int y );
     void endSelectionSignal(const BOOL preserve_line_breaks);
 
+    void changeFontSize(int);
+    void toggleFullScreen();
+    void setFullScreen(bool);
+    void changeSession(int);
+    void newSession();
 
 protected:
     virtual void styleChange( QStyle& );
 
     bool eventFilter( QObject *, QEvent * );
 
     void drawAttrStr(QPainter &paint, QRect rect,
                      QString& str, ca attr, BOOL pm, BOOL clear);
     void paintEvent( QPaintEvent * );
 
     void resizeEvent(QResizeEvent*);
 
@@ -143,25 +150,25 @@ public slots:
     void onClearSelection();
 
 protected slots:
 
     void scrollChanged(int value);
     void hScrollChanged(int value);
     void blinkEvent();
 
 private:
 
     QChar (*fontMap)(QChar); // possible vt100 font extention
 
-    bool fixed_font; // has fixed pitch
+    //    bool fixed_font; // has fixed pitch
     int  font_h;     // height
     int  font_w;     // width
     int  font_a;     // ascend
 
     int blX;    // actual offset (left)
     int brX;    // actual offset (right)
     int bY;     // actual offset
 
     int lines;
     int columns;
     ca *image; // [lines][columns]
 
@@ -175,30 +182,33 @@ private:
     QPoint iPntSel; // initial selection point
     QPoint pntSel; // current selection point
     int    actSel; // selection state
     BOOL    word_selection_mode;
     BOOL    preserve_line_breaks;
 
     QClipboard*    cb;
     QScrollBar* scrollbar, *hScrollbar;
     
     int         scrollLoc, hScrollLoc;
   int hposition, vcolumns;
 
+    int mouse_down_x, mouse_down_y;
     
 //#define SCRNONE  0
 //#define SCRLEFT  1
 //#define SCRRIGHT 2
 
     BOOL blinking;   // hide text in paintEvent
     BOOL hasBlinker; // has characters to blink
     QTimer* blinkT;  // active when hasBlinker
     QPopupMenu* m_drop;
     QString dropText;
+
  public:
     // current session in this widget
     TESession *currentSession;
+
 private slots:
     void drop_menu_activated(int item);
 };
 
 #endif // TE_WIDGET_H