diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2005-01-23 23:38:02 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2005-01-23 23:38:02 +0800 |
| commit | 361ed3d1c475f7b1ab2226abf7605405411ab185 (patch) | |
| tree | 331891b90297d0d93026d2ca15b86570b634fc1e /src/ephy-tab.c | |
| parent | 8f10d345ad4bebf6a99c8a62e2448f49338eeb33 (diff) | |
| download | gsoc2013-epiphany-361ed3d1c475f7b1ab2226abf7605405411ab185.tar gsoc2013-epiphany-361ed3d1c475f7b1ab2226abf7605405411ab185.tar.gz gsoc2013-epiphany-361ed3d1c475f7b1ab2226abf7605405411ab185.tar.bz2 gsoc2013-epiphany-361ed3d1c475f7b1ab2226abf7605405411ab185.tar.lz gsoc2013-epiphany-361ed3d1c475f7b1ab2226abf7605405411ab185.tar.xz gsoc2013-epiphany-361ed3d1c475f7b1ab2226abf7605405411ab185.tar.zst gsoc2013-epiphany-361ed3d1c475f7b1ab2226abf7605405411ab185.zip | |
Check for broken context event button.
2005-01-23 Christian Persch <chpe@cvs.gnome.org>
* configure.ac:
Check for broken context event button.
* embed/ephy-embed-event.c: (ephy_embed_event_get_context),
(ephy_embed_event_get_button):
* embed/ephy-embed-event.h:
* embed/mozilla/mozilla-embed-event.cpp:
* embed/mozilla/mozilla-embed-event.h:
Change get_type to get_button, and don't store a nsCOMPtr in .priv.
* src/ephy-tab.c: (ephy_tab_dom_mouse_click_cb):
* src/ephy-window.c: (show_embed_popup), (tab_context_menu_cb),
(ephy_window_set_active_tab):
Adapted for above change.
* embed/mozilla/EphyBrowser.cpp:
* embed/mozilla/EphyBrowser.h:
Attach listener to oncontextmenu event.
* embed/mozilla/EventContext.cpp:
* embed/mozilla/EventContext.h:
Get event target coordinates also for 'mouse' context events.
* embed/mozilla/mozilla-embed.cpp:
Remove key-down handler, and context code from mouse-down handler.
Diffstat (limited to 'src/ephy-tab.c')
| -rw-r--r-- | src/ephy-tab.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/ephy-tab.c b/src/ephy-tab.c index 4b297e5b1..11ec9168a 100644 --- a/src/ephy-tab.c +++ b/src/ephy-tab.c @@ -1521,9 +1521,8 @@ ephy_tab_dom_mouse_click_cb (EphyEmbed *embed, EphyEmbedEvent *event, EphyTab *tab) { - EphyEmbedEventType type; EphyEmbedEventContext context; - guint modifier; + guint button, modifier; gboolean handled = TRUE; gboolean with_control, with_shift, is_left_click, is_middle_click; gboolean is_link, is_image, is_middle_clickable; @@ -1532,17 +1531,17 @@ ephy_tab_dom_mouse_click_cb (EphyEmbed *embed, g_return_val_if_fail (EPHY_IS_EMBED_EVENT(event), FALSE); - type = ephy_embed_event_get_event_type (event); + button = ephy_embed_event_get_button (event); context = ephy_embed_event_get_context (event); modifier = ephy_embed_event_get_modifier (event); - LOG ("ephy_tab_dom_mouse_click_cb: type %d, context %x, modifier %x", - type, context, modifier) + LOG ("ephy_tab_dom_mouse_click_cb: button %d, context %x, modifier %x", + button, context, modifier) with_control = (modifier & GDK_CONTROL_MASK) != 0; with_shift = (modifier & GDK_SHIFT_MASK) != 0; - is_left_click = (type == EPHY_EMBED_EVENT_MOUSE_BUTTON1); - is_middle_click = (type == EPHY_EMBED_EVENT_MOUSE_BUTTON2); + is_left_click = (button == 1); + is_middle_click = (button == 2); middle_click_opens = eel_gconf_get_boolean (CONF_INTERFACE_MIDDLE_CLICK_OPEN_URL) && |