X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=ui%2Foswald_graphics.c;h=e64476d61ed50f26a8c1cc4e886a3b7c0f040591;hb=c0fd05511a605f063a175d5d99c56af92b65422b;hp=a6eb14f9dfd50191705b71c4c4d0e3198f4a8e55;hpb=5d0ff002cee35d109f4a60eff415b2db556fb8f4;p=oswald.git

diff --git a/ui/oswald_graphics.c b/ui/oswald_graphics.c
index a6eb14f..e64476d 100644
--- a/ui/oswald_graphics.c
+++ b/ui/oswald_graphics.c
@@ -1,23 +1,83 @@
-#include "oswald-ui.h"
+#include "oswald.h"
 #include "oswald_strings.h"
 #include "oswald_fonts.h"
+#include "oswald_hal.h"
 
 #include "oswald_graphics.h"
 
 
-void oswald_draw_bitmap(const uint8_t xstart, const uint8_t ystart, const uint8_t width, const uint8_t height, const void *bmp)
+void oswald_draw_pixel(const unsigned int xstart, const unsigned int ystart)
 {
-	uint8_t x, y;
+	hal_lcd_set_pixel(xstart, ystart, TRUE);
+}
+
+void oswald_draw_bitmap_opts(const unsigned int xstart, const unsigned int ystart, const unsigned int xoff, const unsigned int yoff, const unsigned int width, const unsigned int height, const unsigned int bmp_width, const unsigned int bmp_height, const void *bmp)
+{
+	unsigned int x, y;
+	uint8_t *cb;
+
+	if (bmp == NULL)
+		return;
+
+	//g_printerr("dbmp %d,%d off %d,%d\n", xstart, ystart, width, height);
+	cb = (uint8_t *)bmp;
+	//g_printerr("dat %02x %02x %02x\n", (uint8_t)cb[0], (uint8_t)cb[1], (uint8_t)cb[2]);
+	// we only draw set pixel, unset pixel remain as they are
+	for (y=yoff; y<bmp_height && y<height; y++) {
+		for (x=xoff; x<bmp_width && x<width; x++) {
+			cb = (uint8_t *)(bmp + (y * ((bmp_width / 8) + ((bmp_width % 8) ? 1 : 0))) + (x / 8));
+			// g_printerr("dat %02x %02x %02x\n", (uint8_t)cb[0], (uint8_t)cb[1], (uint8_t)cb[2]);
+			if (*cb & (1 << (x % 8))) {
+				hal_lcd_set_pixel((xstart + x) - xoff, (ystart + y) - yoff, TRUE);
+				// g_printerr("X");
+			} /*else {
+				g_printerr(".");
+			}*/
+		}
+		//g_printerr("\n");
+	}
+}
+
+#if 0
+/*inline*/ void oswald_draw_bitmap(const unsigned int xstart, const unsigned int ystart, const unsigned int width, const unsigned int height, const void *bmp)
+{
+	unsigned int x, y;
+	uint8_t *cb;
 
 	// we only draw set pixel, unset pixel remain as they are
 	for (y=0; y<height; y++) {
 		for (x=0; x<width; x++) {
-			hal_lcd_set_pixel(x, y, TRUE);
+			cb = (uint8_t *)(bmp + (y * ((width / 8) + ((width % 8) ? 1 : 0))) + (x / 8));
+			if (*cb & (1 << (x % 8)))
+				hal_lcd_set_pixel((xstart + x), (ystart + y), TRUE);
 		}
 	}
 }
+#else
+void oswald_draw_bitmap(const unsigned int xstart, const unsigned int ystart, const unsigned int width, const unsigned int height, const void *bmp)
+{
+	// seems we are triggering a MSPGCC compiler bug here...
+	// if we do not do this trick then bmp becomes 0x00 when passed a livel higher!
+	volatile unsigned int num;
+
+	num = (unsigned int) bmp;
+
+	oswald_draw_bitmap_opts(xstart, ystart, 0, 0, width, height, width, height, bmp);
+}
 
-void oswald_draw_Line(uint8_t xstart, uint8_t ystart, uint8_t xend, uint8_t yend)
+void oswald_draw_bitmap_size(const unsigned int xstart, const unsigned int ystart, const unsigned int width, const unsigned int height, const unsigned int bmp_width, const unsigned int bmp_height, const void *bmp)
+{
+	// seems we are triggering a MSPGCC compiler bug here...
+	// if we do not do this trick then bmp becomes 0x00 when passed a livel higher!
+	volatile unsigned int num;
+
+	num = (unsigned int) bmp;
+
+	oswald_draw_bitmap_opts(xstart, ystart, 0, 0, width, height, bmp_width, bmp_height, bmp);
+}
+#endif
+
+void oswald_draw_line(const uint8_t xstart, const uint8_t ystart, const uint8_t xend, const uint8_t yend)
 {
 	int x, y, t, dx, dy, incx, incy, pdx, pdy, ddx, ddy, es, el, err;
  
@@ -59,10 +119,10 @@ void oswald_draw_Line(uint8_t xstart, uint8_t ystart, uint8_t xend, uint8_t yend
 		}
 		hal_lcd_set_pixel(x, y, TRUE);
 	}
-	hal_lcd_update_display();
+	// hal_lcd_update_display();
 }
 
