X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FWorkArea.h;h=715f1f56e59b68a26958d310aa1f4dfd3a313acd;hb=98c966c64594611e469313314abd1e59524adb4a;hp=537d4c4fd7d45837be48742e6ec40d25df1b908c;hpb=85798535a19919e82cc94a177a8414c542a9c5bf;p=lyx.git

diff --git a/src/WorkArea.h b/src/WorkArea.h
index 537d4c4fd7..715f1f56e5 100644
--- a/src/WorkArea.h
+++ b/src/WorkArea.h
@@ -1,11 +1,11 @@
 // -*- C++ -*-
 /* This file is part of
  * ======================================================
- * 
+ *
  *           LyX, The Document Processor
- *        
+ *
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
  * ======================================================*/
 
@@ -18,17 +18,16 @@
 
 #include <utility>
 
+#include <sigc++/signal_system.h>
+
 #include FORMS_H_LOCATION
 #include "Painter.h"
 
-using std::pair;
-
-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,21 +35,23 @@ 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; }
+	//unsigned int width() const { return backgroundbox->w + 15; }
 	///
-	int height() const { return work_area->h; }
+	unsigned int height() const { return work_area->h; }
+	//unsigned int height() const { return backgroundbox->h; }
 	///
 	int xpos() const { return work_area->x; }
+	//int xpos() const { return backgroundbox->x; }
 	///
 	int ypos() const { return work_area->y; }
+	//int ypos() const { return backgroundbox->y; }
 	///
 	void resize(int xpos, int ypos, int width, int height);
 	///
 	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 +70,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,31 +94,64 @@ 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);
+	/// a selection exists
+	void haveSelection(bool) const;
+	///
+	string const getClipboard() const;
+	///
+	void putClipboard(string const &) const;
+	// Signals
+	///
+	SigC::Signal0<void> workAreaExpose;
+	///
+	SigC::Signal1<void, double> scrollCB;
+	///
+	SigC::Signal2<void, KeySym, unsigned int> workAreaKeyPress;
+	///
+	SigC::Signal3<void, int, int, unsigned int> workAreaButtonPress;
+	///
+	SigC::Signal3<void, int, int, unsigned int> workAreaButtonRelease;
+	///
+	SigC::Signal3<void, int, int, unsigned int> workAreaMotionNotify;
+	///
+	SigC::Signal0<void> workAreaFocus;
+	///
+	SigC::Signal0<void> workAreaUnfocus;
+	///
+	SigC::Signal0<void> workAreaEnter;
+	///
+	SigC::Signal0<void> workAreaLeave;
+	///
+	SigC::Signal3<void, int, int, unsigned int> workAreaDoubleClick;
+	///
+	SigC::Signal3<void, int, int, unsigned int> workAreaTripleClick;
+	/// emitted when an X client has requested our selection
+	SigC::Signal0<void> selectionRequested;
+	/// emitted when another X client has stolen our selection
+	SigC::Signal0<void> selectionLost;
+
+	/// handles SelectionRequest X Event, to fill the clipboard
+	int event_cb(XEvent * xev);
 private:
 	///
 	void createPixmap(int, int);
+
 	///
 	FL_OBJECT * backgroundbox;
-	///	
+	///
 	FL_OBJECT * work_area;
 	///
 	FL_OBJECT * scrollbar;
 	///
-	FL_OBJECT * button_down;
-	///
-	FL_OBJECT * button_up;
+	mutable FL_OBJECT * splash_;
 	///
-	BufferView * owner;
+	mutable FL_OBJECT * splash_text_;
 	/// 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