whitespace changes;

[lyx.git] / src / lyxscreen.h

diff --git a/src/lyxscreen.h b/src/lyxscreen.h
index 91f17dc06b19c5637cfc822f5007944f4fe4d0af..c90cab8794d79debc24c9f478367ba5715f853b3 100644 (file)
--- a/src/lyxscreen.h
+++ b/src/lyxscreen.h
@@ -5,7 +5,7 @@
  *           LyX, The Document Processor
  *      
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team
+ *           Copyright 1995-2001 The LyX Team
  *
  * ====================================================== */
 
@@ -16,7 +16,6 @@
 #pragma interface
 #endif
 
-#include FORMS_H_LOCATION
 #include <X11/Xlib.h>
 
 class LyXText;
@@ -26,10 +25,6 @@ class BufferView;
 
 struct Row;
 
-///
-typedef unsigned short Dimension;
-
-
 /** The class LyXScreen is used for the main Textbody.
     Concretely, the screen is held in a pixmap.  This pixmap is kept up to
     date and used to optimize drawing on the screen.
@@ -50,37 +45,40 @@ public:
        ///
        LyXScreen(WorkArea &);
 
+       ///
+       ~LyXScreen();
+ 
        /// Sets the cursor color to LColor::cursor.
        void setCursorColor();
        
        /** Draws the screen form textposition y. Uses as much of
            the already printed pixmap as possible */
-       void Draw(LyXText *, BufferView *, unsigned int y);
+       void draw(LyXText *, BufferView *, unsigned int y);
 
        /// Redraws the screen, without using existing pixmap
-       void Redraw(LyXText *, BufferView *);
+       void redraw(LyXText *, BufferView *);
    
        /// Returns a new top so that the cursor is visible
-       unsigned int TopCursorVisible(LyXText const *);
+       unsigned int topCursorVisible(LyXText const *);
        /// Redraws the screen such that the cursor is visible
-       bool FitCursor(LyXText *, BufferView *);
+       bool fitCursor(LyXText *, BufferView *);
        ///
-       void ShowCursor(LyXText const *, BufferView const *);
+       void showCursor(LyXText const *, BufferView const *);
        ///
-       void HideCursor();
+       void hideCursor();
        ///
-       void CursorToggle(LyXText const *, BufferView const *);
+       void cursorToggle(BufferView *) const;
        ///
-       void ShowManualCursor(LyXText const *, int x, int y,
+       void showManualCursor(LyXText const *, int x, int y,
                              int asc, int desc,
                              Cursor_Shape shape);
        /// returns 1 if first has changed, otherwise 0
-       bool FitManualCursor(LyXText *, BufferView *, int, int, int, int);
+       bool fitManualCursor(LyXText *, BufferView *, int, int, int, int);
        ///
-       void ToggleSelection(LyXText *, BufferView *, bool = true,
+       void toggleSelection(LyXText *, BufferView *, bool = true,
                             int y_offset = 0, int x_offset = 0);
        ///
-       void ToggleToggle(LyXText *, BufferView *,
+       void toggleToggle(LyXText *, BufferView *,
                          int y_offset = 0, int x_offset = 0);
        
        /** Updates part of the screen. If text->status is
@@ -88,7 +86,7 @@ public:
            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(LyXText *, BufferView *, int y_offset=0, int x_offset=0);
+       void update(LyXText *, BufferView *, int y_offset=0, int x_offset=0);
        ///
        bool forceClear() const { return force_clear; }
 
@@ -99,11 +97,11 @@ private:
        void expose(int x, int y, int exp_width, int exp_height); 
 
        /// y1 and y2 are coordinates of the screen
-       void DrawFromTo(LyXText *, BufferView *, int y1, int y2,
-                       int y_offset = 0, int x_offset = 0);
+       void drawFromTo(LyXText *, BufferView *, int y1, int y2,
+                       int y_offset = 0, int x_offset = 0, bool internal=false);
 
        /// y is a coordinate of the text
-       void DrawOneRow(LyXText *, BufferView *, Row * row,
+       void drawOneRow(LyXText *, BufferView *, Row * row,
                        int y_text, int y_offset = 0, int x_offset = 0);
 
        ///