-rw-r--r-- | noncore/apps/opie-console/widget_layer.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/opie-console/widget_layer.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/noncore/apps/opie-console/widget_layer.cpp b/noncore/apps/opie-console/widget_layer.cpp index f428ed4..8d68857 100644 --- a/noncore/apps/opie-console/widget_layer.cpp +++ b/noncore/apps/opie-console/widget_layer.cpp | |||
@@ -1,72 +1,72 @@ | |||
1 | /* ------------------------------------------------------------------------- */ | 1 | /* ------------------------------------------------------------------------- */ |
2 | /* */ | 2 | /* */ |
3 | /* widget_layer.cpp Widget Layer */ | 3 | /* widget_layer.cpp Widget Layer */ |
4 | /* */ | 4 | /* */ |
5 | /* opie developers <opie@handhelds.org> */ | 5 | /* opie developers <opie@handhelds.org> */ |
6 | /* */ | 6 | /* */ |
7 | /* ------------------------------------------------------------------------- */ | 7 | /* ------------------------------------------------------------------------- */ |
8 | 8 | ||
9 | 9 | ||
10 | 10 | ||
11 | #include "widget_layer.h" | 11 | #include "widget_layer.h" |
12 | 12 | ||
13 | #include <qclipboard.h> | 13 | #include <qclipboard.h> |
14 | #include <qregexp.h> | 14 | #include <qregexp.h> |
15 | #include <qglobal.h> | 15 | #include <qglobal.h> |
16 | 16 | ||
17 | #include <string.h> | 17 | #include <string.h> |
18 | //#include < | 18 | //#include < |
19 | 19 | ||
20 | #include "common.h" | 20 | #include "common.h" |
21 | 21 | ||
22 | 22 | ||
23 | 23 | ||
24 | WidgetLayer::WidgetLayer( QWidget *parent, const char *name ) : QFrame( parent, name ) | 24 | WidgetLayer::WidgetLayer( const Profile &config, QWidget *parent, const char *name ) : QFrame( parent, name ) |
25 | { | 25 | { |
26 | // get the clipboard | 26 | // get the clipboard |
27 | m_clipboard = QApplication::clipboard(); | 27 | m_clipboard = QApplication::clipboard(); |
28 | 28 | ||
29 | // when data on clipboard changes, clear selection | 29 | // when data on clipboard changes, clear selection |
30 | QObject::connect( (QObject*) m_clipboard, SIGNAL( dataChanged() ), | 30 | QObject::connect( (QObject*) m_clipboard, SIGNAL( dataChanged() ), |
31 | (QObject*)this, SLOT( onClearSelection() ) ); | 31 | (QObject*)this, SLOT( onClearSelection() ) ); |
32 | 32 | ||
33 | // initialize vars: | 33 | // initialize vars: |
34 | m_lines = 1; | 34 | m_lines = 1; |
35 | m_columns = 1; | 35 | m_columns = 1; |
36 | m_resizing = false; | 36 | m_resizing = false; |
37 | 37 | ||
38 | // just for demonstrating | 38 | // just for demonstrating |
39 | //m_image = QArray<Character>( m_lines * m_columns ); | 39 | //m_image = QArray<Character>( m_lines * m_columns ); |
40 | m_image = QArray<Character>( 1 ); | 40 | m_image = QArray<Character>( 1 ); |
41 | 41 | ||
42 | } | 42 | } |
43 | 43 | ||
44 | 44 | ||
45 | WidgetLayer::~WidgetLayer() | 45 | WidgetLayer::~WidgetLayer() |
46 | { | 46 | { |
47 | // clean up | 47 | // clean up |
48 | delete m_image; | 48 | delete m_image; |
49 | } | 49 | } |
50 | 50 | ||
51 | /* --------------------------------- audio ---------------------------------- */ | 51 | /* --------------------------------- audio ---------------------------------- */ |
52 | 52 | ||
53 | void WidgetLayer::bell() | 53 | void WidgetLayer::bell() |
54 | { | 54 | { |
55 | QApplication::beep(); | 55 | QApplication::beep(); |
56 | } | 56 | } |
57 | 57 | ||
58 | 58 | ||
59 | /* --------------------------------- screen --------------------------------- */ | 59 | /* --------------------------------- screen --------------------------------- */ |
60 | 60 | ||
61 | 61 | ||
62 | void WidgetLayer::propagateSize() | 62 | void WidgetLayer::propagateSize() |
63 | { | 63 | { |
64 | QArray<Character> oldimage = m_image.copy(); | 64 | QArray<Character> oldimage = m_image.copy(); |
65 | int oldlines = m_lines; | 65 | int oldlines = m_lines; |
66 | int oldcolumns = m_columns; | 66 | int oldcolumns = m_columns; |
67 | 67 | ||
68 | makeImage(); | 68 | makeImage(); |
69 | 69 | ||
70 | // copy old image, to reduce flicker | 70 | // copy old image, to reduce flicker |
71 | if ( ! oldimage.isEmpty() ) | 71 | if ( ! oldimage.isEmpty() ) |
72 | { | 72 | { |
diff --git a/noncore/apps/opie-console/widget_layer.h b/noncore/apps/opie-console/widget_layer.h index d821f1d..0056061 100644 --- a/noncore/apps/opie-console/widget_layer.h +++ b/noncore/apps/opie-console/widget_layer.h | |||
@@ -1,97 +1,97 @@ | |||
1 | /* -------------------------------------------------------------------------- */ | 1 | /* -------------------------------------------------------------------------- */ |
2 | /* */ | 2 | /* */ |
3 | /* [widget_layer.h] Widget Layer */ | 3 | /* [widget_layer.h] Widget Layer */ |
4 | /* */ | 4 | /* */ |
5 | /* -------------------------------------------------------------------------- */ | 5 | /* -------------------------------------------------------------------------- */ |
6 | 6 | ||
7 | // proposal of a widget Layer in opie-console | 7 | // proposal of a widget Layer in opie-console |
8 | // | 8 | // |
9 | // fellow devels: | 9 | // fellow devels: |
10 | // just mail me (ibotty@web.de), what you additionally need from the main widget | 10 | // just mail me (ibotty@web.de), what you additionally need from the main widget |
11 | // (or say in chat) | 11 | // (or say in chat) |
12 | 12 | ||
13 | #ifndef WIDGET_LAYER_H | 13 | #ifndef WIDGET_LAYER_H |
14 | #define WIDGET_LAYER_H | 14 | #define WIDGET_LAYER_H |
15 | 15 | ||
16 | // qt includes | 16 | // qt includes |
17 | #include <qapplication.h> | 17 | #include <qapplication.h> |
18 | #include <qframe.h> | 18 | #include <qframe.h> |
19 | #include <qarray.h> | 19 | #include <qarray.h> |
20 | #include <qtimer.h> | 20 | #include <qtimer.h> |
21 | #include <qkeycode.h> | 21 | #include <qkeycode.h> |
22 | #include <qclipboard.h> | 22 | #include <qclipboard.h> |
23 | 23 | ||
24 | 24 | ||
25 | // opie-console includes | 25 | // opie-console includes |
26 | #include "session.h" | 26 | #include "session.h" |
27 | #include "common.h" | 27 | #include "common.h" |
28 | 28 | #include "profile.h" | |
29 | /* | 29 | /* |
30 | * given a pseudo location ( column, line ), | 30 | * given a pseudo location ( column, line ), |
31 | * returns the actual index, in the QArray<Character> | 31 | * returns the actual index, in the QArray<Character> |
32 | */ | 32 | */ |
33 | #define loc(X,Y) ((Y)*m_columns+(X)) | 33 | #define loc(X,Y) ((Y)*m_columns+(X)) |
34 | 34 | ||
35 | 35 | ||
36 | 36 | ||
37 | 37 | ||
38 | class WidgetLayer : public QFrame | 38 | class WidgetLayer : public QFrame |
39 | { Q_OBJECT | 39 | { Q_OBJECT |
40 | 40 | ||
41 | public: | 41 | public: |
42 | 42 | ||
43 | /** | 43 | /** |
44 | * constructor | 44 | * constructor |
45 | * @param const Profile &config, the configuration for this widget | 45 | * @param const Profile &config, the configuration for this widget |
46 | * @param QWidget *parent, the parent widget | 46 | * @param QWidget *parent, the parent widget |
47 | * @param const char *name, the name of the widget, defaults to "" | 47 | * @param const char *name, the name of the widget, defaults to "" |
48 | */ | 48 | */ |
49 | WidgetLayer( const Profile &config, QWidget *parent=0, const char *name=0 ); | 49 | WidgetLayer( const Profile& config, QWidget *parent=0, const char *name=0 ); |
50 | 50 | ||
51 | /** | 51 | /** |
52 | * destructor | 52 | * destructor |
53 | */ | 53 | */ |
54 | virtual ~WidgetLayer(); | 54 | virtual ~WidgetLayer(); |
55 | 55 | ||
56 | public: | 56 | public: |
57 | /** | 57 | /** |
58 | * sets the image | 58 | * sets the image |
59 | * @param QArray<Character> const newimg, the new image | 59 | * @param QArray<Character> const newimg, the new image |
60 | * @param int lines, lines count of newimg | 60 | * @param int lines, lines count of newimg |
61 | * @param int columns, columns count of newimg | 61 | * @param int columns, columns count of newimg |
62 | */ | 62 | */ |
63 | virtual void setImage( QArray<Character> const newimg, int lines, int colums ) = 0; | 63 | virtual void setImage( QArray<Character> const newimg, int lines, int colums ) = 0; |
64 | 64 | ||
65 | /** | 65 | /** |
66 | * annoy the user | 66 | * annoy the user |
67 | */ | 67 | */ |
68 | void bell(); | 68 | void bell(); |
69 | 69 | ||
70 | /** | 70 | /** |
71 | * @return int m_lines, the lines count | 71 | * @return int m_lines, the lines count |
72 | */ | 72 | */ |
73 | int lines(){ return m_lines; } | 73 | int lines(){ return m_lines; } |
74 | 74 | ||
75 | /** | 75 | /** |
76 | * @return int m_columns, the columns count | 76 | * @return int m_columns, the columns count |
77 | */ | 77 | */ |
78 | int columns(){ return m_columns; } | 78 | int columns(){ return m_columns; } |
79 | 79 | ||
80 | /** | 80 | /** |
81 | * insert current selection (currently this is only the clipboard) | 81 | * insert current selection (currently this is only the clipboard) |
82 | */ | 82 | */ |
83 | void insertSelection(); | 83 | void insertSelection(); |
84 | 84 | ||
85 | /** | 85 | /** |
86 | * insert text | 86 | * insert text |
87 | * @param QString text, the text to be inserted | 87 | * @param QString text, the text to be inserted |
88 | */ | 88 | */ |
89 | void insertText( QString text ); | 89 | void insertText( QString text ); |
90 | 90 | ||
91 | /** | 91 | /** |
92 | * set selection (clipboard) to text | 92 | * set selection (clipboard) to text |
93 | * @param const QString &text, the text to be selected | 93 | * @param const QString &text, the text to be selected |
94 | */ | 94 | */ |
95 | void setSelection( const QString &text ); | 95 | void setSelection( const QString &text ); |
96 | 96 | ||
97 | /** | 97 | /** |