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.

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 @@
 
 // qt includes
 #include <qapplication.h>
+#include <qframe.h>
+#include <qarray.h>
 #include <qtimer.h>
 #include <qkeycode.h>
 #include <qclipboard.h>
@@ -24,7 +26,16 @@
 #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:
@@ -32,7 +43,7 @@ public:
 	/**
 	 * constructor
 	 */
-	WidgetLayer( QObject *parent=0, const char *name=0 );
+	WidgetLayer( QWidget *parent=0, const char *name=0 );
 
 	/**
 	 * destructor
@@ -43,7 +54,7 @@ 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
@@ -141,7 +152,7 @@ protected:
 	void propagateSize();
 
 	/**
-	 *
+	 *determines count of lines and columns
 	 */
 	virtual void calcGeometry() = 0;
 
@@ -173,6 +184,12 @@ 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;
 
@@ -192,7 +209,7 @@ protected:
 	QClipboard* m_clipboard;
 
 	/**
-	 * whether widget was resized 
+	 * whether widget is resizing 
 	 */
 	bool m_resizing;
 };