Move Color::color enum to ColorCode.h

[lyx.git] / src / frontends / WorkArea.h

diff --git a/src/frontends/WorkArea.h b/src/frontends/WorkArea.h
index d7b7fe0f6aff5dbff4d4cf250893dcb020810723..74a875f241f83141cd65b1589b14f4c662d8a192 100644 (file)
--- a/src/frontends/WorkArea.h
+++ b/src/frontends/WorkArea.h
@@ -11,40 +11,27 @@
  * Full author contact details are available in file CREDITS.
  */
 
-// X11 use a define called CursorShape, and we really want to use
-// that name our selves. Therefore we do something similar to what is done
-// in kde/fixx11h.h:
-namespace X {
-#ifdef CursorShape
-#ifndef FIXX11H_CursorShape
-#define FIXX11H_CursorShape
-int const XCursorShape = CursorShape;
-#undef CursorShape
-int const CursorShape = CursorShape;
-#endif
-#undef CursorShape
-#endif
-} // namespace X
-
-
 #ifndef BASE_WORKAREA_H
 #define BASE_WORKAREA_H
 
-#include "frontends/key_state.h"
-#include "frontends/LyXKeySym.h"
-#include "frontends/Timeout.h"
+#include "frontends/KeyModifier.h"
+#include "frontends/Delegates.h"
 
+#include "support/Timeout.h"
 #include "support/docstring.h"
 
-#include <boost/signals/trackable.hpp>
+#undef CursorShape
 
+namespace lyx {
+
+class Buffer;
 class BufferView;
 class FuncRequest;
-class LyXView;
+class KeySymbol;
 
-namespace lyx {
 namespace frontend {
 
+class LyXView;
 class Painter;
 
 /// types of cursor in work area
@@ -64,22 +51,27 @@ enum CursorShape {
  * It works in concert with the BaseScreen class to update the
  * widget view of a document.
  */
-class WorkArea : public boost::signals::trackable {
+class WorkArea
+{
 public:
-       WorkArea(LyXView & lyx_view);
+       ///
+       WorkArea(Buffer & buffer, LyXView & lv);
 
-       virtual ~WorkArea() {}
+       virtual ~WorkArea();
 
-       void setBufferView(BufferView * buffer_view);
+       ///
+       void setLyXView(LyXView & lv) { lyx_view_ = &lv; }
 
        ///
        BufferView & bufferView();
        ///
        BufferView const & bufferView() const;
 
+       /// \return true if has the keyboard input focus.
+       virtual bool hasFocus() const = 0;
 
-       /// return the painter object for this work area
-       virtual Painter & getPainter() = 0;
+       /// \return true if has this WorkArea is visible.
+       virtual bool isVisible() const = 0;
 
        /// return the width of the work area in pixels
        virtual int width() const = 0;
@@ -95,65 +87,50 @@ public:
         */
        virtual void setScrollbarParams(int height, int pos, int line_height) = 0;
 
+       ///
+       virtual void scheduleRedraw() = 0;
+
        /// redraw the screen, without using existing pixmap
        virtual void redraw();
+       ///
+       void stopBlinkingCursor();
+       void startBlinkingCursor();
 
-       /// grey out (no buffer)
-       void greyOut();
+       /// Process Key pressed event.
+       /// This needs to be public because it is accessed externally by GuiView.
+       void processKeySym(KeySymbol const & key, KeyModifier mod);
 
-       /// FIXME: should be protected, public until the qt3 and gtk frontends are
-       /// cleaned up.
-       void processKeySym(LyXKeySymPtr key, key_modifier::state state);
+       /// close this work area.
+       /// Slot for Buffer::closing signal.
+       void close();
 
 protected:
        /// cause the display of the given area of the work area
        virtual void expose(int x, int y, int w, int h) = 0;
+       ///
+       void dispatch(FuncRequest const & cmd0, KeyModifier = NoModifier);
 
-public:
-       /// FIXME: This is public because of qt3 and gtk, should be protected
-       void dispatch(FuncRequest const & cmd0);
-
-       /// FIXME: This is public because of qt3 and gtk, should be protected
+       ///
        void resizeBufferView();
-
-       /// FIXME: This is public because of qt3 and gtk, should be protected
-       void scrollBufferView(int position);
-
-protected:
        /// hide the visible cursor, if it is visible
        void hideCursor();
-
        /// show the cursor if it is not visible
        void showCursor();
-
        /// toggle the cursor's visibility
        void toggleCursor();
-
        /// hide the cursor
        virtual void removeCursor() = 0;
-
        /// paint the cursor and store the background
        virtual void showCursor(int x, int y, int h, CursorShape shape) = 0;
+       ///
+       void updateScrollbar();
 
        ///
        BufferView * buffer_view_;
-
        ///
-       LyXView & lyx_view_;
+       LyXView * lyx_view_;
 
 private:
-       ///
-       void updateScrollbar();
-       ///
-       void checkAndGreyOut();
-       ///
-       void displayMessage(lyx::docstring const &);
-       /// buffer messages signal connection
-       boost::signals::connection message_connection_;
-
-       ///
-       bool greyed_out_;
-
        /// is the cursor currently displayed
        bool cursor_visible_;