aboutsummaryrefslogtreecommitdiffstats
path: root/embed/ephy-embed-event.h
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2005-01-23 23:38:02 +0800
committerChristian Persch <chpe@src.gnome.org>2005-01-23 23:38:02 +0800
commit361ed3d1c475f7b1ab2226abf7605405411ab185 (patch)
tree331891b90297d0d93026d2ca15b86570b634fc1e /embed/ephy-embed-event.h
parent8f10d345ad4bebf6a99c8a62e2448f49338eeb33 (diff)
downloadgsoc2013-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 'embed/ephy-embed-event.h')
-rw-r--r--embed/ephy-embed-event.h14
1 files changed, 3 insertions, 11 deletions
diff --git a/embed/ephy-embed-event.h b/embed/ephy-embed-event.h
index 35af428dd..99cca384c 100644
--- a/embed/ephy-embed-event.h
+++ b/embed/ephy-embed-event.h
@@ -49,21 +49,13 @@ typedef enum
EPHY_EMBED_CONTEXT_EMAIL_LINK = 1 << 8
} EphyEmbedEventContext;
-typedef enum
-{
- EPHY_EMBED_EVENT_MOUSE_BUTTON1,
- EPHY_EMBED_EVENT_MOUSE_BUTTON2,
- EPHY_EMBED_EVENT_MOUSE_BUTTON3,
- EPHY_EMBED_EVENT_KEY
-} EphyEmbedEventType;
-
struct _EphyEmbedEventIface
{
GTypeInterface parent_iface;
/* Methods */
- EphyEmbedEventType (* get_type) (EphyEmbedEvent *event);
EphyEmbedEventContext (* get_context) (EphyEmbedEvent *event);
+ guint (* get_button) (EphyEmbedEvent *event);
guint (* get_modifier) (EphyEmbedEvent *event);
void (* get_coordinates) (EphyEmbedEvent *event,
guint *x,
@@ -82,10 +74,10 @@ GType ephy_embed_event_context_get_type (void);
GType ephy_embed_event_type_get_type (void);
-EphyEmbedEventType ephy_embed_event_get_event_type (EphyEmbedEvent *event);
-
EphyEmbedEventContext ephy_embed_event_get_context (EphyEmbedEvent *event);
+guint ephy_embed_event_get_button (EphyEmbedEvent *event);
+
guint ephy_embed_event_get_modifier (EphyEmbedEvent *event);