summaryrefslogtreecommitdiff
path: root/plugins/annotate/src/annotate.h
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/annotate/src/annotate.h')
-rw-r--r--plugins/annotate/src/annotate.h22
1 files changed, 15 insertions, 7 deletions
diff --git a/plugins/annotate/src/annotate.h b/plugins/annotate/src/annotate.h
index 0bafc7f..43d4e65 100644
--- a/plugins/annotate/src/annotate.h
+++ b/plugins/annotate/src/annotate.h
@@ -34,6 +34,8 @@
static int annoLastPointerX = 0;
static int annoLastPointerY = 0;
+static int initialPointerX = 0;
+static int initialPointerY = 0;
typedef struct _Ellipse
{
@@ -46,6 +48,7 @@ enum DrawMode
{
NoMode = 0,
EraseMode,
+ FreeDrawMode,
LineMode,
RectangleMode,
EllipseMode,
@@ -74,11 +77,11 @@ class AnnoScreen :
bool content;
Damage damage;
- int initialPointerX, initialPointerY;
CompRect rectangle, lastRect;
DrawMode drawMode;
- Ellipse ellipse;
+ CompPoint lineVector;
+ Ellipse ellipse;
void handleEvent (XEvent *);
@@ -142,11 +145,6 @@ class AnnoScreen :
CompOption::Vector& options);
bool
- initiate (CompAction *action,
- CompAction::State state,
- CompOption::Vector& options);
-
- bool
terminate (CompAction *action,
CompAction::State state,
CompOption::Vector& options);
@@ -157,6 +155,16 @@ class AnnoScreen :
CompOption::Vector& options);
bool
+ initiateFreeDraw (CompAction *action,
+ CompAction::State state,
+ CompOption::Vector& options);
+
+ bool
+ initiateLine (CompAction *action,
+ CompAction::State state,
+ CompOption::Vector& options);
+
+ bool
rectangleInitiate (CompAction *action,
CompAction::State state,
CompOption::Vector& options);