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.

2 files changed, 36 insertions, 17 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
@@ -19,12 +19,10 @@
 
 #include "common.h"
 
 
-#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
         m_clipboard = QApplication::clipboard();
         
@@ -36,14 +34,19 @@ WidgetLayer::WidgetLayer( QObject *parent, const char *name  ) : QObject( parent
         m_lines = 1;
         m_columns = 1;
         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;
 }
 
 /* --------------------------------- audio ---------------------------------- */
 
@@ -57,42 +60,41 @@ 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;
         
         makeImage();
         
         // 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 );
                 for ( int lin = 0; lin < lins; ++lin )
                 {
                         memcpy( (void*) &m_image[m_columns*lin],
                                 (void*) &oldimage[oldcolumns*lin],
                                 cols*sizeof( Character ) );
                 }
-                //free( oldimage );
         }
         else
                 clearImage();
         
+        delete oldimage;
+
         m_resizing = true;
         emit imageSizeChanged( m_lines, m_columns );
         m_resizing = false;
 }
 
 void WidgetLayer::makeImage()
 {
         calcGeometry();
-        m_image = QArray<Character>();
-        clearImage(); 
+        m_image = QArray<Character>( m_columns * m_lines );
+        clearImage();
 }
 
 void WidgetLayer::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
@@ -14,8 +14,10 @@
 #define WIDGET_LAYER_H
 
 // qt includes
 #include <qapplication.h>
+#include <qframe.h>
+#include <qarray.h>
 #include <qtimer.h>
 #include <qkeycode.h>
 #include <qclipboard.h>
 
@@ -23,17 +25,26 @@
 // opie-console includes
 #include "session.h"
 #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
 
 public:
 
         /**
          * constructor
          */
-        WidgetLayer( QObject *parent=0, const char *name=0 );
+        WidgetLayer( QWidget *parent=0, const char *name=0 );
 
         /**
          * destructor
          */
@@ -42,9 +53,9 @@ public:
 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 );
 
         /**
          * annoy the user
          */
@@ -140,9 +151,9 @@ protected:
          */
         void propagateSize();
 
         /**
-         *
+         *determines count of lines and columns
          */
         virtual void calcGeometry() = 0;
 
         /**
@@ -172,8 +183,14 @@ protected:
         Session *m_session;
 
         /**
          * 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;
 
         /**
@@ -191,9 +208,9 @@ protected:
          */
         QClipboard* m_clipboard;
 
         /**
-         * whether widget was resized 
+         * whether widget is resizing 
          */
         bool m_resizing;
 };