author | ibotty <ibotty> | 2002-10-07 13:23:14 (UTC) |
---|---|---|
committer | ibotty <ibotty> | 2002-10-07 13:23:14 (UTC) |
commit | 68d98791b05217163f97d7c233952df8075416bb (patch) (unidiff) | |
tree | da2ad4d16d62053ca5b836cd08d37364ec12b635 /noncore/apps/opie-console/widget_layer.h | |
parent | a513a88322196c8caa21b00b83d454feae84200c (diff) | |
download | opie-68d98791b05217163f97d7c233952df8075416bb.zip opie-68d98791b05217163f97d7c233952df8075416bb.tar.gz opie-68d98791b05217163f97d7c233952df8075416bb.tar.bz2 |
changed WidgetLayer to a new (well partial) image storage
WidgetLayer is now to be considered stable.
there wont be any api removals.
newwidget.{h,cpp} will inherit WidgetLayer, soon.
i will try to be logic compatible with current widget.{h,cpp}, but will NOT
guarantee api compatibility.
Diffstat (limited to 'noncore/apps/opie-console/widget_layer.h') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/apps/opie-console/widget_layer.h | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/noncore/apps/opie-console/widget_layer.h b/noncore/apps/opie-console/widget_layer.h index 07ec12a..99d248e 100644 --- a/noncore/apps/opie-console/widget_layer.h +++ b/noncore/apps/opie-console/widget_layer.h | |||
@@ -15,6 +15,8 @@ | |||
15 | 15 | ||
16 | // qt includes | 16 | // qt includes |
17 | #include <qapplication.h> | 17 | #include <qapplication.h> |
18 | #include <qframe.h> | ||
19 | #include <qarray.h> | ||
18 | #include <qtimer.h> | 20 | #include <qtimer.h> |
19 | #include <qkeycode.h> | 21 | #include <qkeycode.h> |
20 | #include <qclipboard.h> | 22 | #include <qclipboard.h> |
@@ -24,7 +26,16 @@ | |||
24 | #include "session.h" | 26 | #include "session.h" |
25 | #include "common.h" | 27 | #include "common.h" |
26 | 28 | ||
27 | class WidgetLayer : public QObject | 29 | /* |
30 | * given a pseudo location ( column, line ), | ||
31 | * returns the actual index, in the QArray<Character> | ||
32 | */ | ||
33 | #define loc(X,Y) ((Y)*m_columns+(X)) | ||
34 | |||
35 | |||
36 | |||
37 | |||
38 | class WidgetLayer : public QFrame | ||
28 | { Q_OBJECT | 39 | { Q_OBJECT |
29 | 40 | ||
30 | public: | 41 | public: |
@@ -32,7 +43,7 @@ public: | |||
32 | /** | 43 | /** |
33 | * constructor | 44 | * constructor |
34 | */ | 45 | */ |
35 | WidgetLayer( QObject *parent=0, const char *name=0 ); | 46 | WidgetLayer( QWidget *parent=0, const char *name=0 ); |
36 | 47 | ||
37 | /** | 48 | /** |
38 | * destructor | 49 | * destructor |
@@ -43,7 +54,7 @@ public: | |||
43 | /** | 54 | /** |
44 | * sets the image | 55 | * sets the image |
45 | */ | 56 | */ |
46 | virtual void setImage( const Character* const newimg, int lines, int colums ) = 0; | 57 | virtual void setImage( QArray<Character> const newimg, int lines, int colums ); |
47 | 58 | ||
48 | /** | 59 | /** |
49 | * annoy the user | 60 | * annoy the user |
@@ -141,7 +152,7 @@ protected: | |||
141 | void propagateSize(); | 152 | void propagateSize(); |
142 | 153 | ||
143 | /** | 154 | /** |
144 | * | 155 | *determines count of lines and columns |
145 | */ | 156 | */ |
146 | virtual void calcGeometry() = 0; | 157 | virtual void calcGeometry() = 0; |
147 | 158 | ||
@@ -173,6 +184,12 @@ protected: | |||
173 | 184 | ||
174 | /** | 185 | /** |
175 | * current character image | 186 | * current character image |
187 | * | ||
188 | * a Character at loc( column, line ) | ||
189 | * has the actual index: | ||
190 | * ix = line * m_columns + column; | ||
191 | * | ||
192 | * use loc( x, y ) macro to access. | ||
176 | */ | 193 | */ |
177 | QArray<Character> m_image; | 194 | QArray<Character> m_image; |
178 | 195 | ||
@@ -192,7 +209,7 @@ protected: | |||
192 | QClipboard* m_clipboard; | 209 | QClipboard* m_clipboard; |
193 | 210 | ||
194 | /** | 211 | /** |
195 | * whether widget was resized | 212 | * whether widget is resizing |
196 | */ | 213 | */ |
197 | bool m_resizing; | 214 | bool m_resizing; |
198 | }; | 215 | }; |