citation patch from Angus

[lyx.git] / src / lyxscreen.h

diff --git a/src/lyxscreen.h b/src/lyxscreen.h
index 027b0a609939faf5a432b20f7bb3b66b62f65237..5a4dc7f2ba732595852212509b5b4484c29069aa 100644 (file)
--- a/src/lyxscreen.h
+++ b/src/lyxscreen.h
@@ -20,10 +20,14 @@
 #include <X11/Xlib.h>
 
 class LyXText;
+class WorkArea;
+class Buffer;
+
 struct Row;
+
+///
 typedef unsigned short Dimension;
 
-class WorkArea;
 
 /** The class LyXScreen is used for the main Textbody.
     Concretely, the screen is held in a pixmap.  This pixmap is kept up to
@@ -32,7 +36,7 @@ class WorkArea;
  */
 class LyXScreen {
 public:
-
+       ///
        enum Cursor_Shape {
                ///
                BAR_SHAPE,
@@ -43,49 +47,45 @@ public:
        };
 
        ///
-       LyXScreen(WorkArea &, LyXText * text_ptr);
+       LyXScreen(WorkArea &);
 
        /** Draws the screen form textposition y. Uses as much of
            the already printed pixmap as possible */
-       void Draw(unsigned long y );
+       void Draw(LyXText *, unsigned long y);
 
        /// Redraws the screen, without using existing pixmap
-       void Redraw();
+       void Redraw(LyXText *);
    
        /// Returns a new top so that the cursor is visible
-       unsigned long TopCursorVisible();
+       unsigned long TopCursorVisible(LyXText const *);
        /// Redraws the screen such that the cursor is visible
-       bool FitCursor();
+       bool FitCursor(LyXText *);
        ///
-       void ShowCursor();
+       void ShowCursor(LyXText const *);
        ///
        void HideCursor();
        ///
-       void CursorToggle();
+       void CursorToggle(LyXText const *);
        ///
-       void ShowManualCursor(long x, long y, int asc, int desc,
+       void ShowManualCursor(LyXText const *, long x, long y,
+                             int asc, int desc,
                              Cursor_Shape shape);
        /// returns 1 if first has changed, otherwise 0
-       bool FitManualCursor(long, long, int, int);
+       bool FitManualCursor(LyXText *, long, long, int, int);
        ///
-       void ToggleSelection(bool = true);
+       void ToggleSelection(LyXText *, bool = true, int y_offset = 0,
+                            int x_offset = 0);
        ///
-       void ToggleToggle();
+       void ToggleToggle(LyXText *, int y_offset = 0, int x_offset = 0);
        
        /** Updates part of the screen. If text->status is
            LyXText::NEED_MORE_REFRESH, we update from the
            point of change and to the end of the screen.
            If text->status is LyXText::NEED_VERY_LITTLE_REFRESH,
            we only update the current row. */
-       void Update();
-
-#if 0
-       /** Updates part of the screen. Updates till row with cursor,
-           or only current row */
-       void SmallUpdate();
-#endif
-       /// first visible pixel-row
-       unsigned long first;
+       void Update(LyXText *, int y_offset=0, int x_offset=0);
+       ///
+       bool forceClear() const { return force_clear; }
 
        ///
        bool cursor_visible;
@@ -94,22 +94,15 @@ private:
        void expose(int x, int y, int exp_width, int exp_height); 
 
        /// y1 and y2 are coordinates of the screen
-       void DrawFromTo(int y1, int y2);
+       void DrawFromTo(LyXText *, int y1, int y2, int y_offset=0, int x_offset=0);
 
-#if 1
        /// y is a coordinate of the text
-       void DrawOneRow(Row * row, long y_text);
-#else
-       /// y is a coordinate of the text
-       void DrawOneRow(Row * row, long & y_text);
-#endif
+       void DrawOneRow(LyXText *, Row * row, long y_text, int y_offset=0,
+                       int x_offset=0);
 
        ///
        WorkArea & owner;
        
-       ///
-       LyXText * text;
-
        ///
        Pixmap cursor_pixmap;
        ///
@@ -120,14 +113,10 @@ private:
        int cursor_pixmap_w;
        ///
        int cursor_pixmap_h;
-#if 0
-       ///
-       long screen_refresh_y;
-       ///
-       Row * screen_refresh_row;
-#endif
        ///
        GC gc_copy;
+       ///
+       bool force_clear;
 };
 
 #endif