| -rw-r--r-- | noncore/apps/opie-console/widget_layer.cpp | 24 | ||||
| -rw-r--r-- | noncore/apps/opie-console/widget_layer.h | 27 |
2 files changed, 35 insertions, 16 deletions
diff --git a/noncore/apps/opie-console/widget_layer.cpp b/noncore/apps/opie-console/widget_layer.cpp index 28227e4..f428ed4 100644 --- a/noncore/apps/opie-console/widget_layer.cpp +++ b/noncore/apps/opie-console/widget_layer.cpp @@ -21,8 +21,6 @@ -#define loc(X,Y) ((Y)*m_columns+(X)) - -WidgetLayer::WidgetLayer( QObject *parent, const char *name ) : QObject( parent, name ) +WidgetLayer::WidgetLayer( QWidget *parent, const char *name ) : QFrame( parent, name ) { // get the clipboard @@ -38,10 +36,15 @@ WidgetLayer::WidgetLayer( QObject *parent, const char *name ) : QObject( parent m_resizing = false; - m_image = QArray<Character>(); + // just for demonstrating + //m_image = QArray<Character>( m_lines * m_columns ); + m_image = QArray<Character>( 1 ); + } + WidgetLayer::~WidgetLayer() { - // clean up! + // clean up + delete m_image; } @@ -59,5 +62,5 @@ void WidgetLayer::bell() void WidgetLayer::propagateSize() { - QArray<Character> oldimage = m_image; + QArray<Character> oldimage = m_image.copy(); int oldlines = m_lines; int oldcolumns = m_columns; @@ -66,8 +69,6 @@ void WidgetLayer::propagateSize() // copy old image, to reduce flicker - if ( oldimage ) + if ( ! oldimage.isEmpty() ) { - //FIXME: is it possible to do this with QArray.dublicate()? - int lins = QMIN( oldlines, m_lines ); int cols = QMIN( oldcolumns, m_columns ); @@ -78,9 +79,10 @@ void WidgetLayer::propagateSize() cols*sizeof( Character ) ); } - //free( oldimage ); } else clearImage(); + delete oldimage; + m_resizing = true; emit imageSizeChanged( m_lines, m_columns ); @@ -91,5 +93,5 @@ void WidgetLayer::makeImage() { calcGeometry(); - m_image = QArray<Character>(); + m_image = QArray<Character>( m_columns * m_lines ); clearImage(); } 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 @@ -16,4 +16,6 @@ // qt includes #include <qapplication.h> +#include <qframe.h> +#include <qarray.h> #include <qtimer.h> #include <qkeycode.h> @@ -25,5 +27,14 @@ #include "common.h" -class WidgetLayer : public QObject +/* + * given a pseudo location ( column, line ), + * returns the actual index, in the QArray<Character> + */ +#define loc(X,Y) ((Y)*m_columns+(X)) + + + + +class WidgetLayer : public QFrame { Q_OBJECT @@ -33,5 +44,5 @@ public: * constructor */ - WidgetLayer( QObject *parent=0, const char *name=0 ); + WidgetLayer( QWidget *parent=0, const char *name=0 ); /** @@ -44,5 +55,5 @@ public: * sets the image */ - virtual void setImage( const Character* const newimg, int lines, int colums ) = 0; + virtual void setImage( QArray<Character> const newimg, int lines, int colums ); /** @@ -142,5 +153,5 @@ protected: /** - * + *determines count of lines and columns */ virtual void calcGeometry() = 0; @@ -174,4 +185,10 @@ protected: /** * current character image + * + * a Character at loc( column, line ) + * has the actual index: + * ix = line * m_columns + column; + * + * use loc( x, y ) macro to access. */ QArray<Character> m_image; @@ -193,5 +210,5 @@ protected: /** - * whether widget was resized + * whether widget is resizing */ bool m_resizing; |