From 147073e27db0f115c7e5bbdab245824313b02f33 Mon Sep 17 00:00:00 2001
From: Guillaume Seguin <guillaume@segu.in>
Date: Mon, 15 Feb 2010 21:24:13 +0100
Subject: Addd libXext and libdl to core links

---
 src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b06e1d9..caf094d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -52,7 +52,7 @@ add_executable (compiz
 )
 
 target_link_libraries (
-    compiz ${COMPIZ_LIBRARIES} m pthread
+    compiz ${COMPIZ_LIBRARIES} m pthread Xext dl
 )
 
 install (
-- 
cgit v1.1


From 36cd7758f0cf718de02b84897df0c58fdbf95cce Mon Sep 17 00:00:00 2001
From: Guillaume Seguin <guillaume@segu.in>
Date: Mon, 15 Feb 2010 21:39:05 +0100
Subject: Cleaner Xext dep

---
 CMakeLists.txt     | 1 +
 src/CMakeLists.txt | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2e4acc9..b760c6c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,6 +45,7 @@ set (COMPIZ_REQUIRES
     x11-xcb
     xrandr
     xinerama
+    xext
     ice
     sm
     libxml-2.0
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index caf094d..5c0290e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -52,7 +52,7 @@ add_executable (compiz
 )
 
 target_link_libraries (
-    compiz ${COMPIZ_LIBRARIES} m pthread Xext dl
+    compiz ${COMPIZ_LIBRARIES} m pthread dl
 )
 
 install (
-- 
cgit v1.1


From 6da1124112165f35bea278281e709d96066125fa Mon Sep 17 00:00:00 2001
From: Scott Moreau <oreaus@gmail.com>
Date: Mon, 15 Feb 2010 14:32:41 -0700
Subject: Fix longstanding damage issue.

---
 plugins/annotate/src/annotate.cpp | 40 +++++++++++----------------------------
 plugins/annotate/src/annotate.h   |  2 ++
 2 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/plugins/annotate/src/annotate.cpp b/plugins/annotate/src/annotate.cpp
index b64d262..4cae5d0 100644
--- a/plugins/annotate/src/annotate.cpp
+++ b/plugins/annotate/src/annotate.cpp
@@ -70,6 +70,9 @@ AnnoScreen::cairoContext ()
 	    return NULL;
 	}
 
+	damage = XDamageCreate (screen->dpy (), pixmap,
+				XDamageReportRawRectangles);
+
 	surface =
 	    cairo_xlib_surface_create_with_xrender_format (screen->dpy (),
 							   pixmap, xScreen,
@@ -117,12 +120,7 @@ AnnoScreen::drawCircle (double	       xc,
 	setSourceColor (cr, strokeColor);
 	cairo_stroke (cr);
 
-	CompRegion reg (xc - radius - strokeWidth, yc - radius - strokeWidth,
-		       (radius * 2) + (strokeWidth * 2),
-		       (radius * 2) + (strokeWidth * 2));
-
 	content = true;
-	cScreen->damageRegion (reg);
     }
 }
 
@@ -150,12 +148,7 @@ AnnoScreen::drawRectangle (double	  x,
 	setSourceColor (cr, strokeColor);
 	cairo_stroke (cr);
 
-	CompRegion reg (x - strokeWidth, y - strokeWidth,
-		        w + (strokeWidth * 2), h + (strokeWidth * 2));
-
 	content = true;
-
-	cScreen->damageRegion (reg);
     }
 }
 
@@ -182,13 +175,7 @@ AnnoScreen::drawLine (double	     x1,
 	setSourceColor (cr, color);
 	cairo_stroke (cr);
 
-	CompRegion reg (ex1 - width, ey1 - width,
-		       (ex2 - ex1) + (width * 2),
-		       (ey2 - ey1) + (width * 2));
-
 	content = true;
-
-	cScreen->damageRegion (reg);
     }
 }
 
@@ -233,13 +220,7 @@ AnnoScreen::drawText (double	     		     x,
 	reg.extents.x2 = x + extents.width + 20.0;
 	reg.extents.y2 = y + extents.height;
 
-	CompRegion region (reg.extents.x1, reg.extents.y1,
-			   reg.extents.x2 - reg.extents.x1,
-			   reg.extents.y2 - reg.extents.y1);
-
 	content = true;
-
-	cScreen->damageRegion (region);
     }
 }
 
@@ -453,10 +434,6 @@ AnnoScreen::terminate (CompAction         *action,
 
     drawMode = NoMode;
 
-    /* No need to handle motion events for now */
-
-    screen->handleEventSetEnabled (this, false);
-
     return false;
 }
 
@@ -559,9 +536,6 @@ AnnoScreen::clear (CompAction         *action,
 	    cairoClear (cairo);
 
         cScreen->damageScreen ();
-
-	/* We don't need to refresh the screen anymore */
-	gScreen->glPaintOutputSetEnabled (this, false);
     }
 
     return true;
@@ -795,6 +769,12 @@ AnnoScreen::handleEvent (XEvent      *event)
     case LeaveNotify:
 	handleMotionEvent (pointerX, pointerY);
     default:
+	if (event->type == cScreen->damageEvent () + XDamageNotify)
+	{
+	    XDamageNotifyEvent *de = (XDamageNotifyEvent *) event;
+	    if (pixmap == de->drawable)
+		cScreen->damageRegion ((CompRegion)de->area);
+	}
 	break;
     }
 
@@ -844,6 +824,8 @@ AnnoScreen::~AnnoScreen ()
 	cairo_surface_destroy (surface);
     if (pixmap)
 	XFreePixmap (screen->dpy (), pixmap);
+    if (damage)
+	XDamageDestroy (screen->dpy (), damage);
 }
 
 bool
diff --git a/plugins/annotate/src/annotate.h b/plugins/annotate/src/annotate.h
index 124e81d..7673788 100644
--- a/plugins/annotate/src/annotate.h
+++ b/plugins/annotate/src/annotate.h
@@ -72,6 +72,8 @@ class AnnoScreen :
 	cairo_surface_t *surface;
 	cairo_t		*cairo;
 	bool		content;
+	Damage		damage;
+
 	int		initialPointerX, initialPointerY;
 	CompRect	rectangle, lastRect;
 	DrawMode	drawMode;
-- 
cgit v1.1


From 98960b7d74f61715f9c0f46085f84496feefde94 Mon Sep 17 00:00:00 2001
From: Dennis Kasprzyk <onestone@compiz-fusion.org>
Date: Mon, 15 Feb 2010 22:40:40 +0100
Subject: Revert "Fix longstanding damage issue."

This reverts commit 6da1124112165f35bea278281e709d96066125fa.
---
 plugins/annotate/src/annotate.cpp | 40 ++++++++++++++++++++++++++++-----------
 plugins/annotate/src/annotate.h   |  2 --
 2 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/plugins/annotate/src/annotate.cpp b/plugins/annotate/src/annotate.cpp
index 4cae5d0..b64d262 100644
--- a/plugins/annotate/src/annotate.cpp
+++ b/plugins/annotate/src/annotate.cpp
@@ -70,9 +70,6 @@ AnnoScreen::cairoContext ()
 	    return NULL;
 	}
 
-	damage = XDamageCreate (screen->dpy (), pixmap,
-				XDamageReportRawRectangles);
-
 	surface =
 	    cairo_xlib_surface_create_with_xrender_format (screen->dpy (),
 							   pixmap, xScreen,
@@ -120,7 +117,12 @@ AnnoScreen::drawCircle (double	       xc,
 	setSourceColor (cr, strokeColor);
 	cairo_stroke (cr);
 
+	CompRegion reg (xc - radius - strokeWidth, yc - radius - strokeWidth,
+		       (radius * 2) + (strokeWidth * 2),
+		       (radius * 2) + (strokeWidth * 2));
+
 	content = true;
+	cScreen->damageRegion (reg);
     }
 }
 
@@ -148,7 +150,12 @@ AnnoScreen::drawRectangle (double	  x,
 	setSourceColor (cr, strokeColor);
 	cairo_stroke (cr);
 
+	CompRegion reg (x - strokeWidth, y - strokeWidth,
+		        w + (strokeWidth * 2), h + (strokeWidth * 2));
+
 	content = true;
+
+	cScreen->damageRegion (reg);
     }
 }
 
