diff options
Diffstat (limited to 'frontends/riscos')
| -rw-r--r-- | frontends/riscos/gui/url_bar.c | 1076 |
1 files changed, 590 insertions, 486 deletions
diff --git a/frontends/riscos/gui/url_bar.c b/frontends/riscos/gui/url_bar.c index 3e2066fbc..56fee0317 100644 --- a/frontends/riscos/gui/url_bar.c +++ b/frontends/riscos/gui/url_bar.c @@ -25,20 +25,11 @@ * the use of the hlcache content interface. */ -#include <alloca.h> -#include <assert.h> -#include <stdio.h> -#include <stdbool.h> -#include <stdlib.h> -#include <string.h> -#include "oslib/os.h" -#include "oslib/osspriteop.h" +#include <stddef.h> #include "oslib/wimp.h" #include "utils/log.h" #include "utils/messages.h" -#include "utils/utf8.h" -#include "utils/nsurl.h" #include "netsurf/browser_window.h" #include "netsurf/plotters.h" #include "netsurf/content.h" @@ -46,13 +37,13 @@ #include "riscos/gui.h" #include "riscos/hotlist.h" -#include "riscos/gui/url_bar.h" #include "riscos/url_suggest.h" #include "riscos/wimp.h" #include "riscos/wimp_event.h" #include "riscos/window.h" #include "riscos/ucstables.h" #include "riscos/filetype.h" +#include "riscos/gui/url_bar.h" #define URLBAR_HEIGHT 52 #define URLBAR_FAVICON_SIZE 16 @@ -135,129 +126,50 @@ static struct url_bar_resource url_bar_res[URLBAR_RES_LAST] = { }; -static void ro_gui_url_bar_set_hotlist(struct url_bar *url_bar, bool set); - - -/* This is an exported interface documented in url_bar.h */ -struct url_bar *ro_gui_url_bar_create(struct theme_descriptor *theme) -{ - struct url_bar *url_bar; - - /* Allocate memory. */ - - url_bar = malloc(sizeof(struct url_bar)); - if (url_bar == NULL) { - NSLOG(netsurf, INFO, "No memory for malloc()"); - return NULL; - } - - /* Set up default parameters. */ - - url_bar->theme = theme; - url_bar->sprites = ro_gui_theme_get_sprites(theme); - - url_bar->display = false; - url_bar->shaded = false; - - url_bar->x_min = URLBAR_FAVICON_WIDTH + URLBAR_MIN_WIDTH + - URLBAR_HOTLIST_WIDTH; - url_bar->y_min = URLBAR_HEIGHT; - - url_bar->extent.x0 = 0; - url_bar->extent.y0 = 0; - url_bar->extent.x1 = 0; - url_bar->extent.y1 = 0; - - url_bar->window = NULL; - url_bar->container_icon = -1; - url_bar->text_icon = -1; - url_bar->suggest_icon = -1; - - url_bar->pginfo_extent.x0 = 0; - url_bar->pginfo_extent.y0 = 0; - url_bar->pginfo_extent.x1 = 0; - url_bar->pginfo_extent.y1 = 0; - strncpy(url_bar->pginfo_sprite, - "pgiinternal", - URLBAR_PGINFO_NAME_LENGTH); - - url_bar->favicon_extent.x0 = 0; - url_bar->favicon_extent.y0 = 0; - url_bar->favicon_extent.x1 = 0; - url_bar->favicon_extent.y1 = 0; - url_bar->favicon_width = 0; - url_bar->favicon_height = 0; - url_bar->favicon_content = NULL; - url_bar->favicon_type = 0; - strncpy(url_bar->favicon_sprite, - "Ssmall_xxx", - URLBAR_FAVICON_NAME_LENGTH); - - url_bar->hotlist.set = false; - url_bar->hotlist.extent.x0 = 0; - url_bar->hotlist.extent.y0 = 0; - url_bar->hotlist.extent.x1 = 0; - url_bar->hotlist.extent.y1 = 0; - - url_bar->text_size = RO_GUI_MAX_URL_SIZE; - url_bar->text_buffer = malloc(url_bar->text_size); - if (url_bar->text_buffer == NULL) { - free(url_bar); - return NULL; - } - url_bar->text_buffer[0] = 0; - url_bar->text_buffer_utf8 = NULL; - - url_bar->hidden = false; - - return url_bar; -} - - /** * Position the icons in the URL bar to take account of the currently * configured extent. * - * \param *url_bar The URL bar to update. - * \param full true to resize everything; false to move only - * the right-hand end of the bar. - * \return true if successful; else false. + * \param *url_bar The URL bar to update. + * \param full true to resize everything; + * false to move only the right-hand end of the bar. + * \return true if successful; else false. */ - static bool ro_gui_url_bar_icon_resize(struct url_bar *url_bar, bool full) { - int x0, y0, x1, y1; - int centre; - os_error *error; - os_coord eig = {1, 1}; - wimp_caret caret; - - if (url_bar == NULL || url_bar->window == NULL) + int x0, y0, x1, y1; + int centre; + os_error *error; + os_coord eig = {1, 1}; + wimp_caret caret; + + if ((url_bar == NULL) || + (url_bar->window == NULL)) { return false; + } /* calculate 1px in OS units */ ro_convert_pixels_to_os_units(&eig, (os_mode) -1); /* The vertical centre line of the widget's extent. */ - centre = url_bar->extent.y0 + - (url_bar->extent.y1 - url_bar->extent.y0) / 2; + (url_bar->extent.y1 - url_bar->extent.y0) / 2; /* Position the container icon. */ - if (url_bar->container_icon != -1) { x0 = url_bar->extent.x0; x1 = url_bar->extent.x1 - - url_bar->suggest_x - URLBAR_GRIGHT_GUTTER; + url_bar->suggest_x - URLBAR_GRIGHT_GUTTER; y0 = centre - (URLBAR_HEIGHT / 2); y1 = y0 + URLBAR_HEIGHT; error = xwimp_resize_icon(url_bar->window, - url_bar->container_icon, - x0, y0, x1, y1); + url_bar->container_icon, + x0, y0, x1, y1); if (error != NULL) { - NSLOG(netsurf, INFO, "xwimp_resize_icon: 0x%x: %s", + NSLOG(netsurf, INFO, + "xwimp_resize_icon: 0x%x: %s", error->errnum, error->errmess); ro_warn_user("WimpError", error->errmess); url_bar->container_icon = -1; @@ -266,7 +178,6 @@ static bool ro_gui_url_bar_icon_resize(struct url_bar *url_bar, bool full) } /* Position the URL Suggest icon. */ - if (url_bar->suggest_icon != -1) { x0 = url_bar->extent.x1 - url_bar->suggest_x; x1 = url_bar->extent.x1; @@ -275,10 +186,11 @@ static bool ro_gui_url_bar_icon_resize(struct url_bar *url_bar, bool full) y1 = y0 + url_bar->suggest_y; error = xwimp_resize_icon(url_bar->window, - url_bar->suggest_icon, - x0, y0, x1, y1); + url_bar->suggest_icon, + x0, y0, x1, y1); if (error != NULL) { - NSLOG(netsurf, INFO, "xwimp_resize_icon: 0x%x: %s", + NSLOG(netsurf, INFO, + "xwimp_resize_icon: 0x%x: %s", error->errnum, error->errmess); ro_warn_user("WimpError", error->errmess); url_bar->suggest_icon = -1; @@ -287,20 +199,20 @@ static bool ro_gui_url_bar_icon_resize(struct url_bar *url_bar, bool full) } /* Position the Text icon. */ - if (url_bar->text_icon != -1) { x0 = url_bar->extent.x0 + URLBAR_PGINFO_WIDTH + URLBAR_FAVICON_WIDTH; x1 = url_bar->extent.x1 - eig.x - URLBAR_HOTLIST_WIDTH - - url_bar->suggest_x - URLBAR_GRIGHT_GUTTER; + url_bar->suggest_x - URLBAR_GRIGHT_GUTTER; y0 = centre - (URLBAR_HEIGHT / 2) + eig.y; y1 = y0 + URLBAR_HEIGHT - 2 * eig.y; error = xwimp_resize_icon(url_bar->window, - url_bar->text_icon, - x0, y0, x1, y1); + url_bar->text_icon, + x0, y0, x1, y1); if (error != NULL) { - NSLOG(netsurf, INFO, "xwimp_resize_icon: 0x%x: %s", + NSLOG(netsurf, INFO, + "xwimp_resize_icon: 0x%x: %s", error->errnum, error->errmess); ro_warn_user("WimpError", error->errmess); url_bar->text_icon = -1; @@ -309,47 +221,47 @@ static bool ro_gui_url_bar_icon_resize(struct url_bar *url_bar, bool full) if (xwimp_get_caret_position(&caret) == NULL) { if ((caret.w == url_bar->window) && - (caret.i == url_bar->text_icon)) { + (caret.i == url_bar->text_icon)) { xwimp_set_caret_position(url_bar->window, - url_bar->text_icon, caret.pos.x, - caret.pos.y, -1, caret.index); + url_bar->text_icon, + caret.pos.x, + caret.pos.y, + -1, + caret.index); } } } /* Position the page info icon. */ - url_bar->pginfo_extent.x0 = url_bar->extent.x0 + eig.x; url_bar->pginfo_extent.x1 = url_bar->extent.x0 + URLBAR_PGINFO_WIDTH; url_bar->pginfo_extent.y0 = centre - (URLBAR_HEIGHT / 2) + eig.y; url_bar->pginfo_extent.y1 = url_bar->pginfo_extent.y0 + URLBAR_HEIGHT - - 2 * eig.y; + - 2 * eig.y; /* Position the Favicon icon. */ - url_bar->favicon_extent.x0 = url_bar->extent.x0 + URLBAR_PGINFO_WIDTH ; url_bar->favicon_extent.x1 = url_bar->extent.x0 + URLBAR_PGINFO_WIDTH + URLBAR_FAVICON_WIDTH; url_bar->favicon_extent.y0 = centre - (URLBAR_HEIGHT / 2) + eig.y; url_bar->favicon_extent.y1 = url_bar->favicon_extent.y0 + URLBAR_HEIGHT - - 2 * eig.y; + - 2 * eig.y; /* Position the Hotlist icon. */ - url_bar->hotlist.extent.x0 = url_bar->extent.x1 - eig.x - - URLBAR_HOTLIST_WIDTH - url_bar->suggest_x - - URLBAR_GRIGHT_GUTTER; + URLBAR_HOTLIST_WIDTH - url_bar->suggest_x - + URLBAR_GRIGHT_GUTTER; url_bar->hotlist.extent.x1 = url_bar->hotlist.extent.x0 + - URLBAR_HOTLIST_WIDTH; + URLBAR_HOTLIST_WIDTH; url_bar->hotlist.extent.y0 = centre - (URLBAR_HEIGHT / 2) + eig.y; url_bar->hotlist.extent.y1 = url_bar->hotlist.extent.y0 + URLBAR_HEIGHT - - 2 * eig.y; + - 2 * eig.y; url_bar->hotlist.offset.x = ((url_bar->hotlist.extent.x1 - - url_bar->hotlist.extent.x0) - - (URLBAR_HOTLIST_SIZE * 2)) / 2; + url_bar->hotlist.extent.x0) - + (URLBAR_HOTLIST_SIZE * 2)) / 2; url_bar->hotlist.offset.y = ((url_bar->hotlist.extent.y1 - - url_bar->hotlist.extent.y0) - - (URLBAR_HOTLIST_SIZE * 2)) / 2 - 1; + url_bar->hotlist.extent.y0) - + (URLBAR_HOTLIST_SIZE * 2)) / 2 - 1; return true; } @@ -359,18 +271,19 @@ static bool ro_gui_url_bar_icon_resize(struct url_bar *url_bar, bool full) * Create or delete a URL bar's icons if required to bring it into sync with * the current hidden setting. * - * \param *url_bar The URL bar to update. - * \return true if successful; else false. + * \param *url_bar The URL bar to update. + * \return true if successful; else false. */ - static bool ro_gui_url_bar_icon_update(struct url_bar *url_bar) { - wimp_icon_create icon; - os_error *error; - bool resize; + wimp_icon_create icon; + os_error *error; + bool resize; - if (url_bar == NULL || url_bar->window == NULL) + if ((url_bar == NULL) || + (url_bar->window == NULL)) { return false; + } icon.w = url_bar->window; icon.icon.extent.x0 = 0; @@ -384,13 +297,12 @@ static bool ro_gui_url_bar_icon_update(struct url_bar *url_bar) if (!url_bar->hidden && url_bar->container_icon == -1) { icon.icon.flags = wimp_ICON_BORDER | - (wimp_COLOUR_BLACK << - wimp_ICON_FG_COLOUR_SHIFT) | - (wimp_BUTTON_DOUBLE_CLICK_DRAG << - wimp_ICON_BUTTON_TYPE_SHIFT); + (wimp_COLOUR_BLACK << wimp_ICON_FG_COLOUR_SHIFT) | + (wimp_BUTTON_DOUBLE_CLICK_DRAG << wimp_ICON_BUTTON_TYPE_SHIFT); error = xwimp_create_icon(&icon, &url_bar->container_icon); if (error != NULL) { - NSLOG(netsurf, INFO, "xwimp_create_icon: 0x%x: %s", + NSLOG(netsurf, INFO, + "xwimp_create_icon: 0x%x: %s", error->errnum, error->errmess); ro_warn_user("WimpError", error->errmess); url_bar->container_icon = -1; @@ -398,11 +310,13 @@ static bool ro_gui_url_bar_icon_update(struct url_bar *url_bar) } resize = true; - } else if (url_bar->hidden && url_bar->container_icon != -1){ + } else if ((url_bar->hidden) && + (url_bar->container_icon != -1)) { error = xwimp_delete_icon(url_bar->window, - url_bar->container_icon); + url_bar->container_icon); if (error != NULL) { - NSLOG(netsurf, INFO, "xwimp_delete_icon: 0x%x: %s", + NSLOG(netsurf, INFO, + "xwimp_delete_icon: 0x%x: %s", error->errnum, error->errmess); ro_warn_user("WimpError", error->errmess); return false; @@ -412,24 +326,28 @@ static bool ro_gui_url_bar_icon_update(struct url_bar *url_bar) } /* Create or delete the text icon. */ - - if (!url_bar->hidden && url_bar->text_icon == -1) { + if (!url_bar->hidden && + url_bar->text_icon == -1) { icon.icon.data.indirected_text.text = url_bar->text_buffer; icon.icon.data.indirected_text.validation = text_validation; icon.icon.data.indirected_text.size = url_bar->text_size; - icon.icon.flags = wimp_ICON_TEXT | wimp_ICON_INDIRECTED | - wimp_ICON_VCENTRED | wimp_ICON_FILLED | - (wimp_COLOUR_BLACK << - wimp_ICON_FG_COLOUR_SHIFT); - if (url_bar->display) + icon.icon.flags = wimp_ICON_TEXT | + wimp_ICON_INDIRECTED | + wimp_ICON_VCENTRED | + wimp_ICON_FILLED | + (wimp_COLOUR_BLACK << wimp_ICON_FG_COLOUR_SHIFT); + + if (url_bar->display) { icon.icon.flags |= (wimp_BUTTON_NEVER << - wimp_ICON_BUTTON_TYPE_SHIFT); - else + wimp_ICON_BUTTON_TYPE_SHIFT); + } else { icon.icon.flags |= (wimp_BUTTON_WRITE_CLICK_DRAG << - wimp_ICON_BUTTON_TYPE_SHIFT); + wimp_ICON_BUTTON_TYPE_SHIFT); + } error = xwimp_create_icon(&icon, &url_bar->text_icon); if (error) { - NSLOG(netsurf, INFO, "xwimp_create_icon: 0x%x: %s", + NSLOG(netsurf, INFO, + "xwimp_create_icon: 0x%x: %s", error->errnum, error->errmess); ro_warn_user("WimpError", error->errmess); url_bar->text_icon = -1; @@ -437,11 +355,14 @@ static bool ro_gui_url_bar_icon_update(struct url_bar *url_bar) } resize = true; - } else if (url_bar->hidden && url_bar->text_icon != -1) { + + } else if (url_bar->hidden && + url_bar->text_icon != -1) { error = xwimp_delete_icon(url_bar->window, - url_bar->text_icon); + url_bar->text_icon); if (error != NULL) { - NSLOG(netsurf, INFO, "xwimp_delete_icon: 0x%x: %s", + NSLOG(netsurf, INFO, + "xwimp_delete_icon: 0x%x: %s", error->errnum, error->errmess); ro_warn_user("WimpError", error->errmess); return false; @@ -451,15 +372,18 @@ static bool ro_gui_url_bar_icon_update(struct url_bar *url_bar) } /* Create or delete the suggest icon. */ - - if (!url_bar->hidden && url_bar->suggest_icon == -1) { + if (!url_bar->hidden && + url_bar->suggest_icon == -1) { icon.icon.data.indirected_text.text = null_text_string; icon.icon.data.indirected_text.size = 1; icon.icon.data.indirected_text.validation = suggest_validation; - icon.icon.flags = wimp_ICON_TEXT | wimp_ICON_SPRITE | - wimp_ICON_INDIRECTED | wimp_ICON_HCENTRED | - wimp_ICON_VCENTRED | (wimp_BUTTON_CLICK << - wimp_ICON_BUTTON_TYPE_SHIFT); + icon.icon.flags = wimp_ICON_TEXT | + wimp_ICON_SPRITE | + wimp_ICON_INDIRECTED | + wimp_ICON_HCENTRED | + wimp_ICON_VCENTRED | + (wimp_BUTTON_CLICK << wimp_ICON_BUTTON_TYPE_SHIFT); + error = xwimp_create_icon(&icon, &url_bar->suggest_icon); if (error) { NSLOG(netsurf, INFO, "xwimp_create_icon: 0x%x: %s", @@ -470,20 +394,24 @@ static bool ro_gui_url_bar_icon_update(struct url_bar *url_bar) if (!url_bar->display) ro_gui_wimp_event_register_menu_gright(url_bar->window, - wimp_ICON_WINDOW, url_bar->suggest_icon, - ro_gui_url_suggest_menu); + wimp_ICON_WINDOW, + url_bar->suggest_icon, + ro_gui_url_suggest_menu); - if (!ro_gui_url_bar_update_urlsuggest(url_bar)) + if (!ro_gui_url_bar_update_urlsuggest(url_bar)) { return false; + } resize = true; + } else if (url_bar->hidden && url_bar->suggest_icon != -1) { ro_gui_wimp_event_deregister(url_bar->window, - url_bar->suggest_icon); + url_bar->suggest_icon); error = xwimp_delete_icon(url_bar->window, - url_bar->suggest_icon); + url_bar->suggest_icon); if (error != NULL) { - NSLOG(netsurf, INFO, "xwimp_delete_icon: 0x%x: %s", + NSLOG(netsurf, INFO, + "xwimp_delete_icon: 0x%x: %s", error->errnum, error->errmess); ro_warn_user("WimpError", error->errmess); return false; @@ -493,36 +421,170 @@ static bool ro_gui_url_bar_icon_update(struct url_bar *url_bar) } /* If any icons were created, resize the bar. */ - - if (resize && !ro_gui_url_bar_icon_resize(url_bar, true)) + if (resize && !ro_gui_url_bar_icon_resize(url_bar, true)) { return false; + } /* If there are any icons, apply shading as necessary. */ - - if (url_bar->container_icon != -1) + if (url_bar->container_icon != -1) { ro_gui_set_icon_shaded_state(url_bar->window, - url_bar->container_icon, url_bar->shaded); + url_bar->container_icon, + url_bar->shaded); + } - if (url_bar->text_icon != -1) + if (url_bar->text_icon != -1) { ro_gui_set_icon_shaded_state(url_bar->window, - url_bar->text_icon, url_bar->shaded); + url_bar->text_icon, + url_bar->shaded); + } - if (url_bar->suggest_icon != -1) + if (url_bar->suggest_icon != -1) { ro_gui_set_icon_shaded_state(url_bar->window, - url_bar->suggest_icon, url_bar->shaded); + url_bar->suggest_icon, + url_bar->shaded); + } return true; } +/** + * Set the state of a URL Bar's hotlist icon. + * + * \param *url_bar The URL Bar to update. + * \param set TRUE to set the hotlist icon; FALSE to clear it. + */ +static void ro_gui_url_bar_set_hotlist(struct url_bar *url_bar, bool set) +{ + if (url_bar == NULL || + set == url_bar->hotlist.set) { + return; + } + + url_bar->hotlist.set = set; + + if (!url_bar->hidden) { + xwimp_force_redraw(url_bar->window, + url_bar->hotlist.extent.x0, + url_bar->hotlist.extent.y0, + url_bar->hotlist.extent.x1, + url_bar->hotlist.extent.y1); + } +} + + +/** + * Callback for hlcache. + */ +static nserror +ro_gui_url_bar_res_cb(hlcache_handle *handle, + const hlcache_event *event, void *pw) +{ + struct url_bar_resource *r = pw; + + switch (event->type) { + case CONTENT_MSG_READY: + case CONTENT_MSG_DONE: + r->ready = true; + r->height = content_get_height(handle); + break; + + default: + break; + } + + return NSERROR_OK; +} + + /* This is an exported interface documented in url_bar.h */ +struct url_bar *ro_gui_url_bar_create(struct theme_descriptor *theme) +{ + struct url_bar *url_bar; + + /* Allocate memory. */ + + url_bar = malloc(sizeof(struct url_bar)); + if (url_bar == NULL) { + NSLOG(netsurf, INFO, "No memory for malloc()"); + return NULL; + } + + /* Set up default parameters. */ + + url_bar->theme = theme; + url_bar->sprites = ro_gui_theme_get_sprites(theme); -bool ro_gui_url_bar_rebuild(struct url_bar *url_bar, - struct theme_descriptor *theme, theme_style style, - wimp_w window, bool display, bool shaded) + url_bar->display = false; + url_bar->shaded = false; + + url_bar->x_min = URLBAR_FAVICON_WIDTH + URLBAR_MIN_WIDTH + + URLBAR_HOTLIST_WIDTH; + url_bar->y_min = URLBAR_HEIGHT; + + url_bar->extent.x0 = 0; + url_bar->extent.y0 = 0; + url_bar->extent.x1 = 0; + url_bar->extent.y1 = 0; + + url_bar->window = NULL; + url_bar->container_icon = -1; + url_bar->text_icon = -1; + url_bar->suggest_icon = -1; + + url_bar->pginfo_extent.x0 = 0; + url_bar->pginfo_extent.y0 = 0; + url_bar->pginfo_extent.x1 = 0; + url_bar->pginfo_extent.y1 = 0; + strncpy(url_bar->pginfo_sprite, + "pgiinternal", + URLBAR_PGINFO_NAME_LENGTH); + + url_bar->favicon_extent.x0 = 0; + url_bar->favicon_extent.y0 = 0; + url_bar->favicon_extent.x1 = 0; + url_bar->favicon_extent.y1 = 0; + url_bar->favicon_width = 0; + url_bar->favicon_height = 0; + url_bar->favicon_content = NULL; + url_bar->favicon_type = 0; + strncpy(url_bar->favicon_sprite, + "Ssmall_xxx", + URLBAR_FAVICON_NAME_LENGTH); + + url_bar->hotlist.set = false; + url_bar->hotlist.extent.x0 = 0; + url_bar->hotlist.extent.y0 = 0; + url_bar->hotlist.extent.x1 = 0; + url_bar->hotlist.extent.y1 = 0; + + url_bar->text_size = RO_GUI_MAX_URL_SIZE; + url_bar->text_buffer = malloc(url_bar->text_size); + if (url_bar->text_buffer == NULL) { + free(url_bar); + return NULL; + } + url_bar->text_buffer[0] = 0; + url_bar->text_buffer_utf8 = NULL; + + url_bar->hidden = false; + + return url_bar; +} + + +/* This is an exported interface documented in url_bar.h */ +bool +ro_gui_url_bar_rebuild(struct url_bar *url_bar, + struct theme_descriptor *theme, + theme_style style, + wimp_w window, + bool display, + bool shaded) { - if (url_bar == NULL) + if (url_bar == NULL) { return false; + } url_bar->theme = theme; url_bar->window = window; @@ -535,48 +597,58 @@ bool ro_gui_url_bar_rebuild(struct url_bar *url_bar, url_bar->suggest_icon = -1; ro_gui_wimp_get_sprite_dimensions((osspriteop_area *) -1, - suggest_icon, &url_bar->suggest_x, &url_bar->suggest_y); + suggest_icon, + &url_bar->suggest_x, + &url_bar->suggest_y); + + url_bar->x_min = URLBAR_PGINFO_WIDTH + + URLBAR_FAVICON_WIDTH + + URLBAR_MIN_WIDTH + + URLBAR_HOTLIST_WIDTH + + URLBAR_GRIGHT_GUTTER + + url_bar->suggest_x; - url_bar->x_min = URLBAR_PGINFO_WIDTH + URLBAR_FAVICON_WIDTH + URLBAR_MIN_WIDTH + - URLBAR_HOTLIST_WIDTH + URLBAR_GRIGHT_GUTTER + - url_bar->suggest_x; url_bar->y_min = (url_bar->suggest_y > URLBAR_HEIGHT) ? - url_bar->suggest_y : URLBAR_HEIGHT; + url_bar->suggest_y : URLBAR_HEIGHT; return ro_gui_url_bar_icon_update(url_bar); } /* This is an exported interface documented in url_bar.h */ - void ro_gui_url_bar_destroy(struct url_bar *url_bar) { - if (url_bar == NULL) + if (url_bar == NULL) { return; + } - if (url_bar->text_buffer_utf8 != NULL) + if (url_bar->text_buffer_utf8 != NULL) { free(url_bar->text_buffer_utf8); + } - if (url_bar->text_buffer != NULL) + if (url_bar->text_buffer != NULL) { free(url_bar->text_buffer); + } free(url_bar); } /* This is an exported interface documented in url_bar.h */ - -bool ro_gui_url_bar_get_dims(struct url_bar *url_bar, - int *width, int *height) +bool ro_gui_url_bar_get_dims(struct url_bar *url_bar, int *width, int *height) { - if (url_bar == NULL) + if (url_bar == NULL) { return false; + } - if (url_bar->x_min != -1 && url_bar->y_min != -1) { - if (width != NULL) + if (url_bar->x_min != -1 && + url_bar->y_min != -1) { + if (width != NULL) { *width = url_bar->x_min; - if (height != NULL) + } + if (height != NULL) { *height = url_bar->y_min; + } return true; } @@ -586,46 +658,52 @@ bool ro_gui_url_bar_get_dims(struct url_bar *url_bar, /* This is an exported interface documented in url_bar.h */ - -bool ro_gui_url_bar_set_extent(struct url_bar *url_bar, - int x0, int y0, int x1, int y1) +bool +ro_gui_url_bar_set_extent(struct url_bar *url_bar, + int x0, int y0, int x1, int y1) { - bool stretch; + bool stretch; - if (url_bar == NULL) + if (url_bar == NULL) { return false; + } - if ((x1 - x0) < url_bar->x_min || (y1 - y0) < url_bar->y_min) + if ((x1 - x0) < url_bar->x_min || + (y1 - y0) < url_bar->y_min) { return false; + } - if (url_bar->extent.x0 == x0 && url_bar->extent.y0 == y0 && - url_bar->extent.x1 == x1 && - url_bar->extent.y1 == y1) + if (url_bar->extent.x0 == x0 && + url_bar->extent.y0 == y0 && + url_bar->extent.x1 == x1 && + url_bar->extent.y1 == y1) { return true; + } /* If it's only the length that changes, less needs to be updated. */ - - stretch = (url_bar->extent.x0 == x0 && url_bar->extent.y0 == y0 && - url_bar->extent.y1 == y1) ? true : false; + stretch = (url_bar->extent.x0 == x0 && + url_bar->extent.y0 == y0 && + url_bar->extent.y1 == y1) ? true : false; /* Redraw the relevant bits of the toolbar. */ - - if (url_bar->window != NULL && !url_bar->hidden) { + if (url_bar->window != NULL && + !url_bar->hidden) { if (stretch) { xwimp_force_redraw(url_bar->window, - x0 + URLBAR_PGINFO_WIDTH + URLBAR_FAVICON_WIDTH, y0, - (x1 > url_bar->extent.x1) ? - x1 : url_bar->extent.x1, y1); + x0 + URLBAR_PGINFO_WIDTH + URLBAR_FAVICON_WIDTH, y0, + (x1 > url_bar->extent.x1) ? + x1 : url_bar->extent.x1, y1); } else { xwimp_force_redraw(url_bar->window, - url_bar->extent.x0, url_bar->extent.y0, - url_bar->extent.x1, url_bar->extent.y1); + url_bar->extent.x0, + url_bar->extent.y0, + url_bar->extent.x1, + url_bar->extent.y1); xwimp_force_redraw(url_bar->window, x0, y0, x1, y1); } } /* Reposition the URL bar icons. */ - url_bar->extent.x0 = x0; url_bar->extent.y0 = y0; url_bar->extent.x1 = x1; @@ -636,7 +714,6 @@ bool ro_gui_url_bar_set_extent(struct url_bar *url_bar, /* This is an exported interface documented in url_bar.h */ - bool ro_gui_url_bar_hide(struct url_bar *url_bar, bool hide) { if (url_bar == NULL || url_bar->hidden == hide) @@ -649,7 +726,6 @@ bool ro_gui_url_bar_hide(struct url_bar *url_bar, bool hide) /* This is an exported interface documented in url_bar.h */ - void ro_gui_url_bar_redraw(struct url_bar *url_bar, wimp_draw *redraw) { wimp_icon icon; @@ -663,37 +739,37 @@ void ro_gui_url_bar_redraw(struct url_bar *url_bar, wimp_draw *redraw) return; if ((redraw->clip.x0 - (redraw->box.x0 - redraw->xscroll)) > - (url_bar->pginfo_extent.x1) || - (redraw->clip.y0 - (redraw->box.y1 - redraw->yscroll)) > - (url_bar->pginfo_extent.y1) || - (redraw->clip.x1 - (redraw->box.x0 - redraw->xscroll)) < - (url_bar->pginfo_extent.x0) || - (redraw->clip.y1 - (redraw->box.y1 - redraw->yscroll)) < - (url_bar->pginfo_extent.y0)) { + (url_bar->pginfo_extent.x1) || + (redraw->clip.y0 - (redraw->box.y1 - redraw->yscroll)) > + (url_bar->pginfo_extent.y1) || + (redraw->clip.x1 - (redraw->box.x0 - redraw->xscroll)) < + (url_bar->pginfo_extent.x0) || + (redraw->clip.y1 - (redraw->box.y1 - redraw->yscroll)) < + (url_bar->pginfo_extent.y0)) { /* page info not in redraw area */ draw_pginfo = false; } if ((redraw->clip.x0 - (redraw->box.x0 - redraw->xscroll)) > - (url_bar->favicon_extent.x1) || - (redraw->clip.y0 - (redraw->box.y1 - redraw->yscroll)) > - (url_bar->favicon_extent.y1) || - (redraw->clip.x1 - (redraw->box.x0 - redraw->xscroll)) < - (url_bar->favicon_extent.x0) || - (redraw->clip.y1 - (redraw->box.y1 - redraw->yscroll)) < - (url_bar->favicon_extent.y0)) { + (url_bar->favicon_extent.x1) || + (redraw->clip.y0 - (redraw->box.y1 - redraw->yscroll)) > + (url_bar->favicon_extent.y1) || + (redraw->clip.x1 - (redraw->box.x0 - redraw->xscroll)) < + (url_bar->favicon_extent.x0) || + (redraw->clip.y1 - (redraw->box.y1 - redraw->yscroll)) < + (url_bar->favicon_extent.y0)) { /* Favicon not in redraw area */ draw_favicon = false; } if ((redraw->clip.x0 - (redraw->box.x0 - redraw->xscroll)) > - (url_bar->hotlist.extent.x1) || - (redraw->clip.y0 - (redraw->box.y1 - redraw->yscroll)) > - (url_bar->hotlist.extent.y1) || - (redraw->clip.x1 - (redraw->box.x0 - redraw->xscroll)) < - (url_bar->hotlist.extent.x0) || - (redraw->clip.y1 - (redraw->box.y1 - redraw->yscroll)) < - (url_bar->hotlist.extent.y0)) { + (url_bar->hotlist.extent.x1) || + (redraw->clip.y0 - (redraw->box.y1 - redraw->yscroll)) > + (url_bar->hotlist.extent.y1) || + (redraw->clip.x1 - (redraw->box.x0 - redraw->xscroll)) < + (url_bar->hotlist.extent.x0) || + (redraw->clip.y1 - (redraw->box.y1 - redraw->yscroll)) < + (url_bar->hotlist.extent.y0)) { /* Hotlist icon not in redraw area */ draw_hotlist = false; } @@ -721,13 +797,13 @@ void ro_gui_url_bar_redraw(struct url_bar *url_bar, wimp_draw *redraw) if (url_bar->favicon_content == NULL) { icon.data.indirected_text.text = null_text_string; icon.data.indirected_text.validation = - url_bar->favicon_sprite; + url_bar->favicon_sprite; icon.data.indirected_text.size = 1; icon.flags = wimp_ICON_TEXT | wimp_ICON_SPRITE | - wimp_ICON_INDIRECTED | - wimp_ICON_FILLED | - wimp_ICON_HCENTRED | - wimp_ICON_VCENTRED; + wimp_ICON_INDIRECTED | + wimp_ICON_FILLED | + wimp_ICON_HCENTRED | + wimp_ICON_VCENTRED; icon.extent.x0 = url_bar->favicon_extent.x0; icon.extent.x1 = url_bar->favicon_extent.x1; icon.extent.y0 = url_bar->favicon_extent.y0; @@ -744,15 +820,15 @@ void ro_gui_url_bar_redraw(struct url_bar *url_bar, wimp_draw *redraw) xwimp_set_colour(wimp_COLOUR_WHITE); xos_plot(os_MOVE_TO, - (redraw->box.x0 - redraw->xscroll) + - url_bar->favicon_extent.x0, - (redraw->box.y1 - redraw->yscroll) + - url_bar->favicon_extent.y0); + (redraw->box.x0 - redraw->xscroll) + + url_bar->favicon_extent.x0, + (redraw->box.y1 - redraw->yscroll) + + url_bar->favicon_extent.y0); xos_plot(os_PLOT_TO | os_PLOT_RECTANGLE, - (redraw->box.x0 - redraw->xscroll) + - url_bar->favicon_extent.x1, - (redraw->box.y1 - redraw->yscroll) + - url_bar->favicon_extent.y1); + (redraw->box.x0 - redraw->xscroll) + + url_bar->favicon_extent.x1, + (redraw->box.y1 - redraw->yscroll) + + url_bar->favicon_extent.y1); clip.x0 = (redraw->clip.x0 - ro_plot_origin_x) / 2; clip.y0 = (ro_plot_origin_y - redraw->clip.y0) / 2; @@ -760,9 +836,9 @@ void ro_gui_url_bar_redraw(struct url_bar *url_bar, wimp_draw *redraw) clip.y1 = (ro_plot_origin_y - redraw->clip.y1) / 2; data.x = (url_bar->favicon_extent.x0 + - url_bar->favicon_offset.x) / 2; + url_bar->favicon_offset.x) / 2; data.y = (url_bar->favicon_offset.y - - url_bar->favicon_extent.y1) / 2; + url_bar->favicon_extent.y1) / 2; data.width = url_bar->favicon_width; data.height = url_bar->favicon_height; data.background_colour = 0xFFFFFF; @@ -771,7 +847,7 @@ void ro_gui_url_bar_redraw(struct url_bar *url_bar, wimp_draw *redraw) data.repeat_y = false; content_redraw(url_bar->favicon_content, - &data, &clip, &ctx); + &data, &clip, &ctx); } } @@ -783,20 +859,20 @@ void ro_gui_url_bar_redraw(struct url_bar *url_bar, wimp_draw *redraw) .plot = &ro_plotters }; struct url_bar_resource *hotlist_icon = url_bar->hotlist.set ? - &(url_bar_res[URLBAR_RES_HOTLIST_REMOVE]) : - &(url_bar_res[URLBAR_RES_HOTLIST_ADD]); + &(url_bar_res[URLBAR_RES_HOTLIST_REMOVE]) : + &(url_bar_res[URLBAR_RES_HOTLIST_ADD]); xwimp_set_colour(wimp_COLOUR_WHITE); xos_plot(os_MOVE_TO, - (redraw->box.x0 - redraw->xscroll) + - url_bar->hotlist.extent.x0, - (redraw->box.y1 - redraw->yscroll) + - url_bar->hotlist.extent.y0); + (redraw->box.x0 - redraw->xscroll) + + url_bar->hotlist.extent.x0, + (redraw->box.y1 - redraw->yscroll) + + url_bar->hotlist.extent.y0); xos_plot(os_PLOT_TO | os_PLOT_RECTANGLE, - (redraw->box.x0 - redraw->xscroll) + - url_bar->hotlist.extent.x1, - (redraw->box.y1 - redraw->yscroll) + - url_bar->hotlist.extent.y1); + (redraw->box.x0 - redraw->xscroll) + + url_bar->hotlist.extent.x1, + (redraw->box.y1 - redraw->yscroll) + + url_bar->hotlist.extent.y1); if (hotlist_icon->ready == false) { return; @@ -808,9 +884,9 @@ void ro_gui_url_bar_redraw(struct url_bar *url_bar, wimp_draw *redraw) clip.y1 = (ro_plot_origin_y - redraw->clip.y1) / 2; data.x = (url_bar->hotlist.extent.x0 + - url_bar->hotlist.offset.x) / 2; + url_bar->hotlist.offset.x) / 2; data.y = (url_bar->hotlist.offset.y - - url_bar->hotlist.extent.y1) / 2; + url_bar->hotlist.extent.y1) / 2; data.width = URLBAR_HOTLIST_SIZE; data.height = URLBAR_HOTLIST_SIZE; data.background_colour = 0xFFFFFF; @@ -824,43 +900,47 @@ void ro_gui_url_bar_redraw(struct url_bar *url_bar, wimp_draw *redraw) /* This is an exported interface documented in url_bar.h */ - -bool ro_gui_url_bar_click(struct url_bar *url_bar, - wimp_pointer *pointer, wimp_window_state *state, - url_bar_action *action) +bool +ro_gui_url_bar_click(struct url_bar *url_bar, + wimp_pointer *pointer, + wimp_window_state *state, + url_bar_action *action) { os_coord pos; if (url_bar == NULL || url_bar->hidden || - url_bar->display || url_bar->shaded) + url_bar->display || url_bar->shaded) { return false; + } /* Check that the click was within our part of the window. */ - pos.x = pointer->pos.x - state->visible.x0 + state->xscroll; pos.y = pointer->pos.y - state->visible.y1 + state->yscroll; - if (pos.x < url_bar->extent.x0 || pos.x > url_bar->extent.x1 || - pos.y < url_bar->extent.y0 || - pos.y > url_bar->extent.y1) + if (pos.x < url_bar->extent.x0 || + pos.x > url_bar->extent.x1 || + pos.y < url_bar->extent.y0 || + pos.y > url_bar->extent.y1) { return false; + } /* If we have a Select or Adjust click, check if it originated on the * hotlist icon; if it did, return an event. */ if (pointer->buttons == wimp_SINGLE_SELECT || - pointer->buttons == wimp_SINGLE_ADJUST) { + pointer->buttons == wimp_SINGLE_ADJUST) { if (pos.x >= url_bar->hotlist.extent.x0 && - pos.x <= url_bar->hotlist.extent.x1 && - pos.y >= url_bar->hotlist.extent.y0 && - pos.y <= url_bar->hotlist.extent.y1) { + pos.x <= url_bar->hotlist.extent.x1 && + pos.y >= url_bar->hotlist.extent.y0 && + pos.y <= url_bar->hotlist.extent.y1) { if (pointer->buttons == wimp_SINGLE_SELECT && - action != NULL) + action != NULL) { *action = TOOLBAR_URL_SELECT_HOTLIST; - else if (pointer->buttons == wimp_SINGLE_ADJUST && - action != NULL) + } else if (pointer->buttons == wimp_SINGLE_ADJUST && + action != NULL) { *action = TOOLBAR_URL_ADJUST_HOTLIST; + } return true; } } @@ -870,19 +950,21 @@ bool ro_gui_url_bar_click(struct url_bar *url_bar, */ if (pointer->buttons == wimp_DRAG_SELECT || - pointer->buttons == wimp_DRAG_ADJUST) { + pointer->buttons == wimp_DRAG_ADJUST) { if (pointer->i == url_bar->text_icon) { - if (action != NULL) + if (action != NULL) { *action = TOOLBAR_URL_DRAG_URL; + } return true; } if (pos.x >= url_bar->favicon_extent.x0 && - pos.x <= url_bar->favicon_extent.x1 && - pos.y >= url_bar->favicon_extent.y0 && - pos.y <= url_bar->favicon_extent.y1) { - if (action != NULL) + pos.x <= url_bar->favicon_extent.x1 && + pos.y >= url_bar->favicon_extent.y0 && + pos.y <= url_bar->favicon_extent.y1) { + if (action != NULL) { *action = TOOLBAR_URL_DRAG_FAVICON; + } return true; } } @@ -892,37 +974,49 @@ bool ro_gui_url_bar_click(struct url_bar *url_bar, /* This is an exported interface documented in url_bar.h */ - -bool ro_gui_url_bar_menu_prepare(struct url_bar *url_bar, wimp_i i, - wimp_menu *menu, wimp_pointer *pointer) +bool +ro_gui_url_bar_menu_prepare(struct url_bar *url_bar, + wimp_i i, + wimp_menu *menu, + wimp_pointer *pointer) { - if (url_bar == NULL || url_bar->suggest_icon != i || - menu != ro_gui_url_suggest_menu) + if (url_bar == NULL || + url_bar->suggest_icon != i || + menu != ro_gui_url_suggest_menu) { return false; + } - if (pointer != NULL) + if (pointer != NULL) { return ro_gui_url_suggest_prepare_menu(); + } return true; } /* This is an exported interface documented in url_bar.h */ - -bool ro_gui_url_bar_menu_select(struct url_bar *url_bar, wimp_i i, - wimp_menu *menu, wimp_selection *selection, menu_action action) +bool +ro_gui_url_bar_menu_select(struct url_bar *url_bar, + wimp_i i, + wimp_menu *menu, + wimp_selection *selection, + menu_action action) { const char *urltxt; struct gui_window *g; - if (url_bar == NULL || url_bar->suggest_icon != i || - menu != ro_gui_url_suggest_menu) + if (url_bar == NULL || + url_bar->suggest_icon != i || + menu != ro_gui_url_suggest_menu) { return false; + } urltxt = ro_gui_url_suggest_get_selection(selection); g = ro_gui_toolbar_lookup(url_bar->window); - if (urltxt != NULL && g != NULL && g->bw != NULL) { + if (urltxt != NULL && + g != NULL && + g->bw != NULL) { nsurl *url; nserror error; @@ -933,12 +1027,12 @@ bool ro_gui_url_bar_menu_select(struct url_bar *url_bar, wimp_i i, ro_gui_window_set_url(g, url); browser_window_navigate(g->bw, - url, - NULL, - BW_NAVIGATE_HISTORY, - NULL, - NULL, - NULL); + url, + NULL, + BW_NAVIGATE_HISTORY, + NULL, + NULL, + NULL); nsurl_unref(url); } } @@ -948,15 +1042,19 @@ bool ro_gui_url_bar_menu_select(struct url_bar *url_bar, wimp_i i, /* This is an exported interface documented in url_bar.h */ - -bool ro_gui_url_bar_help_suffix(struct url_bar *url_bar, wimp_i i, - os_coord *mouse, wimp_window_state *state, - wimp_mouse_state buttons, const char **suffix) +bool +ro_gui_url_bar_help_suffix(struct url_bar *url_bar, + wimp_i i, + os_coord *mouse, + wimp_window_state *state, + wimp_mouse_state buttons, + const char **suffix) { - os_coord pos; + os_coord pos; - if (url_bar == NULL || url_bar->hidden) + if (url_bar == NULL || url_bar->hidden) { return false; + } /* Check that the click was within our part of the window. */ @@ -964,49 +1062,53 @@ bool ro_gui_url_bar_help_suffix(struct url_bar *url_bar, wimp_i i, pos.y = mouse->y - state->visible.y1 + state->yscroll; if (pos.x < url_bar->extent.x0 || pos.x > url_bar->extent.x1 || - pos.y < url_bar->extent.y0 || - pos.y > url_bar->extent.y1) + pos.y < url_bar->extent.y0 || + pos.y > url_bar->extent.y1) { return false; + } /* Return hard-coded icon numbers that match the ones that were * always allocated to the URL bar in a previous implementation. * If Messages can be updated, this could be changed. */ - if (i == url_bar->text_icon) + if (i == url_bar->text_icon) { *suffix = "14"; - else if (i == url_bar->suggest_icon) + } else if (i == url_bar->suggest_icon) { *suffix = "15"; - else if (pos.x >= url_bar->hotlist.extent.x0 && - pos.x <= url_bar->hotlist.extent.x1 && - pos.y >= url_bar->hotlist.extent.y0 && - pos.y <= url_bar->hotlist.extent.y1) + } else if (pos.x >= url_bar->hotlist.extent.x0 && + pos.x <= url_bar->hotlist.extent.x1 && + pos.y >= url_bar->hotlist.extent.y0 && + pos.y <= url_bar->hotlist.extent.y1) { *suffix = "Hot"; - else if (pos.x >= url_bar->favicon_extent.x0 && - pos.x <= url_bar->favicon_extent.x1 && - pos.y >= url_bar->favicon_extent.y0 && - pos.y <= url_bar->favicon_extent.y1) + } else if (pos.x >= url_bar->favicon_extent.x0 && + pos.x <= url_bar->favicon_extent.x1 && + pos.y >= url_bar->favicon_extent.y0 && + pos.y <= url_bar->favicon_extent.y1) { *suffix = "Fav"; - else + } else { *suffix = ""; + } return true; } /* This is an exported interface documented in url_bar.h */ - bool ro_gui_url_bar_take_caret(struct url_bar *url_bar) { - os_error *error; + os_error *error; - if (url_bar == NULL || url_bar->hidden) + if (url_bar == NULL || url_bar->hidden) { return false; + } - error = xwimp_set_caret_position(url_bar->window, url_bar->text_icon, - -1, -1, -1, 0); + error = xwimp_set_caret_position(url_bar->window, + url_bar->text_icon, + -1, -1, -1, 0); if (error) { - NSLOG(netsurf, INFO, "xwimp_set_caret_position: 0x%x: %s", + NSLOG(netsurf, INFO, + "xwimp_set_caret_position: 0x%x: %s", error->errnum, error->errmess); ro_warn_user("WimpError", error->errmess); @@ -1018,18 +1120,23 @@ bool ro_gui_url_bar_take_caret(struct url_bar *url_bar) /* This is an exported interface documented in url_bar.h */ - -void ro_gui_url_bar_set_url(struct url_bar *url_bar, const char *url, - bool is_utf8, bool set_caret) +void +ro_gui_url_bar_set_url(struct url_bar *url_bar, + const char *url, + bool is_utf8, + bool set_caret) { - wimp_caret caret; - os_error *error; - char *local_text = NULL; - const char *local_url; + wimp_caret caret; + os_error *error; + char *local_text = NULL; + const char *local_url; nsurl *n; - if (url_bar == NULL || url_bar->text_buffer == NULL || url == NULL) + if (url_bar == NULL || + url_bar->text_buffer == NULL || + url == NULL) { return; + } /* Before we do anything with the URL, get it into local encoding so * that behaviour is consistent with the rest of the URL Bar module @@ -1056,52 +1163,56 @@ void ro_gui_url_bar_set_url(struct url_bar *url_bar, const char *url, /* Copy the text into the icon buffer. If the text is too long, blank * the buffer and warn the user. */ - if (strlen(local_url) >= url_bar->text_size) { url_bar->text_buffer[0] = '\0'; ro_warn_user("LongURL", NULL); - NSLOG(netsurf, INFO, "Long URL (%zu chars): %s", strlen(url), - url); + NSLOG(netsurf, INFO, + "Long URL (%zu chars): %s", + strlen(url), url); } else { - strncpy(url_bar->text_buffer, local_url, - url_bar->text_size - 1); + strncpy(url_bar->text_buffer, + local_url, + url_bar->text_size - 1); url_bar->text_buffer[url_bar->text_size - 1] = '\0'; } - if (local_text != NULL) + if (local_text != NULL) { free(local_text); + } /* Set the hotlist flag. */ - if (nsurl_create(url_bar->text_buffer, &n) == NSERROR_OK) { ro_gui_url_bar_set_hotlist(url_bar, ro_gui_hotlist_has_page(n)); nsurl_unref(n); } /* If there's no icon, then there's nothing else to do... */ - - if (url_bar->text_icon == -1) + if (url_bar->text_icon == -1) { return; + } /* ...if there is, redraw the icon and fix the caret's position. */ - ro_gui_redraw_icon(url_bar->window, url_bar->text_icon); error = xwimp_get_caret_position(&caret); if (error) { - NSLOG(netsurf, INFO, "xwimp_get_caret_position: 0x%x: %s", + NSLOG(netsurf, INFO, + "xwimp_get_caret_position: 0x%x: %s", error->errnum, error->errmess); ro_warn_user("WimpError", error->errmess); return; } - if (set_caret || (caret.w == url_bar->window && - caret.i == url_bar->text_icon)) { - const char *set_url = ro_gui_get_icon_string(url_bar->window, - url_bar->text_icon); + if (set_caret || + (caret.w == url_bar->window && + caret.i == url_bar->text_icon)) { + const char *set_url; + set_url = ro_gui_get_icon_string(url_bar->window, + url_bar->text_icon); error = xwimp_set_caret_position(url_bar->window, - url_bar->text_icon, 0, 0, -1, strlen(set_url)); + url_bar->text_icon, + 0, 0, -1, strlen(set_url)); if (error) { NSLOG(netsurf, INFO, "xwimp_set_caret_position: 0x%x: %s", @@ -1114,64 +1225,47 @@ void ro_gui_url_bar_set_url(struct url_bar *url_bar, const char *url, /* This is an exported interface documented in url_bar.h */ - void ro_gui_url_bar_update_hotlist(struct url_bar *url_bar) { const char *url; nsurl *n; - if (url_bar == NULL) + if (url_bar == NULL) { return; + } url = (const char *) url_bar->text_buffer; - if (url != NULL && nsurl_create(url, &n) == NSERROR_OK) { + if (url != NULL && + nsurl_create(url, &n) == NSERROR_OK) { ro_gui_url_bar_set_hotlist(url_bar, ro_gui_hotlist_has_page(n)); nsurl_unref(n); } } -/** - * Set the state of a URL Bar's hotlist icon. - * - * \param *url_bar The URL Bar to update. - * \param set TRUE to set the hotlist icon; FALSE to clear it. - */ - -static void ro_gui_url_bar_set_hotlist(struct url_bar *url_bar, bool set) -{ - if (url_bar == NULL || set == url_bar->hotlist.set) - return; - - url_bar->hotlist.set = set; - - if (!url_bar->hidden) { - xwimp_force_redraw(url_bar->window, - url_bar->hotlist.extent.x0, - url_bar->hotlist.extent.y0, - url_bar->hotlist.extent.x1, - url_bar->hotlist.extent.y1); - } -} - - /* This is an exported interface documented in url_bar.h */ - const char *ro_gui_url_bar_get_url(struct url_bar *url_bar) { - if ((url_bar == NULL) || (url_bar->text_buffer == NULL)) + nserror res; + + if ((url_bar == NULL) || + (url_bar->text_buffer == NULL)) { return NULL; + } if (url_bar->text_buffer_utf8 != NULL) { free(url_bar->text_buffer_utf8); url_bar->text_buffer_utf8 = NULL; } - if (url_bar->text_buffer[0] == '\0') + if (url_bar->text_buffer[0] == '\0') { return (const char *) url_bar->text_buffer; + } - if (utf8_from_local_encoding(url_bar->text_buffer, 0, &url_bar->text_buffer_utf8) == NSERROR_OK) { - return (const char *) url_bar->text_buffer_utf8; + res = utf8_from_local_encoding(url_bar->text_buffer, 0, + &url_bar->text_buffer_utf8); + if (res == NSERROR_OK) { + return (const char *)url_bar->text_buffer_utf8; } return (const char *) url_bar->text_buffer; @@ -1179,23 +1273,25 @@ const char *ro_gui_url_bar_get_url(struct url_bar *url_bar) /* This is an exported interface documented in url_bar.h */ - bool ro_gui_url_bar_get_url_extent(struct url_bar *url_bar, os_box *extent) { - wimp_icon_state state; - os_error *error; + wimp_icon_state state; + os_error *error; - if (url_bar == NULL || url_bar->hidden) + if (url_bar == NULL || url_bar->hidden) { return false; + } - if (extent == NULL) + if (extent == NULL) { return true; + } state.w = url_bar->window; state.i = url_bar->container_icon; error = xwimp_get_icon_state(&state); if (error) { - NSLOG(netsurf, INFO, "xwimp_get_icon_state: 0x%x: %s", + NSLOG(netsurf, INFO, + "xwimp_get_icon_state: 0x%x: %s", error->errnum, error->errmess); ro_warn_user("WimpError", error->errmess); return false; @@ -1211,36 +1307,45 @@ bool ro_gui_url_bar_get_url_extent(struct url_bar *url_bar, os_box *extent) /* This is an exported interface documented in url_bar.h */ - -bool ro_gui_url_bar_test_for_text_field_click(struct url_bar *url_bar, - wimp_pointer *pointer) +bool +ro_gui_url_bar_test_for_text_field_click(struct url_bar *url_bar, + wimp_pointer *pointer) { - if (url_bar == NULL || url_bar->hidden || pointer == NULL) + if (url_bar == NULL || + url_bar->hidden || + pointer == NULL) { return false; + } return (pointer->w == url_bar->window && - pointer->i == url_bar->text_icon) ? true : false; + pointer->i == url_bar->text_icon) ? true : false; } /* This is an exported interface documented in url_bar.h */ - -bool ro_gui_url_bar_test_for_text_field_keypress(struct url_bar *url_bar, - wimp_key *key) +bool +ro_gui_url_bar_test_for_text_field_keypress(struct url_bar *url_bar, + wimp_key *key) { const char *url; nsurl *n; - if (url_bar == NULL || url_bar->hidden || key == NULL) + if (url_bar == NULL || + url_bar->hidden || + key == NULL) { return false; + } - if (key->w != url_bar->window || key->i != url_bar->text_icon) + if (key->w != url_bar->window || + key->i != url_bar->text_icon) { return false; + } /* Update hotlist indicator */ url = (const char *) url_bar->text_buffer; - if (url != NULL && nsurl_create(url, &n) == NSERROR_OK) { + if (url != NULL && + nsurl_create(url, &n) == NSERROR_OK) { ro_gui_url_bar_set_hotlist(url_bar, ro_gui_hotlist_has_page(n)); nsurl_unref(n); } else if (url_bar->hotlist.set) { @@ -1252,16 +1357,19 @@ bool ro_gui_url_bar_test_for_text_field_keypress(struct url_bar *url_bar, /* This is an exported interface documented in url_bar.h */ -bool ro_gui_url_bar_set_site_favicon(struct url_bar *url_bar, - struct hlcache_handle *h) +bool +ro_gui_url_bar_set_site_favicon(struct url_bar *url_bar, + struct hlcache_handle *h) { - content_type type = CONTENT_NONE; + content_type type = CONTENT_NONE; - if (url_bar == NULL) + if (url_bar == NULL) { return false; + } - if (h != NULL) + if (h != NULL) { type = content_get_type(h); + } // \TODO -- Maybe test for CONTENT_ICO ??? @@ -1270,37 +1378,41 @@ bool ro_gui_url_bar_set_site_favicon(struct url_bar *url_bar, url_bar->favicon_width = content_get_width(h); url_bar->favicon_height = content_get_height(h); - if (url_bar->favicon_width > URLBAR_FAVICON_SIZE) + if (url_bar->favicon_width > URLBAR_FAVICON_SIZE) { url_bar->favicon_width = URLBAR_FAVICON_SIZE; + } - if (url_bar->favicon_height > URLBAR_FAVICON_SIZE) + if (url_bar->favicon_height > URLBAR_FAVICON_SIZE) { url_bar->favicon_height = URLBAR_FAVICON_SIZE; + } url_bar->favicon_offset.x = ((url_bar->favicon_extent.x1 - - url_bar->favicon_extent.x0) - - (url_bar->favicon_width * 2)) / 2; + url_bar->favicon_extent.x0) - + (url_bar->favicon_width * 2)) / 2; url_bar->favicon_offset.y = ((url_bar->favicon_extent.y1 - - url_bar->favicon_extent.y0) - - (url_bar->favicon_height * 2)) / 2; + url_bar->favicon_extent.y0) - + (url_bar->favicon_height * 2)) / 2; } else { url_bar->favicon_content = NULL; - if (url_bar->favicon_type != 0) + if (url_bar->favicon_type != 0) { snprintf(url_bar->favicon_sprite, - URLBAR_FAVICON_NAME_LENGTH, - "Ssmall_%.3x", url_bar->favicon_type); - else + URLBAR_FAVICON_NAME_LENGTH, + "Ssmall_%.3x", url_bar->favicon_type); + } else { snprintf(url_bar->favicon_sprite, - URLBAR_FAVICON_NAME_LENGTH, - "Ssmall_xxx"); + URLBAR_FAVICON_NAME_LENGTH, + "Ssmall_xxx"); + } } - if (!url_bar->hidden) + if (!url_bar->hidden) { xwimp_force_redraw(url_bar->window, - url_bar->favicon_extent.x0, - url_bar->favicon_extent.y0, - url_bar->favicon_extent.x1, - url_bar->favicon_extent.y1); + url_bar->favicon_extent.x0, + url_bar->favicon_extent.y0, + url_bar->favicon_extent.x1, + url_bar->favicon_extent.y1); + } return true; } @@ -1348,10 +1460,10 @@ bool ro_gui_url_bar_page_info_change(struct url_bar *url_bar) if (!url_bar->hidden) { xwimp_force_redraw(url_bar->window, - url_bar->pginfo_extent.x0, - url_bar->pginfo_extent.y0, - url_bar->pginfo_extent.x1, - url_bar->pginfo_extent.y1); + url_bar->pginfo_extent.x0, + url_bar->pginfo_extent.y0, + url_bar->pginfo_extent.x1, + url_bar->pginfo_extent.y1); } return true; @@ -1359,44 +1471,51 @@ bool ro_gui_url_bar_page_info_change(struct url_bar *url_bar) /* This is an exported interface documented in url_bar.h */ -bool ro_gui_url_bar_set_content_favicon(struct url_bar *url_bar, - struct gui_window *g) +bool +ro_gui_url_bar_set_content_favicon(struct url_bar *url_bar, + struct gui_window *g) { int type = 0; char sprite[URLBAR_FAVICON_NAME_LENGTH]; struct hlcache_handle *h; - if (url_bar == NULL || g == NULL) + if (url_bar == NULL || + g == NULL) { return false; + } h = browser_window_get_content(g->bw); - if (h != NULL) + if (h != NULL) { type = ro_content_filetype(h); + } if (type != 0) { snprintf(sprite, URLBAR_FAVICON_NAME_LENGTH, - "small_%.3x", type); + "small_%.3x", type); - if (!ro_gui_wimp_sprite_exists(sprite)) + if (!ro_gui_wimp_sprite_exists(sprite)) { type = 0; + } } url_bar->favicon_type = type; if (url_bar->favicon_content == NULL) { - if (type == 0) + if (type == 0) { snprintf(url_bar->favicon_sprite, - URLBAR_FAVICON_NAME_LENGTH, "Ssmall_xxx"); - else + URLBAR_FAVICON_NAME_LENGTH, "Ssmall_xxx"); + } else { snprintf(url_bar->favicon_sprite, - URLBAR_FAVICON_NAME_LENGTH, "S%s", sprite); + URLBAR_FAVICON_NAME_LENGTH, "S%s", sprite); + } - if (!url_bar->hidden) + if (!url_bar->hidden) { xwimp_force_redraw(url_bar->window, - url_bar->favicon_extent.x0, - url_bar->favicon_extent.y0, - url_bar->favicon_extent.x1, - url_bar->favicon_extent.y1); + url_bar->favicon_extent.x0, + url_bar->favicon_extent.y0, + url_bar->favicon_extent.x1, + url_bar->favicon_extent.y1); + } } return true; @@ -1404,41 +1523,21 @@ bool ro_gui_url_bar_set_content_favicon(struct url_bar *url_bar, /* This is an exported interface documented in url_bar.h */ - bool ro_gui_url_bar_update_urlsuggest(struct url_bar *url_bar) { - if (url_bar == NULL || url_bar->hidden) + if (url_bar == NULL || + url_bar->hidden) { return (url_bar == NULL) ? false : true; + } - if (url_bar->window != NULL && url_bar->suggest_icon != -1) + if (url_bar->window != NULL && + url_bar->suggest_icon != -1) { ro_gui_set_icon_shaded_state(url_bar->window, - url_bar->suggest_icon, - !ro_gui_url_suggest_get_menu_available()); - - return true; -} - - -/** - * Callback for hlcache. - */ -static nserror ro_gui_url_bar_res_cb(hlcache_handle *handle, - const hlcache_event *event, void *pw) -{ - struct url_bar_resource *r = pw; - - switch (event->type) { - case CONTENT_MSG_READY: - case CONTENT_MSG_DONE: - r->ready = true; - r->height = content_get_height(handle); - break; - - default: - break; + url_bar->suggest_icon, + !ro_gui_url_suggest_get_menu_available()); } - return NSERROR_OK; + return true; } @@ -1450,10 +1549,15 @@ bool ro_gui_url_bar_init(void) for (i = 0; i < URLBAR_RES_LAST; i++) { nsurl *url; if (nsurl_create(url_bar_res[i].url, &url) == NSERROR_OK) { - hlcache_handle_retrieve(url, 0, NULL, NULL, - ro_gui_url_bar_res_cb, - &(url_bar_res[i]), NULL, - CONTENT_IMAGE, &(url_bar_res[i].c)); + hlcache_handle_retrieve(url, + 0, + NULL, + NULL, + ro_gui_url_bar_res_cb, + &(url_bar_res[i]), + NULL, + CONTENT_IMAGE, + &(url_bar_res[i].c)); nsurl_unref(url); } } |