| 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 |