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.

1 files changed, 22 insertions, 0 deletions

diff --git a/embed/mozilla/EphyBrowser.h b/embed/mozilla/EphyBrowser.h
index 3b4f4ce06..4878dc412 100644
--- a/embed/mozilla/EphyBrowser.h
+++ b/embed/mozilla/EphyBrowser.h
@@ -29,6 +29,7 @@
 #include <gtkmozembed.h>
 #include <nsCOMPtr.h>
 #include <nsIDOMEventListener.h>
+#include <nsIDOMContextMenuListener.h>
 #include <nsIDOMEventTarget.h>
 #include <nsIWebNavigation.h>
 #include <nsISHistory.h>
@@ -84,12 +85,32 @@ public:
 	NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent);
 };
 
+class EphyContextMenuListener : public nsIDOMContextMenuListener
+{
+public:
+        NS_DECL_ISUPPORTS
+
+        EphyContextMenuListener();   
+        virtual ~EphyContextMenuListener();
+
+        nsresult Init(EphyBrowser *aOwner);
+
+	// nsIDOMContextMenuListener
+
+        NS_IMETHOD ContextMenu(nsIDOMEvent *aEvent);
+        NS_IMETHOD HandleEvent(nsIDOMEvent *aEvent);
+
+protected:
+        EphyBrowser *mOwner;
+};
+
 class EphyBrowser
 {
 friend class EphyEventListener;
 friend class EphyFaviconEventListener;
 friend class EphyPopupBlockEventListener;
 friend class EphyModalAlertEventListener;
+friend class EphyContextMenuListener;
 public:
 	EphyBrowser();
 	~EphyBrowser();
@@ -159,6 +180,7 @@ private:
 	EphyFaviconEventListener *mFaviconEventListener;
 	EphyPopupBlockEventListener *mPopupBlockEventListener;
 	EphyModalAlertEventListener *mModalAlertListener;
+	EphyContextMenuListener *mContextMenuListener;
 	PRBool mInitialized;
 #ifdef HAVE_MOZILLA_PSM
 	nsCOMPtr<nsISecureBrowserUI> mSecurityInfo;