Dekel's patch -- I didn't fix the xforms-0.88 keysyms stuff so it still doesn't finis...

[lyx.git] / src / lyxscreen.h

diff --git a/src/lyxscreen.h b/src/lyxscreen.h
index f70254e24f047c2d93ec60c69e32c0fef05b0cc9..89e8cb01f143cdcdbad755a38502285a5888eebb 100644 (file)
--- a/src/lyxscreen.h
+++ b/src/lyxscreen.h
@@ -20,11 +20,14 @@
 #include <X11/Xlib.h>
 
 class LyXText;
+class WorkArea;
+class Buffer;
+
 struct Row;
+
+///
 typedef unsigned short Dimension;
 
-class WorkArea;
-class Buffer;
 
 /** The class LyXScreen is used for the main Textbody.
     Concretely, the screen is held in a pixmap.  This pixmap is kept up to
@@ -33,7 +36,7 @@ class Buffer;
  */
 class LyXScreen {
 public:
-
+       ///
        enum Cursor_Shape {
                ///
                BAR_SHAPE,
@@ -44,44 +47,43 @@ 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();
-
-       /// first visible pixel-row
-       unsigned long first;
+       void Update(LyXText *, int y_offset=0, int x_offset=0);
 
        ///
        bool cursor_visible;
@@ -90,17 +92,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);
 
        /// y is a coordinate of the text
-       void DrawOneRow(Row * row, long y_text);
+       void DrawOneRow(LyXText *, Row * row, long y_text, int y_offset=0,
+                       int x_offset=0);
 
        ///
        WorkArea & owner;
        
-       ///
-       LyXText * text;
-
        ///
        Pixmap cursor_pixmap;
        ///