@@ -175,7 +182,13 @@ AnnoScreen::drawLine (double	     x1,
 	setSourceColor (cr, color);
 	cairo_stroke (cr);
 
+	CompRegion reg (ex1 - width, ey1 - width,
+		       (ex2 - ex1) + (width * 2),
+		       (ey2 - ey1) + (width * 2));
+
 	content = true;
+
+	cScreen->damageRegion (reg);
     }
 }
 
@@ -220,7 +233,13 @@ AnnoScreen::drawText (double	     		     x,
 	reg.extents.x2 = x + extents.width + 20.0;
 	reg.extents.y2 = y + extents.height;
 
+	CompRegion region (reg.extents.x1, reg.extents.y1,
+			   reg.extents.x2 - reg.extents.x1,
+			   reg.extents.y2 - reg.extents.y1);
+
 	content = true;
+
+	cScreen->damageRegion (region);
     }
 }
 
@@ -434,6 +453,10 @@ AnnoScreen::terminate (CompAction         *action,
 
     drawMode = NoMode;
 
+    /* No need to handle motion events for now */
+
+    screen->handleEventSetEnabled (this, false);
+
     return false;
 }
 
@@ -536,6 +559,9 @@ AnnoScreen::clear (CompAction         *action,
 	    cairoClear (cairo);
 
         cScreen->damageScreen ();
+
+	/* We don't need to refresh the screen anymore */
+	gScreen->glPaintOutputSetEnabled (this, false);
     }
 
     return true;
@@ -769,12 +795,6 @@ AnnoScreen::handleEvent (XEvent      *event)
     case LeaveNotify:
 	handleMotionEvent (pointerX, pointerY);
     default:
-	if (event->type == cScreen->damageEvent () + XDamageNotify)
-	{
-	    XDamageNotifyEvent *de = (XDamageNotifyEvent *) event;
-	    if (pixmap == de->drawable)
-		cScreen->damageRegion ((CompRegion)de->area);
-	}
 	break;
     }
 
@@ -824,8 +844,6 @@ AnnoScreen::~AnnoScreen ()
 	cairo_surface_destroy (surface);
     if (pixmap)
 	XFreePixmap (screen->dpy (), pixmap);
-    if (damage)
-	XDamageDestroy (screen->dpy (), damage);
 }
 
 bool
diff --git a/plugins/annotate/src/annotate.h b/plugins/annotate/src/annotate.h
index 7673788..124e81d 100644
--- a/plugins/annotate/src/annotate.h
+++ b/plugins/annotate/src/annotate.h
@@ -72,8 +72,6 @@ class AnnoScreen :
 	cairo_surface_t *surface;
 	cairo_t		*cairo;
 	bool		content;
-	Damage		damage;
-
 	int		initialPointerX, initialPointerY;
 	CompRect	rectangle, lastRect;
 	DrawMode	drawMode;
-- 
cgit v1.1


From 4c52e497d8daab2cc71db0d66c6e9b89f18178a0 Mon Sep 17 00:00:00 2001
From: Scott Moreau <oreaus@gmail.com>
Date: Mon, 15 Feb 2010 15:31:11 -0700
Subject: Fix longstanding damage issue.

---
 plugins/annotate/src/annotate.cpp | 40 +++++++++++++--------------------------
 plugins/annotate/src/annotate.h   |  2 ++
 2 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/plugins/annotate/src/annotate.cpp b/plugins/annotate/src/annotate.cpp
index b64d262..520a1c9 100644
--- a/plugins/annotate/src/annotate.cpp
+++ b/plugins/annotate/src/annotate.cpp
@@ -70,6 +70,9 @@ AnnoScreen::cairoContext ()
 	    return NULL;
 	}
 
+	damage = XDamageCreate (screen->dpy (), pixmap,
+				XDamageReportRawRectangles);
+
 	surface =
 	    cairo_xlib_surface_create_with_xrender_format (screen->dpy (),
 							   pixmap, xScreen,
@@ -117,12 +120,7 @@ AnnoScreen::drawCircle (double	       xc,
 	setSourceColor (cr, strokeColor);
 	cairo_stroke (cr);
 
-	CompRegion reg (xc - radius - strokeWidth, yc - radius - strokeWidth,
-		       (radius * 2) + (strokeWidth * 2),
-		       (radius * 2) + (strokeWidth * 2));
-
 	content = true;
-	cScreen->damageRegion (reg);
     }
 }
 
@@ -150,12 +148,7 @@ AnnoScreen::drawRectangle (double	  x,
 	setSourceColor (cr, strokeColor);
 	cairo_stroke (cr);
 
-	CompRegion reg (x - strokeWidth, y - strokeWidth,
-		        w + (strokeWidth * 2), h + (strokeWidth * 2));
-
 	content = true;
-
-	cScreen->damageRegion (reg);
     }
 }
 
@@ -182,13 +175,7 @@ AnnoScreen::drawLine (double	     x1,
 	setSourceColor (cr, color);
 	cairo_stroke (cr);
 
-	CompRegion reg (ex1 - width, ey1 - width,
-		       (ex2 - ex1) + (width * 2),
-		       (ey2 - ey1) + (width * 2));
-
 	content = true;
-
-	cScreen->damageRegion (reg);
     }
 }
 
@@ -233,13 +220,7 @@ AnnoScreen::drawText (double	     		     x,
 	reg.extents.x2 = x + extents.width + 20.0;
 	reg.extents.y2 = y + extents.height;
 
-	CompRegion region (reg.extents.x1, reg.extents.y1,
-			   reg.extents.x2 - reg.extents.x1,
-			   reg.extents.y2 - reg.extents.y1);
-
 	content = true;
-
-	cScreen->damageRegion (region);
     }
 }
 
@@ -453,10 +434,6 @@ AnnoScreen::terminate (CompAction         *action,
 
     drawMode = NoMode;
 
-    /* No need to handle motion events for now */
-
-    screen->handleEventSetEnabled (this, false);
-
     return false;
 }
 
@@ -560,7 +537,8 @@ AnnoScreen::clear (CompAction         *action,
 
         cScreen->damageScreen ();
 
-	/* We don't need to refresh the screen anymore */
+	/* We don't need to refresh the screen or handle events anymore */
+	screen->handleEventSetEnabled (this, false);
 	gScreen->glPaintOutputSetEnabled (this, false);
     }
 
@@ -795,6 +773,12 @@ AnnoScreen::handleEvent (XEvent      *event)
     case LeaveNotify:
 	handleMotionEvent (pointerX, pointerY);
     default:
+	if (event->type == cScreen->damageEvent () + XDamageNotify)
+	{
+	    XDamageNotifyEvent *de = (XDamageNotifyEvent *) event;
+	    if (pixmap == de->drawable)
+		cScreen->damageRegion (CompRegion (CompRect (de->area)));
+	}
 	break;
     }
 
@@ -844,6 +828,8 @@ AnnoScreen::~AnnoScreen ()
 	cairo_surface_destroy (surface);
     if (pixmap)
 	XFreePixmap (screen->dpy (), pixmap);
+    if (damage)
+	XDamageDestroy (screen->dpy (), damage);
 }
 
 bool
diff --git a/plugins/annotate/src/annotate.h b/plugins/annotate/src/annotate.h
index 124e81d..7673788 100644
--- a/plugins/annotate/src/annotate.h
+++ b/plugins/annotate/src/annotate.h
@@ -72,6 +72,8 @@ class AnnoScreen :
 	cairo_surface_t *surface;
 	cairo_t		*cairo;
 	bool		content;
+	Damage		damage;
+
 	int		initialPointerX, initialPointerY;
 	CompRect	rectangle, lastRect;
 	DrawMode	drawMode;
-- 
cgit v1.1


From b93cac5d0c36f0d7b30e2d1a303859b547dc8586 Mon Sep 17 00:00:00 2001
From: Scott Moreau <oreaus@gmail.com>
Date: Mon, 22 Feb 2010 08:43:56 -0700
Subject: Draw ellipses instead of circles.

---
 plugins/annotate/annotate.xml.in  |   8 +--
 plugins/annotate/src/annotate.cpp | 130 ++++++++++++++++++++++----------------
 plugins/annotate/src/annotate.h   |  33 +++++-----
 3 files changed, 95 insertions(+), 76 deletions(-)

