WebSVN – Kolibri OS – Diff – /contrib/network/netsurf/netsurf/framebuffer/fbtk/fbtk.c

 #include "framebuffer/fbtk.h"
 #include "framebuffer/image_data.h"
+#include "widget.h"
+#ifdef DBG
+#undef DBG
+#endif
+//#define DBG(s) __menuet__debug_out(s) /* For the debug messages in BOARD */
+#define DBG(s) LOG((s))            /* So that we see debug in Netsurf's LOG files */
 #include "widget.h"
 #ifdef FBTK_LOGGING
 /* tree dump debug, also example of depth first tree walk */
 static void
 dump_tk_tree(fbtk_widget_t *widget)
+{
 	widget = fbtk_get_root_widget(widget);
 	int indent = 0;
 	while (widget != NULL) {
-		LOG(("%*s%p", indent, "", widget));
+		/* LOG(("%*s%p", indent, "", widget)); */
 		if (widget->first_child != NULL) {
 	widget->redraw.x = 0;
 	widget->redraw.y = 0;
 	widget->redraw.width = widget->width;
 	widget->redraw.height = widget->height;
-	LOG(("redrawing %p %d,%d %d,%d",
+	/* LOG(("redrawing %p %d,%d %d,%d", */
-	     widget,
+	/*      widget, */
-	     widget->redraw.x,
+	/*      widget->redraw.x, */
-	     widget->redraw.y,
+	/*      widget->redraw.y, */
-	     widget->redraw.width,
+	/*      widget->redraw.width, */
-	     widget->redraw.height));
+	/*      widget->redraw.height)); */
 	cwidget = widget->last_child;
 	while (cwidget != NULL) {
 /* exported function documented in fbtk.h */
 int
 fbtk_set_mapping(fbtk_widget_t *widget, bool map)
 {
-	LOG(("setting mapping on %p to %d", widget, map));
+	/* LOG(("setting mapping on %p to %d", widget, map)); */
 	widget->mapped = map;
 	if (map) {
 		fbtk_request_redraw(widget);
 	} else {
 	fbtk_widget_t *rw; /* the widget to swap lw with */
 	fbtk_widget_t *before;
 	fbtk_widget_t *after;
 	rw = lw->next;
-	LOG(("Swapping %p with %p", lw, rw));
+	/* LOG(("Swapping %p with %p", lw, rw)); */
 	before = lw->prev;
 	after = rw->next;
 	while (widget->parent != NULL)
 		widget = widget->parent;
 	/* check root widget was found */
 	if (widget->type != FB_WIDGET_TYPE_ROOT) {
-		LOG(("Widget with null parent that is not the root widget!"));
+		/* LOG(("Widget with null parent that is not the root widget!")); */
 		return NULL;
+	}
 		int x,
 		int y,
 		int width,
 		int height)
+{
-	LOG(("New widget..."));
+	/* LOG(("New widget...")); */
 	fbtk_widget_t *neww; /* new widget */
 	if (parent == NULL)
-	{LOG(("parent null..."));
+	{/* LOG(("parent null...")); */
 		return NULL;}
-	LOG(("calloc..."));
+	/* LOG(("calloc...")); */
 	neww = calloc(1, sizeof(fbtk_widget_t));
 	if (neww == NULL)
 		return NULL;
-	LOG(("super!..."));
+	/* LOG(("super!...")); */
-	LOG(("creating %p %d,%d %d,%d", neww, x, y, width, height));
+	/* LOG(("creating %p %d,%d %d,%d", neww, x, y, width, height)); */
 	if ((height + y) > parent->height) {
 		height = parent->height - y;
+	}
-	LOG(("using %p %d,%d %d,%d", neww, x, y, width, height));
+	/* LOG(("using %p %d,%d %d,%d", neww, x, y, width, height)); */
 	/* set values */
 	neww->type = type;
 	neww->x = x;
 	neww->y = y;
 	neww->width = width;
 	neww->height = height;
 	/* insert into widget heiarchy */
-	LOG(("into hierarchy..."));
+	/* LOG(("into hierarchy...")); */
 	neww->parent = parent;
 	if (parent->first_child == NULL) {
 		/* no child widgets yet */
-		LOG(("no childs yet..."));
+		/* LOG(("no childs yet...")); */
 		parent->last_child = neww;
 	} else {
 		/* add new widget to front of sibling chain */
 		neww->next = parent->first_child;
 		neww->next->prev = neww;
-		LOG(("n front of sibling..."));
+		/* LOG(("n front of sibling...")); */
+	}
 	parent->first_child = neww;
+{
 	nsfb_bbox_t plot_ctx;
 	fbtk_widget_t *cwidget; /* child widget */
-	LOG(("DO REDRAW"));
+	/* LOG(("DO REDRAW")); */
-	//__menuet__debug_out("\n***********\nDO REDRAW\n********\n");
+	//DBG("\n***********\nDO REDRAW\n********\n");
 	/* check if the widget requires redrawing */
 	if (widget->redraw.needed == true) {
 		plot_ctx.x0 = fbtk_get_absx(widget) + widget->redraw.x;
 		plot_ctx.y0 = fbtk_get_absy(widget) + widget->redraw.y;
 		plot_ctx.x1 = plot_ctx.x0 + widget->redraw.width;
 		plot_ctx.y1 = plot_ctx.y0 + widget->redraw.height;
-		LOG(("clipping %p %d,%d %d,%d",
+		/* LOG(("clipping %p %d,%d %d,%d", */
-		     widget, plot_ctx.x0, plot_ctx.y0,
+		/*      widget, plot_ctx.x0, plot_ctx.y0, */
-		     plot_ctx.x1, plot_ctx.y1));
+		/*      plot_ctx.x1, plot_ctx.y1)); */
 		if (nsfb_plot_set_clip(nsfb, &plot_ctx) == true) {
-	LOG(("POST CALLBACK"));
+	/* LOG(("POST CALLBACK")); */
-	//__menuet__debug_out("\n***********\nPOST CALLBACK\n********\n");
+	//DBG("\n***********\nPOST CALLBACK\n********\n");
 			fbtk_post_callback(widget, FBTK_CBT_REDRAW);
+		}
 		widget->redraw.needed = false;
 	}
-	LOG(("DO CHILD"));
+	/* LOG(("DO CHILD")); */
-	//__menuet__debug_out("\n***********\nDO CHILD\n********\n");
+	//DBG("\n***********\nDO CHILD\n********\n");
 	/* walk the widgets children if child flag is set */
 	if (widget->redraw.child) {
-		LOG(("DO CHILD 2"));
+		/* LOG(("DO CHILD 2")); */
-	//__menuet__debug_out("\n***********\nDO CHILD 2\n********\n");
+	//DBG("\n***********\nDO CHILD 2\n********\n");
 		cwidget = widget->last_child;
 		while (cwidget != NULL) {
-				LOG(("DO CHILD 3 ZZZ"));
+				/* LOG(("DO CHILD 3 ZZZ")); */
-	//__menuet__debug_out("\n***********\nDO CHILD 3 ZZZ\n********\n");
+	//DBG("\n***********\nDO CHILD 3 ZZZ\n********\n");
 			do_redraw(nsfb, cwidget);
 			cwidget = cwidget->prev;
+		}
-			LOG(("DO CHILD 4"));
+			/* LOG(("DO CHILD 4")); */
 /* exported function docuemnted in fbtk.h */
 int
 fbtk_post_callback(fbtk_widget_t *widget, fbtk_callback_type cbt, ...)
+{
-	LOG(("DO POST CALLBACK"));
+	/* LOG(("DO POST CALLBACK")); */
-	//__menuet__debug_out("\n***********\nDO POST CALLBACK\n********\n");
+	//DBG("\n***********\nDO POST CALLBACK\n********\n");
 	fbtk_callback_info cbi;
 	 * events to it
 	 */
 	if (widget->mapped == false)
 		return ret;
-	LOG(("DO POST CALLBACK 2"));
+	/* LOG(("DO POST CALLBACK 2")); */
-	//__menuet__debug_out("\n***********\nDO POST CALLBACK 2\n********\n");
+	//DBG("\n***********\nDO POST CALLBACK 2\n********\n");
 	if (widget->callback[cbt] != NULL) {
 		cbi.type = cbt;
 		cbi.context = widget->callback_context[cbt];
-	LOG(("DO POST CALLBACK 3 - VA"));
+	/* LOG(("DO POST CALLBACK 3 - VA")); */
-	//__menuet__debug_out("\n***********\nDO POST CALLBACK 3 - VA\n********\n");
+	//DBG("\n***********\nDO POST CALLBACK 3 - VA\n********\n");
 		va_start(ap, cbt);
 		switch (cbt) {
 		case FBTK_CBT_SCROLLX:
-			//__menuet__debug_out("\n***********\n scroll x - VA\n********\n");
+			//DBG("\n***********\n scroll x - VA\n********\n");
 			cbi.x = va_arg(ap,int);
 			break;
 		case FBTK_CBT_SCROLLY:
-			//__menuet__debug_out("\n***********\n scroll y - VA\n********\n");
+			//DBG("\n***********\n scroll y - VA\n********\n");
 			cbi.y = va_arg(ap,int);
 			break;
 		case FBTK_CBT_CLICK:
-			//__menuet__debug_out("\n***********\n click - VA\n********\n");
+			//DBG("\n***********\n click - VA\n********\n");
 			cbi.event = va_arg(ap, void *);
 			cbi.x = va_arg(ap, int);
 			cbi.y = va_arg(ap, int);
 			break;
 		case FBTK_CBT_INPUT:
-			//__menuet__debug_out("\n***********\n input - VA\n********\n");
+			//DBG("\n***********\n input - VA\n********\n");
 			cbi.event = va_arg(ap, void *);
 			break;
 		case FBTK_CBT_POINTERMOVE:
-			//__menuet__debug_out("\n***********\n mouse move - VA\n********\n");
+			//DBG("\n***********\n mouse move - VA\n********\n");
 			cbi.x = va_arg(ap, int);
 			cbi.y = va_arg(ap, int);
 			break;
 		case FBTK_CBT_REDRAW:
-		//__menuet__debug_out("\n***********\n red - VA\n********\n");
+		//DBG("\n***********\n red - VA\n********\n");
 			break;
 		case FBTK_CBT_USER:
-		//__menuet__debug_out("\n***********\n user - VA\n********\n");
+		//DBG("\n***********\n user - VA\n********\n");
 			break;
 		case FBTK_CBT_STRIP_FOCUS:
-		//__menuet__debug_out("\n***********\n focus - VA\n********\n");
+		//DBG("\n***********\n focus - VA\n********\n");
 			break;
 		default:
-		//__menuet__debug_out("\n***********\n wtf - VA\n********\n");
+		//DBG("\n***********\n wtf - VA\n********\n");
 			break;
+		}
-		LOG(("DO POST CALLBACK free"));
+		/* LOG(("DO POST CALLBACK free")); */
-	//__menuet__debug_out("\n***********\nDO POST CALLBACK free\n********\n");
+	//DBG("\n***********\nDO POST CALLBACK free\n********\n");
 		va_end(ap);

Subversion Repositories Kolibri OS

(root)/contrib/network/netsurf/netsurf/framebuffer/fbtk/fbtk.c – Rev 4364 → 5043