From a38a63a37ef8bdc62661d398fb485296c0bed470 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Sat, 15 Feb 2014 18:43:59 +0000 Subject: Make history internal to browser_window module. --- framebuffer/gui.c | 11 +++++------ framebuffer/localhistory.c | 7 +++---- 2 files changed, 8 insertions(+), 10 deletions(-) (limited to 'framebuffer') diff --git a/framebuffer/gui.c b/framebuffer/gui.c index 5b4f7a686..fe33827f7 100644 --- a/framebuffer/gui.c +++ b/framebuffer/gui.c @@ -31,7 +31,7 @@ #include #include -#include "desktop/browser_private.h" +#include "desktop/browser_history.h" #include "desktop/gui.h" #include "desktop/mouse.h" #include "desktop/plotters.h" @@ -58,7 +58,6 @@ #include "framebuffer/fetch.h" #include "content/urldb.h" -#include "desktop/local_history.h" #include "content/fetch.h" #define NSFB_TOOLBAR_DEFAULT_LAYOUT "blfsrutc" @@ -988,8 +987,8 @@ fb_leftarrow_click(fbtk_widget_t *widget, fbtk_callback_info *cbi) if (cbi->event->type != NSFB_EVENT_KEY_UP) return 0; - if (history_back_available(bw->history)) - history_back(bw->history, false); + if (browser_window_back_available(bw)) + browser_window_history_back(bw, false); fb_update_back_forward(gw); @@ -1006,8 +1005,8 @@ fb_rightarrow_click(fbtk_widget_t *widget, fbtk_callback_info *cbi) if (cbi->event->type != NSFB_EVENT_KEY_UP) return 0; - if (history_forward_available(bw->history)) - history_forward(bw->history, false); + if (browser_window_forward_available(bw)) + browser_window_history_forward(bw, false); fb_update_back_forward(gw); return 1; diff --git a/framebuffer/localhistory.c b/framebuffer/localhistory.c index bb2736dd9..d7390abad 100644 --- a/framebuffer/localhistory.c +++ b/framebuffer/localhistory.c @@ -31,7 +31,7 @@ #include #include -#include "desktop/browser_private.h" +#include "desktop/browser_history.h" #include "desktop/gui.h" #include "desktop/plotters.h" #include "desktop/netsurf.h" @@ -52,7 +52,6 @@ #include "framebuffer/font.h" #include "content/urldb.h" -#include "desktop/local_history.h" #include "content/fetch.h" static int @@ -77,7 +76,7 @@ localhistory_redraw(fbtk_widget_t *widget, fbtk_callback_info *cbi) nsfb_plot_rectangle_fill(fbtk_get_nsfb(widget), &rbox, 0xffffffff); - history_redraw_rectangle(glh->bw->history, + browser_window_history_redraw_rectangle(glh->bw, glh->scrollx, glh->scrolly, fbtk_get_width(widget) + glh->scrollx, @@ -97,7 +96,7 @@ localhistory_click(fbtk_widget_t *widget, fbtk_callback_info *cbi) if (cbi->event->type != NSFB_EVENT_KEY_UP) return 0; - history_click(glh->bw->history, cbi->x, cbi->y, false); + browser_window_history_click(glh->bw, cbi->x, cbi->y, false); fbtk_set_mapping(glh->window, false); -- cgit v1.2.3