diff options
Diffstat (limited to 'riscos/gui')
-rw-r--r-- | riscos/gui/button_bar.c | 22 | ||||
-rw-r--r-- | riscos/gui/progress_bar.c | 17 | ||||
-rw-r--r-- | riscos/gui/status_bar.c | 53 | ||||
-rw-r--r-- | riscos/gui/throbber.c | 11 | ||||
-rw-r--r-- | riscos/gui/url_bar.c | 45 |
5 files changed, 52 insertions, 96 deletions
diff --git a/riscos/gui/button_bar.c b/riscos/gui/button_bar.c index d92433d0b..e04bfc270 100644 --- a/riscos/gui/button_bar.c +++ b/riscos/gui/button_bar.c @@ -139,7 +139,7 @@ struct button_bar *ro_gui_button_bar_create(struct theme_descriptor *theme, button_bar = malloc(sizeof(struct button_bar)); if (button_bar == NULL) { - LOG(("No memory for malloc()")); + LOG("No memory for malloc()"); return NULL; } @@ -539,8 +539,7 @@ bool ro_gui_button_bar_icon_update(struct button_bar *button_bar) error = xwimp_create_icon(&icon, &button->icon); if (error) { - LOG(("xwimp_create_icon: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_create_icon: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); button->icon = -1; return false; @@ -550,8 +549,7 @@ bool ro_gui_button_bar_icon_update(struct button_bar *button_bar) error = xwimp_delete_icon(button_bar->window, button->icon); if (error != NULL) { - LOG(("xwimp_delete_icon: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_delete_icon: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return false; } @@ -601,8 +599,7 @@ bool ro_gui_button_bar_icon_resize(struct button_bar *button_bar) button->y_pos + button->y_size); if (error != NULL) { - LOG(("xwimp_resize_icon: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_resize_icon: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); button->icon = -1; return false; @@ -773,8 +770,7 @@ bool ro_gui_button_bar_click(struct button_bar *button_bar, button_bar->sprites, sprite, &box, NULL); if (error) - LOG(("xdragasprite_start: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xdragasprite_start: 0x%x: %s", error->errnum, error->errmess); ro_mouse_drag_start(ro_gui_button_bar_drag_end, NULL, NULL, NULL); @@ -875,8 +871,7 @@ void ro_gui_button_bar_drag_end(wimp_dragged *drag, void *data) error = xwimp_get_pointer_info(&pointer); if (error) { - LOG(("xwimp_get_pointer_info: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_pointer_info: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -886,8 +881,7 @@ void ro_gui_button_bar_drag_end(wimp_dragged *drag, void *data) state.w = drag_start->window; error = xwimp_get_window_state(&state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -1075,7 +1069,7 @@ char *ro_gui_button_bar_get_config(struct button_bar *button_bar) config = malloc(size); if (config == NULL) { - LOG(("No memory for malloc()")); + LOG("No memory for malloc()"); warn_user("NoMemory", 0); return NULL; } diff --git a/riscos/gui/progress_bar.c b/riscos/gui/progress_bar.c index 09b3edb45..3ec6b3aa8 100644 --- a/riscos/gui/progress_bar.c +++ b/riscos/gui/progress_bar.c @@ -137,8 +137,7 @@ struct progress_bar *ro_gui_progress_bar_create(void) error = xwimp_create_window((wimp_window *)&progress_bar_definition, &pb->w); if (error) { - LOG(("xwimp_create_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_create_window: 0x%x: %s", error->errnum, error->errmess); free(pb); return NULL; } @@ -166,8 +165,7 @@ void ro_gui_progress_bar_destroy(struct progress_bar *pb) ro_gui_wimp_event_finalise(pb->w); error = xwimp_delete_window(pb->w); if (error) { - LOG(("xwimp_delete_window: 0x%x:%s", - error->errnum, error->errmess)); + LOG("xwimp_delete_window: 0x%x:%s", error->errnum, error->errmess); } free(pb); @@ -329,8 +327,7 @@ void ro_gui_progress_bar_update(struct progress_bar *pb, int width, int height) redraw.box.x0 = cur.x1; error = xwimp_update_window(&redraw, &more); if (error) { - LOG(("Error getting update window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("Error getting update window: 0x%x: %s", error->errnum, error->errmess); return; } if (more) @@ -354,8 +351,7 @@ void ro_gui_progress_bar_redraw(wimp_draw *redraw) error = xwimp_redraw_window(redraw, &more); if (error) { - LOG(("xwimp_redraw_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_redraw_window: 0x%x: %s", error->errnum, error->errmess); return; } if (more) @@ -389,7 +385,7 @@ void ro_gui_progress_bar_animate(void *p) redraw.box = pb->visible; error = xwimp_update_window(&redraw, &more); if (error != NULL) { - LOG(("Error getting update window: '%s'", error->errmess)); + LOG("Error getting update window: '%s'", error->errmess); return; } if (more) @@ -532,8 +528,7 @@ void ro_gui_progress_bar_redraw_window(wimp_draw *redraw, } error = xwimp_get_rectangle(redraw, &more); if (error) { - LOG(("xwimp_get_rectangle: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_rectangle: 0x%x: %s", error->errnum, error->errmess); return; } } diff --git a/riscos/gui/status_bar.c b/riscos/gui/status_bar.c index e7dc54279..cbc404658 100644 --- a/riscos/gui/status_bar.c +++ b/riscos/gui/status_bar.c @@ -130,8 +130,7 @@ struct status_bar *ro_gui_status_bar_create(wimp_w parent, unsigned int width) error = xwimp_create_window((wimp_window *)&status_bar_definition, &sb->w); if (error) { - LOG(("xwimp_create_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_create_window: 0x%x: %s", error->errnum, error->errmess); free(sb); return NULL; } @@ -165,8 +164,7 @@ void ro_gui_status_bar_destroy(struct status_bar *sb) ro_gui_wimp_event_finalise(sb->w); error = xwimp_delete_window(sb->w); if (error) { - LOG(("xwimp_delete_window: 0x%x:%s", - error->errnum, error->errmess)); + LOG("xwimp_delete_window: 0x%x:%s", error->errnum, error->errmess); } ro_gui_progress_bar_destroy(sb->pb); @@ -223,8 +221,7 @@ void ro_gui_status_bar_set_visible(struct status_bar *sb, bool visible) } else { os_error *error = xwimp_close_window(sb->w); if (error) { - LOG(("xwimp_close_window: 0x%x:%s", - error->errnum, error->errmess)); + LOG("xwimp_close_window: 0x%x:%s", error->errnum, error->errmess); } } } @@ -277,15 +274,14 @@ void ro_gui_status_bar_set_progress_range(struct status_bar *sb, old_range = ro_gui_progress_bar_get_range(sb->pb); ro_gui_progress_bar_set_range(sb->pb, range); - LOG(("Ranges are %i vs %i", old_range, range)); + LOG("Ranges are %i vs %i", old_range, range); if ((old_range == 0) && (range != 0)) { ro_gui_status_position_progress_bar(sb); } else if ((old_range != 0) && (range == 0)) { os_error *error = xwimp_close_window( ro_gui_progress_bar_get_window(sb->pb)); if (error) { - LOG(("xwimp_close_window: 0x%x:%s", - error->errnum, error->errmess)); + LOG("xwimp_close_window: 0x%x:%s", error->errnum, error->errmess); } } } @@ -357,8 +353,7 @@ void ro_gui_status_bar_resize(struct status_bar *sb) state.w = sb->parent; error = xwimp_get_window_state(&state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); return; } window_width = state.visible.x1 - state.visible.x0; @@ -381,8 +376,7 @@ void ro_gui_status_bar_resize(struct status_bar *sb) extent.y1 = status_height - 4; error = xwimp_set_extent(sb->w, &extent); if (error) { - LOG(("xwimp_set_extent: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_set_extent: 0x%x: %s", error->errnum, error->errmess); return; } @@ -410,8 +404,7 @@ void ro_gui_status_bar_resize(struct status_bar *sb) wimp_CHILD_LINKS_PARENT_VISIBLE_BOTTOM_OR_LEFT << wimp_CHILD_TS_EDGE_SHIFT); if (error) { - LOG(("xwimp_open_window_nested: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_open_window_nested: 0x%x: %s", error->errnum, error->errmess); return; } ro_gui_status_position_progress_bar(sb); @@ -419,8 +412,7 @@ void ro_gui_status_bar_resize(struct status_bar *sb) status_width - WIDGET_WIDTH, 0, status_width, status_height - 4); if (error) { - LOG(("xwimp_resize_icon: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_resize_icon: 0x%x: %s", error->errnum, error->errmess); return; } @@ -455,8 +447,7 @@ void ro_gui_status_bar_redraw(wimp_draw *redraw) /* redraw the window */ error = xwimp_redraw_window(redraw, &more); if (error) { - LOG(("xwimp_redraw_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_redraw_window: 0x%x: %s", error->errnum, error->errmess); return; } while (more) { @@ -465,8 +456,7 @@ void ro_gui_status_bar_redraw(wimp_draw *redraw) error = xcolourtrans_set_font_colours(font_CURRENT, 0xeeeeee00, 0x00000000, 14, 0, 0, 0); if (error) { - LOG(("xcolourtrans_set_font_colours: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xcolourtrans_set_font_colours: 0x%x: %s", error->errnum, error->errmess); return; } code = rufl_paint(ro_gui_desktop_font_family, @@ -477,11 +467,9 @@ void ro_gui_status_bar_redraw(wimp_draw *redraw) rufl_BLEND_FONT); if (code != rufl_OK) { if (code == rufl_FONT_MANAGER_ERROR) - LOG(("rufl_FONT_MANAGER_ERROR: 0x%x: %s", - rufl_fm_error->errnum, - rufl_fm_error->errmess)); + LOG("rufl_FONT_MANAGER_ERROR: 0x%x: %s", rufl_fm_error->errnum, rufl_fm_error->errmess); else - LOG(("rufl_paint: 0x%x", code)); + LOG("rufl_paint: 0x%x", code); } } @@ -494,8 +482,7 @@ void ro_gui_status_bar_redraw(wimp_draw *redraw) error = xwimp_get_rectangle(redraw, &more); if (error) { - LOG(("xwimp_get_rectangle: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_rectangle: 0x%x: %s", error->errnum, error->errmess); return; } } @@ -534,8 +521,7 @@ bool ro_gui_status_bar_click(wimp_pointer *pointer) drag.initial.y1 = pointer->pos.y; error = xwimp_drag_box(&drag); if (error) { - LOG(("xwimp_drag_box: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_drag_box: 0x%x: %s", error->errnum, error->errmess); } break; } @@ -560,8 +546,7 @@ void ro_gui_status_bar_open(wimp_open *open) state.w = sb->parent; error = xwimp_get_window_state(&state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); return; } window_width = state.visible.x1 - state.visible.x0; @@ -600,8 +585,7 @@ void ro_gui_status_position_progress_bar(struct status_bar *sb) state.w = sb->w; error = xwimp_get_window_state(&state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); return; } @@ -631,8 +615,7 @@ void ro_gui_status_position_progress_bar(struct status_bar *sb) wimp_CHILD_LINKS_PARENT_VISIBLE_BOTTOM_OR_LEFT << wimp_CHILD_TS_EDGE_SHIFT); if (error) { - LOG(("xwimp_open_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_open_window: 0x%x: %s", error->errnum, error->errmess); } /* update the progress bar display on non-standard width */ diff --git a/riscos/gui/throbber.c b/riscos/gui/throbber.c index 5e2c87678..2eabb3e7e 100644 --- a/riscos/gui/throbber.c +++ b/riscos/gui/throbber.c @@ -79,7 +79,7 @@ struct throbber *ro_gui_throbber_create(struct theme_descriptor *theme) throbber = malloc(sizeof(struct throbber)); if (throbber == NULL) { - LOG(("No memory for malloc()")); + LOG("No memory for malloc()"); return NULL; } @@ -246,8 +246,7 @@ bool ro_gui_throbber_icon_update(struct throbber *throbber) error = xwimp_create_icon(&icon, &throbber->icon); if (error != NULL) { - LOG(("xwimp_create_icon: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_create_icon: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); throbber->icon = -1; return false; @@ -258,8 +257,7 @@ bool ro_gui_throbber_icon_update(struct throbber *throbber) } else if (throbber->hidden && throbber->icon != -1) { error = xwimp_delete_icon(throbber->window, throbber->icon); if (error != NULL) { - LOG(("xwimp_delete_icon: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_delete_icon: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return false; } @@ -295,8 +293,7 @@ bool ro_gui_throbber_icon_resize(struct throbber *throbber) throbber->extent.x0, throbber->extent.y0, throbber->extent.x1, throbber->extent.y1); if (error != NULL) { - LOG(("xwimp_resize_icon: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_resize_icon: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); throbber->icon = -1; return false; diff --git a/riscos/gui/url_bar.c b/riscos/gui/url_bar.c index 29eddedca..5eccd602e 100644 --- a/riscos/gui/url_bar.c +++ b/riscos/gui/url_bar.c @@ -133,7 +133,7 @@ struct url_bar *ro_gui_url_bar_create(struct theme_descriptor *theme) url_bar = malloc(sizeof(struct url_bar)); if (url_bar == NULL) { - LOG(("No memory for malloc()")); + LOG("No memory for malloc()"); return NULL; } @@ -228,8 +228,7 @@ static bool ro_gui_url_bar_icon_resize(struct url_bar *url_bar, bool full) url_bar->container_icon, x0, y0, x1, y1); if (error != NULL) { - LOG(("xwimp_resize_icon: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_resize_icon: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); url_bar->container_icon = -1; return false; @@ -249,8 +248,7 @@ static bool ro_gui_url_bar_icon_resize(struct url_bar *url_bar, bool full) url_bar->suggest_icon, x0, y0, x1, y1); if (error != NULL) { - LOG(("xwimp_resize_icon: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_resize_icon: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); url_bar->suggest_icon = -1; return false; @@ -271,8 +269,7 @@ static bool ro_gui_url_bar_icon_resize(struct url_bar *url_bar, bool full) url_bar->text_icon, x0, y0, x1, y1); if (error != NULL) { - LOG(("xwimp_resize_icon: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_resize_icon: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); url_bar->text_icon = -1; return false; @@ -353,8 +350,7 @@ static bool ro_gui_url_bar_icon_update(struct url_bar *url_bar) wimp_ICON_BUTTON_TYPE_SHIFT); error = xwimp_create_icon(&icon, &url_bar->container_icon); if (error != NULL) { - LOG(("xwimp_create_icon: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_create_icon: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); url_bar->container_icon = -1; return false; @@ -365,8 +361,7 @@ static bool ro_gui_url_bar_icon_update(struct url_bar *url_bar) error = xwimp_delete_icon(url_bar->window, url_bar->container_icon); if (error != NULL) { - LOG(("xwimp_delete_icon: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_delete_icon: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return false; } @@ -392,8 +387,7 @@ static bool ro_gui_url_bar_icon_update(struct url_bar *url_bar) wimp_ICON_BUTTON_TYPE_SHIFT); error = xwimp_create_icon(&icon, &url_bar->text_icon); if (error) { - LOG(("xwimp_create_icon: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_create_icon: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); url_bar->text_icon = -1; return false; @@ -404,8 +398,7 @@ static bool ro_gui_url_bar_icon_update(struct url_bar *url_bar) error = xwimp_delete_icon(url_bar->window, url_bar->text_icon); if (error != NULL) { - LOG(("xwimp_delete_icon: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_delete_icon: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return false; } @@ -425,8 +418,7 @@ static bool ro_gui_url_bar_icon_update(struct url_bar *url_bar) wimp_ICON_BUTTON_TYPE_SHIFT); error = xwimp_create_icon(&icon, &url_bar->suggest_icon); if (error) { - LOG(("xwimp_create_icon: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_create_icon: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return false; } @@ -446,8 +438,7 @@ static bool ro_gui_url_bar_icon_update(struct url_bar *url_bar) error = xwimp_delete_icon(url_bar->window, url_bar->suggest_icon); if (error != NULL) { - LOG(("xwimp_delete_icon: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_delete_icon: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return false; } @@ -931,8 +922,7 @@ bool ro_gui_url_bar_take_caret(struct url_bar *url_bar) error = xwimp_set_caret_position(url_bar->window, url_bar->text_icon, -1, -1, -1, 0); if (error) { - LOG(("xwimp_set_caret_position: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_set_caret_position: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return false; @@ -969,7 +959,7 @@ void ro_gui_url_bar_set_url(struct url_bar *url_bar, const char *url, if (err != NSERROR_OK) { /* A bad encoding should never happen, so assert this */ assert(err != NSERROR_BAD_ENCODING); - LOG(("utf8_to_enc failed")); + LOG("utf8_to_enc failed"); /* Paranoia */ local_text = NULL; } @@ -986,7 +976,7 @@ void ro_gui_url_bar_set_url(struct url_bar *url_bar, const char *url, strncpy(url_bar->text_buffer, "", url_bar->text_size - 1); url_bar->text_buffer[url_bar->text_size - 1] = '\0'; warn_user("LongURL", NULL); - LOG(("Long URL (%d chars): %s", strlen(url), url)); + LOG("Long URL (%d chars): %s", strlen(url), url); } else { strncpy(url_bar->text_buffer, local_url, url_bar->text_size - 1); @@ -1014,8 +1004,7 @@ void ro_gui_url_bar_set_url(struct url_bar *url_bar, const char *url, error = xwimp_get_caret_position(&caret); if (error) { - LOG(("xwimp_get_caret_position: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_caret_position: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -1028,8 +1017,7 @@ void ro_gui_url_bar_set_url(struct url_bar *url_bar, const char *url, error = xwimp_set_caret_position(url_bar->window, url_bar->text_icon, 0, 0, -1, strlen(set_url)); if (error) { - LOG(("xwimp_set_caret_position: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_set_caret_position: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } } @@ -1106,8 +1094,7 @@ bool ro_gui_url_bar_get_url_extent(struct url_bar *url_bar, os_box *extent) state.i = url_bar->container_icon; error = xwimp_get_icon_state(&state); if (error) { - LOG(("xwimp_get_icon_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_icon_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return false; } |