Midori Web Browser

Merge lp:~tuxator/midori/octo-mouse into lp:midori

  1. octo-mouse
  2. Merge into trunk
Proposed by Paweł Forysiuk
Status: Merged
Approved by: Cris Dywan
Approved revision: 6329
Merged at revision: 6330
Proposed branch: lp:~tuxator/midori/octo-mouse
Merge into: lp:midori
Diff against target: 46 lines (+12/-1)
2 files modified
midori/midori-app.c (+1/-1)
midori/midori-view.c (+11/-0)
To merge this branch: bzr merge lp:~tuxator/midori/octo-mouse
Reviewer Review Type Date Requested Status
Cris Dywan Approve
Review via email: mp+179349@code.launchpad.net

Commit message

win32: support additional mouse buttons for going back/forward in history

To post a comment you must log in.
Revision history for this message
Cris Dywan (kalikiana) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'midori/midori-app.c'
2--- midori/midori-app.c 2013-07-01 20:20:33 +0000
3+++ midori/midori-app.c 2013-08-09 08:24:57 +0000
4@@ -1443,7 +1443,7 @@
5 midori_debug (const gchar* token)
6 {
7 static const gchar* debug_token = NULL;
8- const gchar* debug_tokens = "headers body referer cookies paths hsts unarmed bookmarks ";
9+ const gchar* debug_tokens = "headers body referer cookies paths hsts unarmed bookmarks mouse ";
10 const gchar* full_debug_tokens = "adblock:match adblock:time startup ";
11 if (debug_token == NULL)
12 {
13
14=== modified file 'midori/midori-view.c'
15--- midori/midori-view.c 2013-08-04 23:00:47 +0000
16+++ midori/midori-view.c 2013-08-09 08:24:57 +0000
17@@ -1592,6 +1592,9 @@
18 link_uri = midori_view_get_link_uri (view);
19 view->button_press_handled = FALSE;
20
21+ if (midori_debug ("mouse"))
22+ g_message ("%s button %d\n", G_STRFUNC, event->button);
23+
24 switch (event->button)
25 {
26 case 1:
27@@ -1715,11 +1718,19 @@
28 return TRUE;
29 }
30 break;
31+#ifdef G_OS_WIN32
32+ case 4:
33+#else
34 case 8:
35+#endif
36 midori_view_go_back (view);
37 view->button_press_handled = TRUE;
38 return TRUE;
39+#ifdef G_OS_WIN32
40+ case 5:
41+#else
42 case 9:
43+#endif
44 midori_tab_go_forward (MIDORI_TAB (view));
45 view->button_press_handled = TRUE;
46 return TRUE;

Subscribers

People subscribed via source and target branches

to all changes: