diff -u -r ../mozilla/content/events/src/nsDOMEvent.cpp ./content/events/src/nsDOMEvent.cpp --- ../mozilla/content/events/src/nsDOMEvent.cpp Tue Apr 17 01:52:09 2001 +++ ./content/events/src/nsDOMEvent.cpp Wed Jun 6 23:03:05 2001 @@ -459,6 +459,14 @@ case NS_MOUSE_RIGHT_BUTTON_DOWN: case NS_MOUSE_RIGHT_CLICK: case NS_MOUSE_RIGHT_DOUBLECLICK: + case NS_MOUSE_SIX_BUTTON_UP: + case NS_MOUSE_SIX_BUTTON_DOWN: + case NS_MOUSE_SIX_CLICK: + case NS_MOUSE_SIX_DOUBLECLICK: + case NS_MOUSE_SEVEN_BUTTON_UP: + case NS_MOUSE_SEVEN_BUTTON_DOWN: + case NS_MOUSE_SEVEN_CLICK: + case NS_MOUSE_SEVEN_DOUBLECLICK: *aDetail = ((nsMouseEvent*)mEvent)->clickCount; break; default: @@ -758,6 +766,18 @@ case NS_MOUSE_RIGHT_DOUBLECLICK: *aButton = 2; break; + case NS_MOUSE_SIX_BUTTON_UP: + case NS_MOUSE_SIX_BUTTON_DOWN: + case NS_MOUSE_SIX_CLICK: + case NS_MOUSE_SIX_DOUBLECLICK: + *aButton = 5; + break; + case NS_MOUSE_SEVEN_BUTTON_UP: + case NS_MOUSE_SEVEN_BUTTON_DOWN: + case NS_MOUSE_SEVEN_CLICK: + case NS_MOUSE_SEVEN_DOUBLECLICK: + *aButton = 6; + break; default: break; } @@ -1280,18 +1300,26 @@ case NS_MOUSE_LEFT_BUTTON_DOWN: case NS_MOUSE_MIDDLE_BUTTON_DOWN: case NS_MOUSE_RIGHT_BUTTON_DOWN: + case NS_MOUSE_SIX_BUTTON_DOWN: + case NS_MOUSE_SEVEN_BUTTON_DOWN: return mEventNames[eDOMEvents_mousedown]; case NS_MOUSE_LEFT_BUTTON_UP: case NS_MOUSE_MIDDLE_BUTTON_UP: case NS_MOUSE_RIGHT_BUTTON_UP: + case NS_MOUSE_SIX_BUTTON_UP: + case NS_MOUSE_SEVEN_BUTTON_UP: return mEventNames[eDOMEvents_mouseup]; case NS_MOUSE_LEFT_CLICK: case NS_MOUSE_MIDDLE_CLICK: case NS_MOUSE_RIGHT_CLICK: + case NS_MOUSE_SIX_CLICK: + case NS_MOUSE_SEVEN_CLICK: return mEventNames[eDOMEvents_click]; case NS_MOUSE_LEFT_DOUBLECLICK: case NS_MOUSE_MIDDLE_DOUBLECLICK: case NS_MOUSE_RIGHT_DOUBLECLICK: + case NS_MOUSE_SIX_DOUBLECLICK: + case NS_MOUSE_SEVEN_DOUBLECLICK: return mEventNames[eDOMEvents_dblclick]; case NS_MOUSE_ENTER_SYNTH: return mEventNames[eDOMEvents_mouseover]; diff -u -r ../mozilla/content/events/src/nsEventListenerManager.cpp ./content/events/src/nsEventListenerManager.cpp --- ../mozilla/content/events/src/nsEventListenerManager.cpp Mon Apr 23 01:33:07 2001 +++ ./content/events/src/nsEventListenerManager.cpp Wed Jun 6 23:06:41 2001 @@ -1092,15 +1092,23 @@ case NS_MOUSE_LEFT_BUTTON_DOWN: case NS_MOUSE_MIDDLE_BUTTON_DOWN: case NS_MOUSE_RIGHT_BUTTON_DOWN: + case NS_MOUSE_SIX_BUTTON_DOWN: + case NS_MOUSE_SEVEN_BUTTON_DOWN: case NS_MOUSE_LEFT_BUTTON_UP: case NS_MOUSE_MIDDLE_BUTTON_UP: case NS_MOUSE_RIGHT_BUTTON_UP: + case NS_MOUSE_SIX_BUTTON_UP: + case NS_MOUSE_SEVEN_BUTTON_UP: case NS_MOUSE_LEFT_CLICK: case NS_MOUSE_MIDDLE_CLICK: case NS_MOUSE_RIGHT_CLICK: + case NS_MOUSE_SIX_CLICK: + case NS_MOUSE_SEVEN_CLICK: case NS_MOUSE_LEFT_DOUBLECLICK: case NS_MOUSE_MIDDLE_DOUBLECLICK: case NS_MOUSE_RIGHT_DOUBLECLICK: + case NS_MOUSE_SIX_DOUBLECLICK: + case NS_MOUSE_SEVEN_DOUBLECLICK: case NS_MOUSE_ENTER_SYNTH: case NS_MOUSE_EXIT_SYNTH: listeners = GetListenersByType(eEventArrayType_Mouse, nsnull, PR_FALSE); @@ -1119,21 +1127,29 @@ case NS_MOUSE_LEFT_BUTTON_DOWN: case NS_MOUSE_MIDDLE_BUTTON_DOWN: case NS_MOUSE_RIGHT_BUTTON_DOWN: + case NS_MOUSE_SIX_BUTTON_DOWN: + case NS_MOUSE_SEVEN_BUTTON_DOWN: ret = mouseListener->MouseDown(*aDOMEvent); break; case NS_MOUSE_LEFT_BUTTON_UP: case NS_MOUSE_MIDDLE_BUTTON_UP: case NS_MOUSE_RIGHT_BUTTON_UP: + case NS_MOUSE_SIX_BUTTON_UP: + case NS_MOUSE_SEVEN_BUTTON_UP: ret = mouseListener->MouseUp(*aDOMEvent); break; case NS_MOUSE_LEFT_CLICK: case NS_MOUSE_MIDDLE_CLICK: case NS_MOUSE_RIGHT_CLICK: + case NS_MOUSE_SIX_CLICK: + case NS_MOUSE_SEVEN_CLICK: ret = mouseListener->MouseClick(*aDOMEvent); break; case NS_MOUSE_LEFT_DOUBLECLICK: case NS_MOUSE_MIDDLE_DOUBLECLICK: case NS_MOUSE_RIGHT_DOUBLECLICK: + case NS_MOUSE_SIX_DOUBLECLICK: + case NS_MOUSE_SEVEN_DOUBLECLICK: ret = mouseListener->MouseDblClick(*aDOMEvent); break; case NS_MOUSE_ENTER_SYNTH: @@ -1153,6 +1169,8 @@ case NS_MOUSE_LEFT_BUTTON_DOWN: case NS_MOUSE_MIDDLE_BUTTON_DOWN: case NS_MOUSE_RIGHT_BUTTON_DOWN: + case NS_MOUSE_SIX_BUTTON_DOWN: + case NS_MOUSE_SEVEN_BUTTON_DOWN: subType = NS_EVENT_BITS_MOUSE_MOUSEDOWN; if (ls->mSubType & NS_EVENT_BITS_MOUSE_MOUSEDOWN) { correctSubType = PR_TRUE; @@ -1161,6 +1179,8 @@ case NS_MOUSE_LEFT_BUTTON_UP: case NS_MOUSE_MIDDLE_BUTTON_UP: case NS_MOUSE_RIGHT_BUTTON_UP: + case NS_MOUSE_SIX_BUTTON_UP: + case NS_MOUSE_SEVEN_BUTTON_UP: subType = NS_EVENT_BITS_MOUSE_MOUSEUP; if (ls->mSubType & NS_EVENT_BITS_MOUSE_MOUSEUP) { correctSubType = PR_TRUE; @@ -1169,6 +1189,8 @@ case NS_MOUSE_LEFT_CLICK: case NS_MOUSE_MIDDLE_CLICK: case NS_MOUSE_RIGHT_CLICK: + case NS_MOUSE_SIX_CLICK: + case NS_MOUSE_SEVEN_CLICK: subType = NS_EVENT_BITS_MOUSE_CLICK; if (ls->mSubType & NS_EVENT_BITS_MOUSE_CLICK) { correctSubType = PR_TRUE; @@ -1177,6 +1199,8 @@ case NS_MOUSE_LEFT_DOUBLECLICK: case NS_MOUSE_MIDDLE_DOUBLECLICK: case NS_MOUSE_RIGHT_DOUBLECLICK: + case NS_MOUSE_SIX_DOUBLECLICK: + case NS_MOUSE_SEVEN_DOUBLECLICK: subType = NS_EVENT_BITS_MOUSE_DBLCLICK; if (ls->mSubType & NS_EVENT_BITS_MOUSE_DBLCLICK) { correctSubType = PR_TRUE; diff -u -r ../mozilla/content/events/src/nsEventStateManager.cpp ./content/events/src/nsEventStateManager.cpp --- ../mozilla/content/events/src/nsEventStateManager.cpp Tue Apr 24 22:04:27 2001 +++ ./content/events/src/nsEventStateManager.cpp Wed Jun 6 23:26:12 2001 @@ -122,6 +122,8 @@ mLastLeftMouseDownContent = nsnull; mLastMiddleMouseDownContent = nsnull; mLastRightMouseDownContent = nsnull; + mLastSixMouseDownContent = nsnull; + mLastSevenMouseDownContent = nsnull; mConsumeFocusEvents = PR_FALSE; mLockCursor = 0; @@ -133,6 +135,8 @@ mLClickCount = 0; mMClickCount = 0; mRClickCount = 0; + m6ClickCount = 0; + m7ClickCount = 0; mActiveContent = nsnull; mHoverContent = nsnull; mDragOverContent = nsnull; @@ -184,6 +188,8 @@ NS_IF_RELEASE(mLastLeftMouseDownContent); NS_IF_RELEASE(mLastMiddleMouseDownContent); NS_IF_RELEASE(mLastRightMouseDownContent); + NS_IF_RELEASE(mLastSixMouseDownContent); + NS_IF_RELEASE(mLastSevenMouseDownContent); NS_IF_RELEASE(mActiveContent); NS_IF_RELEASE(mHoverContent); @@ -310,6 +316,14 @@ mRClickCount = ((nsMouseEvent*)aEvent)->clickCount; SetClickCount(aPresContext, (nsMouseEvent*)aEvent, aStatus); break; + case NS_MOUSE_SIX_BUTTON_DOWN: + m6ClickCount = ((nsMouseEvent*)aEvent)->clickCount; + SetClickCount(aPresContext, (nsMouseEvent*)aEvent, aStatus); + break; + case NS_MOUSE_SEVEN_BUTTON_DOWN: + m7ClickCount = ((nsMouseEvent*)aEvent)->clickCount; + SetClickCount(aPresContext, (nsMouseEvent*)aEvent, aStatus); + break; case NS_MOUSE_LEFT_BUTTON_UP: #ifdef CLICK_HOLD_CONTEXT_MENUS KillClickHoldTimer(); @@ -317,6 +331,8 @@ StopTrackingDragGesture(); case NS_MOUSE_MIDDLE_BUTTON_UP: case NS_MOUSE_RIGHT_BUTTON_UP: + case NS_MOUSE_SIX_BUTTON_UP: + case NS_MOUSE_SEVEN_BUTTON_UP: SetClickCount(aPresContext, (nsMouseEvent*)aEvent, aStatus); break; case NS_MOUSE_MOVE: @@ -1341,6 +1357,8 @@ case NS_MOUSE_LEFT_BUTTON_DOWN: case NS_MOUSE_MIDDLE_BUTTON_DOWN: case NS_MOUSE_RIGHT_BUTTON_DOWN: + case NS_MOUSE_SIX_BUTTON_DOWN: + case NS_MOUSE_SEVEN_BUTTON_DOWN: { if (mConsumeFocusEvents) { mConsumeFocusEvents = PR_FALSE; @@ -1407,6 +1425,8 @@ case NS_MOUSE_LEFT_BUTTON_UP: case NS_MOUSE_MIDDLE_BUTTON_UP: case NS_MOUSE_RIGHT_BUTTON_UP: + case NS_MOUSE_SIX_BUTTON_UP: + case NS_MOUSE_SEVEN_BUTTON_UP: { SetContentState(nsnull, NS_EVENT_STATE_ACTIVE); ret = CheckForAndDispatchClick(aPresContext, (nsMouseEvent*)aEvent, aStatus); @@ -2265,6 +2285,38 @@ } NS_IF_RELEASE(mLastRightMouseDownContent); break; + case NS_MOUSE_SIX_BUTTON_DOWN: + NS_IF_RELEASE(mLastSixMouseDownContent); + mLastSixMouseDownContent = mouseContent; + NS_IF_ADDREF(mLastSixMouseDownContent); + break; + + case NS_MOUSE_SIX_BUTTON_UP: + if (mLastSixMouseDownContent == mouseContent.get()) { + aEvent->clickCount = m6ClickCount; + m6ClickCount = 0; + } + else { + aEvent->clickCount = 0; + } + NS_IF_RELEASE(mLastSixMouseDownContent); + break; + case NS_MOUSE_SEVEN_BUTTON_DOWN: + NS_IF_RELEASE(mLastSevenMouseDownContent); + mLastSevenMouseDownContent = mouseContent; + NS_IF_ADDREF(mLastSevenMouseDownContent); + break; + + case NS_MOUSE_SEVEN_BUTTON_UP: + if (mLastSevenMouseDownContent == mouseContent.get()) { + aEvent->clickCount = m7ClickCount; + m7ClickCount = 0; + } + else { + aEvent->clickCount = 0; + } + NS_IF_RELEASE(mLastSevenMouseDownContent); + break; } return ret; @@ -2295,6 +2347,12 @@ case NS_MOUSE_RIGHT_BUTTON_UP: event.message = NS_MOUSE_RIGHT_CLICK; break; + case NS_MOUSE_SIX_BUTTON_UP: + event.message = NS_MOUSE_SIX_CLICK; + break; + case NS_MOUSE_SEVEN_BUTTON_UP: + event.message = NS_MOUSE_SEVEN_CLICK; + break; } event.eventStructType = NS_MOUSE_EVENT; @@ -2323,6 +2381,12 @@ break; case NS_MOUSE_RIGHT_BUTTON_UP: event2.message = NS_MOUSE_RIGHT_DOUBLECLICK; + break; + case NS_MOUSE_SIX_BUTTON_UP: + event2.message = NS_MOUSE_SIX_DOUBLECLICK; + break; + case NS_MOUSE_SEVEN_BUTTON_UP: + event2.message = NS_MOUSE_SEVEN_DOUBLECLICK; break; } diff -u -r ../mozilla/content/events/src/nsEventStateManager.h ./content/events/src/nsEventStateManager.h --- ../mozilla/content/events/src/nsEventStateManager.h Wed Apr 18 02:18:10 2001 +++ ./content/events/src/nsEventStateManager.h Wed Jun 6 23:28:02 2001 @@ -178,6 +178,8 @@ nsIContent* mLastLeftMouseDownContent; nsIContent* mLastMiddleMouseDownContent; nsIContent* mLastRightMouseDownContent; + nsIContent* mLastSixMouseDownContent; + nsIContent* mLastSevenMouseDownContent; nsIContent* mActiveContent; nsIContent* mHoverContent; @@ -200,6 +202,8 @@ PRUint32 mLClickCount; PRUint32 mMClickCount; PRUint32 mRClickCount; + PRUint32 m6ClickCount; + PRUint32 m7ClickCount; //Hashtable for accesskey support nsSupportsHashtable *mAccessKeys; diff -u -r ../mozilla/content/html/content/src/nsHTMLButtonElement.cpp ./content/html/content/src/nsHTMLButtonElement.cpp --- ../mozilla/content/html/content/src/nsHTMLButtonElement.cpp Mon Apr 16 02:36:43 2001 +++ ./content/html/content/src/nsHTMLButtonElement.cpp Wed Jun 6 23:14:18 2001 @@ -456,6 +456,12 @@ case NS_MOUSE_RIGHT_DOUBLECLICK: case NS_MOUSE_RIGHT_BUTTON_DOWN: case NS_MOUSE_RIGHT_BUTTON_UP: + case NS_MOUSE_SIX_DOUBLECLICK: + case NS_MOUSE_SIX_BUTTON_DOWN: + case NS_MOUSE_SIX_BUTTON_UP: + case NS_MOUSE_SEVEN_DOUBLECLICK: + case NS_MOUSE_SEVEN_BUTTON_DOWN: + case NS_MOUSE_SEVEN_BUTTON_UP: if (aDOMEvent != nsnull && *aDOMEvent != nsnull) { (*aDOMEvent)->PreventBubble(); } else { diff -u -r ../mozilla/content/html/content/src/nsHTMLInputElement.cpp ./content/html/content/src/nsHTMLInputElement.cpp --- ../mozilla/content/html/content/src/nsHTMLInputElement.cpp Thu Apr 19 19:28:57 2001 +++ ./content/html/content/src/nsHTMLInputElement.cpp Wed Jun 6 23:14:56 2001 @@ -1185,6 +1185,12 @@ case NS_MOUSE_RIGHT_DOUBLECLICK: case NS_MOUSE_RIGHT_BUTTON_DOWN: case NS_MOUSE_RIGHT_BUTTON_UP: + case NS_MOUSE_SIX_DOUBLECLICK: + case NS_MOUSE_SIX_BUTTON_DOWN: + case NS_MOUSE_SIX_BUTTON_UP: + case NS_MOUSE_SEVEN_DOUBLECLICK: + case NS_MOUSE_SEVEN_BUTTON_DOWN: + case NS_MOUSE_SEVEN_BUTTON_UP: { if (type == NS_FORM_INPUT_BUTTON || type == NS_FORM_INPUT_RESET || diff -u -r ../mozilla/dom/public/coreEvents/nsIDOMKeyEvent.h ./dom/public/coreEvents/nsIDOMKeyEvent.h --- ../mozilla/dom/public/coreEvents/nsIDOMKeyEvent.h Wed Dec 20 19:40:08 2000 +++ ./dom/public/coreEvents/nsIDOMKeyEvent.h Thu Jun 7 17:47:21 2001 @@ -151,6 +151,12 @@ DOM_VK_BACK_SLASH = 220, DOM_VK_CLOSE_BRACKET = 221, DOM_VK_QUOTE = 222, + DOM_VK_GOBACK = 0xA0, + DOM_VK_FWD = 0xA1, + DOM_VK_STOP = 0xA2, + DOM_VK_REFRESH = 0xA3, + DOM_VK_SEARCH = 0xA4, + DOM_VK_FAV = 0xA5, DOM_VK_META = 224 }; diff -u -r ../mozilla/dom/public/idl/events/MouseKeyEvent.idl ./dom/public/idl/events/MouseKeyEvent.idl --- ../mozilla/dom/public/idl/events/MouseKeyEvent.idl Wed Aug 16 20:09:16 2000 +++ ./dom/public/idl/events/MouseKeyEvent.idl Thu Jun 7 16:44:35 2001 @@ -123,6 +123,15 @@ const unsigned long DOM_VK_CLOSE_BRACKET = 0xDD; const unsigned long DOM_VK_QUOTE = 0xDE; + /* I just picked these number out of nowhere */ + const unsigmed long DOM_VK_GOBACK = 0xA0; + const unsigmed long DOM_VK_FWD = 0xA1; + const unsigmed long DOM_VK_STOP = 0xA2; + const unsigmed long DOM_VK_REFRESH = 0xA3; + const unsigmed long DOM_VK_SEARCH = 0xA4; + const unsigmed long DOM_VK_FAV = 0xA5; + + const unsigned long DOM_VK_META = 0xE0; readonly attribute unsigned long charCode; diff -u -r ../mozilla/dom/public/idl/events/nsIDOMKeyEvent.idl ./dom/public/idl/events/nsIDOMKeyEvent.idl --- ../mozilla/dom/public/idl/events/nsIDOMKeyEvent.idl Fri Feb 9 06:55:55 2001 +++ ./dom/public/idl/events/nsIDOMKeyEvent.idl Thu Jun 7 17:10:39 2001 @@ -145,6 +145,14 @@ const unsigned long DOM_VK_CLOSE_BRACKET = 0xDD; const unsigned long DOM_VK_QUOTE = 0xDE; + /* I just picked these number out of nowhere */ + const unsigmed long DOM_VK_GOBACK = 0xA0; + const unsigmed long DOM_VK_FWD = 0xA1; + const unsigmed long DOM_VK_STOP = 0xA2; + const unsigmed long DOM_VK_REFRESH = 0xA3; + const unsigmed long DOM_VK_SEARCH = 0xA4; + const unsigmed long DOM_VK_FAV = 0xA5; + const unsigned long DOM_VK_META = 0xE0; readonly attribute unsigned long charCode; diff -u -r ../mozilla/layout/html/base/src/nsHTMLFrame.cpp ./layout/html/base/src/nsHTMLFrame.cpp --- ../mozilla/layout/html/base/src/nsHTMLFrame.cpp Mon Apr 23 20:57:40 2001 +++ ./layout/html/base/src/nsHTMLFrame.cpp Wed Jun 6 23:15:37 2001 @@ -400,6 +400,8 @@ if (aEvent->message == NS_MOUSE_LEFT_BUTTON_UP || aEvent->message == NS_MOUSE_MIDDLE_BUTTON_UP || aEvent->message == NS_MOUSE_RIGHT_BUTTON_UP || + aEvent->message == NS_MOUSE_SIX_BUTTON_UP || + aEvent->message == NS_MOUSE_SEVEN_BUTTON_UP || aEvent->message == NS_MOUSE_MOVE ) { nsIFrame *firstChild; nsresult rv = FirstChild(aPresContext,nsnull,&firstChild); diff -u -r ../mozilla/layout/xul/base/src/nsRootBoxFrame.cpp ./layout/xul/base/src/nsRootBoxFrame.cpp --- ../mozilla/layout/xul/base/src/nsRootBoxFrame.cpp Wed May 2 00:07:48 2001 +++ ./layout/xul/base/src/nsRootBoxFrame.cpp Thu Jun 7 18:36:27 2001 @@ -226,7 +226,9 @@ if (aEvent->message == NS_MOUSE_LEFT_BUTTON_UP || aEvent->message == NS_MOUSE_MIDDLE_BUTTON_UP || - aEvent->message == NS_MOUSE_RIGHT_BUTTON_UP) { + aEvent->message == NS_MOUSE_RIGHT_BUTTON_UP || + aEvent->message == NS_MOUSE_SIX_BUTTON_UP || + aEvent->message == NS_MOUSE_SEVEN_BUTTON_UP) { nsFrame::HandleEvent(aPresContext, aEvent, aEventStatus); } diff -u -r ../mozilla/widget/public/nsGUIEvent.h ./widget/public/nsGUIEvent.h --- ../mozilla/widget/public/nsGUIEvent.h Tue Apr 17 06:02:09 2001 +++ ./widget/public/nsGUIEvent.h Thu Jun 7 16:39:38 2001 @@ -408,21 +408,29 @@ #define NS_MOUSE_MOVE (NS_MOUSE_MESSAGE_START) #define NS_MOUSE_LEFT_BUTTON_UP (NS_MOUSE_MESSAGE_START + 1) #define NS_MOUSE_LEFT_BUTTON_DOWN (NS_MOUSE_MESSAGE_START + 2) -#define NS_MOUSE_MIDDLE_BUTTON_UP (NS_MOUSE_MESSAGE_START + 10) -#define NS_MOUSE_MIDDLE_BUTTON_DOWN (NS_MOUSE_MESSAGE_START + 11) -#define NS_MOUSE_RIGHT_BUTTON_UP (NS_MOUSE_MESSAGE_START + 20) -#define NS_MOUSE_RIGHT_BUTTON_DOWN (NS_MOUSE_MESSAGE_START + 21) -#define NS_MOUSE_ENTER (NS_MOUSE_MESSAGE_START + 22) -#define NS_MOUSE_EXIT (NS_MOUSE_MESSAGE_START + 23) -#define NS_MOUSE_LEFT_DOUBLECLICK (NS_MOUSE_MESSAGE_START + 24) -#define NS_MOUSE_MIDDLE_DOUBLECLICK (NS_MOUSE_MESSAGE_START + 25) -#define NS_MOUSE_RIGHT_DOUBLECLICK (NS_MOUSE_MESSAGE_START + 26) -#define NS_MOUSE_LEFT_CLICK (NS_MOUSE_MESSAGE_START + 27) -#define NS_MOUSE_MIDDLE_CLICK (NS_MOUSE_MESSAGE_START + 28) -#define NS_MOUSE_RIGHT_CLICK (NS_MOUSE_MESSAGE_START + 29) -#define NS_MOUSE_ACTIVATE (NS_MOUSE_MESSAGE_START + 30) -#define NS_MOUSE_ENTER_SYNTH (NS_MOUSE_MESSAGE_START + 31) -#define NS_MOUSE_EXIT_SYNTH (NS_MOUSE_MESSAGE_START + 32) +#define NS_MOUSE_MIDDLE_BUTTON_UP (NS_MOUSE_MESSAGE_START + 3) +#define NS_MOUSE_MIDDLE_BUTTON_DOWN (NS_MOUSE_MESSAGE_START + 4) +#define NS_MOUSE_RIGHT_BUTTON_UP (NS_MOUSE_MESSAGE_START + 5) +#define NS_MOUSE_RIGHT_BUTTON_DOWN (NS_MOUSE_MESSAGE_START + 6) +#define NS_MOUSE_SIX_BUTTON_UP (NS_MOUSE_MESSAGE_START + 7) +#define NS_MOUSE_SIX_BUTTON_DOWN (NS_MOUSE_MESSAGE_START + 8) +#define NS_MOUSE_SEVEN_BUTTON_UP (NS_MOUSE_MESSAGE_START + 9) +#define NS_MOUSE_SEVEN_BUTTON_DOWN (NS_MOUSE_MESSAGE_START + 10) +#define NS_MOUSE_ENTER (NS_MOUSE_MESSAGE_START + 11) +#define NS_MOUSE_EXIT (NS_MOUSE_MESSAGE_START + 12) +#define NS_MOUSE_LEFT_DOUBLECLICK (NS_MOUSE_MESSAGE_START + 13) +#define NS_MOUSE_MIDDLE_DOUBLECLICK (NS_MOUSE_MESSAGE_START + 14) +#define NS_MOUSE_RIGHT_DOUBLECLICK (NS_MOUSE_MESSAGE_START + 15) +#define NS_MOUSE_SIX_DOUBLECLICK (NS_MOUSE_MESSAGE_START + 16) +#define NS_MOUSE_SEVEN_DOUBLECLICK (NS_MOUSE_MESSAGE_START + 17) +#define NS_MOUSE_LEFT_CLICK (NS_MOUSE_MESSAGE_START + 18) +#define NS_MOUSE_MIDDLE_CLICK (NS_MOUSE_MESSAGE_START + 19) +#define NS_MOUSE_RIGHT_CLICK (NS_MOUSE_MESSAGE_START + 20) +#define NS_MOUSE_SIX_CLICK (NS_MOUSE_MESSAGE_START + 21) +#define NS_MOUSE_SEVEN_CLICK (NS_MOUSE_MESSAGE_START + 22) +#define NS_MOUSE_ACTIVATE (NS_MOUSE_MESSAGE_START + 23) +#define NS_MOUSE_ENTER_SYNTH (NS_MOUSE_MESSAGE_START + 24) +#define NS_MOUSE_EXIT_SYNTH (NS_MOUSE_MESSAGE_START + 25) #define NS_CONTEXTMENU_MESSAGE_START 500 #define NS_CONTEXTMENU (NS_CONTEXTMENU_MESSAGE_START) @@ -660,6 +668,13 @@ #define NS_VK_QUOTE nsIDOMKeyEvent::DOM_VK_QUOTE #define NS_VK_META nsIDOMKeyEvent::DOM_VK_META + +#define NS_VK_GOBACK nsIDOMKeyEvent::DOM_VK_GOBACK +#define NS_VK_FWD nsIDOMKeyEvent::DOM_VK_FWD +#define NS_VK_STOP nsIDOMKeyEvent::DOM_VK_STOP +#define NS_VK_REFRESH nsIDOMKeyEvent::DOM_VK_REFRESH +#define NS_VK_SEARCH nsIDOMKeyEvent::DOM_VK_SEARCH +#define NS_VK_FAV nsIDOMKeyEvent::DOM_VK_FAV #define NS_EVENT_FLAG_NONE 0x0000 #define NS_EVENT_FLAG_INIT 0x0001 diff -u -r ../mozilla/widget/src/gtk/nsGtkEventHandler.cpp ./widget/src/gtk/nsGtkEventHandler.cpp --- ../mozilla/widget/src/gtk/nsGtkEventHandler.cpp Mon Mar 19 17:17:47 2001 +++ ./widget/src/gtk/nsGtkEventHandler.cpp Thu Jun 7 16:54:53 2001 @@ -41,6 +41,7 @@ #include #include #include +#include #ifdef DEBUG_pavlov //#define DEBUG_EVENTS 1 @@ -260,7 +261,14 @@ { NS_VK_9, GDK_parenleft }, { NS_VK_0, GDK_parenright }, { NS_VK_SUBTRACT, GDK_underscore }, - { NS_VK_EQUALS, GDK_plus } + { NS_VK_EQUALS, GDK_plus }, + + { NS_VK_GOBACK, XF86XK_Back }, + { NS_VK_FWD, XF86XK_Forward }, + { NS_VK_STOP, XF86XK_Stop }, + { NS_VK_REFRESH, XF86XK_Refresh }, + { NS_VK_SEARCH, XF86XK_Search }, + { NS_VK_FAV, XF86XK_Favorites } }; void nsGtkWidget_InitNSKeyEvent(int aEventType, nsKeyEvent& aKeyEvent, diff -u -r ../mozilla/widget/src/gtk/nsWidget.cpp ./widget/src/gtk/nsWidget.cpp --- ../mozilla/widget/src/gtk/nsWidget.cpp Sun Apr 15 23:13:44 2001 +++ ./widget/src/gtk/nsWidget.cpp Wed Jun 6 23:21:57 2001 @@ -1537,12 +1537,16 @@ case NS_MOUSE_LEFT_BUTTON_DOWN: case NS_MOUSE_MIDDLE_BUTTON_DOWN: case NS_MOUSE_RIGHT_BUTTON_DOWN: + case NS_MOUSE_SIX_BUTTON_DOWN: + case NS_MOUSE_SEVEN_BUTTON_DOWN: result = ConvertStatus(mMouseListener->MousePressed(aEvent)); break; case NS_MOUSE_LEFT_BUTTON_UP: case NS_MOUSE_MIDDLE_BUTTON_UP: case NS_MOUSE_RIGHT_BUTTON_UP: + case NS_MOUSE_SIX_BUTTON_UP: + case NS_MOUSE_SEVEN_BUTTON_UP: result = ConvertStatus(mMouseListener->MouseReleased(aEvent)); result = ConvertStatus(mMouseListener->MouseClicked(aEvent)); break; @@ -1970,6 +1974,14 @@ Release(); return; + case 6: + eventType = NS_MOUSE_SIX_BUTTON_DOWN; + break; + + case 7: + eventType = NS_MOUSE_SEVEN_BUTTON_DOWN; + break; + // Single-click default. default: eventType = NS_MOUSE_LEFT_BUTTON_DOWN; @@ -2033,6 +2045,14 @@ // We don't really need to do anything here, but we don't want // LEFT_BUTTON_UP to happen return; + + case 6: + eventType = NS_MOUSE_SIX_BUTTON_UP; + break; + + case 7: + eventType = NS_MOUSE_SEVEN_BUTTON_UP; + break; default: eventType = NS_MOUSE_LEFT_BUTTON_UP; diff -u -r ../mozilla/widget/src/xlib/nsAppShell.cpp ./widget/src/xlib/nsAppShell.cpp --- ../mozilla/widget/src/xlib/nsAppShell.cpp Mon Apr 9 19:16:15 2001 +++ ./widget/src/xlib/nsAppShell.cpp Thu Jun 7 15:53:52 2001 @@ -693,6 +693,12 @@ case 3: eventType = NS_MOUSE_RIGHT_BUTTON_DOWN; break; + case 6: + eventType = NS_MOUSE_SIX_BUTTON_DOWN; + break; + case 7: + eventType = NS_MOUSE_SEVEN_BUTTON_DOWN; + break; case 4: case 5: scrollEvent.delta = (event->xbutton.button == 4) ? -3 : 3; diff -u -r ../mozilla/widget/src/xlib/nsWidget.cpp ./widget/src/xlib/nsWidget.cpp --- ../mozilla/widget/src/xlib/nsWidget.cpp Mon Mar 19 12:56:01 2001 +++ ./widget/src/xlib/nsWidget.cpp Wed Jun 6 23:23:27 2001 @@ -1132,6 +1132,8 @@ case NS_MOUSE_LEFT_BUTTON_DOWN: case NS_MOUSE_MIDDLE_BUTTON_DOWN: case NS_MOUSE_RIGHT_BUTTON_DOWN: + case NS_MOUSE_SIX_BUTTON_DOWN: + case NS_MOUSE_SEVEN_BUTTON_DOWN: if (HandlePopup(aEvent.point.x, aEvent.point.y)){ // Should we return here as GTK does? return PR_TRUE; @@ -1151,11 +1153,15 @@ case NS_MOUSE_LEFT_BUTTON_DOWN: case NS_MOUSE_MIDDLE_BUTTON_DOWN: case NS_MOUSE_RIGHT_BUTTON_DOWN: + case NS_MOUSE_SIX_BUTTON_DOWN: + case NS_MOUSE_SEVEN_BUTTON_DOWN: result = ConvertStatus(mMouseListener->MousePressed(aEvent)); break; case NS_MOUSE_LEFT_BUTTON_UP: case NS_MOUSE_MIDDLE_BUTTON_UP: case NS_MOUSE_RIGHT_BUTTON_UP: + case NS_MOUSE_SIX_BUTTON_UP: + case NS_MOUSE_SEVEN_BUTTON_UP: result = ConvertStatus(mMouseListener->MouseReleased(aEvent)); result = ConvertStatus(mMouseListener->MouseClicked(aEvent)); break; diff -u -r ../mozilla/widget/src/xpwidgets/nsBaseWidget.cpp ./widget/src/xpwidgets/nsBaseWidget.cpp --- ../mozilla/widget/src/xpwidgets/nsBaseWidget.cpp Fri Apr 13 20:57:28 2001 +++ ./widget/src/xpwidgets/nsBaseWidget.cpp Thu Jun 7 15:56:02 2001 @@ -825,6 +825,14 @@ _ASSIGN_eventName(NS_MOUSE_RIGHT_BUTTON_UP,"NS_MOUSE_RIGHT_BTN_UP"); _ASSIGN_eventName(NS_MOUSE_RIGHT_CLICK,"NS_MOUSE_RIGHT_CLICK"); _ASSIGN_eventName(NS_MOUSE_RIGHT_DOUBLECLICK,"NS_MOUSE_RIGHT_DBLCLICK"); + _ASSIGN_eventName(NS_MOUSE_SIX_BUTTON_DOWN,"NS_MOUSE_SIX_BTN_DOWN"); + _ASSIGN_eventName(NS_MOUSE_SIX_BUTTON_UP,"NS_MOUSE_SIX_BTN_UP"); + _ASSIGN_eventName(NS_MOUSE_SIX_CLICK,"NS_MOUSE_SIX_CLICK"); + _ASSIGN_eventName(NS_MOUSE_SIX_DOUBLECLICK,"NS_MOUSE_SIX_DBLCLICK"); + _ASSIGN_eventName(NS_MOUSE_SEVEN_BUTTON_DOWN,"NS_MOUSE_SEVEN_BTN_DOWN"); + _ASSIGN_eventName(NS_MOUSE_SEVEN_BUTTON_UP,"NS_MOUSE_SEVEN_BTN_UP"); + _ASSIGN_eventName(NS_MOUSE_SEVEN_CLICK,"NS_MOUSE_SEVEN_CLICK"); + _ASSIGN_eventName(NS_MOUSE_SEVEN_DOUBLECLICK,"NS_MOUSE_SEVEN_DBLCLICK"); _ASSIGN_eventName(NS_MOVE,"NS_MOVE"); _ASSIGN_eventName(NS_PAGE_LOAD,"NS_PAGE_LOAD"); _ASSIGN_eventName(NS_PAGE_UNLOAD,"NS_PAGE_UNLOAD");