From 05c1a745685731dd66ec946080d441316bfe5444 Mon Sep 17 00:00:00 2001
From: corvid <corvid@lavabit.com>
Date: Fri, 16 Sep 2011 22:19:33 +0000
Subject: use x,y for tools popup

---
 src/menu.cc  | 5 ++---
 src/menu.hh  | 2 +-
 src/ui.cc    | 3 ++-
 src/uicmd.cc | 4 ++--
 src/uicmd.hh | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/menu.cc b/src/menu.cc
index f0c1ce5b..658b89bc 100644
--- a/src/menu.cc
+++ b/src/menu.cc
@@ -616,10 +616,9 @@ static void Menu_imgload_toggle_cb(Fl_Widget *wid, void*)
 /*
  * Tools popup menu (construction & popup)
  */
-void a_Menu_tools_popup(BrowserWindow *bw, void *v_wid)
+void a_Menu_tools_popup(BrowserWindow *bw, int x, int y)
 {
    const Fl_Menu_Item *item;
-   Fl_Widget *wid = (Fl_Widget*)v_wid;
    UI *ui = (UI*)bw->ui;
 
    static Fl_Menu_Item pm[] = {
@@ -652,7 +651,7 @@ void a_Menu_tools_popup(BrowserWindow *bw, void *v_wid)
    pm[4+cur_panelsize].setonly();
    cur_smallicons ? pm[7].set() : pm[7].clear();
 
-   item = pm->popup(wid->x(), wid->y() + wid->h());
+   item = pm->popup(x, y);
    if (item) {
       ((Fl_Widget *)item)->do_callback();
    }
diff --git a/src/menu.hh b/src/menu.hh
index f8fa1fea..a8170e89 100644
--- a/src/menu.hh
+++ b/src/menu.hh
@@ -18,7 +18,7 @@ void a_Menu_form_popup(BrowserWindow *bw, const DilloUrl *page_url,
 void a_Menu_file_popup(BrowserWindow *bw, void *v_wid);
 void a_Menu_bugmeter_popup(BrowserWindow *bw, const DilloUrl *url);
 void a_Menu_history_popup(BrowserWindow *bw, int x, int y, int direction);
-void a_Menu_tools_popup(BrowserWindow *bw, void *v_wid);
+void a_Menu_tools_popup(BrowserWindow *bw, int x, int y);
 
 
 #ifdef __cplusplus
diff --git a/src/ui.cc b/src/ui.cc
index 3996fc2b..afa88073 100644
--- a/src/ui.cc
+++ b/src/ui.cc
@@ -344,7 +344,8 @@ static void b1_cb(Fl_Widget *wid, void *cb_data)
       break;
    case UI_TOOLS:
       if (b == FL_LEFT_MOUSE || b == FL_RIGHT_MOUSE) {
-         a_UIcmd_tools(a_UIcmd_get_bw_by_widget(wid), wid);
+         a_UIcmd_tools(a_UIcmd_get_bw_by_widget(wid), wid->x(),
+                       wid->y() + wid->h());
       }
       break;
    default:
diff --git a/src/uicmd.cc b/src/uicmd.cc
index 180ce7d2..5ce7afb4 100644
--- a/src/uicmd.cc
+++ b/src/uicmd.cc
@@ -838,9 +838,9 @@ void a_UIcmd_stop(void *vbw)
 /*
  * Popup the tools menu
  */
-void a_UIcmd_tools(void *vbw, void *v_wid)
+void a_UIcmd_tools(void *vbw, int x, int y)
 {
-   a_Menu_tools_popup((BrowserWindow*)vbw, v_wid);
+   a_Menu_tools_popup((BrowserWindow*)vbw, x, y);
 }
 
 /*
diff --git a/src/uicmd.hh b/src/uicmd.hh
index 8989782d..c859ba9c 100644
--- a/src/uicmd.hh
+++ b/src/uicmd.hh
@@ -26,7 +26,7 @@ void a_UIcmd_repush(void *vbw);
 void a_UIcmd_redirection0(void *vbw, const DilloUrl *url);
 void a_UIcmd_save(void *vbw);
 void a_UIcmd_stop(void *vbw);
-void a_UIcmd_tools(void *vbw, void *v_wid);
+void a_UIcmd_tools(void *vbw, int x, int y);
 void a_UIcmd_save_link(BrowserWindow *bw, const DilloUrl *url);
 void a_UIcmd_open_file(void *vbw);
 const char *a_UIcmd_select_file();
-- 
cgit v1.2.3