summaryrefslogtreecommitdiff
path: root/riscos/window.c
diff options
context:
space:
mode:
Diffstat (limited to 'riscos/window.c')
-rw-r--r--riscos/window.c163
1 files changed, 56 insertions, 107 deletions
diff --git a/riscos/window.c b/riscos/window.c
index 7f80bc8c9..097ab9ee6 100644
--- a/riscos/window.c
+++ b/riscos/window.c
@@ -386,8 +386,7 @@ static void gui_window_place_caret(struct gui_window *g, int x, int y, int heigh
error = xwimp_set_caret_position(g->window, -1,
x * 2, -(y + height) * 2, height * 2, -1);
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);
}
}
@@ -436,8 +435,7 @@ static struct gui_window *gui_window_create(struct browser_window *bw,
state.w = existing->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);
}
window.visible.x0 = state.visible.x0;
@@ -541,8 +539,7 @@ static struct gui_window *gui_window_create(struct browser_window *bw,
error = xwimp_create_window(&window, &g->window);
if (error) {
- LOG(("xwimp_create_window: 0x%x: %s",
- error->errnum, error->errmess));
+ LOG("xwimp_create_window: 0x%x: %s", error->errnum, error->errmess);
warn_user("WimpError", error->errmess);
free(g);
return 0;
@@ -603,8 +600,7 @@ static struct gui_window *gui_window_create(struct browser_window *bw,
state.w = g->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 g;
}
@@ -663,8 +659,7 @@ static void gui_window_destroy(struct gui_window *g)
/* delete window */
error = xwimp_delete_window(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);
warn_user("WimpError", error->errmess);
}
ro_gui_wimp_event_finalise(w);
@@ -716,16 +711,14 @@ void gui_window_redraw_window(struct gui_window *g)
info.w = g->window;
error = xwimp_get_window_info_header_only(&info);
if (error) {
- LOG(("xwimp_get_window_info_header_only: 0x%x: %s",
- error->errnum, error->errmess));
+ LOG("xwimp_get_window_info_header_only: 0x%x: %s", error->errnum, error->errmess);
warn_user("WimpError", error->errmess);
return;
}
error = xwimp_force_redraw(g->window, info.extent.x0, info.extent.y0,
info.extent.x1, info.extent.y1);
if (error) {
- LOG(("xwimp_force_redraw: 0x%x: %s",
- error->errnum, error->errmess));
+ LOG("xwimp_force_redraw: 0x%x: %s", error->errnum, error->errmess);
warn_user("WimpError", error->errmess);
}
}
@@ -769,7 +762,7 @@ static void gui_window_update_box(struct gui_window *g, const struct rect *rect)
}
cur = malloc(sizeof(struct update_box));
if (!cur) {
- LOG(("No memory for malloc."));
+ LOG("No memory for malloc.");
warn_user("NoMemory", 0);
return;
}
@@ -804,8 +797,7 @@ static bool gui_window_get_scroll(struct gui_window *g, int *sx, int *sy)
state.w = g->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 false;
}
@@ -836,8 +828,7 @@ static void gui_window_set_scroll(struct gui_window *g, int sx, int sy)
state.w = g->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;
}
@@ -873,8 +864,7 @@ static void gui_window_scroll_visible(struct gui_window *g, int x0, int y0, int
state.w = g->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;
}
@@ -972,8 +962,7 @@ static void gui_window_update_extent(struct gui_window *g)
info.w = g->window;
error = xwimp_get_window_info_header_only(&info);
if (error) {
- LOG(("xwimp_get_window_info_header_only: 0x%x: %s",
- error->errnum, error->errmess));
+ LOG("xwimp_get_window_info_header_only: 0x%x: %s", error->errnum, error->errmess);
warn_user("WimpError", error->errmess);
return;
}
@@ -1027,8 +1016,7 @@ void gui_window_set_pointer(struct gui_window *g, gui_pointer_shape shape)
error = xwimpspriteop_set_pointer_shape(entry->sprite_name,
1, entry->xactive, entry->yactive, 0, 0);
if (error) {
- LOG(("xwimpspriteop_set_pointer_shape: 0x%x: %s",
- error->errnum, error->errmess));
+ LOG("xwimpspriteop_set_pointer_shape: 0x%x: %s", error->errnum, error->errmess);
warn_user("WimpError", error->errmess);
}
} else {
@@ -1038,8 +1026,7 @@ void gui_window_set_pointer(struct gui_window *g, gui_pointer_shape shape)
(osspriteop_id) entry->sprite_name,
1, entry->xactive, entry->yactive, 0, 0);
if (error) {
- LOG(("xosspriteop_set_pointer_shape: 0x%x: %s",
- error->errnum, error->errmess));
+ LOG("xosspriteop_set_pointer_shape: 0x%x: %s", error->errnum, error->errmess);
warn_user("WimpError", error->errmess);
}
}
@@ -1119,8 +1106,7 @@ static void gui_window_remove_caret(struct gui_window *g)
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;
}
@@ -1166,8 +1152,7 @@ static bool gui_window_scroll_start(struct gui_window *g)
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 false;
}
@@ -1175,8 +1160,7 @@ static bool gui_window_scroll_start(struct gui_window *g)
info.w = g->window;
error = xwimp_get_window_info_header_only((wimp_window_info*)&info);
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 false;
}
@@ -1198,8 +1182,7 @@ static bool gui_window_scroll_start(struct gui_window *g)
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);
warn_user("WimpError", error->errmess);
return false;
}
@@ -1230,8 +1213,7 @@ static bool gui_window_drag_start(struct gui_window *g, gui_drag_type type,
* duration */
os_error *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 false;
}
@@ -1248,8 +1230,7 @@ static bool gui_window_drag_start(struct gui_window *g, gui_drag_type type,
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);
warn_user("WimpError", error->errmess);
return false;
}
@@ -1310,8 +1291,7 @@ void gui_window_set_extent(struct gui_window *g, int width, int height)
state.w = g->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;
}
@@ -1342,8 +1322,7 @@ void gui_window_set_extent(struct gui_window *g, int width, int height)
os_box extent = { 0, -height, width, toolbar_height };
error = xwimp_set_extent(g->window, &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);
warn_user("WimpError", error->errmess);
return;
}
@@ -1374,8 +1353,7 @@ static void gui_window_create_form_select_menu(struct gui_window *g,
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);
ro_gui_menu_destroy();
return;
@@ -1417,8 +1395,7 @@ void ro_gui_window_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);
warn_user("WimpError", error->errmess);
return;
}
@@ -1460,8 +1437,7 @@ void ro_gui_window_redraw(wimp_draw *redraw)
if (error && !(ro_gui_current_redraw_gui->
option.buffer_everything &&
error->errnum == error_WIMP_GET_RECT)) {
- LOG(("xwimp_get_rectangle: 0x%x: %s",
- error->errnum, error->errmess));
+ LOG("xwimp_get_rectangle: 0x%x: %s", error->errnum, error->errmess);
warn_user("WimpError", error->errmess);
ro_gui_current_redraw_gui = NULL;
return;
@@ -1512,8 +1488,7 @@ void ro_gui_window_open(wimp_open *open)
state.w = g->window;
error = xwimp_get_window_state_and_nesting(&state, &parent, &linkage);
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;
}
@@ -1618,8 +1593,7 @@ void ro_gui_window_open(wimp_open *open)
error = xwimp_open_window_nested_with_flags(&state, parent, linkage);
if (error) {
- LOG(("xwimp_open_window: 0x%x: %s",
- error->errnum, error->errmess));
+ LOG("xwimp_open_window: 0x%x: %s", error->errnum, error->errmess);
warn_user("WimpError", error->errmess);
return;
}
@@ -1658,8 +1632,7 @@ void ro_gui_window_close(wimp_w w)
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;
}
@@ -1687,9 +1660,7 @@ void ro_gui_window_close(wimp_w w)
}
error = xos_cli(temp_name);
if (error) {
- LOG(("xos_cli: 0x%x: %s",
- error->errnum,
- error->errmess));
+ LOG("xos_cli: 0x%x: %s", error->errnum, error->errmess);
warn_user("MiscError", error->errmess);
return;
}
@@ -1879,8 +1850,7 @@ bool ro_gui_window_handle_local_keypress(struct gui_window *g, wimp_key *key,
ro_error = xwimp_get_pointer_info(&pointer);
if (ro_error) {
- LOG(("xwimp_get_pointer_info: 0x%x: %s\n",
- ro_error->errnum, ro_error->errmess));
+ LOG("xwimp_get_pointer_info: 0x%x: %s\n", ro_error->errnum, ro_error->errmess);
warn_user("WimpError", ro_error->errmess);
return false;
}
@@ -2963,9 +2933,7 @@ bool ro_gui_window_menu_select(wimp_w w, wimp_i i, wimp_menu *menu,
state.w = w;
oserror = xwimp_get_window_state(&state);
if (oserror) {
- LOG(("xwimp_get_window_state: 0x%x: %s",
- oserror->errnum,
- oserror->errmess));
+ LOG("xwimp_get_window_state: 0x%x: %s", oserror->errnum, oserror->errmess);
warn_user("WimpError", oserror->errmess);
}
nsoption_set_int(window_x, state.visible.x0);
@@ -3155,8 +3123,7 @@ void ro_gui_window_scroll_action(struct gui_window *g,
state.w = g->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);
return;
}
@@ -3170,8 +3137,7 @@ void ro_gui_window_scroll_action(struct gui_window *g,
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;
}
@@ -3291,9 +3257,7 @@ void ro_gui_window_scroll_action(struct gui_window *g,
error = xwimp_open_window((wimp_open *) &state);
if (error) {
- LOG(("xwimp_open_window: 0x%x: %s",
- error->errnum,
- error->errmess));
+ LOG("xwimp_open_window: 0x%x: %s", error->errnum, error->errmess);
}
}
}
@@ -3331,8 +3295,7 @@ bool ro_gui_window_dataload(struct gui_window *g, wimp_message *message)
message->your_ref = message->my_ref;
error = xwimp_send_message(wimp_USER_MESSAGE, message, message->sender);
if (error) {
- LOG(("xwimp_send_message: 0x%x: %s\n",
- error->errnum, error->errmess));
+ LOG("xwimp_send_message: 0x%x: %s\n", error->errnum, error->errmess);
warn_user("WimpError", error->errmess);
}
@@ -3398,13 +3361,12 @@ void ro_gui_window_iconise(struct gui_window *g,
(osspriteop_id)overlay, &width, &height, NULL,
NULL);
if (error) {
- LOG(("xosspriteop_read_sprite_info: 0x%x: %s",
- error->errnum, error->errmess));
+ LOG("xosspriteop_read_sprite_info: 0x%x: %s", error->errnum, error->errmess);
warn_user("MiscError", error->errmess);
overlay = NULL;
}
else if (sprite_bpp(overlay) != 8) {
- LOG(("overlay sprite is not 8bpp"));
+ LOG("overlay sprite is not 8bpp");
overlay = NULL;
}
}
@@ -3413,7 +3375,7 @@ void ro_gui_window_iconise(struct gui_window *g,
bitmap = riscos_bitmap_create(width, height, BITMAP_NEW | BITMAP_OPAQUE |
BITMAP_CLEAR_MEMORY);
if (!bitmap) {
- LOG(("Thumbnail initialisation failed."));
+ LOG("Thumbnail initialisation failed.");
return;
}
riscos_bitmap_render(bitmap, h);
@@ -3423,7 +3385,7 @@ void ro_gui_window_iconise(struct gui_window *g,
area = riscos_bitmap_convert_8bpp(bitmap);
riscos_bitmap_destroy(bitmap);
if (!area) {
- LOG(("Thumbnail conversion failed."));
+ LOG("Thumbnail conversion failed.");
return;
}
@@ -3444,8 +3406,7 @@ void ro_gui_window_iconise(struct gui_window *g,
error = xosspriteop_save_sprite_file(osspriteop_USER_AREA,
area, temp_fname);
if (error) {
- LOG(("xosspriteop_save_sprite_file: 0x%x:%s",
- error->errnum, error->errmess));
+ LOG("xosspriteop_save_sprite_file: 0x%x:%s", error->errnum, error->errmess);
warn_user("MiscError", error->errmess);
free(area);
return;
@@ -3453,8 +3414,7 @@ void ro_gui_window_iconise(struct gui_window *g,
error = xwimpspriteop_merge_sprite_file(temp_fname);
if (error) {
- LOG(("xwimpspriteop_merge_sprite_file: 0x%x:%s",
- error->errnum, error->errmess));
+ LOG("xwimpspriteop_merge_sprite_file: 0x%x:%s", error->errnum, error->errmess);
warn_user("WimpError", error->errmess);
remove(temp_fname);
free(area);
@@ -3479,8 +3439,7 @@ void ro_gui_window_iconise(struct gui_window *g,
error = xwimp_send_message(wimp_USER_MESSAGE, (wimp_message*)wi,
wi->sender);
if (error) {
- LOG(("xwimp_send_message: 0x%x:%s",
- error->errnum, error->errmess));
+ LOG("xwimp_send_message: 0x%x:%s", error->errnum, error->errmess);
warn_user("WimpError", error->errmess);
}
else {
@@ -3511,23 +3470,20 @@ static void ro_gui_window_scroll_end(wimp_dragged *drag, void *data)
error = xwimp_drag_box((wimp_drag*)-1);
if (error) {
- LOG(("xwimp_drag_box: 0x%x : %s",
- error->errnum, error->errmess));
+ LOG("xwimp_drag_box: 0x%x : %s", error->errnum, error->errmess);
warn_user("WimpError", error->errmess);
}
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;
}
error = xwimpspriteop_set_pointer_shape("ptr_default", 0x31, 0, 0, 0, 0);
if (error) {
- LOG(("xwimpspriteop_set_pointer_shape: 0x%x: %s",
- error->errnum, error->errmess));
+ LOG("xwimpspriteop_set_pointer_shape: 0x%x: %s", error->errnum, error->errmess);
warn_user("WimpError", error->errmess);
}
@@ -3720,8 +3676,7 @@ bool ro_gui_toolbar_dataload(struct gui_window *g, wimp_message *message)
error = xwimp_send_message(wimp_USER_MESSAGE, message,
message->sender);
if (error) {
- LOG(("xwimp_send_message: 0x%x: %s\n",
- error->errnum, error->errmess));
+ LOG("xwimp_send_message: 0x%x: %s\n", error->errnum, error->errmess);
warn_user("WimpError", error->errmess);
}
return true;
@@ -4192,8 +4147,7 @@ void ro_gui_window_update_boxes(void)
error = xwimp_update_window(&update, &more);
if (error) {
- LOG(("xwimp_update_window: 0x%x: %s",
- error->errnum, error->errmess));
+ LOG("xwimp_update_window: 0x%x: %s", error->errnum, error->errmess);
warn_user("WimpError", error->errmess);
continue;
}
@@ -4226,8 +4180,7 @@ void ro_gui_window_update_boxes(void)
* found. This appears to be a bug in RISC OS. */
if (error && !(use_buffer &&
error->errnum == error_WIMP_GET_RECT)) {
- LOG(("xwimp_get_rectangle: 0x%x: %s",
- error->errnum, error->errmess));
+ LOG("xwimp_get_rectangle: 0x%x: %s", error->errnum, error->errmess);
warn_user("WimpError", error->errmess);
ro_gui_current_redraw_gui = NULL;
continue;
@@ -4420,8 +4373,7 @@ bool ro_gui_window_import_text(struct gui_window *g, const char *filename)
error = xosfile_read_stamped(filename, &obj_type, NULL, NULL,
&size, NULL, NULL);
if (error) {
- LOG(("xosfile_read_stamped: 0x%x:%s",
- error->errnum, error->errmess));
+ LOG("xosfile_read_stamped: 0x%x:%s", error->errnum, error->errmess);
warn_user("FileError", error->errmess);
return true; /* was for us, but it didn't work! */
}
@@ -4440,8 +4392,7 @@ bool ro_gui_window_import_text(struct gui_window *g, const char *filename)
NULL, NULL, NULL, NULL, NULL);
if (error) {
- LOG(("xosfile_load_stamped: 0x%x:%s",
- error->errnum, error->errmess));
+ LOG("xosfile_load_stamped: 0x%x:%s", error->errnum, error->errmess);
warn_user("LoadError", error->errmess);
free(buf);
return true;
@@ -4451,7 +4402,7 @@ bool ro_gui_window_import_text(struct gui_window *g, const char *filename)
if (ret != NSERROR_OK) {
/* bad encoding shouldn't happen */
assert(ret != NSERROR_BAD_ENCODING);
- LOG(("utf8_from_local_encoding failed"));
+ LOG("utf8_from_local_encoding failed");
free(buf);
warn_user("NoMemory", NULL);
return true;
@@ -4624,7 +4575,7 @@ bool ro_gui_window_prepare_form_select_menu(struct gui_window *g,
if (err != NSERROR_OK) {
/* badenc should never happen */
assert(err != NSERROR_BAD_ENCODING);
- LOG(("utf8_to_local_encoding failed"));
+ LOG("utf8_to_local_encoding failed");
warn_user("NoMemory", 0);
ro_gui_menu_destroy();
return false;
@@ -4650,7 +4601,7 @@ bool ro_gui_window_prepare_form_select_menu(struct gui_window *g,
temp = cnv_space2nbsp(option->text);
if (!temp) {
- LOG(("cnv_space2nbsp failed"));
+ LOG("cnv_space2nbsp failed");
warn_user("NoMemory", 0);
ro_gui_menu_destroy();
return false;
@@ -4662,7 +4613,7 @@ bool ro_gui_window_prepare_form_select_menu(struct gui_window *g,
/* A bad encoding should never happen,
* so assert this */
assert(err != NSERROR_BAD_ENCODING);
- LOG(("utf8_to_enc failed"));
+ LOG("utf8_to_enc failed");
warn_user("NoMemory", 0);
ro_gui_menu_destroy();
return false;
@@ -4773,8 +4724,7 @@ bool ro_gui_window_to_window_pos(struct gui_window *g, int x, int y,
state.w = g->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 false;
}
@@ -4805,8 +4755,7 @@ bool ro_gui_window_to_screen_pos(struct gui_window *g, int x, int y,
state.w = g->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 false;
}