mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Core window: Ensure all front ends initialise drag_status.

This commit is contained in:
Michael Drake 2017-06-10 18:10:07 +01:00
parent 50371731e3
commit 92ecc77768
8 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/core-window-interface.md
View File

@ -156,7 +156,7 @@ frontends/example/corewindow.h
/** drag status set by core */ /** drag status set by core */
core_window_drag_status drag_staus; core_window_drag_status drag_status;
/** table of callbacks for core window operations */ /** table of callbacks for core window operations */
struct core_window_callback_table *cb_table; struct core_window_callback_table *cb_table;
@ -357,7 +357,7 @@ frontends/example/corewindow.c
example_cw_drag_status(struct core_window *cw, core_window_drag_status ds) example_cw_drag_status(struct core_window *cw, core_window_drag_status ds)
{ {
struct example_corewindow *example_cw = (struct example_corewindow *)cw; struct example_corewindow *example_cw = (struct example_corewindow *)cw;
example_cw->drag_staus = ds; example_cw->drag_status = ds;
} }

1
frontends/amiga/corewindow.c
View File

@ -920,6 +920,7 @@ nserror ami_corewindow_init(struct ami_corewindow *ami_cw)
{ {
/* setup the core window callback table */ /* setup the core window callback table */
ami_cw->cb_table = &ami_cw_cb_table; ami_cw->cb_table = &ami_cw_cb_table;
ami_cw->drag_status = CORE_WINDOW_DRAG_NONE;
/* clear some vars */ /* clear some vars */
ami_cw->mouse_state = BROWSER_MOUSE_HOVER; ami_cw->mouse_state = BROWSER_MOUSE_HOVER;

3
frontends/framebuffer/corewindow.c
View File

@ -171,7 +171,7 @@ static void
fb_cw_drag_status(struct core_window *cw, core_window_drag_status ds) fb_cw_drag_status(struct core_window *cw, core_window_drag_status ds)
{ {
struct fb_corewindow *fb_cw = (struct fb_corewindow *)cw; struct fb_corewindow *fb_cw = (struct fb_corewindow *)cw;
fb_cw->drag_staus = ds; fb_cw->drag_status = ds;
} }
@ -192,6 +192,7 @@ nserror fb_corewindow_init(fbtk_widget_t *parent, struct fb_corewindow *fb_cw)
/* setup the core window callback table */ /* setup the core window callback table */
fb_cw->cb_table = &fb_cw_cb_table; fb_cw->cb_table = &fb_cw_cb_table;
fb_cw->drag_status = CORE_WINDOW_DRAG_NONE;
/* container window */ /* container window */
fb_cw->wnd = fbtk_create_window(parent, 0, 0, 0, 0, 0); fb_cw->wnd = fbtk_create_window(parent, 0, 0, 0, 0, 0);

2
frontends/framebuffer/corewindow.h
View File

@ -47,7 +47,7 @@ struct fb_corewindow {
/** drag status set by core */ /** drag status set by core */
core_window_drag_status drag_staus; core_window_drag_status drag_status;
/** table of callbacks for core window operations */ /** table of callbacks for core window operations */
struct core_window_callback_table *cb_table; struct core_window_callback_table *cb_table;

4
frontends/gtk/corewindow.c
View File

@ -662,7 +662,7 @@ static void
nsgtk_cw_drag_status(struct core_window *cw, core_window_drag_status ds) nsgtk_cw_drag_status(struct core_window *cw, core_window_drag_status ds)
{ {
struct nsgtk_corewindow *nsgtk_cw = (struct nsgtk_corewindow *)cw; struct nsgtk_corewindow *nsgtk_cw = (struct nsgtk_corewindow *)cw;
nsgtk_cw->drag_staus = ds; nsgtk_cw->drag_status = ds;
} }
@ -682,7 +682,7 @@ static struct core_window_callback_table nsgtk_cw_cb_table = {
nserror nsgtk_corewindow_init(struct nsgtk_corewindow *nsgtk_cw) nserror nsgtk_corewindow_init(struct nsgtk_corewindow *nsgtk_cw)
{ {
nsgtk_cw->cb_table = &nsgtk_cw_cb_table; nsgtk_cw->cb_table = &nsgtk_cw_cb_table;
nsgtk_cw->drag_staus = CORE_WINDOW_DRAG_NONE; nsgtk_cw->drag_status = CORE_WINDOW_DRAG_NONE;
/* input method setup */ /* input method setup */
nsgtk_cw->input_method = gtk_im_multicontext_new(); nsgtk_cw->input_method = gtk_im_multicontext_new();

2
frontends/gtk/corewindow.h
View File

@ -51,7 +51,7 @@ struct nsgtk_corewindow {
/** mouse state */ /** mouse state */
struct nsgtk_corewindow_mouse mouse_state; struct nsgtk_corewindow_mouse mouse_state;
/** drag status set by core */ /** drag status set by core */
core_window_drag_status drag_staus; core_window_drag_status drag_status;
/** /**
* callback to draw on drawable area of nsgtk core window * callback to draw on drawable area of nsgtk core window

3
frontends/windows/corewindow.c
View File

@ -486,7 +486,7 @@ static void
nsw32_cw_drag_status(struct core_window *cw, core_window_drag_status ds) nsw32_cw_drag_status(struct core_window *cw, core_window_drag_status ds)
{ {
struct nsw32_corewindow *nsw32_cw = (struct nsw32_corewindow *)cw; struct nsw32_corewindow *nsw32_cw = (struct nsw32_corewindow *)cw;
nsw32_cw->drag_staus = ds; nsw32_cw->drag_status = ds;
} }
@ -508,6 +508,7 @@ nsw32_corewindow_init(HINSTANCE hInstance,
/* setup the core window callback table */ /* setup the core window callback table */
nsw32_cw->cb_table = &nsw32_cw_cb_table; nsw32_cw->cb_table = &nsw32_cw_cb_table;
nsw32_cw->drag_status = CORE_WINDOW_DRAG_NONE;
/* start with the content area being as small as possible */ /* start with the content area being as small as possible */
nsw32_cw->content_width = -1; nsw32_cw->content_width = -1;

2
frontends/windows/corewindow.h
View File

@ -38,7 +38,7 @@ struct nsw32_corewindow {
const char *title; const char *title;
/** drag status set by core */ /** drag status set by core */
core_window_drag_status drag_staus; core_window_drag_status drag_status;
/** table of callbacks for core window operations */ /** table of callbacks for core window operations */
struct core_window_callback_table *cb_table; struct core_window_callback_table *cb_table;