remove Last when NEW_INSETS is defined

[lyx.git] / src / WorkArea.h

diff --git a/src/WorkArea.h b/src/WorkArea.h
index 537d4c4fd7d45837be48742e6ec40d25df1b908c..7c00df597da8480065aa6e0f56b4d9b5d69df6c2 100644 (file)
--- a/src/WorkArea.h
+++ b/src/WorkArea.h
@@ -18,17 +18,24 @@
 
 #include <utility>
 
+#include <sigc++/signal_system.h>
+
 #include FORMS_H_LOCATION
 #include "Painter.h"
 
-using std::pair;
+#ifdef SIGC_CXX_NAMESPACES
+using SigC::Signal0;
+using SigC::Signal1;
+using SigC::Signal2;
+using SigC::Signal3;
+#endif
 
-class BufferView;
 
+///
 class WorkArea {
 public:
        ///
-       WorkArea(BufferView *, int xpos, int ypos, int width, int height);
+       WorkArea(int xpos, int ypos, int width, int height);
        ///
        ~WorkArea();
        ///
@@ -36,9 +43,9 @@ public:
        ///
        int workWidth() const { return work_area->w; }
        ///
-       int width() const { return work_area->w + scrollbar->w; }
+       unsigned int width() const { return work_area->w + scrollbar->w; }
        ///
-       int height() const { return work_area->h; }
+       unsigned int height() const { return work_area->h; }
        ///
        int xpos() const { return work_area->x; }
        ///
@@ -49,8 +56,6 @@ public:
        void redraw() const {
                fl_redraw_object(work_area);
                fl_redraw_object(scrollbar);
-               fl_redraw_object(button_down);
-               fl_redraw_object(button_up);
        }
        ///
        void setFocus() const;
@@ -69,19 +74,21 @@ public:
        ///
        void setScrollbar(double pos, double length_fraction) const;
        ///
-       void setScrollbarValue(double y) const { fl_set_slider_value(scrollbar, y); }
+       void setScrollbarValue(double y) const {
+               fl_set_scrollbar_value(scrollbar, y);
+       }
        ///
        void setScrollbarBounds(double, double) const;
        ///
-       void setScrollbarIncrements(float inc) const;
+       void setScrollbarIncrements(double inc) const;
        ///
        double getScrollbarValue() const {
-               return fl_get_slider_value(scrollbar);
+               return fl_get_scrollbar_value(scrollbar);
        }
        ///
-       pair<double, double> getScrollbarBounds() const {
-               pair<double, double> p;
-               fl_get_slider_bounds(scrollbar, &p.first, &p.second);
+       std::pair<float, float> const getScrollbarBounds() const {
+               std::pair<float, float> p;
+               fl_get_scrollbar_bounds(scrollbar, &p.first, &p.second);
                return p;
        }
        ///
@@ -91,11 +98,36 @@ public:
                                     FL_Coord, FL_Coord,
                                     int /*key*/, void * xev);
        /// xforms callback
-       static void up_cb(FL_OBJECT *, long);
-       /// xforms callback
-       static void down_cb(FL_OBJECT *, long);
-       /// xforms callback
        static void scroll_cb(FL_OBJECT *, long);
+       ///
+       string const getClipboard() const;
+       ///
+       void putClipboard(string const &) const;
+       // Signals
+       ///
+       Signal0<void> workAreaExpose;
+       ///
+       Signal1<void, double> scrollCB;
+       ///
+       Signal2<void, KeySym, unsigned int> workAreaKeyPress;
+       ///
+       Signal3<void, int, int, unsigned int> workAreaButtonPress;
+       ///
+       Signal3<void, int, int, unsigned int> workAreaButtonRelease;
+       ///
+       Signal3<void, int, int, unsigned int> workAreaMotionNotify;
+       ///
+       Signal0<void> workAreaFocus;
+       ///
+       Signal0<void> workAreaUnfocus;
+       ///
+       Signal0<void> workAreaEnter;
+       ///
+       Signal0<void> workAreaLeave;
+       ///
+       Signal3<void, int, int, unsigned int> workAreaDoubleClick;
+       ///
+       Signal3<void, int, int, unsigned int> workAreaTripleClick;
 private:
        ///
        void createPixmap(int, int);
@@ -105,17 +137,13 @@ private:
        FL_OBJECT * work_area;
        ///
        FL_OBJECT * scrollbar;
-       ///
-       FL_OBJECT * button_down;
-       ///
-       FL_OBJECT * button_up;
-       ///
-       BufferView * owner;
        /// The pixmap overlay on the workarea
        Pixmap workareapixmap;
        ///
        Painter painter_;
        ///
        FL_OBJECT * figinset_canvas;
+       /// if we call redraw with true needed for locking-insets
+       bool screen_cleared;
 };
 #endif