debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use a trick to prevent default activation when middle clicking

Browse source
This commit is contained in:
Christian Dywan 2009-05-17 13:38:42 +02:00
parent b47ee725fd
commit 696a592e82
1 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
midori/midori-browser.c
View file

@ -2863,6 +2863,12 @@ static void
_action_back_activate (GtkAction* action, _action_back_activate (GtkAction* action,
MidoriBrowser* browser) MidoriBrowser* browser)
{ {
if (g_object_get_data (G_OBJECT (action), "midori-middle-click"))
{
g_object_set_data (G_OBJECT (action), "midori-middle-click", (void*)0);
return;
}
GtkWidget* view = midori_browser_get_current_tab (browser); GtkWidget* view = midori_browser_get_current_tab (browser);
if (view) if (view)
midori_view_go_back (MIDORI_VIEW (view)); midori_view_go_back (MIDORI_VIEW (view));
@ -2872,6 +2878,12 @@ static void
_action_forward_activate (GtkAction* action, _action_forward_activate (GtkAction* action,
MidoriBrowser* browser) MidoriBrowser* browser)
{ {
if (g_object_get_data (G_OBJECT (action), "midori-middle-click"))
{
g_object_set_data (G_OBJECT (action), "midori-middle-click", (void*)0);
return;
}
GtkWidget* view = midori_browser_get_current_tab (browser); GtkWidget* view = midori_browser_get_current_tab (browser);
if (view) if (view)
midori_view_go_forward (MIDORI_VIEW (view)); midori_view_go_forward (MIDORI_VIEW (view));
@ -2881,6 +2893,12 @@ static void
_action_homepage_activate (GtkAction* action, _action_homepage_activate (GtkAction* action,
MidoriBrowser* browser) MidoriBrowser* browser)
{ {
if (g_object_get_data (G_OBJECT (action), "midori-middle-click"))
{
g_object_set_data (G_OBJECT (action), "midori-middle-click", (void*)0);
return;
}
gchar* homepage; gchar* homepage;
if (!browser->settings) if (!browser->settings)
@ -3274,6 +3292,10 @@ midori_browser_menu_middle_click_on_navigation_action (MidoriBrowser* browser,
name = gtk_action_get_name (action); name = gtk_action_get_name (action);
/* We use a trick here to implement middle click and prevent the default
"activate" callback from being invoked. We set "midori-middle-click"
as GObject data and check the value in the "activate" callback. */
if (g_str_equal (name, "Homepage")) if (g_str_equal (name, "Homepage"))
{ {
gint n; gint n;
@ -3281,6 +3303,8 @@ midori_browser_menu_middle_click_on_navigation_action (MidoriBrowser* browser,
n = midori_browser_add_uri (browser, homepage); n = midori_browser_add_uri (browser, homepage);
_midori_browser_set_current_page_smartly (browser, n); _midori_browser_set_current_page_smartly (browser, n);
g_object_set_data (G_OBJECT (action), "midori-middle-click", (void*)1);
return TRUE; return TRUE;
} }
else if (g_str_equal (name, "Back")) else if (g_str_equal (name, "Back"))
@ -3302,6 +3326,8 @@ midori_browser_menu_middle_click_on_navigation_action (MidoriBrowser* browser,
n = midori_browser_add_uri (browser, back_uri); n = midori_browser_add_uri (browser, back_uri);
_midori_browser_set_current_page_smartly (browser, n); _midori_browser_set_current_page_smartly (browser, n);
g_object_set_data (G_OBJECT (action), "midori-middle-click", (void*)1);
return TRUE; return TRUE;
} }
else if (g_str_equal (name, "Forward")) else if (g_str_equal (name, "Forward"))
@ -3324,6 +3350,8 @@ midori_browser_menu_middle_click_on_navigation_action (MidoriBrowser* browser,
n = midori_browser_add_uri (browser, forward_uri); n = midori_browser_add_uri (browser, forward_uri);
_midori_browser_set_current_page_smartly (browser, n); _midori_browser_set_current_page_smartly (browser, n);
g_object_set_data (G_OBJECT (action), "midori-middle-click", (void*)1);
return TRUE; return TRUE;
} }