From 9e2a8698714da2920e81942eb52c8040fbf73bef Mon Sep 17 00:00:00 2001
From: Nils Faerber <nils.faerber@kernelconcepts.de>
Date: Thu, 1 Dec 2011 00:21:11 +0100
Subject: [PATCH] Add new hackish bresenham line function to draw thicker
 lines, now used in analog clockface (cmd dana)

---
 Makefile     |  2 +-
 mw_main.c    |  8 ++++----
 mw_utility.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 mw_utility.h |  1 +
 4 files changed, 61 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 83894df..7a11d86 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ PREFIX = /usr/local/
 CFLAGS = -Wall -g -DDEBUG -O2 $(CCFLAGS) `pkg-config --cflags glib-2.0` `pkg-config --cflags dbus-glib-1` `pkg-config --cflags dbus-1` `pkg-config --cflags libsoup-2.4`
 #CFLAGS = -Wall -O2 $(CCFLAGS)
 
-LDFLAGS = `pkg-config --libs glib-2.0` `pkg-config --libs dbus-glib-1` `pkg-config --libs dbus-1` `pkg-config --libs libxml-2.0` `pkg-config --libs libsoup-2.4`
+LDFLAGS = -lm `pkg-config --libs glib-2.0` `pkg-config --libs dbus-glib-1` `pkg-config --libs dbus-1` `pkg-config --libs libxml-2.0` `pkg-config --libs libsoup-2.4`
 
 PRGNAME = metawatch
 
diff --git a/mw_main.c b/mw_main.c
index eb98255..af499c6 100644
--- a/mw_main.c
+++ b/mw_main.c
@@ -461,7 +461,7 @@ void draw_app_ana_clock(mwdevice_t *mwdevice, int hour, int minute, unsigned cha
 		x2 =  tmp;
 		tmp = 48 + (48. * sin(((2. * M_PI) / 12.) * (double)i));
 		y2 =  tmp;
-		mw_buf_draw_line_bresenham(mwbuf, x, y, x2, y2, MW_WHITE);
+		mw_buf_draw_line_bresenham_w(mwbuf, x, y, x2, y2, 2, MW_WHITE);
 	};
 	// Hour
 	g_print("hour = %d -> %f (%f)\n", hour, (double)hour + mf, mf);
@@ -469,13 +469,13 @@ void draw_app_ana_clock(mwdevice_t *mwdevice, int hour, int minute, unsigned cha
 	x =  tmp;
 	tmp = 48 + (30. * sin(((2. * M_PI) / 12.) * ((double)hour + mf)));
 	y =  tmp;
-	mw_buf_draw_line_bresenham(mwbuf, 48, 48, x, y, MW_WHITE);
+	mw_buf_draw_line_bresenham_w(mwbuf, 48, 48, x, y, 2, MW_WHITE);
 	// Minute
 	tmp = 48. + (40. * cos(((2. * M_PI) / 60.) * (double)minute));
 	x =  tmp;
 	tmp = 48 + (40. * sin(((2. * M_PI) / 60.) * (double)minute));
 	y =  tmp;
-	mw_buf_draw_line_bresenham(mwbuf, 48, 48, x, y, MW_WHITE);
+	mw_buf_draw_line_bresenham_w(mwbuf, 48, 48, x, y, 2, MW_WHITE);
 
 	snprintf(daystr, 5, "%d", day);
 	mw_buf_print(mwbuf, 74, 45, daystr, 0, MW_WHITE, MW_BLACK);
@@ -733,7 +733,7 @@ void process_cmd(char *cmdline, int clinep, mwdata_t *mwdata)
 	}
 	if (strncmp(cmd, "dana", 4) == 0) {
 		if (pcnt < 3)
-			g_print("two few params, hour minute\n");
+			g_print("two few params, hour minute, day of month\ndana h m d\n");
 		else {
 			draw_app_ana_clock(&mwdata->mwdevice, atoi(params[0]), atoi(params[1]), atoi(params[2]));
 		}
diff --git a/mw_utility.c b/mw_utility.c
index 53c5f7a..6d7ab8a 100644
--- a/mw_utility.c
+++ b/mw_utility.c
@@ -256,6 +256,61 @@ void mw_buf_draw_line_bresenham(mw_buffer *mwbuf, unsigned int xstart, unsigned
 	}
 }
 
+void mw_buf_draw_line_bresenham_w(mw_buffer *mwbuf, unsigned int xstart, unsigned int ystart, unsigned int xend, unsigned int yend, unsigned char thickness, mw_color clr)
+{
+	int i, x, y, t, dx, dy, incx, incy, pdx, pdy, ddx, ddy, es, el, err;
+ 
+	dx = xend - xstart;
+	dy = yend - ystart;
+ 
+	incx = (dx >= 0) ? 1 : -1;
+	incy = (dy >= 0) ? 1 : -1;
+
+	if (dx<0)
+		dx = -dx;
+	if (dy<0)
+		dy = -dy;
+ 
+	if (dx>dy) {
+		pdx = incx; pdy = 0;
+		ddx=incx; ddy=incy;
+		es =dy;   el =dx;
+	} else {
+		pdx=0;    pdy=incy;
+		ddx=incx; ddy=incy;
+		es =dx;   el =dy;
+	}
+ 
+	x = xstart;
+	y = ystart;
+	err = el/2;
+	mw_buf_draw_pixel(mwbuf, x, y, clr);
+	for (i=1; i<thickness; i++) {
+		mw_buf_draw_pixel(mwbuf, x-i, y, clr);
+		mw_buf_draw_pixel(mwbuf, x+i, y, clr);
+		mw_buf_draw_pixel(mwbuf, x, y-i, clr);
+		mw_buf_draw_pixel(mwbuf, x, y+i, clr);
+	}
+ 
+	for (t = 0; t < el; ++t) {
+		err -= es; 
+		if (err < 0) {
+			err += el;
+			x += ddx;
+			y += ddy;
+		} else {
+			x += pdx;
+			y += pdy;
+		}
+		mw_buf_draw_pixel(mwbuf, x, y, clr);
+		for (i=1; i<thickness; i++) {
+			mw_buf_draw_pixel(mwbuf, x-i, y, clr);
+			mw_buf_draw_pixel(mwbuf, x+i, y, clr);
+			mw_buf_draw_pixel(mwbuf, x, y-i, clr);
+			mw_buf_draw_pixel(mwbuf, x, y+i, clr);
+		}
+	}
+}
 
 /* ----------------------------------------------------------------------
  * Complex combined functions, for user convenience
diff --git a/mw_utility.h b/mw_utility.h
index 7092818..efd2332 100644
--- a/mw_utility.h
+++ b/mw_utility.h
@@ -53,6 +53,7 @@ void mw_buf_draw_pixel(mw_buffer *mwbuf, unsigned int x, unsigned int y, mw_colo
 void mw_buf_print(mw_buffer *mwbuf, unsigned int x, unsigned int y, char *text, unsigned char fsize, mw_color fgclr, mw_color bgclr);
 
 void mw_buf_draw_line_bresenham(mw_buffer *mwbuf, unsigned int xstart, unsigned int ystart, unsigned int xend, unsigned int yend, mw_color clr);
+void mw_buf_draw_line_bresenham_w(mw_buffer *mwbuf, unsigned int xstart, unsigned int ystart, unsigned int xend, unsigned int yend, unsigned char thickness, mw_color clr);
 
 
 void mw_do_notification(mwdevice_t *mwdevice, char *title, char *text, unsigned char vibrate);
-- 
2.39.2