Add OSK icon.

framebuffer/Makefile.target

@@ -95,6 +95,7 @@ FB_IMAGE_scrollr := framebuffer/res/icons/scrollr.png
 FB_IMAGE_scrollu := framebuffer/res/icons/scrollu.png
 FB_IMAGE_scrolld := framebuffer/res/icons/scrolld.png
 
+FB_IMAGE_osk_image := framebuffer/res/icons/osk.png
 
 FB_IMAGE_pointer_image := framebuffer/res/pointers/default.png
 FB_IMAGE_hand_image := framebuffer/res/pointers/point.png

framebuffer/fbtk/osk.c

@@ -173,17 +173,15 @@ fbtk_enable_oskb(fbtk_widget_t *fbtk)
 		fbtk_set_text(widget, kbdbase[kloop].t);
 	}
 
-	widget = fbtk_create_text_button(osk,
+	widget = fbtk_create_button(osk,
-					 fbtk_get_width(osk) - furniture_width,
+			fbtk_get_width(osk) - furniture_width,
-					 fbtk_get_height(osk) - furniture_width,
+			fbtk_get_height(osk) - furniture_width,
-					 furniture_width,
+			furniture_width,
-					 furniture_width,
+			furniture_width,
-					 FB_FRAME_COLOUR,
+			FB_FRAME_COLOUR,
-					 FB_COLOUR_BLACK,
+			&osk_image,
-					 osk_close,
+			osk_close,
-					 NULL);
+			NULL);
-	fbtk_set_text(widget, "\xe2\x8c\xa8");
-
 }
 
 /* exported function documented in fbtk.h */

framebuffer/gui.c

@@ -1377,7 +1377,15 @@ create_normal_browser_window(struct gui_window *gw, int furniture_width)
 						 FB_FRAME_COLOUR, FB_COLOUR_BLACK,
 						 fb_osk_click,
 						 NULL);
-		fbtk_set_text(widget, "\xe2\x8c\xa8");
+		widget = fbtk_create_button(gw->window,
+				fbtk_get_width(gw->window) - furniture_width,
+				fbtk_get_height(gw->window) - furniture_width,
+				furniture_width,
+				furniture_width,
+				FB_FRAME_COLOUR,
+				&osk_image,
+				fb_osk_click,
+				NULL);
 	} else {
 		widget = fbtk_create_fill(gw->window,
 					  fbtk_get_width(gw->window) - furniture_width,

framebuffer/image_data.h

@@ -38,6 +38,8 @@ extern struct fbtk_bitmap scrollr;
 extern struct fbtk_bitmap scrollu;
 extern struct fbtk_bitmap scrolld;
 
+extern struct fbtk_bitmap osk_image;
+
 extern struct fbtk_bitmap pointer_image;
 extern struct fbtk_bitmap hand_image;
 extern struct fbtk_bitmap caret_image;