| /contrib/network/netsurf/netsurf/framebuffer/fbtk/bitmap.c |
|---|
| 35,23 → 35,30 |
| #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 */ |
| static int |
| fb_redraw_bitmap(fbtk_widget_t *widget, fbtk_callback_info *cbi) |
| { |
| LOG(("REDRAW BITMAP")); |
| //__menuet__debug_out("REDRAW BITMAP"); |
| /* LOG(("REDRAW BITMAP")); */ |
| //DBG("REDRAW BITMAP"); |
| nsfb_bbox_t bbox; |
| nsfb_bbox_t rect; |
| nsfb_t *nsfb; |
| LOG(("REDRAW BITMAP 1 ")); |
| //__menuet__debug_out("REDRAW BITMAP 1"); |
| /* LOG(("REDRAW BITMAP 1 ")); */ |
| //DBG("REDRAW BITMAP 1"); |
| nsfb = fbtk_get_nsfb(widget); |
| LOG(("REDRAW BITMAP 2")); |
| //__menuet__debug_out("REDRAW BITMAP 2"); |
| /* LOG(("REDRAW BITMAP 2")); */ |
| //DBG("REDRAW BITMAP 2"); |
| fbtk_get_bbox(widget, &bbox); |
| 58,37 → 65,37 |
| rect = bbox; |
| LOG(("REDRAW BITMAP 3 ")); |
| //__menuet__debug_out("REDRAW BITMAP 3"); |
| /* LOG(("REDRAW BITMAP 3 ")); */ |
| //DBG("REDRAW BITMAP 3"); |
| nsfb_claim(nsfb, &bbox); |
| LOG(("REDRAW BITMAP 4")); |
| //__menuet__debug_out("REDRAW BITMAP 4"); |
| /* LOG(("REDRAW BITMAP 4")); */ |
| //DBG("REDRAW BITMAP 4"); |
| /* clear background */ |
| if ((widget->bg & 0xFF000000) != 0) { |
| /* transparent polygon filling isnt working so fake it */ |
| LOG(("REDRAW BITMAP 5")); |
| //__menuet__debug_out("REDRAW BITMAP 5"); |
| /* LOG(("REDRAW BITMAP 5")); */ |
| //DBG("REDRAW BITMAP 5"); |
| nsfb_plot_rectangle_fill(nsfb, &bbox, widget->bg); |
| } |
| LOG(("REDRAW BITMAP 6")); |
| //__menuet__debug_out("REDRAW BITMAP 6\n"); |
| /* LOG(("REDRAW BITMAP 6")); */ |
| //DBG("REDRAW BITMAP 6\n"); |
| /* plot the image */ |
| LOG(("STUB: DON'T REAL DRAW")); |
| //__menuet__debug_out("STUB: DON'T REAL DRAW\n"); |
| /* LOG(("STUB: DON'T REAL DRAW")); */ |
| //DBG("STUB: DON'T REAL DRAW\n"); |
| LOG(("pixdata is %x", (nsfb_colour_t *)widget->u.bitmap.bitmap->pixdata)); |
| LOG(("pixdata is w:%d h:%d",widget->u.bitmap.bitmap->width, |
| widget->u.bitmap.bitmap->height)); |
| /* LOG(("pixdata is %x", (nsfb_colour_t *)widget->u.bitmap.bitmap->pixdata)); */ |
| /* LOG(("pixdata is w:%d h:%d",widget->u.bitmap.bitmap->width, */ |
| /* widget->u.bitmap.bitmap->height)); */ |
| //hmm |
| 112,13 → 119,13 |
| LOG(("REDRAW BITMAP 7")); |
| //__menuet__debug_out("REDRAW BITMAP 7\n"); |
| /* LOG(("REDRAW BITMAP 7")); */ |
| //DBG("REDRAW BITMAP 7\n"); |
| nsfb_update(nsfb, &bbox); |
| LOG(("REDRAW BITMAP OK\n")); |
| //__menuet__debug_out("REDRAW BITMAP OK\n"); |
| /* LOG(("REDRAW BITMAP OK\n")); */ |
| //DBG("REDRAW BITMAP OK\n"); |
| return 0; |
| } |
| 127,8 → 134,8 |
| void |
| fbtk_set_bitmap(fbtk_widget_t *widget, struct fbtk_bitmap *image) |
| { |
| LOG(("SET BITMAP")); |
| //__menuet__debug_out("set BITMAP"); |
| /* LOG(("SET BITMAP")); */ |
| //DBG("set BITMAP"); |
| if ((widget == NULL) || (widget->type != FB_WIDGET_TYPE_BITMAP)) |
| return; |
| 147,8 → 154,8 |
| colour c, |
| struct fbtk_bitmap *image) |
| { |
| LOG(("CREATE BITMAP")); |
| //__menuet__debug_out("cr BITMAP"); |
| /* LOG(("CREATE BITMAP")); */ |
| //DBG("cr BITMAP"); |
| fbtk_widget_t *neww; |
| neww = fbtk_widget_new(parent, FB_WIDGET_TYPE_BITMAP, x, y, width, height); |
| 176,8 → 183,8 |
| { |
| fbtk_widget_t *neww; |
| LOG(("CREATE BUTTON BITMAP")); |
| //__menuet__debug_out("cr bb BITMAP"); |
| /* LOG(("CREATE BUTTON BITMAP")); */ |
| //DBG("cr bb BITMAP"); |
| neww = fbtk_widget_new(parent, FB_WIDGET_TYPE_BITMAP, x, y, width, height); |
| neww->bg = c; |
| /contrib/network/netsurf/netsurf/framebuffer/fbtk/fbtk.c |
|---|
| 43,6 → 43,13 |
| #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 */ |
| #ifdef FBTK_LOGGING |
| /* tree dump debug, also example of depth first tree walk */ |
| 53,7 → 60,7 |
| int indent = 0; |
| while (widget != NULL) { |
| LOG(("%*s%p", indent, "", widget)); |
| /* LOG(("%*s%p", indent, "", widget)); */ |
| if (widget->first_child != NULL) { |
| widget = widget->first_child; |
| indent += 6; |
| 100,12 → 107,12 |
| widget->redraw.width = widget->width; |
| widget->redraw.height = widget->height; |
| LOG(("redrawing %p %d,%d %d,%d", |
| widget, |
| widget->redraw.x, |
| widget->redraw.y, |
| widget->redraw.width, |
| widget->redraw.height)); |
| /* LOG(("redrawing %p %d,%d %d,%d", */ |
| /* widget, */ |
| /* widget->redraw.x, */ |
| /* widget->redraw.y, */ |
| /* widget->redraw.width, */ |
| /* widget->redraw.height)); */ |
| cwidget = widget->last_child; |
| while (cwidget != NULL) { |
| 125,7 → 132,7 |
| 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); |
| 147,7 → 154,7 |
| 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; |
| 394,7 → 401,7 |
| /* 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; |
| } |
| 525,21 → 532,21 |
| 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(("creating %p %d,%d %d,%d", neww, x, y, width, height)); |
| /* LOG(("super!...")); */ |
| /* LOG(("creating %p %d,%d %d,%d", neww, x, y, width, height)); */ |
| /* make new window fit inside parent */ |
| if (width == 0) { |
| 561,7 → 568,7 |
| } |
| 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; |
| 571,23 → 578,23 |
| /* 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; |
| LOG(("Widget OK...")); |
| /* LOG(("Widget OK...")); */ |
| return neww; |
| } |
| 620,8 → 627,8 |
| fbtk_widget_t *cwidget; /* child widget */ |
| LOG(("DO REDRAW")); |
| //__menuet__debug_out("\n***********\nDO REDRAW\n********\n"); |
| /* LOG(("DO REDRAW")); */ |
| //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; |
| 629,13 → 636,13 |
| 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", |
| widget, plot_ctx.x0, plot_ctx.y0, |
| plot_ctx.x1, plot_ctx.y1)); |
| /* LOG(("clipping %p %d,%d %d,%d", */ |
| /* widget, plot_ctx.x0, plot_ctx.y0, */ |
| /* plot_ctx.x1, plot_ctx.y1)); */ |
| if (nsfb_plot_set_clip(nsfb, &plot_ctx) == true) { |
| LOG(("POST CALLBACK")); |
| //__menuet__debug_out("\n***********\nPOST CALLBACK\n********\n"); |
| /* LOG(("POST CALLBACK")); */ |
| //DBG("\n***********\nPOST CALLBACK\n********\n"); |
| fbtk_post_callback(widget, FBTK_CBT_REDRAW); |
| } |
| 643,28 → 650,28 |
| } |
| LOG(("DO CHILD")); |
| //__menuet__debug_out("\n***********\nDO CHILD\n********\n"); |
| /* LOG(("DO CHILD")); */ |
| //DBG("\n***********\nDO CHILD\n********\n"); |
| /* walk the widgets children if child flag is set */ |
| if (widget->redraw.child) { |
| LOG(("DO CHILD 2")); |
| //__menuet__debug_out("\n***********\nDO CHILD 2\n********\n"); |
| /* LOG(("DO CHILD 2")); */ |
| //DBG("\n***********\nDO CHILD 2\n********\n"); |
| cwidget = widget->last_child; |
| while (cwidget != NULL) { |
| LOG(("DO CHILD 3 ZZZ")); |
| //__menuet__debug_out("\n***********\nDO CHILD 3 ZZZ\n********\n"); |
| /* LOG(("DO CHILD 3 ZZZ")); */ |
| //DBG("\n***********\nDO CHILD 3 ZZZ\n********\n"); |
| do_redraw(nsfb, cwidget); |
| cwidget = cwidget->prev; |
| } |
| LOG(("DO CHILD 4")); |
| //__menuet__debug_out("\n***********\nDO CHILD 4\n********\n"); |
| /* LOG(("DO CHILD 4")); */ |
| //DBG("\n***********\nDO CHILD 4\n********\n"); |
| widget->redraw.child = false; |
| } |
| LOG(("SUP")); |
| //__menuet__debug_out("\n***********\nFIN REDRAW\n********\n"); |
| /* LOG(("SUP")); */ |
| //DBG("\n***********\nFIN REDRAW\n********\n"); |
| return 1; |
| } |
| 720,8 → 727,8 |
| fbtk_post_callback(fbtk_widget_t *widget, fbtk_callback_type cbt, ...) |
| { |
| LOG(("DO POST CALLBACK")); |
| //__menuet__debug_out("\n***********\nDO POST CALLBACK\n********\n"); |
| /* LOG(("DO POST CALLBACK")); */ |
| //DBG("\n***********\nDO POST CALLBACK\n********\n"); |
| fbtk_callback_info cbi; |
| int ret = 0; |
| 735,31 → 742,31 |
| if (widget->mapped == false) |
| return ret; |
| LOG(("DO POST CALLBACK 2")); |
| //__menuet__debug_out("\n***********\nDO POST CALLBACK 2\n********\n"); |
| /* LOG(("DO POST CALLBACK 2")); */ |
| //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")); |
| //__menuet__debug_out("\n***********\nDO POST CALLBACK 3 - VA\n********\n"); |
| /* LOG(("DO POST CALLBACK 3 - VA")); */ |
| //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); |
| 766,53 → 773,53 |
| 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")); |
| //__menuet__debug_out("\n***********\nDO POST CALLBACK free\n********\n"); |
| /* LOG(("DO POST CALLBACK free")); */ |
| //DBG("\n***********\nDO POST CALLBACK free\n********\n"); |
| va_end(ap); |
| LOG(("DO CALLBACK YEAH")); |
| //__menuet__debug_out("\n***********\nWTF IS THIS\n********\n"); |
| /* LOG(("DO CALLBACK YEAH")); */ |
| //DBG("\n***********\nWTF IS THIS\n********\n"); |
| char zupa[64]; |
| sprintf (zupa, "ADDRESS of callback is %x \n",(widget->callback[cbt])); |
| //__menuet__debug_out(zupa); |
| LOG(("ADDRESS of callback is %x \n",(widget->callback[cbt]))); |
| //DBG(zupa); |
| /* LOG(("ADDRESS of callback is %x \n",(widget->callback[cbt]))); */ |
| ret = (widget->callback[cbt])(widget, &cbi); |
| LOG(("DO CALLBACK YEAH 2")); |
| //__menuet__debug_out("\n***********\nWTF IS THIS!!!12121\n********\n"); |
| /* LOG(("DO CALLBACK YEAH 2")); */ |
| //DBG("\n***********\nWTF IS THIS!!!12121\n********\n"); |
| } |
| LOG(("DO POST CALLBACK OK")); |
| //__menuet__debug_out("\n***********\nDO POST CALLBACK OK\n********\n"); |
| /* LOG(("DO POST CALLBACK OK")); */ |
| //DBG("\n***********\nDO POST CALLBACK OK\n********\n"); |
| return ret; |
| } |
| /contrib/network/netsurf/netsurf/framebuffer/fbtk/make.fbtk |
|---|
| 2,6 → 2,6 |
| text.o scroll.o osk.o |
| OUTFILE = TEST.o |
| CFLAGS += -I ../include/ -I ../ -I../../ -I./ -I/home/sourcerer/kos_src/newenginek/kolibri/include |
| CFLAGS += -I ../include/ -I ../ -I../../ -I./ -I/home/sourcerer/kos_src/newenginek/kolibri/include -I../../../libnsfb/include/ -I ../../../libcss/include/ -I ../../../libwapcaplet/include/ |
| include $(MENUETDEV)/makefiles/Makefile_for_o_lib |
| /contrib/network/netsurf/netsurf/framebuffer/fbtk/scroll.c |
|---|
| 40,6 → 40,12 |
| #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 */ |
| /* Vertical scroll widget */ |
| static int |
| 46,7 → 52,7 |
| vscroll_redraw(fbtk_widget_t *widget, fbtk_callback_info *cbi) |
| { |
| LOG(("REDRAW SCROLL")); |
| //__menuet__debug_out("REDRAW SCROLL"); |
| //DBG("REDRAW SCROLL"); |
| int vscroll; |
| int vpos; |
| 54,16 → 60,16 |
| nsfb_bbox_t rect; |
| LOG(("REDRAW SCROLL get rooot")); |
| //__menuet__debug_out("REDRAW SCROLL get root"); |
| //DBG("REDRAW SCROLL get root"); |
| fbtk_widget_t *root = fbtk_get_root_widget(widget); |
| LOG(("REDRAW SCROLL get bbox")); |
| //__menuet__debug_out("REDRAW SCROLL get bbox"); |
| //DBG("REDRAW SCROLL get bbox"); |
| fbtk_get_bbox(widget, &bbox); |
| LOG(("REDRAW SCROLL claim")); |
| //__menuet__debug_out("REDRAW SCROLL claim"); |
| //DBG("REDRAW SCROLL claim"); |
| nsfb_claim(root->u.root.fb, &bbox); |
| rect = bbox; |
| 85,7 → 91,7 |
| nsfb_plot_rectangle(root->u.root.fb, &rect, 1, 0xFF999999, false, false); |
| LOG(("REDRAW SCROLL widg")); |
| //__menuet__debug_out("REDRAW SCROLL widg"); |
| //DBG("REDRAW SCROLL widg"); |
| /* scroll bar */ |
| if ((widget->u.scroll.maximum - widget->u.scroll.minimum) > 0) { |
| 107,7 → 113,7 |
| nsfb_plot_rectangle_fill(root->u.root.fb, &rect, widget->bg); |
| LOG(("REDRAW SCROLL upd")); |
| //__menuet__debug_out("RED upd"); |
| //DBG("RED upd"); |
| //STUB |
| nsfb_update(root->u.root.fb, &bbox); //&bbox |
| 120,7 → 126,7 |
| { |
| LOG(("REDRAG SCROLL")); |
| //__menuet__debug_out("REDRAG SCROLL"); |
| //DBG("REDRAG SCROLL"); |
| int newpos; |
| fbtk_widget_t *scrollw = cbi->context; |
| 146,7 → 152,7 |
| { |
| LOG(("REDRAW Ck SCROLL")); |
| //__menuet__debug_out("REDRAW Ck SCROLL"); |
| //DBG("REDRAW Ck SCROLL"); |
| int newpos; |
| fbtk_widget_t *scrollw = cbi->context; |
| 168,7 → 174,7 |
| { |
| LOG(("REDRAW SCROLL 2")); |
| //__menuet__debug_out("REDRAW SCROLL 2"); |
| //DBG("REDRAW SCROLL 2"); |
| int newpos; |
| fbtk_widget_t *scrollw = cbi->context; |
| 189,7 → 195,7 |
| vscrollarea_click(fbtk_widget_t *widget, fbtk_callback_info *cbi) |
| { |
| LOG(("REDRAW SCROLL 3")); |
| //__menuet__debug_out("REDRAW SCROLL 3"); |
| //DBG("REDRAW SCROLL 3"); |
| int vscroll; |
| int vpos; |
| int newpos; |
| 270,7 → 276,7 |
| { |
| LOG(("REDRAW SCROLL 4")); |
| //__menuet__debug_out("REDRAW SCROLL 4"); |
| //DBG("REDRAW SCROLL 4"); |
| fbtk_widget_t *neww; |
| neww = fbtk_widget_new(parent, |
| 321,7 → 327,7 |
| { |
| LOG(("REDRAW SCROLL 5")); |
| //__menuet__debug_out("REDRAW SCROLL 5"); |
| //DBG("REDRAW SCROLL 5"); |
| int hscroll; |
| int hpos; |
| nsfb_bbox_t bbox; |
| 383,7 → 389,7 |
| { |
| LOG(("REDRAW SCROLL 6")); |
| //__menuet__debug_out("REDRAW SCROLL 6"); |
| //DBG("REDRAW SCROLL 6"); |
| int newpos; |
| fbtk_widget_t *scrollw = cbi->context; |
| 407,7 → 413,7 |
| { |
| LOG(("REDRAW SCROLL 7")); |
| //__menuet__debug_out("REDRAW SCROLL 7"); |
| //DBG("REDRAW SCROLL 7"); |
| int newpos; |
| fbtk_widget_t *scrollw = cbi->context; |
| 429,7 → 435,7 |
| { |
| LOG(("REDRAW SCROLL 8")); |
| //__menuet__debug_out("REDRAW SCROLL 8"); |
| //DBG("REDRAW SCROLL 8"); |
| int newpos; |
| fbtk_widget_t *scrollw = cbi->context; |
| 455,7 → 461,7 |
| { |
| LOG(("REDRAW SCROLL 9")); |
| //__menuet__debug_out("REDRAW SCROLL 9"); |
| //DBG("REDRAW SCROLL 9"); |
| int hscroll; |
| int hpos; |
| int newpos; |
| 514,7 → 520,7 |
| { |
| LOG(("REDRAW SCROLL 10")); |
| //__menuet__debug_out("REDRAW SCROLL 10"); |
| //DBG("REDRAW SCROLL 10"); |
| fbtk_widget_t *neww; |
| neww = fbtk_widget_new(parent, |
| 565,7 → 571,7 |
| int page) |
| { |
| LOG(("REDRAW SCROLL 11")); |
| //__menuet__debug_out("REDRAW SCROLL 11"); |
| //DBG("REDRAW SCROLL 11"); |
| if (widget == NULL) |
| return false; |
| 593,7 → 599,7 |
| fbtk_set_scroll_position(fbtk_widget_t *widget, int position) |
| { |
| LOG(("REDRAW SCROLL 12")); |
| //__menuet__debug_out("REDRAW SCROLL 12"); |
| //DBG("REDRAW SCROLL 12"); |
| if (widget == NULL) |
| return false; |
| /contrib/network/netsurf/netsurf/framebuffer/findfile.c |
|---|
| 91,7 → 91,7 |
| if (res != URL_FUNC_OK) { |
| return NULL; |
| } |
| __menuet__debug_out("Calling url_unescape from findfile.c"); |
| res = url_unescape(path, &respath); |
| free(path); |
| if (res != URL_FUNC_OK) { |
| 99,6 → 99,7 |
| } |
| LOG(("Findfile url2path: %s", respath)); |
| __menuet__debug_out("returning from url_to_path in findfile.c\n"); |
| return respath; |
| } |
| 113,7 → 114,7 |
| raw = path_to_url(filepath_sfind(respaths, buf, path)); |
| LOG(("Findfile gui: %s", raw)); |
| LOG(("Findfile gui: path is %s, raw is %s", path, raw)); |
| if (raw != NULL) { |
| nsurl_create(raw, &url); |
| free(raw); |
| /contrib/network/netsurf/netsurf/framebuffer/font_freetype.c |
|---|
| 41,6 → 41,12 |
| #define BOLD_WEIGHT 700 |
| #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 */ |
| static FT_Library library; |
| static FTC_Manager ft_cmanager; |
| static FTC_CMapCache ft_cmap_cache ; |
| 197,7 → 203,7 |
| } |
| LOG(("Freetype cache...")); |
| __menuet__debug_out("Ft cache\n"); |
| DBG("Ft cache\n"); |
| /* cache manager initialise */ |
| error = FTC_Manager_New(library, |
| max_faces, |
| 214,7 → 220,7 |
| LOG(("Freetype map cache...")); |
| __menuet__debug_out("Ft map cache\n"); |
| DBG("Ft map cache\n"); |
| error = FTC_CMapCache_New(ft_cmanager, &ft_cmap_cache); |
| error = FTC_ImageCache_New(ft_cmanager, &ft_image_cache); |
| 223,7 → 229,7 |
| LOG(("Freetype load fonts...")); |
| __menuet__debug_out("Ft load fonts\n"); |
| DBG("Ft load fonts\n"); |
| /* Start with the sans serif font */ |
| fb_face = fb_new_face(nsoption_charp(fb_face_sans_serif), |
| 232,7 → 238,7 |
| if (fb_face == NULL) { |
| LOG(("Freetype load fonts failed due SANS unavailable :(...")); |
| __menuet__debug_out("Ft Z:(((\n"); |
| DBG("Ft Z:(((\n"); |
| /* The sans serif font is the default and must be found. */ |
| LOG(("Could not find the default font\n")); |
| FTC_Manager_Done(ft_cmanager); |
| 243,7 → 249,7 |
| } |
| LOG(("Freetype loaded sans..")); |
| __menuet__debug_out("Ft sans loaded:)\n"); |
| DBG("Ft sans loaded:)\n"); |
| /* Bold sans serif face */ |
| fb_face = fb_new_face(nsoption_charp(fb_face_sans_serif_bold), |
| 346,7 → 352,7 |
| } |
| LOG(("Freetype fonts ready...")); |
| __menuet__debug_out("Ft ready :)\n"); |
| DBG("Ft ready :)\n"); |
| /* set the default render mode */ |
| if (nsoption_bool(fb_font_monochrome) == true) |
| /contrib/network/netsurf/netsurf/framebuffer/gui.c |
|---|
| 64,6 → 64,12 |
| #define NSFB_TOOLBAR_DEFAULT_LAYOUT "blfsrut" |
| #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 */ |
| fbtk_widget_t *fbtk; |
| struct gui_window *input_window = NULL; |
| 546,17 → 552,17 |
| z=0x20; |
| strcpy(p, *z); |
| __menuet__debug_out("PATH1...\n"); |
| __menuet__debug_out(p); |
| __menuet__debug_out("PATH1...\n"); |
| DBG("PATH1...\n"); |
| DBG(p); |
| DBG("PATH1...\n"); |
| *(strrchr(p, '/')+1)='\0'; |
| strcpy(strrchr(p, '/')+1, "res/"); |
| __menuet__debug_out("PATH1...\n"); |
| __menuet__debug_out(p); |
| __menuet__debug_out("PATH1...\n"); |
| DBG("PATH1...\n"); |
| DBG(p); |
| DBG("PATH1...\n"); |
| asm volatile ("int $0x40"::"a"(30), "b"(1), "c"(p)); |
| 578,15 → 584,18 |
| options = filepath_find(respaths, "Choices"); |
| messages = filepath_find(respaths, "messages"); |
| LOG(("gui.c : printing kolibri DEBUG messages for BOARD")); |
| DBG("====================START\n"); |
| DBG(messages); |
| DBG("====================END\n"); |
| __menuet__debug_out("===path to msg\n"); |
| __menuet__debug_out(messages); |
| __menuet__debug_out("\n===path to msg\n"); |
| //netsurf_init(&argc, &argv, options, "res/messages"); |
| LOG(("Calling netsurf_init")); |
| netsurf_init(&argc, &argv, options, messages); |
| extern HTTP_INIT(); |
| DBG("Calling HTTP_INIT() for KolibriOS http lib.."); |
| HTTP_INIT(); |
| DBG(("NS HTTP_INIT okay")); |
| LOG(("NS init okay")); |
| free(messages); |
| 612,16 → 621,14 |
| return 0; |
| } |
| void |
| gui_poll(bool active) |
| { |
| LOG(("GUI poll in")); |
| /* LOG(("GUI poll in")); */ |
| nsfb_event_t event; |
| int timeout; /* timeout in miliseconds */ |
| LOG(("schedule run")); |
| /* LOG(("schedule run")); */ |
| /* run the scheduler and discover how long to wait for the next event */ |
| timeout = schedule_run(); |
| 629,12 → 636,11 |
| if (active) |
| timeout = 0; |
| LOG(("redraw pending")); |
| /* LOG(("redraw pending")); */ |
| /* if redraws are pending do not wait for event, return immediately */ |
| if (fbtk_get_redraw_pending(fbtk)) |
| timeout = 0; |
| LOG(("fbtk event")); |
| if (fbtk_event(fbtk, &event, timeout)) { |
| if ((event.type == NSFB_EVENT_CONTROL) && |
| (event.value.controlcode == NSFB_CONTROL_QUIT)) |
| 641,10 → 647,10 |
| netsurf_quit = true; |
| } |
| LOG(("fbtk redraw")); |
| /* LOG(("fbtk redraw")); */ |
| fbtk_redraw(fbtk); |
| LOG(("GUI poll out success")); |
| /* LOG(("GUI poll out success")); */ |
| } |
| void |
| /contrib/network/netsurf/netsurf/framebuffer/make.fb |
|---|
| 25,6 → 25,6 |
| OUTFILE = TEST.o |
| CFLAGS += -I ../include/ -I ../ -I../../ -I./ -I/home/sourcerer/kos_src/newenginek/kolibri/include |
| CFLAGS += -I ../include/ -I ../ -I../../ -I./ -I/home/sourcerer/kos_src/newenginek/kolibri/include -I ../../libnsfb/include/ -I ../../libwapcaplet/include/ -I ../../libcss/include/ |
| include $(MENUETDEV)/makefiles/Makefile_for_o_lib |