summaryrefslogtreecommitdiff
path: root/riscos/window.c
diff options
context:
space:
mode:
Diffstat (limited to 'riscos/window.c')
-rw-r--r--riscos/window.c122
1 files changed, 61 insertions, 61 deletions
diff --git a/riscos/window.c b/riscos/window.c
index acf51c546..ab1501cd6 100644
--- a/riscos/window.c
+++ b/riscos/window.c
@@ -390,7 +390,7 @@ static void gui_window_place_caret(struct gui_window *g, int x, int y, int heigh
x * 2, -(y + height) * 2, height * 2, -1);
if (error) {
LOG("xwimp_set_caret_position: 0x%x: %s", error->errnum, error->errmess);
- warn_user("WimpError", error->errmess);
+ ro_warn_user("WimpError", error->errmess);
}
}
@@ -417,7 +417,7 @@ static struct gui_window *gui_window_create(struct browser_window *bw,
g = malloc(sizeof *g);
if (!g) {
- warn_user("NoMemory", 0);
+ ro_warn_user("NoMemory", 0);
return 0;
}
g->bw = bw;
@@ -439,7 +439,7 @@ static struct gui_window *gui_window_create(struct browser_window *bw,
error = xwimp_get_window_state(&state);
if (error) {
LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess);
- warn_user("WimpError", error->errmess);
+ ro_warn_user("WimpError", error->errmess);
}
window.visible.x0 = state.visible.x0;
window.visible.x1 = state.visible.x1;
@@ -543,7 +543,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);
- warn_user("WimpError", error->errmess);
+ ro_warn_user("WimpError", error->errmess);
free(g);
return 0;
}
@@ -604,7 +604,7 @@ static struct gui_window *gui_window_create(struct browser_window *bw,
error = xwimp_get_window_state(&state);
if (error) {
LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess);
- warn_user("WimpError", error->errmess);
+ ro_warn_user("WimpError", error->errmess);
return g;
}
@@ -663,7 +663,7 @@ static void gui_window_destroy(struct gui_window *g)
error = xwimp_delete_window(w);
if (error) {
LOG("xwimp_delete_window: 0x%x: %s", error->errnum, error->errmess);
- warn_user("WimpError", error->errmess);
+ ro_warn_user("WimpError", error->errmess);
}
ro_gui_wimp_event_finalise(w);
@@ -715,14 +715,14 @@ void gui_window_redraw_window(struct gui_window *g)
error = xwimp_get_window_info_header_only(&info);
if (error) {
LOG("xwimp_get_window_info_header_only: 0x%x: %s", error->errnum, error->errmess);
- warn_user("WimpError", error->errmess);
+ ro_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);
- warn_user("WimpError", error->errmess);
+ ro_warn_user("WimpError", error->errmess);
}
}
@@ -766,7 +766,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.");
- warn_user("NoMemory", 0);
+ ro_warn_user("NoMemory", 0);
return;
}
cur->x0 = x0;
@@ -801,7 +801,7 @@ static bool gui_window_get_scroll(struct gui_window *g, int *sx, int *sy)
error = xwimp_get_window_state(&state);
if (error) {
LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess);
- warn_user("WimpError", error->errmess);
+ ro_warn_user("WimpError", error->errmess);
return false;
}
@@ -832,7 +832,7 @@ static void gui_window_set_scroll(struct gui_window *g, int sx, int sy)
error = xwimp_get_window_state(&state);
if (error) {
LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess);
- warn_user("WimpError", error->errmess);
+ ro_warn_user("WimpError", error->errmess);
return;
}
@@ -868,7 +868,7 @@ static void gui_window_scroll_visible(struct gui_window *g, int x0, int y0, int
error = xwimp_get_window_state(&state);
if (error) {
LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess);
- warn_user("WimpError", error->errmess);
+ ro_warn_user("WimpError", error->errmess);
return;
}
@@ -966,7 +966,7 @@ static void gui_window_update_extent(struct gui_window *g)
error = xwimp_get_window_info_header_only(&info);
if (error) {
LOG("xwimp_get_window_info_header_only: 0x%x: %s", error->errnum, error->errmess);
- warn_user("WimpError", error->errmess);
+ ro_warn_user("WimpError", error->errmess);
return;
}
@@ -1020,7 +1020,7 @@ void gui_window_set_pointer(struct gui_window *g, gui_pointer_shape shape)
1, entry->xactive, entry->yactive, 0, 0);
if (error) {
LOG("xwimpspriteop_set_pointer_shape: 0x%x: %s", error->errnum, error->errmess);
- warn_user("WimpError", error->errmess);
+ ro_warn_user("WimpError", error->errmess);
}
} else {
/* pointer in our own sprite area */
@@ -1030,7 +1030,7 @@ void gui_window_set_pointer(struct gui_window *g, gui_pointer_shape shape)
1, entry->xactive, entry->yactive, 0, 0);
if (error) {
LOG("xosspriteop_set_pointer_shape: 0x%x: %s", error->errnum, error->errmess);
- warn_user("WimpError", error->errmess);
+ ro_warn_user("WimpError", error->errmess);
}
}
@@ -1122,7 +1122,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);
- warn_user("WimpError", error->errmess);
+ ro_warn_user("WimpError", error->errmess);
return;
}
@@ -1168,7 +1168,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);
- warn_user("WimpError", error->errmess);
+ ro_warn_user("WimpError", error->errmess);
return false;
}
@@ -1176,7 +1176,7 @@ static bool gui_window_scroll_start(struct gui_window *g)
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);
- warn_user("WimpError", error->errmess);
+ ro_warn_user("WimpError", error->errmess);
return false;
}
@@ -1198,7 +1198,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);
- warn_user("WimpError", error->errmess);
+ ro_warn_user("WimpError", error->errmess);
return false;
}
@@ -1229,7 +1229,7 @@ static bool gui_window_drag_start(struct gui_window *g, gui_drag_type type,
os_error *error = xwimp_get_pointer_info(&pointer);
if (error) {
LOG("xwimp_get_pointer_info 0x%x : %s", error->errnum, error->errmess);
- warn_user("WimpError", error->errmess);
+ ro_warn_user("WimpError", error->errmess);
return false;
}
@@ -1246,7 +1246,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);
- warn_user("WimpError", error->errmess);
+ ro_warn_user("WimpError", error->errmess);
return false;
}
}
@@ -1307,7 +1307,7 @@ void gui_window_set_extent(struct gui_window *g, int width, int height)
error = xwimp_get_window_state(&state);
if (error) {
LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess);
- warn_user("WimpError", error->errmess);
+ ro_warn_user("WimpError", error->errmess);
return;
}
if (width == -1)
@@ -1338,7 +1338,7 @@ void gui_window_set_extent(struct gui_window *g, int width, int height)
error = xwimp_set_extent(g->window, &extent);
if (error) {
LOG("xwimp_set_extent: 0x%x: %s", error->errnum, error->errmess);
- warn_user("WimpError", error->errmess);
+ ro_warn_user("WimpError", error->errmess);
return;
}
}
@@ -1369,7 +1369,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);
- warn_user("WimpError", error->errmess);
+ ro_warn_user("WimpError", error->errmess);
ro_gui_menu_destroy();
return;
}
@@ -1411,7 +1411,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);
- warn_user("WimpError", error->errmess);
+ ro_warn_user("WimpError", error->errmess);
return;
}
while (more) {
@@ -1453,7 +1453,7 @@ void ro_gui_window_redraw(wimp_draw *redraw)
option.buffer_everything &&
error->errnum == error_WIMP_GET_RECT)) {
LOG("xwimp_get_rectangle: 0x%x: %s", error->errnum, error->errmess);
- warn_user("WimpError", error->errmess);
+ ro_warn_user("WimpError", error->errmess);
ro_gui_current_redraw_gui = NULL;
return;
}
@@ -1504,7 +1504,7 @@ void ro_gui_window_open(wimp_open *open)
error = xwimp_get_window_state_and_nesting(&state, &parent, &linkage);
if (error) {
LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess);
- warn_user("WimpError", error->errmess);
+ ro_warn_user("WimpError", error->errmess);
return;
}
@@ -1609,7 +1609,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);
- warn_user("WimpError", error->errmess);
+ ro_warn_user("WimpError", error->errmess);
return;
}
@@ -1648,7 +1648,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);
- warn_user("WimpError", error->errmess);
+ ro_warn_user("WimpError", error->errmess);
return;
}
@@ -1676,7 +1676,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);
- warn_user("MiscError", error->errmess);
+ ro_warn_user("MiscError", error->errmess);
return;
}
free(temp_name);
@@ -1866,7 +1866,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);
- warn_user("WimpError", ro_error->errmess);
+ ro_warn_user("WimpError", ro_error->errmess);
return false;
}
@@ -1890,7 +1890,7 @@ bool ro_gui_window_handle_local_keypress(struct gui_window *g, wimp_key *key,
nsurl_unref(url);
}
if (error != NSERROR_OK) {
- warn_user(messages_get_errorcode(error), 0);
+ ro_warn_user(messages_get_errorcode(error), 0);
}
return true;
}
@@ -2950,7 +2950,7 @@ bool ro_gui_window_menu_select(wimp_w w, wimp_i i, wimp_menu *menu,
oserror = xwimp_get_window_state(&state);
if (oserror) {
LOG("xwimp_get_window_state: 0x%x: %s", oserror->errnum, oserror->errmess);
- warn_user("WimpError", oserror->errmess);
+ ro_warn_user("WimpError", oserror->errmess);
}
nsoption_set_int(window_x, state.visible.x0);
nsoption_set_int(window_y, state.visible.y0);
@@ -3005,7 +3005,7 @@ bool ro_gui_window_menu_select(wimp_w w, wimp_i i, wimp_menu *menu,
}
if (error != NSERROR_OK) {
- warn_user(messages_get_errorcode(error), 0);
+ ro_warn_user(messages_get_errorcode(error), 0);
}
return true;
@@ -3154,7 +3154,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);
- warn_user("WimpError", error->errmess);
+ ro_warn_user("WimpError", error->errmess);
return;
}
@@ -3312,7 +3312,7 @@ bool ro_gui_window_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);
- warn_user("WimpError", error->errmess);
+ ro_warn_user("WimpError", error->errmess);
}
return true;
@@ -3378,7 +3378,7 @@ void ro_gui_window_iconise(struct gui_window *g,
NULL);
if (error) {
LOG("xosspriteop_read_sprite_info: 0x%x: %s", error->errnum, error->errmess);
- warn_user("MiscError", error->errmess);
+ ro_warn_user("MiscError", error->errmess);
overlay = NULL;
}
else if (sprite_bpp(overlay) != 8) {
@@ -3423,7 +3423,7 @@ void ro_gui_window_iconise(struct gui_window *g,
area, temp_fname);
if (error) {
LOG("xosspriteop_save_sprite_file: 0x%x:%s", error->errnum, error->errmess);
- warn_user("MiscError", error->errmess);
+ ro_warn_user("MiscError", error->errmess);
free(area);
return;
}
@@ -3431,7 +3431,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);
- warn_user("WimpError", error->errmess);
+ ro_warn_user("WimpError", error->errmess);
remove(temp_fname);
free(area);
return;
@@ -3456,7 +3456,7 @@ void ro_gui_window_iconise(struct gui_window *g,
wi->sender);
if (error) {
LOG("xwimp_send_message: 0x%x:%s", error->errnum, error->errmess);
- warn_user("WimpError", error->errmess);
+ ro_warn_user("WimpError", error->errmess);
}
else {
g->iconise_icon = id;
@@ -3487,20 +3487,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);
- warn_user("WimpError", error->errmess);
+ ro_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);
- warn_user("WimpError", error->errmess);
+ ro_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);
- warn_user("WimpError", error->errmess);
+ ro_warn_user("WimpError", error->errmess);
}
if (ro_gui_window_to_window_pos(g, drag->final.x0, drag->final.y0, &pos))
@@ -3649,14 +3649,14 @@ void ro_gui_window_toolbar_click(void *data,
case TOOLBAR_BUTTON_UP:
err = browser_window_navigate_up(g->bw, false);
if (err != NSERROR_OK) {
- warn_user(messages_get_errorcode(err), NULL);
+ ro_warn_user(messages_get_errorcode(err), NULL);
}
break;
case TOOLBAR_BUTTON_UP_NEW:
err = browser_window_navigate_up(g->bw, true);
if (err != NSERROR_OK) {
- warn_user(messages_get_errorcode(err), NULL);
+ ro_warn_user(messages_get_errorcode(err), NULL);
}
break;
@@ -3693,7 +3693,7 @@ bool ro_gui_toolbar_dataload(struct gui_window *g, wimp_message *message)
message->sender);
if (error) {
LOG("xwimp_send_message: 0x%x: %s\n", error->errnum, error->errmess);
- warn_user("WimpError", error->errmess);
+ ro_warn_user("WimpError", error->errmess);
}
return true;
}
@@ -3885,7 +3885,7 @@ void ro_gui_window_launch_url(struct gui_window *g, const char *url1)
error = nsurl_create(url1, &url);
if (error != NSERROR_OK) {
- warn_user(messages_get_errorcode(error), 0);
+ ro_warn_user(messages_get_errorcode(error), 0);
} else {
ro_gui_window_set_url(g, url);
@@ -3928,7 +3928,7 @@ void ro_gui_window_action_home(struct gui_window *g)
nsurl_unref(url);
}
if (error != NSERROR_OK) {
- warn_user(messages_get_errorcode(error), 0);
+ ro_warn_user(messages_get_errorcode(error), 0);
}
}
@@ -3951,7 +3951,7 @@ void ro_gui_window_action_new_window(struct gui_window *g)
NULL, g->bw, NULL);
if (error != NSERROR_OK) {
- warn_user(messages_get_errorcode(error), 0);
+ ro_warn_user(messages_get_errorcode(error), 0);
}
}
@@ -4164,7 +4164,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);
- warn_user("WimpError", error->errmess);
+ ro_warn_user("WimpError", error->errmess);
continue;
}
@@ -4197,7 +4197,7 @@ void ro_gui_window_update_boxes(void)
if (error && !(use_buffer &&
error->errnum == error_WIMP_GET_RECT)) {
LOG("xwimp_get_rectangle: 0x%x: %s", error->errnum, error->errmess);
- warn_user("WimpError", error->errmess);
+ ro_warn_user("WimpError", error->errmess);
ro_gui_current_redraw_gui = NULL;
continue;
}
@@ -4390,7 +4390,7 @@ bool ro_gui_window_import_text(struct gui_window *g, const char *filename)
&size, NULL, NULL);
if (error) {
LOG("xosfile_read_stamped: 0x%x:%s", error->errnum, error->errmess);
- warn_user("FileError", error->errmess);
+ ro_warn_user("FileError", error->errmess);
return true; /* was for us, but it didn't work! */
}
@@ -4400,7 +4400,7 @@ bool ro_gui_window_import_text(struct gui_window *g, const char *filename)
buf = calloc(size + 1, sizeof(char));
if (!buf) {
- warn_user("NoMemory", NULL);
+ ro_warn_user("NoMemory", NULL);
return true;
}
@@ -4409,7 +4409,7 @@ bool ro_gui_window_import_text(struct gui_window *g, const char *filename)
if (error) {
LOG("xosfile_load_stamped: 0x%x:%s", error->errnum, error->errmess);
- warn_user("LoadError", error->errmess);
+ ro_warn_user("LoadError", error->errmess);
free(buf);
return true;
}
@@ -4420,7 +4420,7 @@ bool ro_gui_window_import_text(struct gui_window *g, const char *filename)
assert(ret != NSERROR_BAD_ENCODING);
LOG("utf8_from_local_encoding failed");
free(buf);
- warn_user("NoMemory", NULL);
+ ro_warn_user("NoMemory", NULL);
return true;
}
size = strlen(utf8_buf);
@@ -4582,7 +4582,7 @@ bool ro_gui_window_prepare_form_select_menu(struct gui_window *g,
reopen = false;
gui_form_select_menu = malloc(wimp_SIZEOF_MENU(entries));
if (!gui_form_select_menu) {
- warn_user("NoMemory", 0);
+ ro_warn_user("NoMemory", 0);
ro_gui_menu_destroy();
return false;
}
@@ -4592,7 +4592,7 @@ bool ro_gui_window_prepare_form_select_menu(struct gui_window *g,
/* badenc should never happen */
assert(err != NSERROR_BAD_ENCODING);
LOG("utf8_to_local_encoding failed");
- warn_user("NoMemory", 0);
+ ro_warn_user("NoMemory", 0);
ro_gui_menu_destroy();
return false;
}
@@ -4618,7 +4618,7 @@ bool ro_gui_window_prepare_form_select_menu(struct gui_window *g,
temp = cnv_space2nbsp(option->text);
if (!temp) {
LOG("cnv_space2nbsp failed");
- warn_user("NoMemory", 0);
+ ro_warn_user("NoMemory", 0);
ro_gui_menu_destroy();
return false;
}
@@ -4630,7 +4630,7 @@ bool ro_gui_window_prepare_form_select_menu(struct gui_window *g,
* so assert this */
assert(err != NSERROR_BAD_ENCODING);
LOG("utf8_to_enc failed");
- warn_user("NoMemory", 0);
+ ro_warn_user("NoMemory", 0);
ro_gui_menu_destroy();
return false;
}
@@ -4741,7 +4741,7 @@ bool ro_gui_window_to_window_pos(struct gui_window *g, int x, int y,
error = xwimp_get_window_state(&state);
if (error) {
LOG("xwimp_get_window_state: 0x%x:%s", error->errnum, error->errmess);
- warn_user("WimpError", error->errmess);
+ ro_warn_user("WimpError", error->errmess);
return false;
}
pos->x = (x - (state.visible.x0 - state.xscroll)) / 2 / g->scale;
@@ -4772,7 +4772,7 @@ bool ro_gui_window_to_screen_pos(struct gui_window *g, int x, int y,
error = xwimp_get_window_state(&state);
if (error) {
LOG("xwimp_get_window_state: 0x%x:%s", error->errnum, error->errmess);
- warn_user("WimpError", error->errmess);
+ ro_warn_user("WimpError", error->errmess);
return false;
}
pos->x = (x * 2 * g->scale) + (state.visible.x0 - state.xscroll);
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-24 16:32:45 +0000