mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2025-02-22 09:24:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

Core form select widget now associated with HTML contents. Don't use current_redraw_browser for select widget redraw. Fixes core select widget in iframes.

Browse Source 
svn path=/trunk/netsurf/; revision=12522
This commit is contained in:
Michael Drake 2011-06-28 11:15:39 +00:00
parent e70d4947ea
commit 5c9155e606
7 changed files with 60 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
desktop/browser.c
View File

@ -1455,8 +1455,6 @@ void browser_window_refresh_url_bar(struct browser_window *bw, const char *url,
assert(bw);
assert(url);
bw->visible_select_menu = NULL;
if (bw->parent != NULL) {
/* Not root window; don't set a URL in GUI URL bar */
@ -1804,12 +1802,7 @@ void browser_window_mouse_drag_end(struct browser_window *bw,
break;
case DRAGGING_OTHER:
if (bw->visible_select_menu != NULL) {
form_select_mouse_drag_end(bw->visible_select_menu,
mouse, x, y);
bw->drag_type = DRAGGING_NONE;
}
/* Drag handled by content handler */
break;
default:

2
desktop/browser.h
View File

@ -185,8 +185,6 @@ struct browser_window {
/** search context for free text search */
struct search_context *search_context;
struct form_control *visible_select_menu;
/** cache of the currently displayed status text. */
char *status_text; /**< Current status bar text. */
int status_text_len; /**< Length of the ::status_text buffer. */

60
render/form.c
View File

@ -46,6 +46,7 @@
#include "render/font.h"
#include "render/form.h"
#include "render/html.h"
#include "render/html_internal.h"
#include "render/layout.h"
#include "utils/log.h"
#include "utils/messages.h"
@ -67,7 +68,7 @@ struct form_select_menu {
bool scroll_capture;
select_menu_redraw_callback callback;
void *client_data;
struct browser_window *bw;
struct content *c;
};
static plot_style_t plot_style_fill_selected = {
@ -868,7 +869,7 @@ char *form_encode_item(const char *item, const char *charset,
bool form_open_select_menu(void *client_data,
struct form_control *control,
select_menu_redraw_callback callback,
struct browser_window *bw)
struct content *c)
{
int i, line_height_with_spacing, scroll;
struct form_option *option;
@ -876,45 +877,48 @@ bool form_open_select_menu(void *client_data,
plot_font_style_t fstyle;
int total_height;
struct form_select_menu *menu;
/* if the menu is opened for the first time */
if (control->data.select.menu == NULL) {
menu = calloc(1, sizeof (struct form_select_menu));
if (menu == NULL) {
warn_user("NoMemory", 0);
return false;
}
control->data.select.menu = menu;
box = control->box;
menu->width = box->width +
box->border[RIGHT].width +
box->border[LEFT].width +
box->padding[RIGHT] + box->padding[LEFT];
font_plot_style_from_css(control->box->style,
&fstyle);
menu->f_size = fstyle.size;
menu->line_height = FIXTOINT(FDIV((FMUL(FLTTOFIX(1.2), FMUL(nscss_screen_dpi, INTTOFIX((fstyle.size / FONT_SIZE_SCALE))))), F_72));
menu->line_height = FIXTOINT(FDIV((FMUL(FLTTOFIX(1.2),
FMUL(nscss_screen_dpi,
INTTOFIX(fstyle.size / FONT_SIZE_SCALE)))),
F_72));
line_height_with_spacing = menu->line_height +
menu->line_height *
SELECT_LINE_SPACING;
total_height = control->data.select.num_items *
line_height_with_spacing;
menu->height = total_height;
scroll = 0;
if (menu->height > MAX_SELECT_HEIGHT) {
menu->height = MAX_SELECT_HEIGHT;
if (control->data.select.num_selected > 0) {
i = 0;
option = control->data.select.items;
@ -922,7 +926,7 @@ bool form_open_select_menu(void *client_data,
option = option->next;
i++;
}
if ((i + 1) * line_height_with_spacing >
MAX_SELECT_HEIGHT)
scroll = (i + 1) *
@ -942,12 +946,12 @@ bool form_open_select_menu(void *client_data,
free(menu);
return false;
}
menu->bw = bw;
menu->c = c;
}
else menu = control->data.select.menu;
menu->callback(client_data, 0, 0, menu->width, menu->height);
return true;
}
@ -1143,7 +1147,8 @@ bool form_clip_inside_select_menu(struct form_control *control, float scale,
void form_select_menu_clicked(struct form_control *control, int x, int y)
{
struct form_select_menu *menu = control->data.select.menu;
struct form_option *option;
struct form_option *option;
html_content *html = (html_content *)menu->c;
int line_height, line_height_with_spacing;
int item_bottom_y;
int scroll, i;
@ -1163,9 +1168,11 @@ void form_select_menu_clicked(struct form_control *control, int x, int y)
i++;
}
if (option != NULL)
form_select_process_selection(menu->bw->current_content,
if (option != NULL) {
/* TODO: going via the bw to get a hlcache_handle is nasty */
form_select_process_selection(html->bw->current_content,
control, i);
}
menu->callback(menu->client_data, 0, 0, menu->width, menu->height);
}
@ -1278,6 +1285,7 @@ void form_select_menu_scroll_callback(void *client_data,
{
struct form_control *control = client_data;
struct form_select_menu *menu = control->data.select.menu;
html_content *html = (html_content *)menu->c;
switch (scrollbar_data->msg) {
case SCROLLBAR_MSG_REDRAW:
@ -1295,10 +1303,10 @@ void form_select_menu_scroll_callback(void *client_data,
menu->height);
break;
case SCROLLBAR_MSG_SCROLL_START:
browser_window_set_drag_type(menu->bw, DRAGGING_OTHER);
browser_window_set_drag_type(html->bw, DRAGGING_OTHER);
menu->scroll_capture = true;
gui_window_box_scroll_start(menu->bw->window,
gui_window_box_scroll_start(html->bw->window,
scrollbar_data->x0, scrollbar_data->y0,
scrollbar_data->x1, scrollbar_data->y1);
break;
@ -1399,18 +1407,18 @@ void form_select_process_selection(hlcache_handle *h,
void form_select_menu_callback(void *client_data,
int x, int y, int width, int height)
{
struct browser_window *bw = client_data;
html_content *html = client_data;
int menu_x, menu_y;
struct box *box;
box = bw->visible_select_menu->box;
box = html->visible_select_menu->box;
box_coords(box, &menu_x, &menu_y);
menu_x -= box->border[LEFT].width;
menu_y += box->height + box->border[BOTTOM].width +
box->padding[BOTTOM] +
box->padding[TOP];
browser_window_redraw_rect(bw, menu_x + x, menu_y + y,
content__request_redraw((struct content *)html, menu_x + x, menu_y + y,
width, height);
}

2
render/form.h
View File

@ -156,7 +156,7 @@ char *form_url_encode(struct form *form,
bool form_open_select_menu(void *client_data,
struct form_control *control,
select_menu_redraw_callback redraw_callback,
struct browser_window *bw);
struct content *c);
void form_select_menu_callback(void *client_data,
int x, int y, int width, int height);
void form_free_select_menu(struct form_control *control);

25
render/html_interaction.c
View File

@ -145,22 +145,29 @@ void html_mouse_action(struct content *c, struct browser_window *bw,
html_content *html = (html_content *) c;
if (bw->visible_select_menu != NULL) {
box = bw->visible_select_menu->box;
if (bw->drag_type != DRAGGING_NONE && !mouse &&
html->visible_select_menu != NULL) {
/* drag end: select menu */
form_select_mouse_drag_end(html->visible_select_menu,
mouse, x, y);
}
if (html->visible_select_menu != NULL) {
box = html->visible_select_menu->box;
box_coords(box, &box_x, &box_y);
box_x -= box->border[LEFT].width;
box_y += box->height + box->border[BOTTOM].width +
box->padding[BOTTOM] + box->padding[TOP];
status = form_select_mouse_action(bw->visible_select_menu,
status = form_select_mouse_action(html->visible_select_menu,
mouse, x - box_x, y - box_y);
if (status != NULL)
browser_window_set_status(bw, status);
else {
int width, height;
form_select_get_dimensions(bw->visible_select_menu,
form_select_get_dimensions(html->visible_select_menu,
&width, &height);
bw->visible_select_menu = NULL;
html->visible_select_menu = NULL;
browser_window_redraw_rect(bw, box_x, box_y,
width, height);
}
@ -169,7 +176,7 @@ void html_mouse_action(struct content *c, struct browser_window *bw,
if (bw->drag_type != DRAGGING_NONE && !mouse &&
html->scrollbar != NULL) {
/* Scrollbar drag end */
/* drag end: scrollbar */
html_overflow_scroll_drag_end(html->scrollbar, mouse, x, y);
}
@ -321,10 +328,10 @@ void html_mouse_action(struct content *c, struct browser_window *bw,
pointer = GUI_POINTER_MENU;
if (mouse & BROWSER_MOUSE_CLICK_1 &&
option_core_select_menu) {
bw->visible_select_menu = gadget;
form_open_select_menu(bw, gadget,
html->visible_select_menu = gadget;
form_open_select_menu(c, gadget,
form_select_menu_callback,
bw);
c);
pointer = GUI_POINTER_DEFAULT;
} else if (mouse & BROWSER_MOUSE_CLICK_1)
gui_create_form_select_menu(bw, gadget);

4
render/html_internal.h
View File

@ -88,6 +88,10 @@ typedef struct html_content {
/** Scrollbar capturing all mouse events, updated to any active HTML
* scrollbar, or NULL when no scrollbar drags active */
struct scrollbar *scrollbar;
/** Open core-handled form SELECT menu,
* or NULL if none currently open. */
struct form_control *visible_select_menu;
} html_content;

10
render/html_redraw.c
View File

@ -134,9 +134,8 @@ bool html_redraw(struct content *c, int x, int y,
select = false;
select_only = false;
if (current_redraw_browser != NULL &&
current_redraw_browser->visible_select_menu != NULL) {
struct form_control *control =
current_redraw_browser->visible_select_menu;
html->visible_select_menu != NULL) {
struct form_control *control = html->visible_select_menu;
select = true;
/* check if the redraw rectangle is completely inside of the
select menu */
@ -160,14 +159,13 @@ bool html_redraw(struct content *c, int x, int y,
if (select) {
int menu_x, menu_y;
box = current_redraw_browser->visible_select_menu->box;
box = html->visible_select_menu->box;
box_coords(box, &menu_x, &menu_y);
menu_x -= box->border[LEFT].width;
menu_y += box->height + box->border[BOTTOM].width +
box->padding[BOTTOM] + box->padding[TOP];
result &= form_redraw_select_menu(
current_redraw_browser->visible_select_menu,
result &= form_redraw_select_menu(html->visible_select_menu,
x + menu_x, y + menu_y,
current_redraw_browser->scale, clip);
}