summaryrefslogtreecommitdiff
path: root/framebuffer/gui.h
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2010-07-07 18:08:17 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2010-07-07 18:08:17 +0000
commit5bebf2f2fc27a31c8b2efa7a837baef63c1b0a97 (patch)
tree65d353a907c3496eb638bbff780ff4d0f1437313 /framebuffer/gui.h
parentf6faa20a37f38643d505ba41baa8a88e3dfa545a (diff)
downloadnetsurf-5bebf2f2fc27a31c8b2efa7a837baef63c1b0a97.tar.gz
netsurf-5bebf2f2fc27a31c8b2efa7a837baef63c1b0a97.tar.bz2
Merge branches/vince/netsurf-fbtk-rework to trunk.
svn path=/trunk/netsurf/; revision=10605
Diffstat (limited to 'framebuffer/gui.h')
-rw-r--r--framebuffer/gui.h45
1 files changed, 29 insertions, 16 deletions
diff --git a/framebuffer/gui.h b/framebuffer/gui.h
index 98110ac6c..c1fa3cc1d 100644
--- a/framebuffer/gui.h
+++ b/framebuffer/gui.h
@@ -24,26 +24,41 @@ typedef struct fb_cursor_s fb_cursor_t;
/* bounding box */
typedef struct nsfb_bbox_s bbox_t;
+struct gui_localhistory {
+ struct browser_window *bw;
+
+ struct fbtk_widget_s *window;
+ struct fbtk_widget_s *hscroll;
+ struct fbtk_widget_s *vscroll;
+ struct fbtk_widget_s *history;
+
+ int scrollx, scrolly; /**< scroll offsets. */
+};
+
struct gui_window {
- struct browser_window *bw;
-
- struct fbtk_widget_s *window;
- struct fbtk_widget_s *back;
- struct fbtk_widget_s *forward;
- struct fbtk_widget_s *url;
- struct fbtk_widget_s *status;
- struct fbtk_widget_s *throbber;
- struct fbtk_widget_s *hscroll;
- struct fbtk_widget_s *vscroll;
- struct fbtk_widget_s *browser;
- int throbber_index;
+ struct browser_window *bw;
+
+ struct fbtk_widget_s *window;
+ struct fbtk_widget_s *back;
+ struct fbtk_widget_s *forward;
+ struct fbtk_widget_s *url;
+ struct fbtk_widget_s *status;
+ struct fbtk_widget_s *throbber;
+ struct fbtk_widget_s *hscroll;
+ struct fbtk_widget_s *vscroll;
+ struct fbtk_widget_s *browser;
+
+ int throbber_index;
+
+ struct gui_localhistory *localhistory;
};
extern struct gui_window *window_list;
-/* scroll a window */
-void fb_window_scroll(struct fbtk_widget_s *browser, int x, int y);
+struct gui_localhistory *fb_create_localhistory(struct browser_window *bw, struct fbtk_widget_s *parent, int furniture_width);
+void fb_localhistory_map(struct gui_localhistory * glh);
+
#endif /* NETSURF_FB_GUI_H */
@@ -52,5 +67,3 @@ void fb_window_scroll(struct fbtk_widget_s *browser, int x, int y);
* c-basic-offset:8
* End:
*/
-
-