diff --git a/plugins/annotate/annotate.xml.in b/plugins/annotate/annotate.xml.in
index 75342ed..84674cc 100644
--- a/plugins/annotate/annotate.xml.in
+++ b/plugins/annotate/annotate.xml.in
@@ -19,10 +19,10 @@
 		<_long>Initiate rectangle drawing</_long>
 		<default>&lt;Super&gt;&lt;Alt&gt;Button2</default>
 	    </option>
-	    <option name="initiate_circle_button" type="button">
-		<_short>Initiate Circle</_short>
-		<_long>Initiate circle drawing</_long>
-		<default>&lt;Super&gt;&lt;Alt&gt;&lt;Shift&gt;Button1</default>
+	    <option name="initiate_ellipse_button" type="button">
+		<_short>Initiate Ellipse</_short>
+		<_long>Initiate ellipse drawing</_long>
+		<default>&lt;Super&gt;&lt;Alt&gt;&lt;Shift&gt;Button2</default>
 	    </option>
 	    <option name="draw" type="action">
 		<_short>Draw</_short>
diff --git a/plugins/annotate/src/annotate.cpp b/plugins/annotate/src/annotate.cpp
index 520a1c9..5da7feb 100644
--- a/plugins/annotate/src/annotate.cpp
+++ b/plugins/annotate/src/annotate.cpp
@@ -98,25 +98,35 @@ AnnoScreen::setSourceColor (cairo_t	   *cr,
 }
 
 void
