Diff: GraphicsDisplay.h

Revision:

111:efe436c43aba

Parent:

109:7b94f06f085b

Child:

112:325ca91bc03d

--- a/GraphicsDisplay.h	Sat Mar 19 20:49:14 2016 +0000
+++ b/GraphicsDisplay.h	Mon Apr 25 01:43:59 2016 +0000
@@ -141,6 +141,17 @@
     /// and down a row. If the initial write is outside the window, it will
     /// be captured into the window when it crosses a boundary.
     ///
+    /// @param[in] r is the rect_t rect to define the window.
+    /// @returns success/failure code. @see RetCode_t.
+    ///
+    virtual RetCode_t window(rect_t r);
+
+    /// Set the window, which controls where items are written to the screen.
+    ///
+    /// When something hits the window width, it wraps back to the left side
+    /// and down a row. If the initial write is outside the window, it will
+    /// be captured into the window when it crosses a boundary.
+    ///
     /// @param[in] x is the left edge in pixels.
     /// @param[in] y is the top edge in pixels.
     /// @param[in] w is the window width in pixels.
@@ -149,6 +160,15 @@
     ///
     virtual RetCode_t window(loc_t x, loc_t y, dim_t w, dim_t h);
     
+    /// method to set the window region to the full screen.
+    ///
+    /// This restores the 'window' to the full screen, so that 
+    /// other operations (@see cls) would clear the whole screen.
+    ///
+    /// @returns success/failure code. @see RetCode_t.
+    ///
+    virtual RetCode_t WindowMax(void);
+    
     /// Clear the screen.
     ///
     /// The behavior is to clear the whole screen.
@@ -159,15 +179,6 @@
     ///
     virtual RetCode_t cls(uint16_t layers = 0);
     
-    /// method to set the window region to the full screen.
-    ///
-    /// This restores the 'window' to the full screen, so that 
-    /// other operations (@see cls) would clear the whole screen.
-    ///
-    /// @returns success/failure code. @see RetCode_t.
-    ///
-    virtual RetCode_t WindowMax(void);
-    
     /// method to put a single color pixel to the screen.
     ///
     /// This method may be called as many times as necessary after 
@@ -432,11 +443,7 @@
     short _x;
     short _y;
     
-    // window location
-    short _x1;
-    short _x2;
-    short _y1;
-    short _y2;
+    rect_t windowrect;              ///< window commands are held here for speed of access 
 };
 
 #endif