From 9fdd190e008b86cc92abb41bb659d74161062369 Mon Sep 17 00:00:00 2001 From: Ole Loots Date: Thu, 3 Jan 2013 01:22:38 +0100 Subject: Removed browser.h/.c --- atari/ctxmenu.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'atari/ctxmenu.c') diff --git a/atari/ctxmenu.c b/atari/ctxmenu.c index 035fbcc9f..664556463 100644 --- a/atari/ctxmenu.c +++ b/atari/ctxmenu.c @@ -40,7 +40,6 @@ #include "utils/messages.h" #include "atari/gui.h" -#include "atari/browser.h" #include "atari/rootwin.h" #include "atari/misc.h" #include "atari/clipboard.h" @@ -70,7 +69,8 @@ static struct s_context_info * get_context_info( struct gui_window * gw, short m hlcache_handle *h; GRECT bwrect; struct contextual_content ccdata; - struct browser_window * bw = gw->browser->bw; + struct browser_window * bw = gw->browser->bw; + int sx, sy; h = bw->current_content; ctxinfo.flags = 0; @@ -89,13 +89,14 @@ static struct s_context_info * get_context_info( struct gui_window * gw, short m } ctxinfo.flags |= CNT_BROWSER; - memset( &ctxinfo.ccdata, sizeof(struct contextual_content), 0 ); - browser_window_get_contextual_content( - gw->browser->bw, - mx+gw->browser->scroll.current.x, - my+gw->browser->scroll.current.y, - (struct contextual_content*)&ctxinfo.ccdata - ); + + memset( &ctxinfo.ccdata, sizeof(struct contextual_content), 0 ); + + gui_window_get_scroll(gw, &sx, &sy); + + browser_window_get_contextual_content( gw->browser->bw, mx+sx, my+sy, + (struct contextual_content*)&ctxinfo.ccdata); + if( ctxinfo.ccdata.link_url ){ ctxinfo.flags |= CNT_HREF; } -- cgit v1.2.3