-AnnoScreen::drawCircle (double	       xc,
-			double	       yc,
-			double	       radius,
-			unsigned short *fillColor,
-			unsigned short *strokeColor,
-			double	       strokeWidth)
+AnnoScreen::drawEllipse (double		xc,
+			 double		yc,
+			 double		radiusX,
+			 double		radiusY,
+			 unsigned short	*fillColor,
+			 unsigned short	*strokeColor,
+			 double		strokeWidth)
 {
     cairo_t *cr;
 
     cr = cairoContext ();
     if (cr)
     {
-	double  ex1, ey1, ex2, ey2;
-
 	setSourceColor (cr, fillColor);
-	cairo_arc (cr, xc, yc, radius, 0, 2 * M_PI);
+	cairo_save (cr);
+	cairo_translate (cr, xc, yc);
+	if (radiusX > radiusY)
+	{
+	    cairo_scale (cr, 1.0, radiusY/radiusX);
+	    cairo_arc (cr, 0, 0, radiusX, 0, 2 * M_PI);
+	}
+	else
+	{
+	    cairo_scale (cr, radiusX/radiusY, 1.0);
+	    cairo_arc (cr, 0, 0, radiusY, 0, 2 * M_PI);
+	}
+	cairo_restore (cr);
 	cairo_fill_preserve (cr);
 	cairo_set_line_width (cr, strokeWidth);
-	cairo_stroke_extents (cr, &ex1, &ey1, &ex2, &ey2);
 	setSourceColor (cr, strokeColor);
 	cairo_stroke (cr);
 
@@ -309,15 +319,16 @@ AnnoScreen::draw (CompAction         *action,
 	    drawRectangle (x, y, w, h, fillColor, strokeColor,
 			       strokeWidth);
         }
-        else if (strcasecmp (tool, "circle") == 0)
+        else if (strcasecmp (tool, "ellipse") == 0)
         {
-	    double xc, yc, r;
+	    double xc, yc, xr, yr;
 
 	    xc = CompOption::getFloatOptionNamed (options, "xc", 0);
 	    yc = CompOption::getFloatOptionNamed (options, "yc", 0);
-	    r  = CompOption::getFloatOptionNamed (options, "radius", 100);
+	    xr = CompOption::getFloatOptionNamed (options, "radiusX", 100);
+	    yr = CompOption::getFloatOptionNamed (options, "radiusY", 100);
 
-	    drawCircle (xc, yc, r, fillColor, strokeColor,
+	    drawEllipse (xc, yc, xr, yr, fillColor, strokeColor,
 			    strokeWidth);
         }
         else if (strcasecmp (tool, "line") == 0)
@@ -422,14 +433,15 @@ AnnoScreen::terminate (CompAction         *action,
 		       optionGetStrokeColor (),
 		       optionGetStrokeWidth ());
     }
-    if (drawMode == CircleMode)
+    if (drawMode == EllipseMode)
     {
-	drawCircle (circle.centerX,
-		    circle.centerY,
-		    circle.radius,
-		    optionGetFillColor (),
-		    optionGetStrokeColor (),
-		    optionGetStrokeWidth ());
+	drawEllipse (ellipse.center.x (),
+		     ellipse.center.y (),
+		     ellipse.radiusX,
+		     ellipse.radiusY,
+		     optionGetFillColor (),
+		     optionGetStrokeColor (),
+		     optionGetStrokeWidth ());
     }
 
     drawMode = NoMode;
@@ -494,9 +506,9 @@ AnnoScreen::rectangleInitiate (CompAction         *action,
 }
 
 bool
-AnnoScreen::circleInitiate (CompAction         *action,
-			    CompAction::State  state,
-			    CompOption::Vector& options)
+AnnoScreen::ellipseInitiate (CompAction         *action,
+			     CompAction::State  state,
+			     CompOption::Vector& options)
 {
     if (screen->otherGrabExist (NULL))
         return false;
@@ -510,11 +522,12 @@ AnnoScreen::circleInitiate (CompAction         *action,
     if (state & CompAction::StateInitKey)
         action->setState (action->state () | CompAction::StateTermKey);
 
-    drawMode = CircleMode;
+    drawMode = EllipseMode;
 
     initialPointerX = pointerX;
     initialPointerY = pointerY;
-    circle.radius = 0;
+    ellipse.radiusX = 0;
+    ellipse.radiusY = 0;
     lastRect.setGeometry (initialPointerX, initialPointerY, 0, 0);
 
     screen->handleEventSetEnabled (this, true);
@@ -631,42 +644,45 @@ AnnoScreen::glPaintOutput (const GLScreenPaintAttrib &attrib,
 	    glEnd ();
 	}
 
-	if (drawMode == CircleMode)
+	if (drawMode == EllipseMode)
 	{
 	    float vectorX, vectorY;
 	    int angle;
 
-	    /* fill circle */
+	    /* fill ellipse */
 	    glColor4usv (optionGetFillColor ());
 
 	    glBegin (GL_TRIANGLE_FAN);
-	    glVertex2d (circle.centerX, circle.centerY);
+	    glVertex2d (ellipse.center.x (), ellipse.center.y ());
 	    for (angle = 0; angle <= 360; angle += 1)
 	    {
-		vectorX = circle.centerX +
-			 (circle.radius * sinf (angle * DEG2RAD));
-		vectorY = circle.centerY +
-			 (circle.radius * cosf (angle * DEG2RAD));
+		vectorX = ellipse.center.x () +
+			 (ellipse.radiusX * sinf (angle * DEG2RAD));
+		vectorY = ellipse.center.y () +
+			 (ellipse.radiusY * cosf (angle * DEG2RAD));
 		glVertex2d (vectorX, vectorY);
 	    }
-	    glVertex2d (circle.centerX, circle.centerY + circle.radius);
+	    glVertex2d (ellipse.center.x (), ellipse.center.y () +
+			ellipse.radiusY);
 	    glEnd();
 
-	    /* draw circle outline */
+	    /* draw ellipse outline */
 	    glColor4usv (optionGetStrokeColor ());
 	    glLineWidth (optionGetStrokeWidth ());
 
 	    glBegin (GL_LINE_STRIP);
-	    glVertex2d (circle.centerX, circle.centerY + circle.radius);
+	    glVertex2d (ellipse.center.x (), ellipse.center.y () +
+			ellipse.radiusY);
 	    for (angle = 0; angle <= 360; angle += 1)
 	    {
-		vectorX = circle.centerX +
-			 (circle.radius * sinf (angle * DEG2RAD));
-		vectorY = circle.centerY +
-			 (circle.radius * cosf (angle * DEG2RAD));
+		vectorX = ellipse.center.x () +
+			 (ellipse.radiusX * sinf (angle * DEG2RAD));
+		vectorY = ellipse.center.y () +
+			 (ellipse.radiusY * cosf (angle * DEG2RAD));
 		glVertex2d (vectorX, vectorY);
 	    }
-	    glVertex2d (circle.centerX, circle.centerY + circle.radius);
+	    glVertex2d (ellipse.center.x (), ellipse.center.y () +
+			ellipse.radiusY);
 	    glEnd();
 	}
 
@@ -724,23 +740,25 @@ AnnoScreen::handleMotionEvent (int	  xRoot,
 
 	    damageRect = rectangle;
 	    break;
-	case CircleMode:
-	    circle.radius = sqrt (((xRoot - initialPointerX) *
-				   (xRoot - initialPointerX)) +
-				  ((yRoot - initialPointerY) *
-				   (yRoot - initialPointerY)));
-	    circle.centerX = initialPointerX;
-	    circle.centerY = initialPointerY;
-
-	    damageRect = CompRect (circle.centerX - circle.radius,
-				   circle.centerY - circle.radius,
-				   circle.radius * 2, circle.radius * 2);
+	case EllipseMode:
+	    ellipse.center.setX (initialPointerX +
+				(xRoot - initialPointerX) / 2);
+	    ellipse.center.setY (initialPointerY +
+				(yRoot - initialPointerY) / 2);
+
+	    ellipse.radiusX = abs (xRoot - ellipse.center.x ());
+	    ellipse.radiusY = abs (yRoot - ellipse.center.y ());
+
+	    damageRect = CompRect (ellipse.center.x () - ellipse.radiusX,
+				   ellipse.center.y () - ellipse.radiusY,
+				   ellipse.radiusX * 2,
+				   ellipse.radiusY * 2);
 	    break;
 	default:
 	    break;
 	}
 
-	if (cScreen && (drawMode == CircleMode || drawMode == RectangleMode))
+	if (cScreen && (drawMode == EllipseMode || drawMode == RectangleMode))
 	{
 	    /* Add border width to the damage region */
 	    damageRect.setGeometry (damageRect.x () - optionGetStrokeWidth (),
@@ -809,9 +827,9 @@ AnnoScreen::AnnoScreen (CompScreen *screen) :
 	(boost::bind (&AnnoScreen::rectangleInitiate, this, _1, _2, _3));
     optionSetInitiateRectangleButtonTerminate
 	(boost::bind (&AnnoScreen::terminate, this, _1, _2, _3));
-    optionSetInitiateCircleButtonInitiate
-	(boost::bind (&AnnoScreen::circleInitiate, this, _1, _2, _3));
-    optionSetInitiateCircleButtonTerminate
+    optionSetInitiateEllipseButtonInitiate
+	(boost::bind (&AnnoScreen::ellipseInitiate, this, _1, _2, _3));
+    optionSetInitiateEllipseButtonTerminate
 	(boost::bind (&AnnoScreen::terminate, this, _1, _2, _3));
     optionSetClearKeyInitiate
 	(boost::bind (&AnnoScreen::clear, this, _1, _2, _3));
diff --git a/plugins/annotate/src/annotate.h b/plugins/annotate/src/annotate.h
index 7673788..0bafc7f 100644
--- a/plugins/annotate/src/annotate.h
+++ b/plugins/annotate/src/annotate.h
@@ -35,12 +35,12 @@
 static int annoLastPointerX = 0;
 static int annoLastPointerY = 0;
 
-typedef struct _Circle
+typedef struct _Ellipse
 {
-    int centerX;
-    int centerY;
-    double radius;
-} Circle;
+    CompPoint	center;
+    int		radiusX;
+    int		radiusY;
+} Ellipse;
 
 enum DrawMode
 {
@@ -48,7 +48,7 @@ enum DrawMode
     EraseMode,
     LineMode,
     RectangleMode,
-    CircleMode,
+    EllipseMode,
     TextMode
 };
 
@@ -78,7 +78,7 @@ class AnnoScreen :
 	CompRect	rectangle, lastRect;
 	DrawMode	drawMode;
 
-	Circle circle;
+	Ellipse ellipse;
 
 	void handleEvent (XEvent *);
 
@@ -97,12 +97,13 @@ class AnnoScreen :
 			unsigned short *color);
 
 	void
-	drawCircle (double	       xc,
-		    double	       yc,
-		    double	       radius,
-		    unsigned short *fillColor,
-		    unsigned short *strokeColor,
-		    double	       strokeWidth);
+	drawEllipse (double		xc,
+		     double		yc,
+		     double		radiusX,
+		     double		radiusY,
+		     unsigned short	*fillColor,
+		     unsigned short	*strokeColor,
+		     double		strokeWidth);
 
 	void
 	drawRectangle (double	  x,
@@ -161,9 +162,9 @@ class AnnoScreen :
 			   CompOption::Vector& options);
 
 	bool
-	circleInitiate (CompAction         *action,
-		        CompAction::State  state,
-			CompOption::Vector& options);
+	ellipseInitiate (CompAction         *action,
+			 CompAction::State  state,
+			 CompOption::Vector& options);
 
 	bool
 	clear (CompAction         *action,
-- 
cgit v1.1


From 618676e2b02309fbe4af4214fe33de9b9428412b Mon Sep 17 00:00:00 2001
From: Scott Moreau <oreaus@gmail.com>
Date: Mon, 22 Feb 2010 08:44:33 -0700
Subject: Add straight line drawing function.

---
 plugins/annotate/annotate.xml.in  |  13 ++-
 plugins/annotate/src/annotate.cpp | 163 +++++++++++++++++++++++++++-----------
 plugins/annotate/src/annotate.h   |  22 +++--
 3 files changed, 141 insertions(+), 57 deletions(-)

diff --git a/plugins/annotate/annotate.xml.in b/plugins/annotate/annotate.xml.in
index 84674cc..4eee3ab 100644
--- a/plugins/annotate/annotate.xml.in
+++ b/plugins/annotate/annotate.xml.in
@@ -9,15 +9,20 @@
 	    </requirement>
 	</deps>
 	<options>
-	    <option name="initiate_button" type="button">
-		<_short>Initiate</_short>
-		<_long>Initiate annotate drawing</_long>
+	    <option name="initiate_free_draw_button" type="button">
+		<_short>Initiate Free Draw</_short>
+		<_long>Initiate freehand drawing</_long>
 		<default>&lt;Super&gt;&lt;Alt&gt;Button1</default>
 	    </option>
+	    <option name="initiate_line_button" type="button">
+		<_short>Initiate Line</_short>
+		<_long>Initiate line drawing</_long>
+		<default>&lt;Super&gt;&lt;Alt&gt;Button2</default>
+	    </option>
 	    <option name="initiate_rectangle_button" type="button">
 		<_short>Initiate Rectangle</_short>
 		<_long>Initiate rectangle drawing</_long>
-		<default>&lt;Super&gt;&lt;Alt&gt;Button2</default>
+		<default>&lt;Super&gt;&lt;Alt&gt;&lt;Shift&gt;Button1</default>
 	    </option>
 	    <option name="initiate_ellipse_button" type="button">
 		<_short>Initiate Ellipse</_short>
diff --git a/plugins/annotate/src/annotate.cpp b/plugins/annotate/src/annotate.cpp
index 5da7feb..1f1e852 100644
--- a/plugins/annotate/src/annotate.cpp
+++ b/plugins/annotate/src/annotate.cpp
@@ -383,33 +383,6 @@ AnnoScreen::draw (CompAction         *action,
 }
 
 bool
-AnnoScreen::initiate (CompAction         *action,
-		      CompAction::State  state,
-		      CompOption::Vector& options)
-{
-    if (screen->otherGrabExist (NULL))
-        return false;
-
-    if (!grabIndex)
-        grabIndex = screen->pushGrab (None, "annotate");
-
-    if (state & CompAction::StateInitButton)
-        action->setState (action->state () | CompAction::StateTermButton);
-
-    if (state & CompAction::StateInitKey)
-        action->setState (action->state () | CompAction::StateTermKey);
-
-    annoLastPointerX = pointerX;
-    annoLastPointerY = pointerY;
-
-    drawMode = LineMode;
-
-    screen->handleEventSetEnabled (this, true);
-
-    return true;
-}
-
-bool
 AnnoScreen::terminate (CompAction         *action,
 		       CompAction::State  state,
 		       CompOption::Vector& options)
@@ -423,8 +396,16 @@ AnnoScreen::terminate (CompAction         *action,
     action->setState (action->state () & ~(CompAction::StateTermKey |
 					   CompAction::StateTermButton));
 
-    if (drawMode == RectangleMode)
+    switch (drawMode)
     {
+    case LineMode:
+	drawLine (initialPointerX, initialPointerY,
+		  lineVector.x (), lineVector.y (),
+		  optionGetLineWidth (),
+		  optionGetStrokeColor ());
+	break;
+
+    case RectangleMode:
 	drawRectangle (rectangle.x (),
 		       rectangle.y (),
 		       rectangle.width (),
@@ -432,9 +413,9 @@ AnnoScreen::terminate (CompAction         *action,
 		       optionGetFillColor (),
 		       optionGetStrokeColor (),
 		       optionGetStrokeWidth ());
-    }
-    if (drawMode == EllipseMode)
-    {
+	break;
+
+    case EllipseMode:
 	drawEllipse (ellipse.center.x (),
 		     ellipse.center.y (),
 		     ellipse.radiusX,
@@ -442,6 +423,10 @@ AnnoScreen::terminate (CompAction         *action,
 		     optionGetFillColor (),
 		     optionGetStrokeColor (),
 		     optionGetStrokeWidth ());
+	break;
+
+    default:
+	break;
     }
 
     drawMode = NoMode;
@@ -477,6 +462,60 @@ AnnoScreen::eraseInitiate (CompAction         *action,
 }
 
 bool
+AnnoScreen::initiateFreeDraw (CompAction         *action,
+			      CompAction::State  state,
+			      CompOption::Vector& options)
+{
+    if (screen->otherGrabExist (NULL))
+        return false;
+
+    if (!grabIndex)
+        grabIndex = screen->pushGrab (None, "annotate");
+
+    if (state & CompAction::StateInitButton)
+        action->setState (action->state () | CompAction::StateTermButton);
+
+    if (state & CompAction::StateInitKey)
+        action->setState (action->state () | CompAction::StateTermKey);
+
+    annoLastPointerX = pointerX;
+    annoLastPointerY = pointerY;
+
+    drawMode = FreeDrawMode;
+
+    screen->handleEventSetEnabled (this, true);
+
+    return true;
+}
+
+bool
+AnnoScreen::initiateLine (CompAction         *action,
+			  CompAction::State  state,
+			  CompOption::Vector& options)
+{
+    if (screen->otherGrabExist (NULL))
+        return false;
+
+    if (!grabIndex)
+        grabIndex = screen->pushGrab (None, "annotate");
+
+    if (state & CompAction::StateInitButton)
+        action->setState (action->state () | CompAction::StateTermButton);
+
+    if (state & CompAction::StateInitKey)
+        action->setState (action->state () | CompAction::StateTermKey);
+
+    initialPointerX = pointerX;
+    initialPointerY = pointerY;
+
+    drawMode = LineMode;
+
+    screen->handleEventSetEnabled (this, true);
+
+    return true;
+}
+
+bool
 AnnoScreen::rectangleInitiate (CompAction         *action,
 			       CompAction::State  state,
 			       CompOption::Vector& options)
@@ -575,6 +614,8 @@ AnnoScreen::glPaintOutput (const GLScreenPaintAttrib &attrib,
 	GLMatrix sTransform = transform;
 	int      numRect;
 	int      pos = 0;
+	float vectorX, vectorY;
+	int angle;
 
 	/* This replaced prepareXCoords (s, output, -DEFAULT_Z_CAMERA) */
 	sTransform.toScreenSpace (output, -DEFAULT_Z_CAMERA);
@@ -626,8 +667,18 @@ AnnoScreen::glPaintOutput (const GLScreenPaintAttrib &attrib,
 	    }
 	}
 
-	if (drawMode == RectangleMode)
+	switch (drawMode)
 	{
+	case LineMode:
+	    glColor4usv (optionGetStrokeColor ());
+	    glLineWidth (optionGetLineWidth ());
+	    glBegin (GL_LINES);
+	    glVertex2i (initialPointerX, initialPointerY);
+	    glVertex2i (lineVector.x (), lineVector.y ());
+	    glEnd ();
+	    break;
+
+	case RectangleMode:
 	    /* fill rectangle */
 	    glColor4usv (optionGetFillColor ());
 	    glRecti (rectangle.x1 (), rectangle.y2 (),
@@ -642,13 +693,9 @@ AnnoScreen::glPaintOutput (const GLScreenPaintAttrib &attrib,
 	    glVertex2i (rectangle.x2 (), rectangle.y2 ());
 	    glVertex2i (rectangle.x1 (), rectangle.y2 ());
 	    glEnd ();
-	}
-
-	if (drawMode == EllipseMode)
-	{
-	    float vectorX, vectorY;
-	    int angle;
+	    break;
 
+	case EllipseMode:
 	    /* fill ellipse */
 	    glColor4usv (optionGetFillColor ());
 
@@ -684,6 +731,10 @@ AnnoScreen::glPaintOutput (const GLScreenPaintAttrib &attrib,
 	    glVertex2d (ellipse.center.x (), ellipse.center.y () +
 			ellipse.radiusY);
 	    glEnd();
+	    break;
+
+	default:
+	    break;
 	}
 
 	/* clean up */
@@ -714,12 +765,24 @@ AnnoScreen::handleMotionEvent (int	  xRoot,
 		      xRoot, yRoot,
 		      20.0, clearColor);
 	    break;
-	case LineMode:
+
+	case FreeDrawMode:
 	    drawLine (annoLastPointerX, annoLastPointerY,
 		      xRoot, yRoot,
 		      optionGetLineWidth (),
 		      optionGetStrokeColor ());
 	    break;
+
+	case LineMode:
+	    lineVector.setX (xRoot);
+	    lineVector.setY (yRoot);
+
+	    damageRect.setGeometry (MIN(initialPointerX, lineVector.x ()),
+				    MIN(initialPointerY, lineVector.y ()),
+				    abs (lineVector.x () - initialPointerX),
+				    abs (lineVector.y () - initialPointerY));
+	    break;
+
 	case RectangleMode:
 	    if ((xRoot < initialPointerX) && (yRoot < initialPointerY))
 		rectangle.setGeometry (xRoot, yRoot,
@@ -740,6 +803,7 @@ AnnoScreen::handleMotionEvent (int	  xRoot,
 
 	    damageRect = rectangle;
 	    break;
+
 	case EllipseMode:
 	    ellipse.center.setX (initialPointerX +
 				(xRoot - initialPointerX) / 2);
@@ -754,11 +818,14 @@ AnnoScreen::handleMotionEvent (int	  xRoot,
 				   ellipse.radiusX * 2,
 				   ellipse.radiusY * 2);
 	    break;
+
 	default:
 	    break;
 	}
 
-	if (cScreen && (drawMode == EllipseMode || drawMode == RectangleMode))
+	if (cScreen && (drawMode == LineMode ||
+			drawMode == RectangleMode ||
+			drawMode == EllipseMode))
 	{
 	    /* Add border width to the damage region */
 	    damageRect.setGeometry (damageRect.x () - optionGetStrokeWidth (),
@@ -815,14 +882,20 @@ AnnoScreen::AnnoScreen (CompScreen *screen) :
     ScreenInterface::setHandler (screen, false);
     GLScreenInterface::setHandler (gScreen, false);
 
-    optionSetInitiateButtonInitiate
-	(boost::bind (&AnnoScreen::initiate, this, _1, _2, _3));
-    optionSetInitiateButtonTerminate
-	(boost::bind (&AnnoScreen::terminate, this, _1, _2, _3));
+    optionSetDrawInitiate
+	(boost::bind (&AnnoScreen::draw, this, _1, _2, _3));
     optionSetEraseButtonInitiate
 	(boost::bind (&AnnoScreen::eraseInitiate, this, _1, _2, _3));
     optionSetEraseButtonTerminate
 	(boost::bind (&AnnoScreen::terminate, this, _1, _2, _3));
+    optionSetInitiateFreeDrawButtonInitiate
+	(boost::bind (&AnnoScreen::initiateFreeDraw, this, _1, _2, _3));
+    optionSetInitiateFreeDrawButtonTerminate
+	(boost::bind (&AnnoScreen::terminate, this, _1, _2, _3));
+    optionSetInitiateLineButtonInitiate
+	(boost::bind (&AnnoScreen::initiateLine, this, _1, _2, _3));
+    optionSetInitiateLineButtonTerminate
+	(boost::bind (&AnnoScreen::terminate, this, _1, _2, _3));
     optionSetInitiateRectangleButtonInitiate
 	(boost::bind (&AnnoScreen::rectangleInitiate, this, _1, _2, _3));
     optionSetInitiateRectangleButtonTerminate
@@ -833,8 +906,6 @@ AnnoScreen::AnnoScreen (CompScreen *screen) :
 	(boost::bind (&AnnoScreen::terminate, this, _1, _2, _3));
     optionSetClearKeyInitiate
 	(boost::bind (&AnnoScreen::clear, this, _1, _2, _3));
-    optionSetDrawInitiate
-	(boost::bind (&AnnoScreen::draw, this, _1, _2, _3));
     drawMode = NoMode;
 }
 
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);
-- 
cgit v1.1


From 37332a37b4ee93c23e10be06af73b36c18ceb396 Mon Sep 17 00:00:00 2001
From: Scott Moreau <oreaus@gmail.com>
Date: Mon, 22 Feb 2010 08:44:47 -0700
Subject: Add option to use initial click point as center for drawing shapes.

---
 plugins/annotate/annotate.xml.in  |  5 +++++
 plugins/annotate/src/annotate.cpp | 42 +++++++++++++++++++++------------------
 2 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/plugins/annotate/annotate.xml.in b/plugins/annotate/annotate.xml.in
index 4eee3ab..11f932e 100644
--- a/plugins/annotate/annotate.xml.in
+++ b/plugins/annotate/annotate.xml.in
@@ -48,6 +48,11 @@
 		<_short>Clear</_short>
 		<_long>Clear</_long>
 	    </option>
+	    <option name="draw_shapes_from_center" type="bool">
+		    <_short>Draw shapes from center</_short>
+		    <_long>Uses the initial click point as the center of shapes.</_long>
+		    <default>true</default>
+	    </option>
 	    <option name="fill_color" type="color">
 		<_short>Annotate Fill Color</_short>
 		<_long>Fill color for annotations</_long>
diff --git a/plugins/annotate/src/annotate.cpp b/plugins/annotate/src/annotate.cpp
index 1f1e852..05fd6b9 100644
--- a/plugins/annotate/src/annotate.cpp
+++ b/plugins/annotate/src/annotate.cpp
@@ -784,31 +784,35 @@ AnnoScreen::handleMotionEvent (int	  xRoot,
 	    break;
 
 	case RectangleMode:
-	    if ((xRoot < initialPointerX) && (yRoot < initialPointerY))
-		rectangle.setGeometry (xRoot, yRoot,
-				       initialPointerX - xRoot,
-				       initialPointerY - yRoot);
-	    else if (yRoot < initialPointerY)
-		    rectangle.setGeometry (initialPointerX, yRoot,
-					   xRoot - initialPointerX,
-					   initialPointerY - yRoot);
-	    else if (xRoot < initialPointerX)
-		    rectangle.setGeometry (xRoot, initialPointerY,
-					   initialPointerX - xRoot,
-					   yRoot - initialPointerY);
+	    if (optionGetDrawShapesFromCenter ())
+		rectangle.setGeometry (initialPointerX -
+				       abs (xRoot - initialPointerX),
+				       initialPointerY -
+				       abs (yRoot - initialPointerY),
+				      (abs (xRoot - initialPointerX)) * 2,
+				      (abs (yRoot - initialPointerY)) * 2);
 	    else
-		rectangle.setGeometry (initialPointerX, initialPointerY,
-				       xRoot - initialPointerX,
-				       yRoot - initialPointerY);
+		rectangle.setGeometry (MIN(initialPointerX, xRoot),
+				       MIN(initialPointerY, yRoot),
+				       abs (xRoot - initialPointerX),
+				       abs (yRoot - initialPointerY));
 
 	    damageRect = rectangle;
 	    break;
 
 	case EllipseMode:
-	    ellipse.center.setX (initialPointerX +
-				(xRoot - initialPointerX) / 2);
-	    ellipse.center.setY (initialPointerY +
-				(yRoot - initialPointerY) / 2);
+	    if (optionGetDrawShapesFromCenter ())
+	    {
+		ellipse.center.setX (initialPointerX);
+		ellipse.center.setY (initialPointerY);
+	    }
+	    else
+	    {
+		ellipse.center.setX (initialPointerX +
+				    (xRoot - initialPointerX) / 2);
+		ellipse.center.setY (initialPointerY +
+				    (yRoot - initialPointerY) / 2);
+	    }
 
 	    ellipse.radiusX = abs (xRoot - ellipse.center.x ());
 	    ellipse.radiusY = abs (yRoot - ellipse.center.y ());
-- 
cgit v1.1


From db87069dab2edec369a1c347e4b9f382c26289ec Mon Sep 17 00:00:00 2001
From: Scott Moreau <oreaus@gmail.com>
Date: Mon, 22 Feb 2010 08:45:04 -0700
Subject: General reorganization and cleanup.

---
 plugins/annotate/annotate.xml.in  |  3 ++-
 plugins/annotate/src/annotate.cpp | 12 ++++++------
 plugins/annotate/src/annotate.h   | 32 ++++++++++++++++----------------
 3 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/plugins/annotate/annotate.xml.in b/plugins/annotate/annotate.xml.in
index 11f932e..9f8948e 100644
--- a/plugins/annotate/annotate.xml.in
+++ b/plugins/annotate/annotate.xml.in
@@ -35,7 +35,7 @@
 		<allowed/>
 	    </option>
 	    <option name="erase_button" type="button">
-		<_short>Initiate erase</_short>
+		<_short>Initiate Erase</_short>
 		<_long>Initiate annotate erasing</_long>
 		<default>&lt;Super&gt;&lt;Alt&gt;Button3</default>
 	    </option>
@@ -58,6 +58,7 @@
 		<_long>Fill color for annotations</_long>
 		<default>
 		    <red>0xffff</red>
+		    <alpha>0x8888</alpha>
 		</default>
 	    </option>
 	    <option name="stroke_color" type="color">
diff --git a/plugins/annotate/src/annotate.cpp b/plugins/annotate/src/annotate.cpp
index 05fd6b9..ecbc888 100644
--- a/plugins/annotate/src/annotate.cpp
+++ b/plugins/annotate/src/annotate.cpp
@@ -435,7 +435,7 @@ AnnoScreen::terminate (CompAction         *action,
 }
 
 bool
-AnnoScreen::eraseInitiate (CompAction         *action,
+AnnoScreen::initiateErase (CompAction         *action,
 		           CompAction::State  state,
 		           CompOption::Vector& options)
 {
@@ -516,7 +516,7 @@ AnnoScreen::initiateLine (CompAction         *action,
 }
 
 bool
-AnnoScreen::rectangleInitiate (CompAction         *action,
+AnnoScreen::initiateRectangle (CompAction         *action,
 			       CompAction::State  state,
 			       CompOption::Vector& options)
 {
@@ -545,7 +545,7 @@ AnnoScreen::rectangleInitiate (CompAction         *action,
 }
 
 bool
-AnnoScreen::ellipseInitiate (CompAction         *action,
+AnnoScreen::initiateEllipse (CompAction         *action,
 			     CompAction::State  state,
 			     CompOption::Vector& options)
 {
@@ -889,7 +889,7 @@ AnnoScreen::AnnoScreen (CompScreen *screen) :
     optionSetDrawInitiate
 	(boost::bind (&AnnoScreen::draw, this, _1, _2, _3));
     optionSetEraseButtonInitiate
-	(boost::bind (&AnnoScreen::eraseInitiate, this, _1, _2, _3));
+	(boost::bind (&AnnoScreen::initiateErase, this, _1, _2, _3));
     optionSetEraseButtonTerminate
 	(boost::bind (&AnnoScreen::terminate, this, _1, _2, _3));
     optionSetInitiateFreeDrawButtonInitiate
@@ -901,11 +901,11 @@ AnnoScreen::AnnoScreen (CompScreen *screen) :
     optionSetInitiateLineButtonTerminate
 	(boost::bind (&AnnoScreen::terminate, this, _1, _2, _3));
     optionSetInitiateRectangleButtonInitiate
-	(boost::bind (&AnnoScreen::rectangleInitiate, this, _1, _2, _3));
+	(boost::bind (&AnnoScreen::initiateRectangle, this, _1, _2, _3));
     optionSetInitiateRectangleButtonTerminate
 	(boost::bind (&AnnoScreen::terminate, this, _1, _2, _3));
     optionSetInitiateEllipseButtonInitiate
-	(boost::bind (&AnnoScreen::ellipseInitiate, this, _1, _2, _3));
+	(boost::bind (&AnnoScreen::initiateEllipse, this, _1, _2, _3));
     optionSetInitiateEllipseButtonTerminate
 	(boost::bind (&AnnoScreen::terminate, this, _1, _2, _3));
     optionSetClearKeyInitiate
diff --git a/plugins/annotate/src/annotate.h b/plugins/annotate/src/annotate.h
index 43d4e65..1f6af17 100644
--- a/plugins/annotate/src/annotate.h
+++ b/plugins/annotate/src/annotate.h
@@ -100,13 +100,12 @@ class AnnoScreen :
 			unsigned short *color);
 
 	void
-	drawEllipse (double		xc,
-		     double		yc,
-		     double		radiusX,
-		     double		radiusY,
-		     unsigned short	*fillColor,
-		     unsigned short	*strokeColor,
-		     double		strokeWidth);
+	drawLine (double	     x1,
+		  double	     y1,
+		  double	     x2,
+		  double	     y2,
+		  double	     width,
+		  unsigned short *color);
 
 	void
 	drawRectangle (double	  x,
@@ -118,12 +117,13 @@ class AnnoScreen :
 		       double	  strokeWidth);
 
 	void
-	drawLine (double	     x1,
-		  double	     y1,
-		  double	     x2,
-		  double	     y2,
-		  double	     width,
-		  unsigned short *color);
+	drawEllipse (double		xc,
+		     double		yc,
+		     double		radiusX,
+		     double		radiusY,
+		     unsigned short	*fillColor,
+		     unsigned short	*strokeColor,
+		     double		strokeWidth);
 
 	void
 	drawText (double	     		     x,
@@ -150,7 +150,7 @@ class AnnoScreen :
 		   CompOption::Vector& options);
 
 	bool
-	eraseInitiate (CompAction         *action,
+	initiateErase (CompAction         *action,
 		       CompAction::State  state,
 		       CompOption::Vector& options);
 
@@ -165,12 +165,12 @@ class AnnoScreen :
 		      CompOption::Vector& options);
 
 	bool
-	rectangleInitiate (CompAction         *action,
+	initiateRectangle (CompAction         *action,
 			   CompAction::State  state,
 			   CompOption::Vector& options);
 
 	bool
-	ellipseInitiate (CompAction         *action,
+	initiateEllipse (CompAction         *action,
 			 CompAction::State  state,
 			 CompOption::Vector& options);
 
-- 
cgit v1.1


From 3f6c5425d108bcd8684c2d13ae7f6f55a991bec9 Mon Sep 17 00:00:00 2001
From: Scott Moreau <oreaus@gmail.com>
Date: Mon, 22 Feb 2010 10:40:01 -0700
Subject: Make corners of rectangles square while dragging.

---
 plugins/annotate/src/annotate.cpp | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/plugins/annotate/src/annotate.cpp b/plugins/annotate/src/annotate.cpp
index ecbc888..b418a12 100644
--- a/plugins/annotate/src/annotate.cpp
+++ b/plugins/annotate/src/annotate.cpp
@@ -610,12 +610,12 @@ AnnoScreen::glPaintOutput (const GLScreenPaintAttrib &attrib,
 
     if (status)
     {
-	CompRect rect;
-	GLMatrix sTransform = transform;
-	int      numRect;
-	int      pos = 0;
-	float vectorX, vectorY;
-	int angle;
+	CompRect	rect;
+	GLMatrix	sTransform = transform;
+	int		numRect;
+	int		pos = 0;
+	float		vectorX, vectorY, offset;
+	int		angle;
 
 	/* This replaced prepareXCoords (s, output, -DEFAULT_Z_CAMERA) */
 	sTransform.toScreenSpace (output, -DEFAULT_Z_CAMERA);
@@ -686,13 +686,15 @@ AnnoScreen::glPaintOutput (const GLScreenPaintAttrib &attrib,
 
 	    /* draw rectangle outline */
 	    glColor4usv (optionGetStrokeColor ());
-	    glLineWidth (optionGetStrokeWidth ());
-	    glBegin (GL_LINE_LOOP);
-	    glVertex2i (rectangle.x1 (), rectangle.y1 ());
-	    glVertex2i (rectangle.x2 (), rectangle.y1 ());
-	    glVertex2i (rectangle.x2 (), rectangle.y2 ());
-	    glVertex2i (rectangle.x1 (), rectangle.y2 ());
-	    glEnd ();
+	    offset = optionGetStrokeWidth () / 2;
+	    glRecti (rectangle.x1 () - offset, rectangle.y2 (),
+		     rectangle.x1 () + offset, rectangle.y1 ());
+	    glRecti (rectangle.x2 () - offset, rectangle.y2 (),
+		     rectangle.x2 () + offset, rectangle.y1 ());
+	    glRecti (rectangle.x1 () - offset, rectangle.y1 () + offset,
+		     rectangle.x2 () + offset, rectangle.y1 () - offset);
+	    glRecti (rectangle.x1 () - offset, rectangle.y2 () + offset,
+		     rectangle.x2 () + offset, rectangle.y2 () - offset);
 	    break;
 
 	case EllipseMode:
-- 
cgit v1.1


From e7f252407a646d73d5019fc11eea72e3d1348eb0 Mon Sep 17 00:00:00 2001
From: Scott Moreau <oreaus@gmail.com>
Date: Mon, 22 Feb 2010 10:40:52 -0700
Subject: Use the same width for all lines.

---
 plugins/annotate/annotate.xml.in  | 14 +++-----------
 plugins/annotate/src/annotate.cpp | 18 +++++++-----------
 2 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/plugins/annotate/annotate.xml.in b/plugins/annotate/annotate.xml.in
index 9f8948e..d31dff2 100644
--- a/plugins/annotate/annotate.xml.in
+++ b/plugins/annotate/annotate.xml.in
@@ -68,20 +68,12 @@
 		    <green>0xffff</green>
 		</default>
 	    </option>
-	    <option name="line_width" type="float">
-		<_short>Line width</_short>
-		<_long>Line width for annotations</_long>
-		<default>3.0</default>
-		<min>0.1</min>
-		<max>100.0</max>
-		<precision>0.1</precision>
-	    </option>
 	    <option name="stroke_width" type="float">
 		<_short>Stroke width</_short>
 		<_long>Stroke width for annotations</_long>
-		<default>1.0</default>
-		<min>0.1</min>
-		<max>20.0</max>
+		<default>3.0</default>
+		<min>1.0</min>
+		<max>100.0</max>
 		<precision>0.1</precision>
 	    </option>
 	</options>
diff --git a/plugins/annotate/src/annotate.cpp b/plugins/annotate/src/annotate.cpp
index b418a12..ec294aa 100644
--- a/plugins/annotate/src/annotate.cpp
+++ b/plugins/annotate/src/annotate.cpp
@@ -281,9 +281,9 @@ AnnoScreen::draw (CompAction         *action,
     cr = cairoContext ();
     if (cr)
     {
-        const char	   *tool;
-        unsigned short *fillColor, *strokeColor;
-        double	   lineWidth, strokeWidth;
+        const char	*tool;
+        unsigned short	*fillColor, *strokeColor;
+        double		strokeWidth;
 
         tool =
 	 CompOption::getStringOptionNamed (options, "tool", "line").c_str ();
@@ -303,10 +303,6 @@ AnnoScreen::draw (CompAction         *action,
         strokeWidth = CompOption::getFloatOptionNamed (options, "stroke_width",
 				           strokeWidth);
 
-        lineWidth = optionGetLineWidth ();
-        lineWidth = CompOption::getFloatOptionNamed (options, "line_width",
-				         lineWidth);
-
         if (strcasecmp (tool, "rectangle") == 0)
         {
 	    double x, y, w, h;
@@ -340,7 +336,7 @@ AnnoScreen::draw (CompAction         *action,
 	    x2 = CompOption::getFloatOptionNamed (options, "x2", 100);
 	    y2 = CompOption::getFloatOptionNamed (options, "y2", 100);
 
-	    drawLine (x1, y1, x2, y2, lineWidth, fillColor);
+	    drawLine (x1, y1, x2, y2, strokeWidth, fillColor);
         }
         else if (strcasecmp (tool, "text") == 0)
         {
@@ -401,7 +397,7 @@ AnnoScreen::terminate (CompAction         *action,
     case LineMode:
 	drawLine (initialPointerX, initialPointerY,
 		  lineVector.x (), lineVector.y (),
-		  optionGetLineWidth (),
+		  optionGetStrokeWidth (),
 		  optionGetStrokeColor ());
 	break;
 
@@ -671,7 +667,7 @@ AnnoScreen::glPaintOutput (const GLScreenPaintAttrib &attrib,
 	{
 	case LineMode:
 	    glColor4usv (optionGetStrokeColor ());
-	    glLineWidth (optionGetLineWidth ());
+	    glLineWidth (optionGetStrokeWidth ());
 	    glBegin (GL_LINES);
 	    glVertex2i (initialPointerX, initialPointerY);
 	    glVertex2i (lineVector.x (), lineVector.y ());
@@ -771,7 +767,7 @@ AnnoScreen::handleMotionEvent (int	  xRoot,
 	case FreeDrawMode:
 	    drawLine (annoLastPointerX, annoLastPointerY,
 		      xRoot, yRoot,
-		      optionGetLineWidth (),
+		      optionGetStrokeWidth (),
 		      optionGetStrokeColor ());
 	    break;
 
-- 
cgit v1.1


From 374393a340dfefbac9c6441d6c1a3cbf80d2b220 Mon Sep 17 00:00:00 2001
From: Scott Moreau <oreaus@gmail.com>
Date: Mon, 22 Feb 2010 10:41:22 -0700
Subject: Add option to change erase size.

---
 plugins/annotate/annotate.xml.in  | 8 ++++++++
 plugins/annotate/src/annotate.cpp | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/plugins/annotate/annotate.xml.in b/plugins/annotate/annotate.xml.in
index d31dff2..c9a602b 100644
--- a/plugins/annotate/annotate.xml.in
+++ b/plugins/annotate/annotate.xml.in
@@ -68,6 +68,14 @@
 		    <green>0xffff</green>
 		</default>
 	    </option>
+	    <option name="erase_width" type="float">
+		<_short>Erase width</_short>
+		<_long>Erase size</_long>
+		<default>20.0</default>
+		<min>1.0</min>
+		<max>100.0</max>
+		<precision>0.1</precision>
+	    </option>
 	    <option name="stroke_width" type="float">
 		<_short>Stroke width</_short>
 		<_long>Stroke width for annotations</_long>
diff --git a/plugins/annotate/src/annotate.cpp b/plugins/annotate/src/annotate.cpp
index ec294aa..76a2a94 100644
--- a/plugins/annotate/src/annotate.cpp
+++ b/plugins/annotate/src/annotate.cpp
@@ -761,7 +761,7 @@ AnnoScreen::handleMotionEvent (int	  xRoot,
 	case EraseMode:
 	    drawLine (annoLastPointerX, annoLastPointerY,
 		      xRoot, yRoot,
-		      20.0, clearColor);
+		      optionGetEraseWidth (), clearColor);
 	    break;
 
 	case FreeDrawMode:
-- 
cgit v1.1


From 4360728006585da95738d2aafda436e0fd8fa148 Mon Sep 17 00:00:00 2001
From: Scott Moreau <oreaus@gmail.com>
Date: Mon, 22 Feb 2010 10:45:58 -0700
Subject: Draw more finely granulated ellipse outline.

---
 plugins/annotate/src/annotate.cpp | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/plugins/annotate/src/annotate.cpp b/plugins/annotate/src/annotate.cpp
index 76a2a94..3f08929 100644
--- a/plugins/annotate/src/annotate.cpp
+++ b/plugins/annotate/src/annotate.cpp
@@ -613,6 +613,8 @@ AnnoScreen::glPaintOutput (const GLScreenPaintAttrib &attrib,
 	float		vectorX, vectorY, offset;
 	int		angle;
 
+	offset = optionGetStrokeWidth () / 2;
+
 	/* This replaced prepareXCoords (s, output, -DEFAULT_Z_CAMERA) */
 	sTransform.toScreenSpace (output, -DEFAULT_Z_CAMERA);
 
@@ -682,7 +684,6 @@ AnnoScreen::glPaintOutput (const GLScreenPaintAttrib &attrib,
 
 	    /* draw rectangle outline */
 	    glColor4usv (optionGetStrokeColor ());
-	    offset = optionGetStrokeWidth () / 2;
 	    glRecti (rectangle.x1 () - offset, rectangle.y2 (),
 		     rectangle.x1 () + offset, rectangle.y1 ());
 	    glRecti (rectangle.x2 () - offset, rectangle.y2 (),
@@ -715,19 +716,24 @@ AnnoScreen::glPaintOutput (const GLScreenPaintAttrib &attrib,
 	    glColor4usv (optionGetStrokeColor ());
 	    glLineWidth (optionGetStrokeWidth ());
 
-	    glBegin (GL_LINE_STRIP);
+	    glBegin (GL_TRIANGLE_STRIP);
 	    glVertex2d (ellipse.center.x (), ellipse.center.y () +
-			ellipse.radiusY);
-	    for (angle = 0; angle <= 360; angle += 1)
+			ellipse.radiusY - offset);
+	    for (angle = 360; angle >= 0; angle -= 1)
 	    {
-		vectorX = ellipse.center.x () +
-			 (ellipse.radiusX * sinf (angle * DEG2RAD));
-		vectorY = ellipse.center.y () +
-			 (ellipse.radiusY * cosf (angle * DEG2RAD));
+		vectorX = ellipse.center.x () + ((ellipse.radiusX -
+			  offset) * sinf (angle * DEG2RAD));
+		vectorY = ellipse.center.y () + ((ellipse.radiusY -
+			  offset) * cosf (angle * DEG2RAD));
+		glVertex2d (vectorX, vectorY);
+		vectorX = ellipse.center.x () + ((ellipse.radiusX +
+			  offset) * sinf (angle * DEG2RAD));
+		vectorY = ellipse.center.y () + ((ellipse.radiusY +
+			  offset) * cosf (angle * DEG2RAD));
 		glVertex2d (vectorX, vectorY);
 	    }
 	    glVertex2d (ellipse.center.x (), ellipse.center.y () +
-			ellipse.radiusY);
+			ellipse.radiusY + offset);
 	    glEnd();
 	    break;
 
-- 
cgit v1.1


From b5e0fc02322d37ba5d73edc1ab4b8127b3126ff2 Mon Sep 17 00:00:00 2001
From: Scott Moreau <oreaus@gmail.com>
Date: Mon, 22 Feb 2010 10:55:27 -0700
Subject: Properly calculate damage region.

---
 plugins/annotate/src/annotate.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/plugins/annotate/src/annotate.cpp b/plugins/annotate/src/annotate.cpp
index 3f08929..82484fe 100644
--- a/plugins/annotate/src/annotate.cpp
+++ b/plugins/annotate/src/annotate.cpp
@@ -836,12 +836,14 @@ AnnoScreen::handleMotionEvent (int	  xRoot,
 			drawMode == EllipseMode))
 	{
 	    /* Add border width to the damage region */
-	    damageRect.setGeometry (damageRect.x () - optionGetStrokeWidth (),
-				    damageRect.y () - optionGetStrokeWidth (),
+	    damageRect.setGeometry (damageRect.x () -
+				    (optionGetStrokeWidth () / 2),
+				    damageRect.y () -
+				    (optionGetStrokeWidth () / 2),
 				    damageRect.width () +
-				    (optionGetStrokeWidth () * 2),
+				    optionGetStrokeWidth () + 1,
 				    damageRect.height () +
-				    (optionGetStrokeWidth () * 2));
+				    optionGetStrokeWidth () + 1);
 
 	    cScreen->damageRegion (damageRect);
 	    cScreen->damageRegion (lastRect);
-- 
cgit v1.1