moving things around in the playbutton

1 files changed, 212 insertions, 210 deletions

diff --git a/src/play-button.c b/src/play-button.c
index 35b1dc8..2ee304a 100644
--- a/src/play-button.c
+++ b/src/play-button.c
@@ -20,7 +20,7 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 Uses code from ctk
 */
 
-#ifdef HAVE_CONFIG_H	int x = button->allocation.x + X;
+#ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
@@ -104,215 +104,6 @@ static void draw (GtkWidget* button, cairo_t *cr);
 
 G_DEFINE_TYPE (PlayButton, play_button, GTK_TYPE_MENU_ITEM);
 
-/// internal helper functions //////////////////////////////////////////////////
-
-
-static inline void
-_blurinner (guchar* pixel,
-	    gint*   zR,
-	    gint*   zG,
-	    gint*   zB,
-	    gint*   zA,
-	    gint    alpha,
-	    gint    aprec,
-	    gint    zprec)
-{
-	gint R;
-	gint G;
-	gint B;
-	guchar A;
-
-	R = *pixel;
-	G = *(pixel + 1);
-	B = *(pixel + 2);
-	A = *(pixel + 3);
-
-	*zR += (alpha * ((R << zprec) - *zR)) >> aprec;
-	*zG += (alpha * ((G << zprec) - *zG)) >> aprec;
-	*zB += (alpha * ((B << zprec) - *zB)) >> aprec;
-	*zA += (alpha * ((A << zprec) - *zA)) >> aprec;
-
-	*pixel       = *zR >> zprec;
-	*(pixel + 1) = *zG >> zprec;
-	*(pixel + 2) = *zB >> zprec;
-	*(pixel + 3) = *zA >> zprec;
-}
-
-static inline void
-_blurrow (guchar* pixels,
-	  gint    width,
-	  gint    height,
-	  gint    channels,
-	  gint    line,
-	  gint    alpha,
-	  gint    aprec,
-	  gint    zprec)
-{
-	gint    zR;
-	gint    zG;
-	gint    zB;
-	gint    zA;
-	gint    index;
-	guchar* scanline;
-
-	scanline = &(pixels[line * width * channels]);
-
-	zR = *scanline << zprec;
-	zG = *(scanline + 1) << zprec;
-	zB = *(scanline + 2) << zprec;
-	zA = *(scanline + 3) << zprec;
-
-	for (index = 0; index < width; index ++)
-		_blurinner (&scanline[index * channels],
-			    &zR,
-			    &zG,
-			    &zB,
-			    &zA,
-			    alpha,
-			    aprec,
-			    zprec);
-
-	for (index = width - 2; index >= 0; index--)
-		_blurinner (&scanline[index * channels],
-			    &zR,
-			    &zG,
-			    &zB,
-			    &zA,
-			    alpha,
-			    aprec,
-			    zprec);
-}
-
-static inline void
-_blurcol (guchar* pixels,
-	  gint    width,
-	  gint    height,
-	  gint    channels,
-	  gint    x,
-	  gint    alpha,
-	  gint    aprec,
-	  gint    zprec)
-{
-	gint zR;
-	gint zG;
-	gint zB;
-	gint zA;
-	gint index;
-	guchar* ptr;
-
-	ptr = pixels;
-
-	ptr += x * channels;
-
-	zR = *((guchar*) ptr    ) << zprec;
-	zG = *((guchar*) ptr + 1) << zprec;
-	zB = *((guchar*) ptr + 2) << zprec;
-	zA = *((guchar*) ptr + 3) << zprec;
-
-	for (index = width; index < (height - 1) * width; index += width)
-		_blurinner ((guchar*) &ptr[index * channels],
-			    &zR,
-			    &zG,
-			    &zB,
-			    &zA,
-			    alpha,
-			    aprec,
-			    zprec);
-
-	for (index = (height - 2) * width; index >= 0; index -= width)
-		_blurinner ((guchar*) &ptr[index * channels],
-			    &zR,
-			    &zG,
-			    &zB,
-			    &zA,
-			    alpha,
-			    aprec,
-			    zprec);
-}
-
-void
-_expblur (guchar* pixels,
-	  gint    width,
-	  gint    height,
-	  gint    channels,
-	  gint    radius,
-	  gint    aprec,
-	  gint    zprec)
-{
-	gint alpha;
-	gint row = 0;
-	gint col = 0;
-
-	if (radius < 1)
-		return;
-
-	// calculate the alpha such that 90% of 
-	// the kernel is within the radius.
-	// (Kernel extends to infinity)
-	alpha = (gint) ((1 << aprec) * (1.0f - expf (-2.3f / (radius + 1.f))));
-
-	for (; row < height; row++)
-		_blurrow (pixels,
-			  width,
-			  height,
-			  channels,
-			  row,
-			  alpha,
-			  aprec,
-			  zprec);
-
-	for(; col < width; col++)
-		_blurcol (pixels,
-			  width,
-			  height,
-			  channels,
-			  col,
-			  alpha,
-			  aprec,
-			  zprec);
-
-	return;
-}
-
-void
-_surface_blur (cairo_surface_t* surface,
-               guint            radius)
-{
-	guchar*        pixels;
-	guint          width;
-	guint          height;
-	cairo_format_t format;
-
-	// before we mess with the surface execute any pending drawing
-	cairo_surface_flush (surface);
-
-	pixels = cairo_image_surface_get_data (surface);
-	width  = cairo_image_surface_get_width (surface);
-	height = cairo_image_surface_get_height (surface);
-	format = cairo_image_surface_get_format (surface);
-
-	switch (format)
-	{
-		case CAIRO_FORMAT_ARGB32:
-			_expblur (pixels, width, height, 4, radius, 16, 7);
-		break;
-
-		case CAIRO_FORMAT_RGB24:
-			_expblur (pixels, width, height, 3, radius, 16, 7);
-		break;
-
-		case CAIRO_FORMAT_A8:
-			_expblur (pixels, width, height, 1, radius, 16, 7);
-		break;
-
-		default :
-			// do nothing
-		break;
-	}
-
-	// inform cairo we altered the surfaces contents
-	cairo_surface_mark_dirty (surface);	
-}
 
 /// GObject functions //////////////////////////////////////////////////////////
 