-void oswald_draw_line_ww(u8t xstart, u8t ystart, u8t xend, u8t yend, u8t thickness)
+void oswald_draw_line_ww(const uint8_t xstart, const uint8_t ystart, const uint8_t xend, const uint8_t yend, const uint8_t thickness)
 {
 	int i, x, y, t, dx, dy, incx, incy, pdx, pdy, ddx, ddy, es, el, err;
  
@@ -78,13 +138,19 @@ void oswald_draw_line_ww(u8t xstart, u8t ystart, u8t xend, u8t yend, u8t thickne
 		dy = -dy;
  
 	if (dx>dy) {
-		pdx = incx; pdy = 0;
-		ddx=incx; ddy=incy;
-		es =dy;   el =dx;
+		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;
+		pdx=0;
+		pdy=incy;
+		ddx=incx;
+		ddy=incy;
+		es =dx;
+		el =dy;
 	}
  
 	x = xstart;
@@ -116,10 +182,10 @@ void oswald_draw_line_ww(u8t xstart, u8t ystart, u8t xend, u8t yend, u8t thickne
 			hal_lcd_set_pixel(x, y+i, TRUE);
 		}
 	}
-	hal_lcd_update_display();
+	// hal_lcd_update_display();
 }
 
-u8t oswald_write_character(u8t x, u8t y, oswald_font_face face, u8t Character)
+uint8_t oswald_write_character(const uint8_t x, const uint8_t y, const oswald_font_face face, const uint8_t Character)
 {
 #if 0
 	u8t CharacterHeight = GetCharacterHeight();
@@ -135,25 +201,56 @@ u8t oswald_write_character(u8t x, u8t y, oswald_font_face face, u8t Character)
 			if (bitmap[ly] & (1<<lx)) {
 				hal_lcd_set_pixel(lx+x, ly+y, TRUE);
 				// printf(".");
-			} else {
+			} /*else {
 				hal_lcd_set_pixel(lx+x, ly+y, FALSE);
 				// printf(" ");
-			}
+			}*/
 		}
 		// printf("\n");
 	}
 
 	return CharacterWidth + GetFontSpacing();
-#endif
-	char *cdata = oswald_fonts[face].data[Character];
+#else
+	uint8_t *cdata = oswald_fonts[face].data;
+	uint8_t cwidth;
+	int csize;
+
+	if (Character == 32) // space / blank
+		return oswald_fonts[face].width / 2;
 
-	dbg_out("%c", cdata[1]);
-	return 0;
+	csize = ((oswald_fonts[face].width / 8) + ((oswald_fonts[face].width % 8) ? 1 : 0)) * oswald_fonts[face].height;
+	if (oswald_fonts[face].font_type == FONT_TYPE_PROPORTIONAL)
+		csize += 1;
+
+	//csize += (oswald_fonts[face].height / 8) + ((oswald_fonts[face].height % 8) ? 1 : 0);
+
+	// g_printerr("fp = 0x%08lx cdata = 0x%08lx\n", font_7x12, cdata);
+
+	cdata = (cdata + ((int)csize * (int)Character));
+
+	//g_printerr("%02x\n", oswald_fonts[face].data[0][0]);
+	//g_printerr("char %02x face %d %dx%d csize %d\n", Character, face, oswald_fonts[face].width, oswald_fonts[face].height, csize);
+	//g_printerr("char %02x %02x %02x\n", (uint8_t)cdata[0], (uint8_t)cdata[1], (uint8_t)cdata[2]);
+
+	// oswald_draw_bitmap(x, y, oswald_fonts[face].height, oswald_fonts[face].height, cdata);
+	if (oswald_fonts[face].font_type == FONT_TYPE_MONOSPACE) {
+		cwidth = oswald_fonts[face].width;
+		oswald_draw_bitmap(x, y, ((oswald_fonts[face].width / 8) + ((oswald_fonts[face].width % 8) ? 1 : 0))*8, oswald_fonts[face].height, (uint8_t *)cdata);
+	}
+	if (oswald_fonts[face].font_type == FONT_TYPE_PROPORTIONAL) {
+		cwidth = cdata[0];
+		cdata++;
+		oswald_draw_bitmap_size(x, y, cwidth+1, oswald_fonts[face].height, ((oswald_fonts[face].width / 8) + ((oswald_fonts[face].width % 8) ? 1 : 0))*8, oswald_fonts[face].height, (uint8_t *)cdata);
+	}
+	// oswald_draw_bitmap_offset(x, y, (oswald_fonts[face].width % 8) > 0 ? (8-(oswald_fonts[face].width % 8)) : 0, 0, ((oswald_fonts[face].width / 8) + ((oswald_fonts[face].width % 8) ? 1 : 0))*8, oswald_fonts[face].height, cdata);
+
+	return cwidth;
+#endif
 }
 
-void oswald_write_string(u8t x, u8t y, oswald_font_face face, u8t *str)
+void oswald_write_string(const uint8_t x, const uint8_t y, const oswald_font_face face, char *str)
 {
-	register lx, i, strl;
+	uint8_t lx, i, strl;
 
 	strl = oswald_strlen(str);
 	if (strl == 0)
@@ -161,15 +258,15 @@ void oswald_write_string(u8t x, u8t y, oswald_font_face face, u8t *str)
 
 	lx = x;
 	for (i=0; i<strl; i++) {
-		lx += WriteLcdCharacter(lx, y, str[i]);
+		lx += oswald_write_character(lx, y, face, str[i]);
 	}
 }
 
 
-void oswald_Write_number(u8t x, u8t y, oswald_font_face face, s16t number)
+void oswald_write_number(const uint8_t x, const uint8_t y, const oswald_font_face face, const int16_t number)
 {
-	register lx, i, strl;
-	u8t str[8];
+	uint8_t lx, i, strl;
+	char str[8];
 
 	itoa(number, str, 10);
 	strl = oswald_strlen(str);
@@ -178,7 +275,8 @@ void oswald_Write_number(u8t x, u8t y, oswald_font_face face, s16t number)
 
 	lx = x;
 	for (i=0; i<strl; i++) {
-		lx += WriteLcdCharacter(lx, y, str[i]);
+		lx += oswald_write_character(lx, y, face, str[i]);
 	}
 }
 
+