@@ -491,6 +282,8 @@ play_button_set_style(GtkWidget* button, GtkStyle* style)
 	priv->foreground_colour_bg = style->bg[GTK_STATE_NORMAL];
 }
 
+/// internal helper functions //////////////////////////////////////////////////
+
 static void
 draw_gradient (cairo_t* cr,
                double   x,
@@ -926,6 +719,213 @@ _color_shade (const CairoColorRGB *a, float k, CairoColorRGB *b)
 	b->b = blue;
 }
 
+static inline void
+_blurinner (guchar* pixel,
+	    gint*   zR,
+	    gint*   zG,
+	    gint*   zB,
+	    gint*   zA,
+	    gint    alpha,
+	    gint    aprec,
+	    gint    zprec)
+{
+	gint R;
+	gint G;
+	gint B;
+	guchar A;
+
+	R = *pixel;
+	G = *(pixel + 1);
+	B = *(pixel + 2);
+	A = *(pixel + 3);
+
+	*zR += (alpha * ((R << zprec) - *zR)) >> aprec;
+	*zG += (alpha * ((G << zprec) - *zG)) >> aprec;
+	*zB += (alpha * ((B << zprec) - *zB)) >> aprec;
+	*zA += (alpha * ((A << zprec) - *zA)) >> aprec;
+
+	*pixel       = *zR >> zprec;
+	*(pixel + 1) = *zG >> zprec;
+	*(pixel + 2) = *zB >> zprec;
+	*(pixel + 3) = *zA >> zprec;
+}
+
+static inline void
+_blurrow (guchar* pixels,
+	  gint    width,
+	  gint    height,
+	  gint    channels,
+	  gint    line,
+	  gint    alpha,
+	  gint    aprec,
+	  gint    zprec)
+{
+	gint    zR;
+	gint    zG;
+	gint    zB;
+	gint    zA;
+	gint    index;
+	guchar* scanline;
+
+	scanline = &(pixels[line * width * channels]);
+
+	zR = *scanline << zprec;
+	zG = *(scanline + 1) << zprec;
+	zB = *(scanline + 2) << zprec;
+	zA = *(scanline + 3) << zprec;
+
+	for (index = 0; index < width; index ++)
+		_blurinner (&scanline[index * channels],
+			    &zR,
+			    &zG,
+			    &zB,
+			    &zA,
+			    alpha,
+			    aprec,
+			    zprec);
+
+	for (index = width - 2; index >= 0; index--)
+		_blurinner (&scanline[index * channels],
+			    &zR,
+			    &zG,
+			    &zB,
+			    &zA,
+			    alpha,
+			    aprec,
+			    zprec);
+}
+
+static inline void
+_blurcol (guchar* pixels,
+	  gint    width,
+	  gint    height,
+	  gint    channels,
+	  gint    x,
+	  gint    alpha,
+	  gint    aprec,
+	  gint    zprec)
+{
+	gint zR;
+	gint zG;
+	gint zB;
+	gint zA;
+	gint index;
+	guchar* ptr;
+
+	ptr = pixels;
+
+	ptr += x * channels;
+
+	zR = *((guchar*) ptr    ) << zprec;
+	zG = *((guchar*) ptr + 1) << zprec;
+	zB = *((guchar*) ptr + 2) << zprec;
+	zA = *((guchar*) ptr + 3) << zprec;
+
+	for (index = width; index < (height - 1) * width; index += width)
+		_blurinner ((guchar*) &ptr[index * channels],
+			    &zR,
+			    &zG,
+			    &zB,
+			    &zA,
+			    alpha,
+			    aprec,
+			    zprec);
+
+	for (index = (height - 2) * width; index >= 0; index -= width)
+		_blurinner ((guchar*) &ptr[index * channels],
+			    &zR,
+			    &zG,
+			    &zB,
+			    &zA,
+			    alpha,
+			    aprec,
+			    zprec);
+}
+
+void
+_expblur (guchar* pixels,
+	  gint    width,
+	  gint    height,
+	  gint    channels,
+	  gint    radius,
+	  gint    aprec,
+	  gint    zprec)
+{
+	gint alpha;
+	gint row = 0;
+	gint col = 0;
+
+	if (radius < 1)
+		return;
+
+	// calculate the alpha such that 90% of 
+	// the kernel is within the radius.
+	// (Kernel extends to infinity)
+	alpha = (gint) ((1 << aprec) * (1.0f - expf (-2.3f / (radius + 1.f))));
+
+	for (; row < height; row++)
+		_blurrow (pixels,
+			  width,
+			  height,
+			  channels,
+			  row,
+			  alpha,
+			  aprec,
+			  zprec);
+
+	for(; col < width; col++)
+		_blurcol (pixels,
+			  width,
+			  height,
+			  channels,
+			  col,
+			  alpha,
+			  aprec,
+			  zprec);
+
+	return;
+}
+
+void
+_surface_blur (cairo_surface_t* surface,
+               guint            radius)
+{
+	guchar*        pixels;
+	guint          width;
+	guint          height;
+	cairo_format_t format;
+
+	// before we mess with the surface execute any pending drawing
+	cairo_surface_flush (surface);
+
+	pixels = cairo_image_surface_get_data (surface);
+	width  = cairo_image_surface_get_width (surface);
+	height = cairo_image_surface_get_height (surface);
+	format = cairo_image_surface_get_format (surface);
+
+	switch (format)
+	{
+		case CAIRO_FORMAT_ARGB32:
+			_expblur (pixels, width, height, 4, radius, 16, 7);
+		break;
+
+		case CAIRO_FORMAT_RGB24:
+			_expblur (pixels, width, height, 3, radius, 16, 7);
+		break;
+
+		case CAIRO_FORMAT_A8:
+			_expblur (pixels, width, height, 1, radius, 16, 7);
+		break;
+
+		default :
+			// do nothing
+		break;
+	}
+
+	// inform cairo we altered the surfaces contents
+	cairo_surface_mark_dirty (surface);	
+}
+
 static void
 draw (GtkWidget* button, cairo_t *cr)
 {
@@ -1200,6 +1200,8 @@ draw (GtkWidget* button, cairo_t *cr)
 	}
 }
 
+    
+
 /**
 * play_button_new:
 * @returns: a new #PlayButton.