- Fix for recurring static variable (make it a member of the window group

structure)


git-svn-id: svn://10.0.0.236/branches/js_ops_BRANCH@1188 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/include/jscookie.h

@@ -0,0 +1,62 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+/*
+   jscookie.h -- javascript reflection of cookies for filters.
+   Created: Frederick G.M. Roeber <roeber@netscape.com>, 12-Jul-97.
+   Adopted: Judson Valeski, 1997
+ */
+
+#ifndef _JSCOOKIE_H_
+#define _JSCOOKIE_H_
+
+typedef enum {
+    JSCF_accept,
+    JSCF_reject,
+    JSCF_ask,
+    JSCF_whatever,
+    JSCF_error
+}
+    JSCFResult;
+
+typedef struct {
+    char *path_from_header;
+    char *host_from_header;
+    char *name_from_header;
+    char *cookie_from_header;
+    time_t expires;
+    char *url;
+    Bool secure;
+    Bool domain;
+    Bool prompt; /* the preference */
+    NET_CookieBehaviorEnum preference;
+}
+    JSCFCookieData;
+
+extern JSCFResult JSCF_Execute(
+                               MWContext *mwcontext,
+                               const char *script_name,
+                               JSCFCookieData *data,
+                               Bool *data_changed
+                               );
+
+/* runs the garbage collector on the filter context. Probably a good
+   idea to call on completion of NET_GetURL or something. */
+extern void JSCF_Cleanup(void);
+
+#endif /* _JSCOOKIE_H_ */
+

mozilla/include/libevent.h

@@ -0,0 +1,755 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/*
+ * Header file for event passing between the mozilla thread and
+ *   the mocha thread
+ */
+
+#ifndef libevent_h___
+#define libevent_h___
+
+#include "libmocha.h"
+#include "prtypes.h"
+#ifndef NSPR20
+#include "prevent.h"
+#else
+#include "plevent.h"
+#endif
+#include "shist.h"
+#include "fe_proto.h"
+#include "lo_ele.h"
+#include "jscookie.h"
+
+NSPR_BEGIN_EXTERN_C
+
+extern PREventQueue * mozilla_event_queue;
+
+typedef struct WindowGroup LMWindowGroup;
+
+/* 
+ * XXX - should we use the same event values as layer events?
+ */
+
+/* Event bits stored in the low end of decoder->event_mask. */
+#define EVENT_MOUSEDOWN 0x00000001
+#define EVENT_MOUSEUP   0x00000002
+#define EVENT_MOUSEOVER 0x00000004      /* user is mousing over a link */
+#define EVENT_MOUSEOUT  0x00000008      /* user is mousing out of a link */
+#define EVENT_MOUSEMOVE 0x00000010  
+#define EVENT_MOUSEDRAG 0x00000020
+#define EVENT_CLICK     0x00000040      /* input element click in progress */
+#define EVENT_DBLCLICK  0x00000080
+#define EVENT_KEYDOWN   0x00000100
+#define EVENT_KEYUP     0x00000200
+#define EVENT_KEYPRESS	0x00000400
+#define EVENT_DRAGDROP  0x00000800      /* not yet implemented */
+#define EVENT_FOCUS     0x00001000      /* input focus event in progress */
+#define EVENT_BLUR      0x00002000      /* loss of focus event in progress */
+#define EVENT_SELECT    0x00004000      /* input field selection in progress */
+#define EVENT_CHANGE    0x00008000      /* field value change in progress */
+#define EVENT_RESET     0x00010000      /* form submit in progress */
+#define EVENT_SUBMIT    0x00020000      /* form submit in progress */
+#define EVENT_SCROLL    0x00040000      /* window is being scrolled */
+#define EVENT_LOAD      0x00080000      /* layout parsed a loaded document */
+#define EVENT_UNLOAD    0x00100000
+#define EVENT_XFER_DONE	0x00200000      /* document has loaded */
+#define EVENT_ABORT     0x00400000
+#define EVENT_ERROR     0x00800000
+#define EVENT_LOCATE	0x01000000
+#define EVENT_MOVE	0x02000000
+#define EVENT_RESIZE    0x04000000
+#define EVENT_FORWARD   0x08000000
+#define EVENT_HELP	0x10000000		/* for handling of help events */
+#define EVENT_BACK      0x20000000
+
+/* #define EVENT_PRINT     0x20000000	*//* To be removed per joki */
+
+#define STATUS_STOP      0x00000001      /* stop processing */
+#define STATUS_IGNORE    0x00000002      /* no new messages */
+
+#define	EVENT_ALT_MASK	    0x00000001
+#define	EVENT_CONTROL_MASK  0x00000002
+#define	EVENT_SHIFT_MASK    0x00000004
+#define	EVENT_META_MASK	    0x00000008
+
+#define ARGTYPE_NULL	0x00000001
+#define ARGTYPE_INT32	0x00000002
+#define ARGTYPE_BOOL	0x00000004
+#define ARGTYPE_STRING	0x00000008
+
+#define SIZE_MAX	0x00000001
+#define SIZE_MIN        0X00000002
+/*
+ * When the event has been processed by the backend, there will be
+ *   a front-end callback that gets called.  If the event processed
+ *   successfully, the callback will be passed EVENT_OK.  If the
+ *   event wasn't successful (i.e. the user canceled it) the return
+ *   status will be EVENT_CANCEL.  If something radical happened
+ *   and the front-end should do nothing (i.e. mocha changed the
+ *   underlying context) the status will be EVENT_PANIC and the
+ *   front end should treat the context and element passed to the
+ *   exit routine as bogus
+ */
+typedef enum {
+    EVENT_OK,
+    EVENT_CANCEL,
+    EVENT_PANIC
+} ETEventStatus;
+
+/*
+ * When a given event gets processed we may need to tell the front
+ *   end about it so that they can update the UI / continue the 
+ *   operation.  The context, lo_element, lType and whatever
+ *   field are all supplied by the original ET_SendEvent() call.
+ *   See ET_SendEvent() for a description of the values for
+ *   the status parameter
+ */
+typedef void
+(*ETClosureFunc)(MWContext * pContext, LO_Element * lo_element, 
+                 int32 lType, void * whatever, ETEventStatus status);
+
+/*
+ * Someone has initiated a call to LM_EvaluateBuffer().  This function
+ *   gets called back with the result
+ */
+ typedef void
+(*ETEvalAckFunc)(void * data, char * result_string, size_t result_length,
+		 char * wysiwyg_url, char * base_href, Bool valid);
+
+/*
+ * This function is called back after a layer's state has been restored
+ * in a resize_relayout.
+ */
+ typedef void
+ (*ETRestoreAckFunc)(void * data, LO_BlockInitializeStruct *param);
+
+/*
+ * Typedef for a function taking a void pointer and
+ *   returning nothing
+ */
+ typedef void
+(*ETVoidPtrFunc)(void * data);
+
+/*
+ * Typedef for a function taking a void pointer and
+ *   returning a bool
+ */
+ typedef PRBool
+(*ETBoolPtrFunc)(void * data);
+
+/*
+ * Typedef for a function taking a void pointer and
+ *   returning a int32
+ */
+ typedef int32
+(*ETIntPtrFunc)(void * data);
+
+/*
+ * Typedef for a function taking a void pointer and
+ *   returning a char *
+ */
+ typedef char *
+(*ETStringPtrFunc)(void * data);
+
+/*
+ * Struct for passing JS typed variable info through C interface calls
+ */
+typedef union ArgVal {
+    int32		intArg;
+    XP_Bool		boolArg;
+    char *		stringArg;
+} ArgVal;
+
+typedef struct {
+    uint8		type;	  /* arg type as defined at top of file */
+    ArgVal		value;		
+} JSCompArg;
+
+/*
+ * Typedef for a function used to verify installed components and 
+ *   get back components utility functions.
+ */
+ typedef PRBool
+(*ETVerifyComponentFunc)(void **active_callback, void **startup_callback);
+
+/*
+ * Generic function for JS setting values with native calls.
+ */
+ typedef void
+(*ETCompPropSetterFunc)(char *name, void *value);
+
+/*
+ * Generic function for JS getting values from native calls.
+ */
+ typedef void*
+(*ETCompPropGetterFunc)(char *name);
+
+/*
+ * Generic function for JS calling native methods.
+ */
+ typedef void*
+(*ETCompMethodFunc)(int32 argc, JSCompArg *argv);
+
+/* --------------------------------------------------------------------------
+ * Common prologue for talking between the mocha thread and the mozilla 
+ *   thread
+ */
+typedef struct {
+    PREvent		event;	  /* the PREvent structure */
+    MWContext*		context;  /* context */
+    int32		doc_id;   /* doc id of context when event launched */
+    PRPackedBool	handle_eagerly;
+} ETEvent;
+
+/*
+ * Struct to send back from front end in order to get additional 
+ *   event information without having to initialize event object 
+ *   until necessary.  Yow, there is a lot of junk in here now
+ *   can we make a union out of some of these or are they always
+ *   needed?
+ */
+typedef struct {
+    ETEvent	    ce;
+    MochaDecoder  * decoder;
+    JSObject	  * object;
+    int32	    type;
+    int32           layer_id;
+    int32	    id;
+    LO_Element	  * lo_element;
+    ETClosureFunc   fnClosure;    /* event sender closure           */
+    void          * whatever;     /* anything other state           */
+    int32	    x,y;
+    int32	    docx,docy;
+    int32	    screenx,screeny;
+    uint32	    which;
+    uint32	    modifiers;
+    void	  * data;
+    uint32	    dataSize;
+    PRPackedBool    saved;
+    PRPackedBool    event_handled;
+} JSEvent;
+
+/*
+ * Tell the backend about a new event.
+ * The event is placed onto an event queue, it is not processed
+ *   immediately.  If the event is the type that can be cancelled
+ *   by the backend (i.e. a button click or a submit) the front
+ *   end must wait until the callback routine gets called before
+ *   continuing with the operation.  The ETEventStatus will be
+ *   EVENT_OK if the operation is to continue or EVENT_CANCEL
+ *   if it got cancelled.
+ * 
+ * The processing of the event may cause the document to change 
+ *   or even the whole window to close.  In those cases the callback 
+ *   will still get called in case there is any front-end cleanup 
+ *   to do but the ETEventStatus will be set to EVENT_PANIC
+ *
+ */
+
+extern JSBool
+ET_SendEvent(MWContext * pContext, LO_Element *pElement, JSEvent *pEvent, 
+             ETClosureFunc fnClosure, void * whatever);
+
+/*
+ * Tell the backend about a new document load event.  We need a 
+ *   closure so that libparse/layout knows when its safe to discard
+ *   the old document when they were waiting for onunload events to
+ *   finish processing
+ */
+extern void
+ET_SendLoadEvent(MWContext * pContext, int32 type, ETVoidPtrFunc fnClosure,
+		 NET_StreamClass *stream, int32 layer_id, Bool resize_reload);
+
+/*
+ * Tell the backend about a new image event.  Async.  No closure
+ */
+extern void
+ET_SendImageEvent(MWContext * pContext, LO_ImageStruct *image_data,
+                  LM_ImageEvent event);
+
+/*
+ * Send an interrupt event to the current context
+ * Remove all pending events for the event queue of the given context.
+ */
+extern void
+ET_InterruptContext(MWContext * pContext);
+
+extern JSBool
+ET_ContinueProcessing(MWContext * pContext);
+
+/*
+ * Tell mocha to destroy the given context's data.  The callback 
+ *   function gets called when mocha is done with all of its data
+ *   that was associated with the context
+ */
+extern void
+ET_RemoveWindowContext(MWContext * context, ETVoidPtrFunc fn, 
+                       void * data);
+
+typedef struct {
+    uint	   len, line_no;
+    char	 * scope_to;
+    void	 * data;
+    JSVersion	   version;
+    JSPrincipals * principals;
+    JSBool         want_result;
+    JSBool	   unicode;
+} ETEvalStuff;
+
+/*
+ * Evaluate the mocha code in the given buffer
+ */
+extern void
+ET_EvaluateBuffer(MWContext * context, char * buffer, uint buflen,
+		  uint line_no, char * scope_to, JSBool want_result,
+		  ETEvalAckFunc fn, void * data,
+		  JSVersion ver, struct JSPrincipals *);
+
+extern void
+ET_EvaluateScript(MWContext * context, char * buffer, ETEvalStuff * stuff,
+		  ETEvalAckFunc fn);
+
+/*
+ * Ask Mocha to reflect the given object into JavaScript
+ */
+extern void
+ET_ReflectObject(MWContext * pContext, void * lo_ele, void * tag,
+		 int32 layer_id, uint index, ReflectedObject type);
+
+void
+ET_ReflectFormElement(MWContext * pContext, void * form,
+		      LO_FormElementStruct * form_element, PA_Tag * tag);
+
+extern void
+ET_ReflectWindow(MWContext * pContext, 
+		 PA_Block onLoad, PA_Block onUnload, 
+		 PA_Block onFocus, PA_Block onBlur, PA_Block onHelp,
+		 PA_Block onMouseOver, PA_Block onMouseOut, PA_Block onDragDrop,
+		 PA_Block onMove, PA_Block onResize,
+                 PA_Block id, char *all,
+		 Bool bDelete, int newline_count);
+
+/*
+ * Tell mocha we are processing a form
+ */
+extern void
+ET_SetActiveForm(MWContext * pContext, struct lo_FormData_struct * loElement);
+
+/*
+ * Tell mocha which layer we are processing
+ */
+void
+ET_SetActiveLayer(MWContext * pContext, int32 layer_id);
+
+/*
+** Tell mocha where to send its output
+*/
+extern void
+ET_ClearDecoderStream(MWContext * context, NET_StreamClass * old_stream);
+
+extern void
+ET_SetDecoderStream(MWContext * context, NET_StreamClass *stream,
+	            URL_Struct *url_struct, JSBool free_stream_on_close);
+
+/*
+** Remember the current nesting URL in the MochaDecoder
+*/
+extern void
+ET_SetNestingUrl(MWContext * context, char * szUrl);
+
+/*
+** Remember the current language version in the MochaDecoder
+*/
+extern void
+ET_SetVersion(MWContext * context, JSVersion version);
+
+/*
+ * Tell mocha to trash the current document.  around and around...
+ */
+extern void
+ET_ReleaseDocument(MWContext * pContext, JSBool resize_reload);
+
+/*
+ * Tell mocha to trash the layer's document.
+ */
+extern void
+ET_DestroyLayer(MWContext * pContext, JSObject *layer_obj);
+
+extern void
+ET_MochaStreamComplete(MWContext * context, void * buf, int len, 
+		       char * content_type, Bool isUnicode);
+
+extern void
+ET_MochaStreamAbort(MWContext * context, int status);
+			
+/*
+ * Called when a layer's contents are changing and we want to create
+ * a new layer document.
+ */
+extern void
+ET_NewLayerDocument(MWContext *pContext, int32 layer_id);
+
+extern void
+ET_DocWriteAck(MWContext *pContext, int status);
+
+extern void
+ET_RegisterComponent(char *name, void *active_callback, void *startup_callback);
+
+extern void
+ET_RegisterComponentProp(char *comp, char *name, uint8 retType, void *setter, 
+			 void *getter);
+
+extern void
+ET_RegisterComponentMethod(char *comp, char *name, uint8 retType, void *method, 
+			   int32 argc);
+
+/* =============================================================== */
+
+/*
+ * This event can be sent to both the mozilla thread and the moacha thread
+ */
+typedef struct {
+    ETEvent			ce;
+    TimeoutCallbackFunction	fnCallback;
+    void*			pClosure;
+    uint32			ulTime;
+    void*			pTimerId;
+} MozillaEvent_Timeout;
+
+
+/* =============================================================== */
+
+/*
+ * Busy loop waiting for events to come along
+ */
+extern void PR_CALLBACK
+lm_wait_for_events(void *);
+
+/* 
+ * global mocha event queues.  It would be nice to not have these
+ *   exported this globally
+ */
+extern PREventQueue *lm_InterpretQueue;
+extern PREventQueue *lm_PriorityQueue;
+
+/*
+ * Ways to send events to the front end
+ */
+extern JSBool
+ET_PostMessageBox(MWContext* context, char* szMessage, 
+		  JSBool bConfirm);
+
+extern void
+ET_PostProgress(MWContext* context, const char* szMessage);
+
+/* --- timeout routines --- */
+
+/*
+ * Set (or clear) a timeout to go off.  The timeout will go off in the
+ *   mozilla thread so we will use the routine ET_FireTimeoutCallBack()
+ *   to get back into our thread to actually run the closure
+ */
+extern void * 
+ET_PostSetTimeout(TimeoutCallbackFunction fnCallback, 
+		  void * pClosure, uint32 ulTime, int32 doc_id);
+
+extern void
+ET_PostClearTimeout(void * stuff);
+
+extern void
+ET_FireTimeoutCallBack(void *);
+
+/* --- end of timeout routines --- */
+
+extern void
+ET_PostDestroyWindow(MWContext * context);
+
+extern void
+ET_PostManipulateForm(MWContext * context, LO_Element * pForm, int32 action);
+
+extern void
+ET_PostClearView(MWContext * context);
+
+extern void
+ET_PostFreeImageElement(MWContext * context, void * stuff);
+
+extern void
+ET_PostFreeImageContext(MWContext *context, IL_GroupContext *img_cx);
+
+extern void
+ET_PostFreeAnonImages(MWContext *context, IL_GroupContext *img_cx);
+
+extern void
+ET_PostDisplayImage(MWContext *, int, LO_ImageStruct *);
+
+extern void
+ET_PostGetUrl(MWContext *, URL_Struct * pUrl);
+
+extern char *
+ET_PostPrompt(MWContext* context, const char* szMessage, 
+			  const char * szDefault);
+
+extern MWContext *
+ET_PostNewWindow(MWContext* context, URL_Struct * pUrl, 
+                 char * szName, Chrome * pChrome, LMWindowGroup *grp);
+
+extern void
+ET_PostUpdateChrome(MWContext* context, Chrome * pChrome);
+
+extern void
+ET_PostQueryChrome(MWContext* context, Chrome * pChrome);
+
+extern void
+ET_PostGetScreenSize(MWContext* context, int32 *pX, int32 *pY);
+
+extern void
+ET_PostGetAvailScreenRect(MWContext* context, int32 *pX, int32 *pY, 
+					    int32 *pLeft, int32 *pTop);
+
+extern void
+ET_PostGetColorDepth(MWContext* context, int32 *pPixel, int32 *pPallette);
+
+extern char *
+ET_PostGetSelectedText(MWContext* context);
+
+extern void
+ET_PostScrollDocTo(MWContext* context, int loc, int32 x, int32 y);
+
+extern void
+ET_PostScrollDocBy(MWContext* context, int loc, int32 x, int32 y);
+
+extern void
+ET_PostBackCommand(MWContext* context);
+
+extern void
+ET_PostForwardCommand(MWContext* context);
+
+extern void
+ET_PostHomeCommand(MWContext* context);
+
+extern JSBool
+ET_PostFindCommand(MWContext* context, char * szName, JSBool matchCase, 
+		   JSBool searchBackward);
+extern void
+ET_PostPrintCommand(MWContext* context);
+
+extern void
+ET_PostOpenFileCommand(MWContext* context);
+
+extern void 
+ET_MakeHTMLAlert(MWContext * context, const char * szString);
+
+/* respond to events sent to the mocha thread by the mozilla thread */
+
+extern void
+ET_PostJsEventAck(MWContext* context, LO_Element * pEle, int type, 
+                  ETClosureFunc fnClosure, void * pStuff, 
+                  ETEventStatus status);
+
+
+
+extern void
+ET_PostEvalAck(MWContext * context, int doc_id, void * data, 
+	       char * str, size_t len, char * wysiwyg_url, 
+	       char * base_href, Bool valid, ETEvalAckFunc fn);
+
+extern void
+ET_PostRestoreAck(void *data, LO_BlockInitializeStruct *param, 
+                  ETRestoreAckFunc fn);
+
+/* netlib events */
+
+extern char *
+ET_net_GetCookie(MWContext* context, int32 doc_id);
+
+extern char *
+ET_net_SetCookieString(MWContext* context, char * szCookie, int32 doc_id);
+
+extern NET_StreamClass *
+ET_net_CacheConverter(FO_Present_Types format, void * obj,
+                      URL_Struct *pUrl, MWContext * pContext);
+
+extern void
+ET_net_FindURLInCache(URL_Struct * pUrl, MWContext * pContext);
+
+extern NET_StreamClass	*
+ET_net_StreamBuilder(FO_Present_Types format, URL_Struct *pUrl, 
+		     MWContext * pContext);
+
+/* layout events */
+
+extern  void
+ET_lo_ResetForm(MWContext * pContext, LO_Element * ele);
+
+void
+ET_fe_SubmitInputElement(MWContext * pContext, LO_Element * ele);
+
+/*
+ * Synchronously shove the given text down the parser's processing
+ *   queue.  If the currently loaded document is not equal to 
+ *   doc_id, this message should be ignored since it arrived too
+ *   late for the intended document
+ */
+extern int
+ET_lo_DoDocWrite(JSContext *cx, MWContext * context, NET_StreamClass * stream, 
+                 char * str, size_t len, int32 doc_id);
+
+
+extern void
+ET_il_GetImage(const char * str, MWContext * pContext, IL_GroupContext *img_cx,
+               LO_ImageStruct * image_data, NET_ReloadMethod how);
+
+extern void
+ET_il_SetGroupObserver(MWContext * pContext, IL_GroupContext *pImgCX, void *pDpyCX,
+					   JSBool bAddObserver);
+			   
+extern void
+ET_InterruptImgCX(MWContext * pContext);
+
+/*
+ * Tell layout to trash the current document.
+ */
+extern void
+ET_lo_DiscardDocument(MWContext * pContext);
+
+/*
+ * Tell layout to prepare a layer for writing.
+ */
+extern Bool
+ET_lo_PrepareLayerForWriting(MWContext *context, int32 layer_id,
+			     const char *referer);
+
+/*
+ * Return a copy of the current history element.  Caller must free
+ */
+extern History_entry * 
+ET_shist_GetCurrent(MWContext * pContext);
+
+/*
+ * Return the current security status.
+ */
+extern int 
+ET_GetSecurityStatus(MWContext * pContext);
+
+/*
+ * Make sure Mocha/Java glue is ready.  Returns the same return code as
+ * LM_InitMoja.
+ */
+extern int
+ET_InitMoja(MWContext * pContext);
+
+/*
+ * Pack up toys and go home
+ */
+extern void
+ET_FinishMocha(void);
+
+/*
+ * Used to call a stream completion function in the mozilla
+ *   thread
+ */
+extern void
+ET_moz_CallFunction(ETVoidPtrFunc fn, void * data);
+
+extern void
+ET_moz_CallFunctionAsync(ETVoidPtrFunc fn, void * data);
+
+extern PRBool
+ET_moz_CallFunctionBool(ETBoolPtrFunc fn, void * data);
+
+extern int32
+ET_moz_CallFunctionInt(ETIntPtrFunc fn, void * data);
+
+extern char *
+ET_moz_CallFunctionString(ETStringPtrFunc fn, void * data);
+
+extern void
+ET_moz_CallAsyncAndSubEventLoop(ETVoidPtrFunc fn, void *data,
+				MWContext *context);
+
+extern void
+ET_moz_Abort(MKStreamAbortFunc fn, void * data, int status);
+
+extern void
+ET_moz_SetMochaWriteStream(MochaDecoder * decoder);
+
+extern NET_StreamClass *
+ET_moz_DocCacheConverter(MWContext * context, URL_Struct * pUrl, 
+			 char * wysiwyg_url, int32 layer_id);
+
+extern PRBool
+ET_moz_VerifyComponentFunction(ETVerifyComponentFunc fn, ETBoolPtrFunc *pActive_callback, 
+			       ETVoidPtrFunc *pStartup_callback);
+
+extern void
+ET_moz_CompSetterFunction(ETCompPropSetterFunc fn, char *name, void *data);
+
+extern void *
+ET_moz_CompGetterFunction(ETCompPropGetterFunc fn, char *name);
+
+extern void *
+ET_moz_CompMethodFunction(ETCompMethodFunc fn, int32 argc, JSCompArg *argv);
+
+typedef enum { 
+    CL_Move,
+    CL_MoveX,
+    CL_MoveY,
+    CL_Offset,
+    CL_Resize,
+    CL_SetBboxWidth,
+    CL_SetBboxHeight,
+    CL_SetBboxTop,
+    CL_SetBboxLeft,
+    CL_SetBboxBottom,
+    CL_SetBboxRight,
+    CL_SetHidden,
+    CL_MoveInZ,
+    CL_SetSrc,
+    CL_SetSrcWidth,
+    CL_SetZ,
+    CL_SetBgColor,
+    CL_SetBackdrop
+} ETLayerOp;
+
+extern int
+ET_TweakLayer(MWContext * context, CL_Layer * layer, int32 x, int32 y, 
+              void *param_ptr, int32 param_val, ETLayerOp op,
+	      const char *referer, int32 doc_id);
+
+extern void
+ET_RestoreLayerState(MWContext *context, int32 layer_id,
+                     LO_BlockInitializeStruct *param, ETRestoreAckFunc fn,
+                     void *data);
+
+extern int32
+ET_npl_RefreshPluginList(MWContext* context, XP_Bool refreshInstances);
+
+extern JSCFResult 
+ET_JSCFExecute(MWContext *context, const char *script_name,
+		JSCFCookieData *data, Bool *data_changed);
+
+extern JSBool
+ET_HandlePref(JSContext * cx, uint argc, jsval * argv, jsval * rval);
+
+extern void
+ET_SetPluginWindow(MWContext * pContext, void * app);
+
+NSPR_END_EXTERN_C
+
+#endif /* libevent_h___ */

mozilla/include/libmocha.h

@@ -0,0 +1,546 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/*
+ * Header file for Mocha in the Navigator (libmocha).
+ */
+
+#ifndef libmocha_h___
+#define libmocha_h___
+
+#include "ntypes.h"
+#include "il_types.h"
+#include "prtypes.h"
+#include "plhash.h"
+#include "prthread.h"
+#include "jsapi.h"
+
+/* enable JavaScript Debugger support */
+#if defined (_WIN32) || defined(XP_UNIX) || defined(powerc) || defined(__powerc) || defined(XP_OS2)
+#ifdef JAVA
+#define JSDEBUGGER 1 
+#endif
+#endif
+
+NSPR_BEGIN_EXTERN_C
+
+typedef struct JSTimeout JSTimeout;
+typedef struct JSPrincipalsList JSPrincipalsList;
+typedef struct JSNestingUrl JSNestingUrl;
+
+/*
+ * There exists one MochaDecoder per top-level MWContext that decodes Mocha,
+ * either from an HTML page or from a "mocha:[expr]" URL.
+ */
+typedef struct MochaDecoder {
+    int32           forw_count;		    /* forward reference count */
+    int32           back_count;		    /* back (up the tree) count */
+    JSContext	    *js_context;
+    MWContext       *window_context;
+    JSObject	    *window_object;
+    NET_StreamClass *stream;
+    int32           stream_owner;   /* id of layer that's loading the stream */
+    URL_Struct      *url_struct;
+    JSTimeout	    *timeouts;
+    JSTimeout       *saved_timeouts;
+    uint16          signature_ordinal;
+    PRPackedBool    replace_location;
+    PRPackedBool    resize_reload;
+    PRPackedBool    load_event_sent;
+    PRPackedBool    visited;
+    PRPackedBool    writing_input;
+    PRPackedBool    free_stream_on_close;
+    PRPackedBool    in_window_quota;
+    PRPackedBool    called_win_close;
+    PRPackedBool    principals_compromised;
+    const char      *source_url;
+    JSNestingUrl    *nesting_url;
+    uint32          error_count;
+    uint32          event_mask;
+    int32           active_layer_id;
+    uint32          active_form_id;
+    uint32	    event_bit;
+    int32	    doc_id;
+
+    /*
+     * Class prototype objects, in alphabetical order.  Must be CLEARed (set
+     * to null) in LM_PutMochaDecoder, HELD (GC roots added) in lm_NewWindow,
+     * and DROPped (removed as GC roots) in lm_DestroyWindow.
+     * XXXbe clean up, clear via bzero, using a sub-structure.
+     */
+    JSObject	    *anchor_prototype;
+    JSObject	    *bar_prototype;
+    JSObject        *document_prototype;
+    JSObject	    *event_prototype;
+    JSObject	    *event_capturer_prototype;
+    JSObject	    *event_receiver_prototype;
+    JSObject	    *form_prototype;
+    JSObject	    *image_prototype;
+    JSObject	    *input_prototype;
+    JSObject	    *layer_prototype;
+    JSObject	    *option_prototype;
+    JSObject	    *rect_prototype;
+    JSObject	    *url_prototype;
+
+    /*
+     * Window sub-objects.  These must also follow the CLEAR/HOLD/DROP
+     * protocol mentioned above.
+     */
+    JSObject	    *document;
+    JSObject	    *history;
+    JSObject	    *location;
+    JSObject	    *navigator;
+    JSObject	    *components;
+    JSObject	    *screen;
+    JSObject	    *hardware;
+    JSObject	    *crypto;
+    JSObject        *pkcs11;
+
+    /*
+     * Ad-hoc GC roots.
+     */
+    JSObject	    *event_receiver;
+    JSObject	    *opener;
+
+    JSVersion	    firstVersion;   /* First JS script tag version. */
+
+    /*
+     * Security info for all of this decoder's scripts, except those
+     * contained in layers.
+     */
+    JSPrincipals    *principals;
+    JSPrincipalsList*early_access_list;
+
+    IL_GroupContext *image_context; /* Image context for anonymous images */
+
+    /* 
+     * Table that maintains an id to JS object mapping for reflected
+     * elements. This is used during resize to reestablish the connection
+     * between layout elements and their corresponding JS object. 
+     * Form elements are special, since they can't use the same keying
+     */
+    PRHashTable     *id_to_object_map;
+} MochaDecoder;
+
+/* 
+ * Number of buckets for the id-to-object hash table.
+ */
+#define LM_ID_TO_OBJ_MAP_SIZE 20
+#define LM_FORM_ELEMENT_MAP_SIZE 10
+
+/*
+ * Types of objects reflected into Mocha
+ */
+typedef enum {
+	LM_APPLETS = 0,
+	LM_FORMS,
+	LM_LINKS,
+	LM_NAMEDANCHORS,
+	LM_EMBEDS,
+	LM_IMAGES,
+	LM_FORMELEMENTS,
+	LM_LAYERS
+} ReflectedObject;
+
+/*
+ * Generates an id-to-object mapping key from the ReflectedObject
+ * type, the containing layer id and the id of the object itself.
+ * The key is 4 bits type, 14 bits layer_id and 14 bits id.
+ */
+#define LM_GET_MAPPING_KEY(obj_type, layer_id, id)    \
+     (void *)(((((uint32)obj_type) << 28) & 0xF0000000UL) |     \
+              ((((uint32)layer_id) << 14) & 0x0FFFC000UL) |     \
+              (((uint32)id) & 0x00003FFFUL))
+
+/*
+ * Public, well-known string constants.
+ */
+extern char js_language_name[];      /* "JavaScript" */
+extern char js_content_type[];       /* "application/x-javascript" */
+
+/*
+ * Initialize and finalize Mocha-in-the-client.
+ */
+extern void LM_InitMocha(void);
+extern void LM_FinishMocha(void);
+
+/*
+ * Force mocha on in the given context, even if the user pref is set to
+ * disable mocha.
+ */
+extern void LM_ForceJSEnabled(MWContext *cx);
+
+/*
+ * Initialize and finalize Mocha-Java connection
+ */
+#define LM_MOJA_UNINITIALIZED   0
+#define LM_MOJA_OK              1
+#define LM_MOJA_JAVA_FAILED     2
+#define LM_MOJA_OUT_OF_MEMORY   3
+extern int LM_InitMoja(void);
+extern void LM_FinishMoja(void);
+extern int LM_IsMojaInitialized(void);
+
+/*
+ * Enter or leave the big mocha lock.  Any thread which wants to
+ * preserve JavaScript run-to-completion semantics must bracket
+ * JavaScript evaluation with these calls.
+ */
+typedef void
+(PR_CALLBACK *JSLockReleaseFunc)(void * data);
+
+
+extern void PR_CALLBACK LM_LockJS(MWContext *mwc);
+extern void PR_CALLBACK LM_UnlockJS(MWContext *mwc);
+extern JSBool PR_CALLBACK LM_AttemptLockJS(MWContext *mwc, 
+                                           JSLockReleaseFunc fn, void * data);
+extern JSBool PR_CALLBACK LM_ClearAttemptLockJS(MWContext *mwc, 
+                                                JSLockReleaseFunc fn, 
+                                                void * data);
+extern PRBool PR_CALLBACK
+LM_HandOffJSLock(PRThread * oldOwner, PRThread *newOwner);
+
+/*
+ * For interruption purposes we will sometimes need to know the
+ *   context who is holding the JS lock
+ */
+extern void LM_JSLockSetContext(MWContext * context);
+extern MWContext * LM_JSLockGetContext(MWContext *mwc);
+
+/*
+ * Enable/disable for Mocha-in-the-client.
+ */
+#define LM_SwitchMocha(toggle)	LM_SetMochaEnabled(toggle)
+
+extern JSBool
+LM_GetMochaEnabled(void);
+
+/*
+ * Get (create if necessary) a MochaDecoder for context, adding a reference
+ * to its window_object.  Put drops the reference, destroying window_object
+ * when the count reaches zero.  These functions should only be called in
+ * the mocha thread or while holding the JS-lock
+ */
+extern MochaDecoder *
+LM_GetMochaDecoder(MWContext *context);
+
+extern void
+LM_PutMochaDecoder(MochaDecoder *decoder);
+
+/*
+ * Get the source URL for script being loaded by document.  This URL will be
+ * the document's URL for inline script, or the SRC= URL for included script.
+ * The returned pointer is safe only within the extent of the function that
+ * calls LM_GetSourceURL().
+ */
+extern const char *
+LM_GetSourceURL(MochaDecoder *decoder);
+
+/*
+ * Set the current layer and hence the current scope for script evaluation.
+ */
+extern void
+LM_SetActiveLayer(MWContext * context, int32 layer_id);
+
+/*
+ * Get the current layer and hence the current scope for script evaluation.
+ */
+extern int32
+LM_GetActiveLayer(MWContext * context);
+
+/*
+ * Evaluate the contents of a SCRIPT tag. You can specify the JSObject
+ * to use as the base scope. Pass NULL to use the default window_object
+ */
+extern JSBool
+LM_EvaluateBuffer(MochaDecoder *decoder, void *base, size_t length,
+		  uint lineno, char * scope_to, struct JSPrincipals *principals,
+		  JSBool unicode, jsval *result);
+
+/*
+ * Evaluate an expression entity in an HTML attribute (WIDTH="&{height/2};").
+ * Returns null on error, otherwise a pointer to the malloc'd string result.
+ * The caller is responsible for freeing the string result.
+ */
+extern char *
+LM_EvaluateAttribute(MWContext *context, char *expr, uint lineno);
+
+/*
+ * Remove any MochaDecoder window_context pointer to an MWContext that's
+ * being destroyed.
+ */
+extern void
+LM_RemoveWindowContext(MWContext *context, History_entry * he);
+
+extern void
+LM_DropSavedWindow(MWContext *context, void *window);
+
+/*
+ * Set and clear the HTML stream and URL for the MochaDecoder
+ *   associated with the given context
+ */
+extern JSBool
+LM_SetDecoderStream(MWContext * context, NET_StreamClass *stream,
+		            URL_Struct *url_struct, JSBool free_stream_on_close);
+
+/*
+ * Start caching HTML or plain text generated by document.write() where the
+ * script is running on mc, the document is being generated into decoder's
+ * window, and url_struct tells about the generator.
+ */
+extern NET_StreamClass *
+LM_WysiwygCacheConverter(MWContext *context, URL_Struct *url_struct,
+			 const char * wysiwyg_url, const char * base_href);
+
+/*
+ * Skip over the "wysiwyg://docid/" in url_string and return a pointer to the
+ * real URL hidden after the prefix.  If url_string is not of "wysiwyg:" type,
+ * just return url_string.  Never returns null.
+ */
+extern const char *
+LM_StripWysiwygURLPrefix(const char *url_string);
+
+/*
+ * This function works only on "wysiwyg:" type URLs -- don't call it unless
+ * you know that NET_URL_Type(url_string) is WYSIWYG_TYPE_URL.  It'll return
+ * null if url_string seems too short, or if it can't find the third slash.
+ */
+extern const char *
+LM_SkipWysiwygURLPrefix(const char *url_string);
+
+/*
+ * Return a pointer to a malloc'd string of the form "<BASE HREF=...>" where
+ * the "..." URL is the directory of cx's origin URL.  Such a base URL is the
+ * default base for relative URLs in generated HTML.
+ */
+extern char *
+LM_GetBaseHrefTag(JSContext *cx, JSPrincipals *principals);
+
+/*
+ * XXX Make these public LO_... typedefs in lo_ele.h/ntypes.h?
+ */
+struct lo_FormData_struct;
+struct lo_NameList_struct;
+
+extern struct lo_FormData_struct *
+LO_GetFormDataByID(MWContext *context, int32 layer_id, intn form_id);
+
+extern uint
+LO_EnumerateForms(MWContext *context, int32 layer_id);
+
+extern struct LO_ImageStruct_struct *
+LO_GetImageByIndex(MWContext *context, int32 layer_id, intn image_id);
+
+extern uint
+LO_EnumerateImages(MWContext *context, int32 layer_id);
+
+/*
+ * Reflect display layers into Mocha.
+ */
+extern JSObject *
+LM_ReflectLayer(MWContext *context, int32 layer_id, int32 parent_layer_id,
+                PA_Tag *tag);
+
+extern LO_FormElementStruct *
+LO_GetFormElementByIndex(struct lo_FormData_struct *form_data, int32 index);
+
+extern uint
+LO_EnumerateFormElements(MWContext *context,
+			 struct lo_FormData_struct *form_data);
+
+/*
+ * Layout helper function to find a named anchor by its index in the
+ * document.anchors[] array.
+ */
+extern struct lo_NameList_struct *
+LO_GetNamedAnchorByIndex(MWContext *context, int32 layer_id, uint index);
+
+extern uint
+LO_EnumerateNamedAnchors(MWContext *context, int32 layer_id);
+
+/*
+ * Layout Mocha helper function to find an HREF Anchor by its index in the
+ * document.links[] array.
+ */
+extern LO_AnchorData *
+LO_GetLinkByIndex(MWContext *context, int32 layer_id, uint index);
+
+extern uint
+LO_EnumerateLinks(MWContext *context, int32 layer_id);
+
+extern LO_JavaAppStruct *
+LO_GetAppletByIndex(MWContext *context, int32 layer_id, uint index);
+
+extern uint
+LO_EnumerateApplets(MWContext *context, int32 layer_id);
+
+extern LO_EmbedStruct *
+LO_GetEmbedByIndex(MWContext *context, int32 layer_id, uint index);
+
+extern uint
+LO_EnumerateEmbeds(MWContext *context, int32 layer_id);
+
+/*
+ * Get and set a color attribute in the current document state.
+ */
+extern void
+LO_GetDocumentColor(MWContext *context, int type, LO_Color *color);
+
+extern void
+LO_SetDocumentColor(MWContext *context, int type, LO_Color *color);
+
+/*
+ * Layout function to reallocate the lo_FormElementOptionData array pointed at
+ * by lo_FormElementSelectData's options member to include space for the number
+ * of options given by selectData->option_cnt.
+ */
+extern XP_Bool
+LO_ResizeSelectOptions(lo_FormElementSelectData *selectData);
+
+/*
+ * Discard the current document and all its subsidiary objects.
+ */
+extern void
+LM_ReleaseDocument(MWContext *context, JSBool resize_reload);
+
+/*
+ * Search if a the event is being captured in the frame hierarchy.
+ */
+extern XP_Bool
+LM_EventCaptureCheck(MWContext *context, uint32 current_event);
+
+/*
+ * Scroll a window to the given point.
+ */
+extern void LM_SendOnScroll(MWContext *context, int32 x, int32 y);
+
+/*
+ * Display a help topic.
+ */
+extern void LM_SendOnHelp(MWContext *context);
+
+/*
+ * Send a load or abort event for an image to a callback.
+ */
+typedef enum LM_ImageEvent {
+    LM_IMGUNBLOCK   = 0,
+    LM_IMGLOAD      = 1,
+    LM_IMGABORT     = 2,
+    LM_IMGERROR     = 3,
+    LM_LASTEVENT    = 3
+} LM_ImageEvent;
+
+extern void
+LM_ProcessImageEvent(MWContext *context, LO_ImageStruct *image_data,
+		  LM_ImageEvent event);
+
+/* This should be called when a named anchor is located. */
+extern JSBool
+LM_SendOnLocate(MWContext *context, struct lo_NameList_struct *name_rec);
+
+extern JSObject *
+LM_ReflectApplet(MWContext *context, LO_JavaAppStruct *applet_data,
+                 PA_Tag * tag, int32 layer_id, uint index);
+
+extern JSObject *
+LM_ReflectEmbed(MWContext *context, LO_EmbedStruct *lo_embed,
+                PA_Tag * tag, int32 layer_id, uint index);
+
+struct lo_FormData_struct;
+struct lo_NameList_struct;
+
+extern JSObject *
+LM_ReflectForm(MWContext *context, struct lo_FormData_struct *form_data, 
+	       PA_Tag * tag, int32 layer_id, uint index);
+
+extern JSObject *
+LM_ReflectFormElement(MWContext *context, int32 layer_id, int32 form_id, 
+                      int32 element_id, PA_Tag * tag);
+
+extern JSObject *
+LM_ReflectLink(MWContext *context, LO_AnchorData *anchor_data, PA_Tag * tag, 
+               int32 layer_id, uint index);
+
+extern JSObject *
+LM_ReflectNamedAnchor(MWContext *context, struct lo_NameList_struct *name_rec, 
+                      PA_Tag * tag, int32 layer_id, uint index);
+
+extern JSObject *
+LM_ReflectImage(MWContext *context, LO_ImageStruct *image_data, 
+			    PA_Tag * tag, int32 layer_id, uint index);
+
+extern JSBool
+LM_CanDoJS(MWContext *context);
+
+extern JSBool
+LM_IsActive(MWContext *context);
+
+/*
+ * Security.
+ */
+
+extern JSPrincipals *
+LM_NewJSPrincipals(URL_Struct *archive, char *name, const char *codebase);
+
+extern char *
+LM_ExtractFromPrincipalsArchive(JSPrincipals *principals, char *name, 
+                                uint *length);
+
+extern JSBool
+LM_SetUntransformedSource(JSPrincipals *principals, char *original, 
+                          char *transformed);
+
+extern JSPrincipals * PR_CALLBACK
+LM_GetJSPrincipalsFromJavaCaller(JSContext *cx, int callerDepth);
+
+/*
+ * LM_RegisterPrincipals will verify and register a set of principals 
+ * in the decoder, modifying decoder->principals in the process. It
+ * returns the modified decoder.
+ * 
+ * The "name" parameter may be NULL if "principals" was created with a name.
+ */
+
+extern JSPrincipals *
+LM_RegisterPrincipals(MochaDecoder *decoder, JSPrincipals *principals, 
+                      char *name, char *src);
+/*
+ * JavaScript Debugger support
+ */
+#ifdef JSDEBUGGER 
+
+extern NET_StreamClass*
+LM_StreamBuilder( int         format_out,
+                  void        *data_obj,
+                  URL_Struct  *URL_s,
+                  MWContext   *mwcontext );
+
+extern JSBool
+LM_GetJSDebugActive(void);
+
+extern void
+LM_JamSourceIntoJSDebug( const char *filename,
+                         const char *str, 
+                         int32      len,
+                         MWContext  *mwcontext );
+
+#endif
+
+NSPR_END_EXTERN_C
+
+#endif /* libmocha_h___ */

mozilla/lib/libmocha/Makefile

@@ -0,0 +1,95 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+
+
+DEPTH		= ../..
+
+MODULE		= mocha
+LIBRARY_NAME	= mocha
+
+REQUIRES	= lay net parse img js style layer applet dbm nspr security \
+		  htmldlgs util jtools pref java libreg softupdt jsdebug
+
+CSRCS		= et_mocha.c \
+		  et_moz.c \
+		  lm_applt.c \
+		  lm_bars.c \
+		  lm_cmpnt.c \
+		  lm_doc.c \
+		  lm_embed.c \
+		  lm_event.c \
+		  lm_form.c \
+		  lm_hardw.c \
+		  lm_hist.c \
+		  lm_href.c \
+		  lm_img.c \
+		  lm_init.c \
+		  lm_input.c \
+		  lm_nav.c \
+		  lm_plgin.c \
+		  lm_screen.c \
+		  lm_supdt.c \
+		  lm_taint.c \
+		  lm_trggr.c \
+		  lm_url.c \
+		  lm_win.c \
+		  lm_layer.c \
+		  lm_wngrp.c \
+		  $(NULL)
+
+
+ifdef MOZ_JAVA
+CSRCS +=             \
+		  lm_jsd.c \
+		  $(NULL)
+endif
+
+ifndef NO_SECURITY
+CSRCS		+= lm_crypt.c lm_pk11.c
+endif
+
+include $(DEPTH)/config/rules.mk
+
+DEFINES		+= -DDLL_SUFFIX=\"$(DLL_SUFFIX)\"
+
+ifdef JS_THREADSAFE
+DEFINES += -DJS_THREADSAFE
+endif
+
+EMBED_CFLAGS	= $(CFLAGS) -I$(DEPTH)/lib/plugin
+TAINT_CFLAGS	= $(CFLAGS) -I$(DEPTH)/lib/libjar -I$(DEPTH)/sun-java/netscape/security/_jri
+
+ifneq ($(OS_ARCH),OS2)
+$(OBJDIR)/lm_embed.o: lm_embed.c
+	@$(MAKE_OBJDIR)
+	$(CC) -o $@ -c $(EMBED_CFLAGS) $<
+
+$(OBJDIR)/lm_taint.o: lm_taint.c
+	@$(MAKE_OBJDIR)
+	$(CC) -o $@ -c $(TAINT_CFLAGS) $<
+
+else
+$(OBJDIR)/lm_embed.o: lm_embed.c
+	@$(MAKE_OBJDIR)
+	$(CC) -Fo$@ -c $(EMBED_CFLAGS) $<
+
+$(OBJDIR)/lm_taint.o: lm_taint.c
+	@$(MAKE_OBJDIR)
+	$(CC) -Fo$@ -c $(TAINT_CFLAGS) $<
+
+endif

mozilla/lib/libmocha/lm.h

@@ -0,0 +1,880 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef lm_h___
+#define lm_h___
+/*
+ * JS in the Navigator library-private interface.
+ */
+#include "xp.h"         /* for uint and PA_Block */
+#include "prlong.h"	/* for int64 time type used below */
+#include "libevent.h"	/* until its a stand-alone */
+#include "libmocha.h"
+
+/*
+ * Shared string constants for common property names.
+ */
+extern char lm_argc_err_str[];          /* "incorrect number of arguments" */
+
+extern char lm_unknown_origin_str[];    /* "[unknown origin]" */
+
+extern char lm_onLoad_str[];            /* "onLoad" */
+extern char lm_onUnload_str[];          /* "onUnload" */
+extern char lm_onAbort_str[];           /* "onAbort" */
+extern char lm_onError_str[];           /* "onError" */
+extern char lm_onScroll_str[];          /* "onScroll" */
+extern char lm_onFocus_str[];           /* "onFocus" */
+extern char lm_onBlur_str[];            /* "onBlur" */
+extern char lm_onSelect_str[];          /* "onSelect" */
+extern char lm_onChange_str[];          /* "onChange" */
+extern char lm_onReset_str[];           /* "onReset" */
+extern char lm_onSubmit_str[];          /* "onSubmit" */
+extern char lm_onClick_str[];           /* "onClick" */
+extern char lm_onMouseDown_str[];       /* "onMouseDown" */
+extern char lm_onMouseOver_str[];       /* "onMouseOver" */
+extern char lm_onMouseOut_str[];        /* "onMouseOut" */
+extern char lm_onMouseUp_str[];         /* "onMouseUp" */
+extern char lm_onLocate_str[];          /* "onLocate" */
+extern char lm_onHelp_str[];            /* "onHelp" [EA] */
+
+extern char lm_focus_str[];             /* "focus" */
+extern char lm_blur_str[];              /* "blur" */
+extern char lm_select_str[];            /* "select" */
+extern char lm_click_str[];             /* "click" */
+extern char lm_scroll_str[];            /* "scroll" */
+extern char lm_enable_str[];            /* "enable" */
+extern char lm_disable_str[];           /* "disable" */
+
+extern char lm_toString_str[];          /* "toString" */
+extern char lm_length_str[];            /* "length" */
+extern char lm_document_str[];          /* "document" */
+extern char lm_forms_str[];             /* "forms" */
+extern char lm_links_str[];             /* "links" */
+extern char lm_anchors_str[];           /* "anchors" */
+extern char lm_applets_str[];           /* "applets" */
+extern char lm_embeds_str[];            /* "embeds" */
+extern char lm_plugins_str[];           /* "plugins" */
+extern char lm_images_str[];            /* "images" */
+extern char lm_layers_str[];            /* "layers" */
+extern char lm_location_str[];          /* "location" */
+extern char lm_navigator_str[];         /* "navigator" */
+extern char lm_netcaster_str[];         /* "netcaster" */
+extern char lm_components_str[];        /* "components" */
+
+extern char lm_parentLayer_str[];       /* "parentLayer" */
+extern char lm_opener_str[];            /* "opener" */
+extern char lm_closed_str[];            /* "closed" */
+extern char lm_assign_str[];            /* "assign" */
+extern char lm_reload_str[];            /* "reload" */
+extern char lm_replace_str[];           /* "replace" */
+extern char lm_event_str[];             /* "event" */
+extern char lm_methodPrefix_str[];      /* "#method" */
+extern char lm_methodArgc_str[];      /* "#method" */
+extern char lm_methodArgv_str[];      /* "#method" */
+extern char lm_getPrefix_str[];         /* "#get_" */
+extern char lm_setPrefix_str[];         /* "#set_" */
+extern char lm_typePrefix_str[];        /* "#type_" */
+extern const char *lm_event_argv[];     /* {lm_event_str} */
+
+extern PRThread		    *lm_InterpretThread;
+extern PRThread		    *mozilla_thread;
+extern PRThread		    *lm_js_lock_previous_owner;
+
+extern JSContext *lm_writing_context;
+
+/*
+ * Timeout structure threaded on MochaDecoder.timeouts for cleanup.
+ */
+struct JSTimeout {
+    int32               ref_count;      /* reference count to shared usage */
+    char                *expr;          /* the JS expression to evaluate */
+    JSObject            *funobj;        /* or function to call, if !expr */
+    jsval               *argv;          /* function actual arguments */
+    void                *toid;          /* Identifier, used internally only */
+    uint32              public_id;      /* Returned as value of setTimeout() */
+    uint16              argc;           /* and argument count */
+    uint16              spare;          /* alignment padding */
+    int32		doc_id;       	/* document this is for */
+    int32               interval;       /* Non-zero if repetitive timeout */
+    int64               when;           /* nominal time to run this timeout */
+    JSVersion		version;	/* Version of JavaScript to execute */
+    JSPrincipals        *principals;    /* principals with which to execute */
+    char                *filename;      /* filename of setTimeout call */
+    uint32              lineno;         /* line number of setTimeout call */
+    JSTimeout           *next;          /* next timeout in list */
+};
+
+extern void             lm_ClearWindowTimeouts(MochaDecoder *decoder);
+
+struct JSNestingUrl {
+    JSNestingUrl 	*next;
+    char                *str;
+};
+
+/*
+ * Event queue stack madness to handle doc.write("<script>doc.write...").
+ */
+typedef struct QueueStackElement {
+    PREventQueue		* queue;
+    MWContext		        * context;
+    int32			  doc_id;
+    struct QueueStackElement	* up;
+    struct QueueStackElement	* down;
+    PRPackedBool		  done;
+    PRPackedBool		  discarding;
+    PRPackedBool		  inherit_parent;
+    void                        * retval;
+} QueueStackElement;
+
+extern void
+et_SubEventLoop(QueueStackElement * qse);
+
+/*
+ * Stack size per window context, plus one for the navigator.
+ */
+#define LM_STACK_SIZE   8192
+
+extern JSRuntime        *lm_runtime;
+extern JSClass		lm_window_class;
+extern JSClass		lm_layer_class;
+extern JSClass		lm_document_class;
+extern JSClass		lm_event_class;
+
+extern JSBool           lm_SaveParamString(JSContext *cx, PA_Block *bp,
+                                           const char *str);
+extern MochaDecoder     *lm_NewWindow(MWContext *context);
+extern void             lm_DestroyWindow(MochaDecoder *decoder);
+
+/*
+ * Hold and drop the reference count for tree back-edges that go from object
+ * private data to the containing decoder.  These refs do not keep the object
+ * tree under decoder alive from the GC, but they do keep decoder from being
+ * destroyed and some out of order finalizer tripping over its freed memory.
+ */
+#ifdef DEBUG
+extern MochaDecoder     *lm_HoldBackCount(MochaDecoder *decoder);
+extern void             lm_DropBackCount(MochaDecoder *decoder);
+
+#define HOLD_BACK_COUNT(decoder) lm_HoldBackCount(decoder)
+#define DROP_BACK_COUNT(decoder) lm_DropBackCount(decoder)
+#else
+#define HOLD_BACK_COUNT(decoder)                                             \
+    (((decoder) ? (decoder)->back_count++ : 0), (decoder))
+#define DROP_BACK_COUNT(decoder)                                             \
+    (((decoder) && --(decoder)->back_count <= 0 && !(decoder)->forw_count)   \
+     ? lm_DestroyWindow(decoder)					     \
+     : (void)0)
+#endif
+
+extern JSBool           lm_InitWindowContent(MochaDecoder *decoder);
+extern JSBool           lm_DefineWindowProps(JSContext *cx,
+                                             MochaDecoder *decoder);
+extern JSBool           lm_ResolveWindowProps(JSContext *cx,
+                                              MochaDecoder *decoder,
+                                              JSObject *obj,
+                                              jsval id);
+extern void             lm_FreeWindowContent(MochaDecoder *decoder,
+					     JSBool fromDiscard);
+extern JSBool           lm_SetInputStream(JSContext *cx,
+					  MochaDecoder *decoder,
+					  NET_StreamClass *stream,
+					  URL_Struct *url_struct,
+                                          JSBool free_stream_on_close);
+extern JSObject         *lm_DefineDocument(MochaDecoder *decoder,
+                                           int32 layer_id);
+extern JSObject         *lm_DefineHistory(MochaDecoder *decoder);
+extern JSObject         *lm_DefineLocation(MochaDecoder *decoder);
+extern JSObject         *lm_DefineNavigator(MochaDecoder *decoder);
+extern JSObject         *lm_DefineComponents(MochaDecoder *decoder);
+extern JSObject         *lm_DefineCrypto(MochaDecoder *decoder);
+extern JSObject         *lm_DefineScreen(MochaDecoder *decoder,
+                                         JSObject *parent);
+extern JSObject         *lm_DefineHardware(MochaDecoder *decoder,
+                                         JSObject *parent);
+extern JSBool           lm_DefinePluginClasses(MochaDecoder *decoder);
+extern JSBool           lm_DefineBarClasses(MochaDecoder *decoder);
+extern JSBool           lm_ResolveBar(JSContext *cx, MochaDecoder *decoder,
+				      const char *name);
+extern JSBool           lm_DefineTriggers(void);
+extern JSObject         *lm_NewPluginList(JSContext *cx, JSObject *parent_obj);
+extern JSObject         *lm_NewMIMETypeList(JSContext *cx);
+extern JSObject         *lm_GetDocumentFromLayerId(MochaDecoder *decoder,
+                                                   int32 layer_id);
+extern JSObject         *lm_DefinePkcs11(MochaDecoder *decoder);
+/*
+ * Get (create if needed) document's form, link, and named anchor arrays.
+ */
+extern JSObject         *lm_GetFormArray(MochaDecoder *decoder,
+                                         JSObject *document);
+extern JSObject         *lm_GetLinkArray(MochaDecoder *decoder,
+                                         JSObject *document);
+extern JSObject         *lm_GetNameArray(MochaDecoder *decoder,
+                                         JSObject *document);
+extern JSObject         *lm_GetAppletArray(MochaDecoder *decoder,
+                                           JSObject *document);
+extern JSObject         *lm_GetEmbedArray(MochaDecoder *decoder,
+                                          JSObject *document);
+extern JSObject         *lm_GetImageArray(MochaDecoder *decoder,
+                                          JSObject *document);
+extern JSObject         *lm_GetDocumentLayerArray(MochaDecoder *decoder,
+                                                  JSObject *document);
+
+
+/*
+ * dummy object for applets and embeds that can't be reflected
+ */
+extern JSObject *lm_DummyObject;
+extern void lm_InitDummyObject(JSContext *cx);
+
+/* bit vector for handlers */
+typedef enum  {
+	HANDLER_ONCLICK = 1 << 0,
+	HANDLER_ONFOCUS = 1 << 1,
+	HANDLER_ONBLUR = 1 << 2,
+	HANDLER_ONCHANGE = 1 << 3,
+	HANDLER_ONSELECT = 1 << 4,
+	HANDLER_ONSCROLL = 1 << 5,
+	HANDLER_ONMOUSEDOWN = 1 << 6,
+	HANDLER_ONMOUSEUP = 1 << 7,
+	HANDLER_ONKEYDOWN = 1 << 8,
+	HANDLER_ONKEYUP = 1 << 9,
+	HANDLER_ONKEYPRESS = 1 << 10,
+	HANDLER_ONDBLCLICK = 1 << 11
+} JSHandlersBitVector;
+
+/*
+ * Base class of all JS input private object data structures.
+ */
+typedef struct JSInputBase {
+    MochaDecoder        *decoder;       /* this window's JS decoder */
+    int32               type;           /* layout form element type */
+    JSHandlersBitVector	handlers;	/* bit vector for handlers */
+} JSInputBase;
+
+/*
+ * Base class of event-handling elements like layers and documents.
+ */
+typedef struct JSInputHandler {
+    JSInputBase     base;           /* decoder and type */
+    JSObject        *object;        /* this input handler's JS object */
+    uint32          event_mask;     /* mask of events in progress */
+} JSInputHandler;
+
+/*
+ * Base class of input event-capturing elements like layers and documents.
+ */
+typedef struct JSEventReceiver {
+    JSObject        *object;        /* this event receiver's JS object */
+    uint32          event_mask;     /* mask of events in progress */
+} JSEventReceiver;
+
+/*
+ * Base class of input event-handling elements like anchors and form inputs.
+ */
+typedef struct JSEventCapturer {
+    JSEventReceiver base;	    /* this event capturer's receiver base */
+    uint32          event_bit;	    /* mask of events being captured */
+} JSEventCapturer;
+
+#define base_decoder    base.decoder
+#define base_type       base.type
+#define base_handlers	base.handlers
+
+/*
+ * JS URL object.
+ *
+ * Location is a special URL: when you set one of its properties, your client
+ * window goes to the newly formed address.
+ */
+typedef struct JSURL {
+    JSInputHandler  handler;
+    int32           layer_id;
+    uint32          index;
+    JSString        *href;
+    JSString        *target;
+    JSString        *text;
+} JSURL;
+
+/* JS Document Object
+ * Documents exist per-window and per-layer
+ */
+typedef struct JSDocument {
+    JSEventCapturer	capturer;
+    MochaDecoder        *decoder;
+    JSObject            *object;
+    int32               layer_id;     /* The containing layer's id */
+    JSObject	        *forms;
+    JSObject	        *links;
+    JSObject	        *anchors;
+    JSObject	        *applets;
+    JSObject            *embeds;
+    JSObject	        *images;
+    JSObject	        *layers;
+} JSDocument;
+
+#define URL_NOT_INDEXED ((uint32)-1)
+
+#define url_decoder     handler.base_decoder
+#define url_type        handler.base_type
+#define url_object      handler.object
+#define url_event_mask  handler.event_mask
+
+extern JSURL *
+lm_NewURL(JSContext *cx, MochaDecoder *decoder,
+          LO_AnchorData *anchor_data, JSObject *document);
+
+extern void
+lm_ReplaceURL(MWContext *context, URL_Struct *url_struct);
+
+extern JSBool
+lm_GetURL(JSContext *cx, MochaDecoder *decoder, URL_Struct *url_struct);
+
+extern const char *
+lm_CheckURL(JSContext *cx, const char *url_string, JSBool checkFile);
+
+extern JSBool
+lm_CheckWindowName(JSContext *cx, const char *window_name);
+
+extern PRHashTable *
+lm_GetIdToObjectMap(MochaDecoder *decoder);
+
+extern JSBool PR_CALLBACK
+lm_BranchCallback(JSContext *cx, JSScript *script);
+
+extern void PR_CALLBACK
+lm_ErrorReporter(JSContext *cx, const char *message,
+                 JSErrorReport *report);
+
+extern JSObject *
+lm_GetFormObjectByID(MWContext *context, int32 layer_id, uint form_id);
+
+extern LO_FormElementStruct *
+lm_GetFormElementByIndex(JSContext * cx, JSObject *form_obj, int32 index);
+
+extern JSObject *
+lm_GetFormElementFromMapping(JSContext *cx, JSObject *form_obj, uint32 index);
+
+extern JSBool
+lm_AddFormElement(JSContext *cx, JSObject *form, JSObject *obj,
+                  char *name, uint index);
+
+extern JSBool
+lm_ReflectRadioButtonArray(MWContext *context, int32 layer_id, intn form_id,
+                           const char *name, PA_Tag * tag);
+
+extern JSBool
+lm_SendEvent(MWContext *context, JSObject *obj, JSEvent *event,
+             jsval *result);
+
+extern JSBool
+lm_HandleEvent(JSContext *cx, JSObject *obj, JSObject *eventObj,
+	       jsval funval, jsval *result);
+
+extern JSBool
+lm_FindEventHandler(MWContext *context, JSObject *obj, JSObject *eventObj,
+		     jsval funval, jsval *result);
+
+extern JSObject *
+lm_NewEventObject(MochaDecoder * decoder, JSEvent * pEvent);
+
+typedef struct JSEventNames {
+    const char *lowerName;
+    const char *mixedName;
+} JSEventNames;
+
+extern const char *
+lm_EventName(uint32 event_bit);
+
+extern JSEventNames *
+lm_GetEventNames(uint32 event_bit);
+
+/*
+ * Compile the given attribute and attach it to the JSObject
+ */
+extern JSBool
+lm_CompileEventHandler(MochaDecoder * decoder, PA_Block id, PA_Block data, 
+		       int newline_(cx, sizeof *option);
+		if (!option)
+		    goto bad;
+
+		option_obj =
+		    JS_NewObject(cx, &lm_option_class,
+				 input->input_decoder->option_prototype, obj);
+
+		if (!option_obj || !JS_SetPrivate(cx, option_obj, option)) {
+		    JS_free(cx, option);
+		    goto bad;
+		}
+		option->decoder = HOLD_BACK_COUNT(input->input_decoder);
+		option->object = option_obj;
+		option->index = (uint32)slot;
+		option->indexInForm = form_element->element_index;
+		option->data = NULL;
+		*vp = OBJECT_TO_JSVAL(option_obj);
+		goto good;
+	    }
+	}
+	break;
+
+      case FORM_TYPE_RADIO:
+      case FORM_TYPE_CHECKBOX:
+	{
+	    lo_FormElementToggleData *toggle;
+
+	    toggle = &form_element->element_data->ele_toggle;
+	    switch (input_slot) {
+	      case INPUT_NAME:
+		str = lm_LocalEncodingToStr(context, 
+					    (char *)toggle->name);
+		break;
+	      case INPUT_VALUE:
+		str = lm_LocalEncodingToStr(context, 
+					    (char *)toggle->value);
+		break;
+	      case INPUT_STATUS:
+		*vp = BOOLEAN_TO_JSVAL(toggle->toggled);
+		goto good;
+	      case INPUT_DEFAULT_STATUS:
+		*vp = BOOLEAN_TO_JSVAL(toggle->default_toggle);
+		goto good;
+
+#if DISABLED_READONLY_SUPPORT
+	      case INPUT_DISABLED:
+	        *vp = BOOLEAN_TO_JSVAL(toggle->disabled);
+		goto good;
+	      case INPUT_READONLY:
+		*vp = BOOLEAN_TO_JSVAL(FALSE);
+		goto good;
+#endif
+	      default:
+		/* Don't mess with a user-defined property. */
+		goto good;
+	    }
+	}
+	break;
+
+      default:
+	{
+	    lo_FormElementMinimalData *minimal;
+
+	    minimal = &form_element->element_data->ele_minimal;
+	    switch (input_slot) {
+	      case INPUT_NAME:
+		str = lm_LocalEncodingToStr(context, 
+					    (char *)minimal->name);
+		break;
+	      case INPUT_VALUE:
+		str = lm_LocalEncodingToStr(context, 
+					    (char *)minimal->value);
+		break;
+#if DISABLED_READONLY_SUPPORT
+	      case INPUT_DISABLED:
+	        *vp = BOOLEAN_TO_JSVAL(minimal->disabled);
+		goto good;
+	      case INPUT_READONLY:
+		*vp = BOOLEAN_TO_JSVAL(FALSE); /* minimal elements don't have the readonly attribute. */
+		goto good;
+#endif
+	      default:
+		/* Don't mess with a user-defined property. */
+		goto good;
+	    }
+	}
+	break;
+    }
+
+    if (!str)
+	goto bad;
+    *vp = STRING_TO_JSVAL(str);
+
+good:
+    LO_UnlockLayout();
+    return JS_TRUE;
+
+bad:
+    LO_UnlockLayout();
+    return JS_FALSE;
+
+}
+
+char *
+lm_FixNewlines(JSContext *cx, const char *value, JSBool formElement)
+{
+    size_t size;
+    const char *cp;
+    char *tp, *new_value;
+
+#if defined XP_PC
+    size = 1;
+    for (cp = value; *cp != '\0'; cp++) {
+	switch (*cp) {
+	  case '\r':
+	    if (cp[1] != '\n')
+		size++;
+	    break;
+	  case '\n':
+	    if (cp > value && cp[-1] != '\r')
+		size++;
+	    break;
+	}
+    }
+    size += cp - value;
+#else
+    size = XP_STRLEN(value) + 1;
+#endif
+    new_value = JS_malloc(cx, size);
+    if (!new_value)
+	return NULL;
+    for (cp = value, tp = new_value; *cp != '\0'; cp++) {
+#if defined XP_MAC
+	if (*cp == '\n') {
+	    if (cp > value && cp[-1] != '\r')
+		*tp++ = '\r';
+	} else {
+	    *tp++ = *cp;
+	}
+#elif defined XP_PC
+	switch (*cp) {
+	  case '\r':
+	    *tp++ = '\r';
+	    if (cp[1] != '\n' && formElement)
+		*tp++ = '\n';
+	    break;
+	  case '\n':
+	    if (cp > value && cp[-1] != '\r' && formElement)
+		*tp++ = '\r';
+	    *tp++ = '\n';
+	    break;
+	  default:
+	    *tp++ = *cp;
+	    break;
+	}
+#else /* XP_UNIX */
+	if (*cp == '\r') {
+	    if (cp[1] != '\n')
+		*tp++ = '\n';
+	} else {
+	    *tp++ = *cp;
+	}
+#endif
+    }
+    *tp = '\0';
+    return new_value;
+}
+
+PR_STATIC_CALLBACK(JSBool)
+input_setProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+    JSInput *input;
+    enum input_slot input_slot;
+    const char *prop_name;
+    char *value = NULL;
+    LO_FormElementStruct *form_element;
+    MochaDecoder *decoder;
+    MWContext *context;
+    int32 intval;
+    jsint slot;
+
+    input = JS_GetInstancePrivate(cx, obj, &lm_input_class, NULL);
+    if (!input)
+	return JS_TRUE;
+
+    /* If the property is seting a key handler we find out now so
+     * that we can tell the front end to send the event. */
+    if (JSVAL_IS_STRING(id)) {
+	prop_name = JS_GetStringBytes(JSVAL_TO_STRING(id));
+	/* XXX use lm_onKeyDown_str etc. initialized by PARAM_ONKEYDOWN */
+	if (XP_STRCASECMP(prop_name, "onkeydown") == 0 ||
+	    XP_STRCASECMP(prop_name, "onkeyup") == 0 ||
+	    XP_STRCASECMP(prop_name, "onkeypress") == 0) {
+	    form_element = lm_GetFormElementByIndex(cx, JS_GetParent(cx, obj),
+						    input->index);
+	    form_element->event_handler_present = TRUE;
+	}
+	return JS_TRUE;
+    }
+
+    XP_ASSERT(JSVAL_IS_INT(id));
+    slot = JSVAL_TO_INT(id);
+
+    decoder = input->input_decoder;
+    context = decoder->window_context;
+    input_slot = slot;
+    switch (input_slot) {
+      case INPUT_TYPE:
+      case INPUT_FORM:
+      case INPUT_OPTIONS:
+	/* These are immutable. */
+	break;
+      case INPUT_NAME:
+      case INPUT_VALUE:
+      case INPUT_DEFAULT_VALUE:
+	/* These are string-valued. */
+	if (!JSVAL_IS_STRING(*vp) &&
+	    !JS_ConvertValue(cx, *vp, JSTYPE_STRING, vp)) {
+	    return JS_FALSE;
+	}
+	value = lm_StrToLocalEncoding(context, JSVAL_TO_STRING(*vp));
+	break;
+      case INPUT_STATUS:
+      case INPUT_DEFAULT_STATUS:
+#if DISABLED_READONLY_SUPPORT
+      case INPUT_READONLY:
+      case INPUT_DISABLED:
+#endif
+	/* These must be Booleans. */
+	if (!JSVAL_IS_BOOLEAN(*vp) &&
+	    !JS_ConvertValue(cx, *vp, JSTYPE_BOOLEAN, vp)) {
+	    return JS_FALSE;
+	}
+	break;
+      case INPUT_LENGTH:
+      case INPUT_SELECTED_INDEX:
+	/* These should be integers. */
+	if (JSVAL_IS_INT(*vp))
+	    intval = JSVAL_TO_INT(*vp);
+	else if (!JS_ValueToInt32(cx, *vp, &intval)) {
+	    return JS_FALSE;
+	}
+	break;
+    }
+
+    LO_LockLayout();
+
+    form_element = lm_GetFormElementByIndex(cx, JS_GetParent(cx, obj),
+					    input->index);
+    if (!form_element)
+	goto good;
+
+    switch (form_element->element_data->type) {
+      case FORM_TYPE_FILE:
+	/* if we try to set a file upload widget we better be a signed script */
+	if (!lm_CanAccessTarget(cx, JSTARGET_UNIVERSAL_FILE_READ))
+	    break;
+	/* else fall through... */
+
+      case FORM_TYPE_TEXT:
+      case FORM_TYPE_TEXTAREA:	/* XXX we ASSUME common struct prefixes */
+      case FORM_TYPE_PASSWORD:
+	{
+	    lo_FormElementTextData *text;
+	    JSBool ok;
+	    char * fixed_string;
+
+	    text = &form_element->element_data->ele_text;
+	    switch (input_slot) {
+	      case INPUT_NAME:
+		if (!lm_SaveParamString(cx, &text->name, value))
+		    goto bad;
+		break;
+	      case INPUT_VALUE:
+	      case INPUT_DEFAULT_VALUE:
+		fixed_string = lm_FixNewlines(cx, value, JS_TRUE);
+		if (!fixed_string)
+		    goto bad;
+		ok = (input_slot == INPUT_VALUE)
+		     ? lm_SaveParamString(cx, &text->current_text, fixed_string)
+		     : lm_SaveParamString(cx, &text->default_text, fixed_string);
+
+		JS_free(cx, (char *)fixed_string);
+		if (!ok)
+		    goto bad;
+		if (input_slot == INPUT_VALUE && context) {
+		    ET_PostManipulateForm(context, (LO_Element *)form_element,
+                                  EVENT_CHANGE);
+		}
+		break;
+#if DISABLED_READONLY_SUPPORT
+	      case INPUT_DISABLED:
+		text->disabled = JSVAL_TO_BOOLEAN(*vp);
+		if (context) {
+		  ET_PostManipulateForm(context, (LO_Element *)form_element,
+					EVENT_CHANGE);
+		}
+		break;
+	      case INPUT_READONLY:
+		if (form_element->element_data->type == FORM_TYPE_FILE)
+		  break;
+		text->readonly = JSVAL_TO_BOOLEAN(*vp);
+		if (context) {
+		  ET_PostManipulateForm(context, (LO_Element *)form_element,
+					EVENT_CHANGE);
+		}
+		break;
+#endif
+	      default:
+		/* Don't mess with option or user-defined property. */
+		goto good;
+	    }
+	}
+	break;
+
+      case FORM_TYPE_SELECT_ONE:
+      case FORM_TYPE_SELECT_MULT:
+	{
+	    lo_FormElementSelectData *selectData;
+	    lo_FormElementOptionData *optionData;
+	    JSSelectOption *option;
+	    int32 i, new_option_cnt, old_option_cnt;
+
+	    selectData = &form_element->element_data->ele_select;
+	    switch (slot) {
+	      case INPUT_NAME:
+		if (!lm_SaveParamString(cx, &selectData->name, value))
+		    goto bad;
+		break;
+
+	      case INPUT_LENGTH:
+		new_option_cnt = intval;
+		old_option_cnt = selectData->option_cnt;
+		optionData = (lo_FormElementOptionData *) selectData->options;
+
+		/* Remove truncated slots, or clear extended element data. */
+		if (new_ayer(MWContext *context, int32 wrap_width, int32 parent_layer_id);
+
+extern void
+lm_RestoreLayerState(MWContext *context, int32 layer_id, 
+                     LO_BlockInitializeStruct *param);
+
+extern PRHashNumber 
+lm_KeyHash(const void *key);
+
+extern JSBool
+lm_jsval_to_rgb(JSContext *cx, jsval *vp, LO_Color **rgbp);
+
+extern JSBool
+layer_setBgColorProperty(JSContext *cx, JSObject *obj, jsval *vp);
+
+extern JSObject *
+lm_GetActiveContainer(MochaDecoder *decoder);
+
+extern JSBool
+lm_GetPrincipalsCompromise(JSContext *cx, JSObject *obj);
+
+extern char *
+lm_FixNewlines(JSContext *cx, const char *value, JSBool formElement);
+
+extern JSBool PR_CALLBACK
+win_open(JSContext *cx, JSObject *obj, uint argc, jsval *argv, jsval *rval);
+
+
+/* defined in libmocha.h */
+#ifdef JSDEBUGGER   
+
+extern void
+lm_InitJSDebug(JSRuntime *jsruntime);
+
+extern void
+lm_ExitJSDebug(JSRuntime *jsruntime);
+
+#endif
+
+#define IS_MESSAGE_WINDOW(context)                                           \
+(((context)->type == MWContextMail)      ||                                  \
+ ((context)->type == MWContextNews)      ||                                  \
+ ((context)->type == MWContextMailMsg)   ||                                  \
+ ((context)->type == MWContextNewsMsg))
+
+/* INTL support */
+
+extern char *
+lm_StrToLocalEncoding(MWContext * context, JSString * str);
+
+extern JSString *
+lm_LocalEncodingToStr(MWContext * context, char * bytes);
+
+/* end INTL support */
+
+/* MLM */
+typedef struct lm_lock_waiter {
+    JSLockReleaseFunc       fn;
+    void                  * data;
+    struct lm_lock_waiter * next;
+} lm_lock_waiter;
+
+typedef struct ContextListStr ContextList;
+
+typedef struct WindowGroup LMWindowGroup;
+
+struct WindowGroup {
+    LMWindowGroup     *next;
+    LMWindowGroup     *prev;
+
+    /* XXXMLM - this entry is currently unused; it should eventually hold
+     *           a shared JSContext for the thread group. 
+     */
+    JSContext         *js_context;
+
+    PRBool            interruptCurrentOp;
+
+    PRMonitor         *owner_monitor;
+    PRThread          *thread;
+    PRThread          *owner;
+    lm_lock_waiter    *waiting_list;
+    int32             current_count;
+
+    PRBool            mozWantsLock;
+    PRBool            mozGotLock;
+    
+    PRBool            hasLock;
+    JSContext         *lock_context;
+
+    JSTimeout         **js_timeout_insertion_point;
+    JSTimeout         *js_timeout_running;
+
+    uint              inputRecurring;
+
+    PREventQueue      *interpret_queue;
+    QueueStackElement *queue_stack;
+    uint              queue_depth;
+    uint              queue_count;
+    PRMonitor         *queue_monitor;
+    ContextList       *mw_contexts;
+    MWContext         *current_context;
+    PRBool            done;
+};
+
+extern void lm_InitWindowGroups(void);
+extern LMWindowGroup *lm_NewWindowGroup(void);
+extern void lm_StartWindowGroup(LMWindowGroup *grp);
+extern void lm_DestroyWindowGroup(LMWindowGroup *grp);
+extern LMWindowGroup *LM_GetDefaultWindowGroup(MWContext *mwc);
+extern LMWindowGroup *lm_MWContextToGroup(MWContext *mwc);
+extern LMWindowGroup *lm_QueueStackToGroup(QueueStackElement *qse);
+extern PREventQueue *LM_MWContextToQueue(MWContext *mwc);
+extern PREventQueue *LM_WindowGroupToQueue(LMWindowGroup *lmg);
+extern ContextList *lm_GetEntryForContext(LMWindowGroup *grp, MWContext *cx);
+extern void LM_AddContextToGroup(LMWindowGroup *grp, MWContext *cx);
+extern void LM_RemoveContextFromGroup(MWContext *cx);
+extern PRBool LM_IsLocked(LMWindowGroup *grp);
+extern void LM_BeginRequest(LMWindowGroup *grp, JSContext *jsc);
+extern void LM_EndRequest(LMWindowGroup *grp, JSContext *jsc);
+
+extern void LM_LockJSByGroup(LMWindowGroup *grp);
+extern void LM_UnlockJSByGroup(LMWindowGroup *grp);
+
+extern JSBool lm_inited(void);
+
+extern JSContext *LM_GetCrippledContext(void);
+extern MochaDecoder *LM_GetCrippledDecoder(void);
+extern void LM_SetCrippledDecoder(MochaDecoder *md);
+extern JSBool LM_ShouldRunGC(JSContext *cx, JSGCStatus status);
+
+/* MLM */
+
+#endif /* lm_h___ */

mozilla/lib/libmocha/lm_cmpnt.c

@@ -0,0 +1,675 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+
+/*
+ * JS reflection of Navigator Components.
+ *
+ * Created: Tom Pixley, 4/22/97
+ *
+ */
+
+#include "lm.h"
+#include "prmem.h"
+#include "np.h"
+#include "net.h"
+#include "fe_proto.h"
+
+/*
+ * -----------------------------------------------------------------------
+ *
+ * Data types
+ *
+ * -----------------------------------------------------------------------
+ */
+
+typedef struct JSComponent
+{
+    MochaDecoder	*decoder;
+    JSObject		*obj;
+    JSString	        *name;
+    ETBoolPtrFunc	 active_callback;
+    ETVoidPtrFunc	 startup_callback;
+} JSComponent;
+
+typedef struct JSComponentArray
+{
+    MochaDecoder       *decoder;
+    JSObject	       *obj;
+    jsint		length;
+} JSComponentArray;
+
+typedef struct JSPreDefComponent
+{
+    const char *name;
+    ETVerifyComponentFunc func;
+} JSPreDefComponent;
+
+static JSPreDefComponent predef_components[] =
+{
+    {0}
+};
+
+/*
+ * -----------------------------------------------------------------------
+ *
+ * Reflection of an installed component.
+ *
+ * -----------------------------------------------------------------------
+ */
+
+enum component_slot
+{
+    COMPONENT_NAME        = -1,
+    COMPONENT_ACTIVE      = -2
+};
+
+
+static JSPropertySpec component_props[] =
+{
+    {"name",        COMPONENT_NAME,	JSPROP_ENUMERATE | JSPROP_READONLY},
+    {"active",	    COMPONENT_ACTIVE,	JSPROP_ENUMERATE | JSPROP_READONLY},
+    {0}
+};
+
+extern JSClass lm_component_class;
+
+PR_STATIC_CALLBACK(JSBool)
+component_getProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+    JSComponent *component;
+    JSString *str;
+    jsint slot;
+
+    if (!JSVAL_IS_INT(id))
+	return JS_TRUE;
+
+    slot = JSVAL_TO_INT(id);
+
+    component = JS_GetInstancePrivate(cx, obj, &lm_component_class, NULL);
+    if (!component)
+	return JS_TRUE;
+
+    switch (slot) {
+      case COMPONENT_NAME:
+        str = component->name;
+	if (str)
+	    *vp = STRING_TO_JSVAL(str);
+	else
+	    *vp = JS_GetEmptyStringValue(cx);
+        break;
+
+      case COMPONENT_ACTIVE:
+	*vp = JSVAL_FALSE;
+	if (ET_moz_CallFunctionBool((ETBoolPtrFunc)component->active_callback, NULL))
+	    *vp = JSVAL_TRUE;
+        break;
+
+      default:
+	break;
+    }
+
+    return JS_TRUE;
+}
+
+PR_STATIC_CALLBACK(JSBool)
+component_mozilla_getProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+    char *name, *type_str, *get_str;
+    jsval type, func;
+
+    if (!JSVAL_IS_STRING(id))
+	return JS_TRUE;
+
+    name = JS_GetStringBytes(JSVAL_TO_STRING(id));
+
+    type_str = JS_malloc(cx, XP_STRLEN(lm_typePrefix_str) + XP_STRLEN(name) + 1);
+    get_str = JS_malloc(cx, XP_STRLEN(lm_getPrefix_str) + XP_STRLEN(name) + 1);
+    if (!type_str || !get_str)
+	return JS_TRUE;
+
+    XP_STRCPY(type_str, lm_typePrefix_str);
+    XP_STRCAT(type_str, name);
+    XP_STRCPY(get_str, lm_getPrefix_str);
+    XP_STRCAT(get_str, name);
+
+    if (!JS_GetProperty(cx, obj, type_str, &type) ||
+	!JSVAL_IS_INT(type) ||
+	!JS_GetProperty(cx, obj, get_str, &func))
+	return JS_TRUE;
+
+    JS_free(cx, type_str);
+    JS_free(cx, get_str);
+
+    switch(JSVAL_TO_INT(type)) {
+    case ARGTYPE_INT32:
+	*vp = INT_TO_JSVAL((int32)ET_moz_CompGetterFunction((ETCompPropGetterFunc)JSVAL_TO_INT(func), name));
+	break;
+    case ARGTYPE_BOOL:
+	*vp = BOOLEAN_TO_JSVAL((JSBool)ET_moz_CompGetterFunction((ETCompPropGetterFunc)JSVAL_TO_INT(func), name));
+	break;
+    case ARGTYPE_STRING:
+	*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, 
+		(char*)ET_moz_CompGetterFunction((ETCompPropGetterFunc)JSVAL_TO_INT(func), name)));
+	break;
+    }
+
+    return JS_TRUE;
+}
+
+PR_STATIC_CALLBACK(JSBool)
+component_mozilla_setProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+    char *name, *type_str, *set_str, *prop_val;
+    jsval type, func;
+
+    if (!JSVAL_IS_STRING(id))
+	return JS_TRUE;
+
+    name = JS_GetStringBytes(JSVAL_TO_STRING(id));
+
+    type_str = JS_malloc(cx, XP_STRLEN(lm_typePrefix_str) + XP_STRLEN(name) + 1);
+    set_str = JS_malloc(cx, XP_STRLEN(lm_setPrefix_str) + XP_STRLEN(name) + 1);
+    if (!type_str || !set_str)
+	return JS_TRUE;
+
+    XP_STRCPY(type_str, lm_typePrefix_str);
+    XP_STRCAT(type_str, name);
+    XP_STRCPY(set_str, lm_setPrefix_str);
+    XP_STRCAT(set_str, name);
+    if (!JS_GetProperty(cx, obj, type_str, &type) ||
+	!JSVAL_IS_INT(type) ||
+	!JS_GetProperty(cx, obj, set_str, &func))
+	return JS_TRUE;
+
+    JS_free(cx, type_str);
+    JS_free(cx, set_str);
+  
+    switch(JSVAL_TO_INT(type)) {
+    case ARGTYPE_INT32:
+	if (JSVAL_IS_INT(*vp))
+	    ET_moz_CompSetterFunction((ETCompPropSetterFunc)JSVAL_TO_INT(func), name, (void*)JSVAL_TO_INT(*vp));
+	break;
+    case ARGTYPE_BOOL:
+	if (JSVAL_IS_BOOLEAN(*vp))
+	    ET_moz_CompSetterFunction((ETCompPropSetterFunc)JSVAL_TO_INT(func), name, (void*)JSVAL_TO_BOOLEAN(*vp));
+	break;
+    case ARGTYPE_STRING:
+	if (JSVAL_IS_STRING(*vp)) {
+	    prop_val = JS_GetStringBytes(JSVAL_TO_STRING(*vp));
+	    ET_moz_CompSetterFunction((ETCompPropSetterFunc)JSVAL_TO_INT(func), name, (void*)prop_val);
+	}
+	break;
+    }
+
+    return JS_TRUE;
+}
+
+void
+lm_RegisterComponentProp(const char *comp, const char *targetName, 
+			 uint8 retType, ETCompPropSetterFunc setter, 
+			 ETCompPropGetterFunc getter)
+{
+    JSContext *cx;
+    JSObject *arrayObj, *obj;
+    jsval val;
+    char *type, *set, *get;
+    MochaDecoder *cd = LM_GetCrippledDecoder();
+    
+    if (!comp || !targetName || !(cx = cd->js_context))
+	return;
+
+    arrayObj = lm_DefineComponents(cd);
+    if (!arrayObj)
+	return;
+
+    if (!JS_GetProperty(cx, arrayObj, comp, &val) ||
+        !JSVAL_IS_OBJECT(val))
+	return;
+
+    obj = JSVAL_TO_OBJECT(val);
+
+    if (!JS_DefineProperty(cx, obj, targetName, JSVAL_VOID, component_mozilla_getProperty, 
+		       component_mozilla_setProperty, 0)) {
+    }
+
+    type = JS_malloc(cx, XP_STRLEN(lm_typePrefix_str) + XP_STRLEN(targetName) + 1);
+    if (type) {
+	XP_STRCPY(type, lm_typePrefix_str);
+	XP_STRCAT(type, targetName);
+	if (!JS_DefineProperty(cx, obj, type,
+			   INT_TO_JSVAL((int32)retType), 0, 0, JSPROP_READONLY)) {
+	}
+	JS_free(cx, type);
+    }
+
+    get = JS_malloc(cx, XP_STRLEN(lm_getPrefix_str) + XP_STRLEN(targetName) + 1);
+    if (get) {
+	XP_STRCPY(get, lm_getPrefix_str);
+	XP_STRCAT(get, targetName);
+	if (!JS_DefineProperty(cx, obj, get,
+			   INT_TO_JSVAL(getter), 0, 0, JSPROP_READONLY)) {
+	}
+	JS_free(cx, get);
+    }
+
+    set = JS_malloc(cx, XP_STRLEN(lm_setPrefix_str) + XP_STRLEN(targetName) + 1);
+    if (set) {
+	XP_STRCPY(set, lm_setPrefix_str);
+	XP_STRCAT(set, targetName);
+	if (!JS_DefineProperty(cx, obj, set,
+			   INT_TO_JSVAL(setter), 0, 0, JSPROP_READONLY)) {
+	}
+	JS_free(cx, set);
+    }
+}
+
+PR_STATIC_CALLBACK(JSBool)
+component_resolve_name(JSContext *cx, JSObject *obj, jsval id)
+{
+    return JS_TRUE;
+}
+
+PR_STATIC_CALLBACK(void)
+component_finalize(JSContext *cx, JSObject *obj)
+{
+    JSComponent* component;
+
+    component = JS_GetPrivate(cx, obj);
+    if (!component)
+	return;
+    JS_UnlockGCThing(cx, component->name);
+    DROP_BACK_COUNT(component->decoder);
+    JS_free(cx, component);
+}
+
+JSClass lm_component_class =
+{
+    "Component", JSCLASS_HAS_PRIVATE,
+    JS_PropertyStub, JS_PropertyStub,
+    component_getProperty, component_getProperty, JS_EnumerateStub,
+    component_resolve_name, JS_ConvertStub, component_finalize
+};
+
+PR_STATIC_CALLBACK(JSBool)
+component_activate(JSContext *cx, JSObject *obj, uint argc, jsval *argv, jsval *rval)
+{
+    JSComponent *component;
+
+    component = JS_GetInstancePrivate(cx, obj, &lm_component_class, argv);
+    if (!component)
+	return JS_FALSE;
+
+    ET_moz_CallFunctionAsync((ETVoidPtrFunc)component->startup_callback, NULL);
+
+    return JS_TRUE;
+}
+
+static JSFunctionSpec component_methods[] =
+{
+    {"activate", component_activate, 0},
+    {0}
+};
+
+PR_STATIC_CALLBACK(JSBool)
+component_mozilla_method_stub(JSContext *cx, JSObject *obj, uint argc, 
+			      jsval *argv, jsval *rval)
+{
+    JSFunction *func;
+    JSObject *func_obj;
+    jsval type, native;
+    uint i;
+    JSCompArg *comp_argv;
+
+    func = JS_ValueToFunction(cx, argv[-2]);
+    func_obj = JS_GetFunctionObject(func);
+
+    if (!JS_GetProperty(cx, func_obj, lm_typePrefix_str, &type) ||
+	!JSVAL_IS_INT(type) ||
+	!JS_GetProperty(cx, func_obj, lm_methodPrefix_str, &native) ||
+	!(comp_argv = JS_malloc(cx, argc * sizeof(JSCompArg))))
+	return JS_TRUE;
+  
+    for (i=0; i<argc; i++) {
+	if (JSVAL_IS_INT(argv[i])) {
+	    comp_argv[i].type = ARGTYPE_INT32;
+	    comp_argv[i].value.intArg = JSVAL_TO_INT(argv[i]);
+	}
+	else if (JSVAL_IS_BOOLEAN(argv[i])) {
+	    comp_argv[i].type = ARGTYPE_BOOL;
+	    comp_argv[i].value.boolArg = JSVAL_TO_BOOLEAN(argv[i]);
+	}
+	else if (JSVAL_IS_STRING(argv[i])) {
+	    comp_argv[i].type = ARGTYPE_STRING;
+	    comp_argv[i].value.stringArg = JS_GetStringBytes(JSVAL_TO_STRING(argv[i]));
+	}
+	else {
+	    comp_argv[i].type = ARGTYPE_NULL;
+	    comp_argv[i].value.intArg = 0;
+	}
+    }
+
+    switch(JSVAL_TO_INT(type)) {
+    case ARGTYPE_NULL:
+	ET_moz_CompMethodFunction((ETCompMethodFunc)JSVAL_TO_INT(native), argc, NULL);
+	*rval = 0;
+	break;
+    case ARGTYPE_INT32:
+	*rval = INT_TO_JSVAL((int32)ET_moz_CompMethodFunction((ETCompMethodFunc)JSVAL_TO_INT(native), argc, comp_argv));
+	break;
+    case ARGTYPE_BOOL:
+	*rval = BOOLEAN_TO_JSVAL((JSBool)ET_moz_CompMethodFunction((ETCompMethodFunc)JSVAL_TO_INT(native), argc, comp_argv));
+	break;
+    case ARGTYPE_STRING:
+	*rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, 
+		(char*)ET_moz_CompMethodFunction((ETCompMethodFunc)JSVAL_TO_INT(native), argc, comp_argv)));
+	break;
+    }
+    return JS_TRUE;
+}
+
+void
+lm_RegisterComponentMethod(const char *comp, const char *targetName, 
+			   uint8 retType, ETCompMethodFunc method, int32 argc)
+{
+    JSContext *cx;
+    JSObject *arrayObj, *obj, *func_obj;
+    JSFunction *func;
+    jsval val;
+    MochaDecoder *cd = LM_GetCrippledDecoder();
+    
+    if (!comp || !targetName || !(cx = cd->js_context))
+	return;
+
+    arrayObj = lm_DefineComponents(cd);
+    if (!arrayObj)
+	return;
+
+    if (!JS_GetProperty(cx, arrayObj, comp, &val) ||
+        !JSVAL_IS_OBJECT(val))
+	return;
+
+    obj = JSVAL_TO_OBJECT(val);
+
+    if (!(func = JS_DefineFunction(cx, obj, targetName, component_mozilla_method_stub, argc, 0))){
+    }
+
+    func_obj = JS_GetFunctionObject(func);
+
+    if (!JS_DefineProperty(cx, func_obj, lm_typePrefix_str,
+		       INT_TO_JSVAL((int32)retType), 0, 0, JSPROP_READONLY))
+	return;
+    if (!JS_DefineProperty(cx, func_obj, lm_methodPrefix_str,
+		       INT_TO_JSVAL(method), 0, 0, JSPROP_READONLY))
+	return;
+    if (!JS_DefineProperty(cx, func_obj, lm_methodArgc_str,
+		       INT_TO_JSVAL(argc), 0, 0, JSPROP_READONLY))
+	return;
+}
+
+/* Constructor method for a JSComponent object */
+static JSComponent*
+component_create_self(JSContext *cx, MochaDecoder* decoder, JSComponent *component, const char *name)
+{
+    JSObject *obj;
+
+    /* JSComponent may be malloc'd previous to this to make it easier
+     * to fill in the struct with data from the Mozilla thread
+     */
+    if (!component) {
+	component = JS_malloc(cx, sizeof(JSComponent));
+	if (!component)
+	    return NULL;
+    }
+
+    obj = JS_NewObject(cx, &lm_component_class, NULL, NULL);
+    if (!obj || !JS_SetPrivate(cx, obj, component)) {
+	JS_free(cx, component);
+	return NULL;
+    }
+
+    if (!JS_DefineProperties(cx, obj, component_props))
+	return NULL;
+
+    if (!JS_DefineFunctions(cx, obj, component_methods))
+	return NULL;
+
+    /* Fill out static property fields */
+    component->decoder = HOLD_BACK_COUNT(decoder);
+    component->obj = obj;
+
+    component->name = JS_NewStringCopyZ(cx, name);
+    if (!component->name || !JS_LockGCThing(cx, component->name))
+	return NULL;
+
+    return component;
+}
+
+
+/*
+ * -----------------------------------------------------------------------
+ *
+ * Reflection of the list of installed components.
+ * The only static property is the array length;
+ * the array elements (JSComponents) are added
+ * lazily when referenced.
+ *
+ * -----------------------------------------------------------------------
+ */
+
+enum componentarray_slot
+{
+    COMPONENTLIST_ARRAY_LENGTH = -1
+};
+
+static JSPropertySpec componentarray_props[] =
+{
+    {"length",  COMPONENTLIST_ARRAY_LENGTH,    JSPROP_READONLY},
+    {0}
+};
+
+/* Look up the component for the specified slot of the plug-in list */
+static JSComponent*
+componentarray_create_component(JSContext *cx, JSComponentArray *array,
+				JSComponent *component, const char *targetName, jsint targetSlot)
+{
+    component = component_create_self(cx, array->decoder, component, targetName);
+    if (component) {
+	char *name;
+	jsval val;
+
+	name = JS_GetStringBytes(component->name);
+	val = OBJECT_TO_JSVAL(component->obj);
+	JS_DefineProperty(cx, array->obj, name, val, NULL, NULL,
+			  JSPROP_ENUMERATE);
+	JS_AliasElement(cx, array->obj, name, targetSlot);
+	array->length++;
+	return component;
+    }
+    return NULL;
+}
+
+extern JSClass lm_component_array_class;
+
+void
+lm_RegisterComponent(const char *targetName, ETBoolPtrFunc active_callback, 
+		     ETVoidPtrFunc startup_callback) 
+{
+    JSContext *cx;
+    JSObject *arrayObj;
+    JSComponentArray *array;
+    JSComponent *component;
+    jsval val;
+    MochaDecoder *cd = LM_GetCrippledDecoder();
+
+    if (!(cx = cd->js_context) || !targetName)
+	return;
+	
+    arrayObj = lm_DefineComponents(cd);
+    if (!arrayObj)
+	return;
+
+    array = JS_GetInstancePrivate(cx, arrayObj, &lm_component_array_class, NULL);
+    if (!array)
+	return;
+
+    if (JS_GetProperty(cx, arrayObj, targetName, &val) && JSVAL_IS_OBJECT(val)) {
+	/* We already have a component by this name.  Update the active and
+	 * startup callback funcs in case ours are out of date 
+	 */
+	component = JS_GetPrivate(cx, JSVAL_TO_OBJECT(val));
+	if (!component)
+	    return;
+
+	component->active_callback = active_callback;
+	component->startup_callback = startup_callback;
+
+	return;
+    }
+
+    component = JS_malloc(cx, sizeof(JSComponent));
+    if (!component)
+	return;
+
+    component->active_callback = active_callback;
+    component->startup_callback = startup_callback;
+
+    componentarray_create_component(cx, array, component, targetName, array->length);
+}
+
+
+PR_STATIC_CALLBACK(JSBool)
+componentarray_getProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+    JSComponentArray *array;
+    jsint slot;
+
+    if (!JSVAL_IS_INT(id))
+	return JS_TRUE;
+
+    slot = JSVAL_TO_INT(id);
+
+    array = JS_GetInstancePrivate(cx, obj, &lm_component_array_class, NULL);
+    if (!array)
+	return JS_TRUE;
+
+    switch (slot) {
+      case COMPONENTLIST_ARRAY_LENGTH:
+        *vp = INT_TO_JSVAL(array->length);
+        break;
+
+      default:
+        /* Don't mess with a user-defined property. */
+        if (slot >= 0 && slot < (jsint) array->length) {
+
+	    /* Search for an existing JSComponent for this slot */
+	    JSObject* componentObj = NULL;
+	    jsval val = *vp;
+
+	    if (JSVAL_IS_OBJECT(val)) {
+    		componentObj = JSVAL_TO_OBJECT(val);
+	    }
+	    else {
+		JSComponent* component;
+		component = componentarray_create_component(cx, array, NULL,
+		                                            NULL, slot);
+		if (component)
+    		    componentObj = component->obj;
+	    }
+
+	    *vp = OBJECT_TO_JSVAL(componentObj);
+	    break;
+	}
+    }
+
+    return JS_TRUE;
+}
+
+PR_STATIC_CALLBACK(void)
+componentarray_finalize(JSContext *cx, JSObject *obj)
+{
+    JSComponentArray* array;
+
+    array = JS_GetPrivate(cx, obj);
+    if (!array)
+	return;
+    DROP_BACK_COUNT(array->decoder);
+    JS_free(cx, array);
+}
+
+JSClass lm_component_array_class =
+{
+    "ComponentArray", JSCLASS_HAS_PRIVATE,
+    JS_PropertyStub, JS_PropertyStub,
+    componentarray_getProperty, componentarray_getProperty, JS_EnumerateStub,
+    JS_ResolveStub, JS_ConvertStub, componentarray_finalize
+};
+
+
+JSObject*
+lm_DefineComponents(MochaDecoder *decoder)
+{
+    JSObject *obj;
+    JSComponentArray *array;
+    JSContext *cx = decoder->js_context;
+    JSPreDefComponent def_comps;   
+    JSComponent *component;
+    jsint slot;
+
+    obj = decoder->components;
+    if (obj)
+        return obj;
+
+    array = JS_malloc(cx, sizeof(JSComponentArray));
+    if (!array)
+        return NULL;
+    XP_BZERO(array, sizeof *array);
+
+    obj = JS_NewObject(cx, &lm_component_array_class, NULL,
+		       decoder->window_object);
+    if (!obj || !JS_SetPrivate(cx, obj, array)) {
+        JS_free(cx, array);
+        return NULL;
+    }
+    if (!JS_DefineProperties(cx, obj, componentarray_props))
+	return NULL; 
+
+    array->decoder = HOLD_BACK_COUNT(decoder);
+    array->obj = obj;
+
+    /* Components can be added dynamically but some are predefined */
+    slot = 0;
+    array->length = 0;
+    def_comps = predef_components[slot];
+    while (def_comps.name) {
+	component = JS_malloc(cx, sizeof(JSComponent));
+	if (!component)
+	    return NULL;
+
+	if (ET_moz_VerifyComponentFunction(def_comps.func, &(component->active_callback), 
+					   &(component->startup_callback))) {
+	    componentarray_create_component(cx, array, component, def_comps.name, array->length);
+	}
+	else {
+	    /*Component call failed somewhere.*/
+	    JS_free(cx, component);
+	}
+	def_comps = predef_components[++slot];
+    }
+    return obj;
+}

mozilla/lib/libmocha/lm_img.c

@@ -0,0 +1,854 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+/*
+ * Image reflection and event notification
+ *
+ * Scott Furman, 3/30/96
+ */
+
+#include "lm.h"
+
+#include "lo_ele.h"
+#include "prtypes.h"
+#include "pa_tags.h"
+#include "layout.h"
+
+#define IL_CLIENT
+#include "libimg.h"             /* Image Library public API. */
+
+enum image_array_slot {
+    IMAGE_ARRAY_LENGTH = -1
+};
+
+static JSPropertySpec image_array_props[] = {
+    {lm_length_str, IMAGE_ARRAY_LENGTH,
+		    JSPROP_ENUMERATE | JSPROP_READONLY | JSPROP_PERMANENT},
+    {0}
+};
+
+extern JSClass lm_image_array_class;
+
+PR_STATIC_CALLBACK(JSBool)
+image_array_getProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+    JSObjectArray *array;
+    MochaDecoder *decoder;
+    MWContext *context;
+    jsint count, slot;
+    LO_ImageStruct *image;
+    int32 active_layer_id;
+
+    if (!JSVAL_IS_INT(id))
+	return JS_TRUE;
+
+    slot = JSVAL_TO_INT(id);
+
+    array = JS_GetInstancePrivate(cx, obj, &lm_image_array_class, NULL);
+    if (!array)
+	return JS_TRUE;
+    decoder = array->decoder;
+    context = decoder->window_context;
+    if (!context)
+	return JS_TRUE;
+
+    LO_LockLayout();
+    switch (slot) {
+      case IMAGE_ARRAY_LENGTH:
+	active_layer_id = LM_GetActiveLayer(context);
+	LM_SetActiveLayer(context, array->layer_id);
+	count = LO_EnumerateImages(context, array->layer_id);
+	LM_SetActiveLayer(context, active_layer_id);
+	if (count > array->length)
+	    array->length = count;
+	*vp = INT_TO_JSVAL(count);
+	break;
+
+      default:
+	if (slot < 0) {
+	    /* Don't mess with user-defined or method properties. */
+	    LO_UnlockLayout();
+	    return JS_TRUE;
+	}
+	if (slot >= array->length)
+	    array->length = slot + 1;
+	image = LO_GetImageByIndex(context, array->layer_id, (uint)slot);
+	if (image) {
+	    *vp = OBJECT_TO_JSVAL(LM_ReflectImage(context, image, NULL,
+						  array->layer_id, 
+                                                  (uint)slot));
+	}
+	break;
+    }
+    LO_UnlockLayout();
+    return JS_TRUE;
+}
+
+PR_STATIC_CALLBACK(void)
+image_array_finalize(JSContext *cx, JSObject *obj)
+{
+    JSObjectArray *array;
+
+    array = JS_GetPrivate(cx, obj);
+    if (!array)
+        return;
+    DROP_BACK_COUNT(array->decoder);
+    JS_free(cx, array);
+}
+
+JSClass lm_image_array_class = {
+    "ImageArray", JSCLASS_HAS_PRIVATE,
+    JS_PropertyStub, JS_PropertyStub,
+    image_array_getProperty, image_array_getProperty, JS_EnumerateStub,
+    JS_ResolveStub, JS_ConvertStub, image_array_finalize
+};
+
+enum image_slot {
+    IMAGE_NAME              = -2,
+    IMAGE_SRC               = -3,
+    IMAGE_LOWSRC            = -4,
+    IMAGE_X                 = -5,
+    IMAGE_Y                 = -6,
+    IMAGE_HEIGHT            = -7,
+    IMAGE_WIDTH             = -8,
+    IMAGE_BORDER            = -9,
+    IMAGE_VSPACE            = -10,
+    IMAGE_HSPACE            = -11,
+    IMAGE_COMPLETE          = -12
+};
+
+static JSPropertySpec image_props[] = {
+    {"name",                IMAGE_NAME,         JSPROP_ENUMERATE | JSPROP_READONLY},
+    {"src",                 IMAGE_SRC,          JSPROP_ENUMERATE},
+    {"lowsrc",              IMAGE_LOWSRC,       JSPROP_ENUMERATE},
+    {"x",                   IMAGE_X,            JSPROP_ENUMERATE | JSPROP_READONLY},
+    {"y",                   IMAGE_Y,            JSPROP_ENUMERATE | JSPROP_READONLY},
+    {"height",              IMAGE_HEIGHT,       JSPROP_ENUMERATE | JSPROP_READONLY},
+    {"width",               IMAGE_WIDTH,        JSPROP_ENUMERATE | JSPROP_READONLY},
+    {"border",              IMAGE_BORDER,       JSPROP_ENUMERATE | JSPROP_READONLY},
+    {"vspace",              IMAGE_VSPACE,       JSPROP_ENUMERATE | JSPROP_READONLY},
+    {"hspace",              IMAGE_HSPACE,       JSPROP_ENUMERATE | JSPROP_READONLY},
+    {"complete",            IMAGE_COMPLETE,     JSPROP_ENUMERATE | JSPROP_READONLY},
+    {0}
+};
+
+/*
+ * Base image element type.
+ */
+typedef struct JSImage {
+    JSEventReceiver	    receiver;
+    MochaDecoder           *decoder;
+    LO_ImageStruct         *image_data;     /* 0 unless made by new Image() */
+    uint8                   pending_events;
+    int32                   layer_id;
+    uint                    index;
+    JSBool            complete;       /* Finished loading or aborted */
+    JSString        *name;
+} JSImage;
+
+#define GET_IMAGE_DATA(context, image)                                        \
+    ((image)->image_data ? (image)->image_data                                \
+     : LO_GetImageByIndex((context), (image)->layer_id, (image)->index))
+
+extern JSClass lm_image_class;
+
+/*
+ * Force the mozilla event queue to flush to make sure any image-set-src
+ *   events have been processed
+ */
+PR_STATIC_CALLBACK(void)
+lm_img_src_sync(void * data)
+{
+}
+
+
+PR_STATIC_CALLBACK(JSBool)
+image_getProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+    JSImage *image;
+    LO_ImageStruct *image_data;
+    enum image_slot image_slot;
+    JSString *str;
+    jsint slot;
+
+    if (!JSVAL_IS_INT(id))
+	return JS_TRUE;
+
+    slot = JSVAL_TO_INT(id);
+
+    image = JS_GetInstancePrivate(cx, obj, &lm_image_class, NULL);
+    if (!image)
+	return JS_TRUE;
+    image_data = GET_IMAGE_DATA(image->decoder->window_context, image);
+    if (!image_data)
+        return JS_TRUE;      /* Try to handle this case gracefully. */
+
+    image_slot = slot;
+    if (image_slot == IMAGE_SRC || image_slot == IMAGE_LOWSRC) {
+        if (!lm_CheckPermissions(cx, obj, JSTARGET_UNIVERSAL_BROWSER_READ))
+            return JS_FALSE;
+    }
+
+    switch (image_slot) {
+    case IMAGE_NAME:
+	if (image->name)
+	    *vp = STRING_TO_JSVAL(image->name);
+	else
+	    *vp = JSVAL_NULL;
+        break;
+
+    case IMAGE_SRC:
+	if (image_data->pending_mocha_event) {
+	    ET_moz_CallFunction(lm_img_src_sync, NULL);
+	    image_data->pending_mocha_event = PR_FALSE;
+	}
+	str = JS_NewStringCopyZ(cx, (char*)image_data->image_url);
+	if (!str)
+	    return JS_FALSE;
+	*vp = STRING_TO_JSVAL(str);
+	break;
+
+    case IMAGE_LOWSRC:
+	if (image_data->pending_mocha_event) {
+	    ET_moz_CallFunction(lm_img_src_sync, NULL);
+	    image_data->pending_mocha_event = PR_FALSE;
+	}
+	str = JS_NewStringCopyZ(cx, (char*)image_data->lowres_image_url);
+	if (!str)
+	    return JS_FALSE;
+	*vp = STRING_TO_JSVAL(str);
+	break;
+
+    case IMAGE_X:
+        *vp = INT_TO_JSVAL(image_data->x + image_data->x_offset);
+        break;
+
+    case IMAGE_Y:
+        *vp = INT_TO_JSVAL(image_data->y + image_data->y_offset);
+        break;
+
+    case IMAGE_HEIGHT:
+        *vp = INT_TO_JSVAL(image_data->height);
+        break;
+
+    case IMAGE_WIDTH:
+        *vp = INT_TO_JSVAL(image_data->width);
+        break;
+
+    case IMAGE_BORDER:
+        *vp = INT_TO_JSVAL(image_data->border_width);
+        break;
+
+    case IMAGE_HSPACE:
+        *vp = INT_TO_JSVAL(image_data->border_horiz_space);
+        break;
+
+    case IMAGE_VSPACE:
+        *vp = INT_TO_JSVAL(image_data->border_vert_space);
+        break;
+
+    case IMAGE_COMPLETE:
+        *vp = BOOLEAN_TO_JSVAL(image->complete);
+        break;
+
+    default:
+        /* Don't mess with a user-defined or method property. */
+        return JS_TRUE;
+    }
+
+    return JS_TRUE;
+}
+
+static JSBool
+image_set_src(JSImage *image, const char *str, LO_ImageStruct *image_data)
+{
+    MochaDecoder *decoder;
+    MWContext *context;
+    IL_GroupContext *img_cx;
+    
+    decoder = image->decoder;
+    context = decoder->window_context;
+    img_cx = decoder->image_context;
+
+    if (!context) return JS_TRUE;
+
+    image_data->pending_mocha_event = PR_TRUE;
+    image_data->image_attr->attrmask |= LO_ATTR_MOCHA_IMAGE;
+    
+    ET_il_GetImage(str, context, img_cx, image_data, NET_DONT_RELOAD);
+
+    return JS_TRUE;
+}
+
+PR_STATIC_CALLBACK(JSBool)
+image_setProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+    JSBool ok;
+    JSImage *image;
+    MochaDecoder *decoder;
+    MWContext *context;
+    LO_ImageStruct *image_data;
+    enum image_slot image_slot;
+    const char *url;
+    jsint slot;
+
+    image = JS_GetInstancePrivate(cx, obj, &lm_image_class, NULL);
+    if (!image)
+	return JS_TRUE;
+    decoder = image->decoder;
+    context = decoder->window_context;
+    if (!context) 
+	return JS_TRUE;
+    
+    if (!JSVAL_IS_INT(id))
+	return JS_TRUE;
+
+    slot = JSVAL_TO_INT(id);
+
+    image_data = GET_IMAGE_DATA(context, image);
+    if (!image_data)
+        return JS_TRUE;      /* Try to handle this case gracefully. */
+
+    image_slot = slot;
+    switch (image_slot) {
+    case IMAGE_SRC:
+    case IMAGE_LOWSRC:
+        if (!lm_CheckPermissions(cx, obj, JSTARGET_UNIVERSAL_BROWSER_WRITE))
+            return JS_FALSE;
+
+        if (JSVAL_IS_NULL(*vp)) {
+            url = NULL;
+        } else {
+            if (!JSVAL_IS_STRING(*vp) &&
+                !JS_ConvertValue(cx, *vp, JSTYPE_STRING, vp))
+                return JS_FALSE;
+                
+            url = JS_GetStringBytes(JSVAL_TO_STRING(*vp));
+            url = lm_CheckURL(cx, url, JS_TRUE);  /* will allocate new string */
+            if (!url)
+                return JS_FALSE;
+        }
+
+        if (image_slot == IMAGE_SRC) {
+            ok = image_set_src(image, url, image_data);
+        } else if (url) {
+	    ok = lm_SaveParamString(cx, &image_data->lowres_image_url, url);
+        }
+
+	if (url)
+	    XP_FREE((void *) url);
+
+        if (!ok)
+            return JS_FALSE;
+
+	/*
+	 * don't call image_getProperty so that we don't immediately
+	 *   turn around and block
+	 */
+	return JS_TRUE;
+        break;
+
+    case IMAGE_NAME:
+    case IMAGE_X:
+    case IMAGE_Y:
+    case IMAGE_HEIGHT:
+    case IMAGE_WIDTH:
+    case IMAGE_BORDER:
+    case IMAGE_VSPACE:
+    case IMAGE_HSPACE:
+    case IMAGE_COMPLETE:
+	/* These are immutable. */
+	break;
+    }
+
+    return image_getProperty(cx, obj, id, vp);
+}
+
+PR_STATIC_CALLBACK(void)
+image_finalize(JSContext *cx, JSObject *obj)
+{
+    JSImage *image;
+    LO_ImageStruct *image_data;
+    MochaDecoder *decoder;
+    MWContext *context;
+
+    image = JS_GetPrivate(cx, obj);
+    if (!image)
+	return;
+
+    image_data = image->image_data;
+    decoder = image->decoder;
+    context = decoder->window_context;
+    if (image_data) {
+        /* If this is a layer background image or a reflection of an
+           existing layout image, then layout will take care of
+           destroying the image.  For anonymous images, however, 
+           we need to handle destruction here. */
+        if (!image_data->layer) {
+            ET_PostFreeImageElement(context, image_data);
+            XP_FREE(image_data->image_attr);
+            XP_FREE(image_data);
+        }
+    } else {
+	if (context) {
+	    LO_LockLayout();
+	    image_data = LO_GetImageByIndex(context, image->layer_id,
+                                            image->index);
+	    if (image_data && image_data->mocha_object == obj)
+		image_data->mocha_object = NULL;
+	    LO_UnlockLayout();
+	}
+    }
+    DROP_BACK_COUNT(decoder);
+
+    JS_UnlockGCThing(cx, image->name);
+    JS_free(cx, image);
+}
+
+JSClass lm_image_class = {
+    "Image", JSCLASS_HAS_PRIVATE,
+    JS_PropertyStub, JS_PropertyStub, image_getProperty, image_setProperty,
+    JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, image_finalize
+};
+
+/* Fill in native, private part of JS image */
+static JSImage *
+init_image_object(JSContext *cx, JSObject *obj, LO_ImageStruct *image_data)
+{
+    JSImage *image;
+    MochaDecoder *decoder;
+    
+    image = JS_malloc(cx, sizeof *image);
+    if (!image)
+        return NULL;
+    XP_BZERO(image, sizeof *image);
+
+    image->image_data = image_data;
+    decoder = JS_GetPrivate(cx, JS_GetGlobalObject(cx));
+    image->decoder = HOLD_BACK_COUNT(decoder);
+    image_data->mocha_object = obj;
+
+    /* Events are never blocked for anonymous images
+       since there is no associated layout. */
+    image->pending_events = PR_BIT(LM_IMGUNBLOCK);
+    if (!JS_SetPrivate(cx, obj, image))
+	return NULL;
+
+    return image;
+}
+
+JSObject *
+lm_NewImage(JSContext *cx,
+            LO_ImageStruct *image_data)
+{
+    JSObject *obj, *outer_obj;
+    MochaDecoder *decoder;
+    decoder = JS_GetPrivate(cx, JS_GetGlobalObject(cx));
+    outer_obj = lm_GetOuterObject(decoder);
+
+    obj = JS_NewObject(cx, &lm_image_class, decoder->image_prototype, 
+		       outer_obj);
+    if (!init_image_object(cx, obj, image_data))
+        return NULL;
+    
+    return obj;
+}
+
+PR_STATIC_CALLBACK(JSBool)
+Image(JSContext *cx, JSObject *obj, uint argc, jsval *argv, jsval *rval)
+{
+    jsint width, height;
+    LO_ImageStruct *image_data;
+
+    XP_ASSERT(JS_InstanceOf(cx, obj, &lm_image_class, NULL));
+
+    height = width = 0;
+
+    if (argc > 0) {
+	if (argc != 2) {
+	    JS_ReportError(cx, lm_argc_err_str);
+	    return JS_FALSE;
+	}
+        if (!JSVAL_IS_INT(argv[0]) ||
+            !JSVAL_IS_INT(argv[1])) {
+            return JS_FALSE;
+        }
+	width = JSVAL_TO_INT(argv[0]);
+	height = JSVAL_TO_INT(argv[1]);
+    }
+
+    /* Allocate dummy layout structure.  This is not really
+       used by layout, but the front-ends and the imagelib
+       need it as a handle on an image instance. */
+    image_data = XP_NEW_ZAP(LO_ImageStruct);
+    if (!image_data) {
+	JS_ReportOutOfMemory(cx);
+        return JS_FALSE;
+    }
+    image_data->image_attr = XP_NEW_ZAP(LO_ImageAttr);
+    if (!image_data->image_attr) {
+        XP_FREE(image_data);
+	JS_ReportOutOfMemory(cx);
+        return JS_FALSE;
+    }
+
+    image_data->type = LO_IMAGE;
+
+    /* Fake layout ID, guaranteed not to match any real layout element */
+    image_data->ele_id = -1;
+
+    if (!init_image_object(cx, obj, image_data)) {
+	XP_FREE(image_data->image_attr);
+	XP_FREE(image_data);
+        return JS_FALSE;
+    }
+
+    /* Process arguments */
+
+    /* Width & Height */
+    if (argc == 2) {
+        image_data->width  = (int)width;
+        image_data->height = (int)height;
+    }
+
+    return JS_TRUE;
+}
+
+static JSObject *
+reflect_image_array(MochaDecoder *decoder, JSObject *document)
+{
+    JSContext *cx;
+    JSObjectArray *array;
+    JSObject *obj;
+    JSDocument *doc;
+
+    cx = decoder->js_context;
+    doc = JS_GetPrivate(cx, document);
+    if (!doc)
+	return NULL;
+
+    array = JS_malloc(cx, sizeof *array);
+    if (!array)
+	return NULL;
+    XP_BZERO(array, sizeof *array);
+
+    obj = JS_NewObject(cx, &lm_image_array_class, NULL, document);
+    if (!obj || !JS_SetPrivate(cx, obj, array)) {
+        LM_PutMochaDecoder(decoder);
+        return NULL;
+    }
+
+    if (!JS_DefineProperties(cx, obj, image_array_props))
+	return NULL;
+
+    array->decoder = HOLD_BACK_COUNT(decoder);
+    array->layer_id = doc->layer_id;
+    return obj;
+}
+
+JSObject *
+lm_GetImageArray(MochaDecoder *decoder, JSObject *document)
+{
+    JSObject *obj;
+    JSDocument *doc;
+
+    doc = JS_GetPrivate(decoder->js_context, document);
+    if (!doc)
+	return NULL;
+
+    obj = doc->images;
+    if (obj)
+	return obj;
+    obj = reflect_image_array(decoder, document);
+    doc->images = obj;
+    return obj;
+}
+
+JSObject *
+LM_ReflectImage(MWContext *context, LO_ImageStruct *image_data, 
+			    PA_Tag * tag, int32 layer_id, uint index)
+{
+    JSObject *obj, *array_obj, *outer_obj, *document;
+    MochaDecoder *decoder;
+    JSContext *cx;
+    JSImage *image;
+    PA_Block name = NULL;
+    lo_TopState *top_state;
+    PRHashTable *map;
+
+    image_data = LO_GetImageByIndex(context, layer_id, index);
+    XP_ASSERT(image_data);
+    if (! image_data)
+      return NULL;
+
+    obj = image_data->mocha_object;
+    if (obj)
+	return obj;
+
+    decoder = LM_GetMochaDecoder(context);
+    if (!decoder)
+	return NULL;
+    cx = decoder->js_context;
+
+    top_state = lo_GetMochaTopState(context);
+    if (top_state->resize_reload) {
+        map = lm_GetIdToObjectMap(decoder);
+        
+        if (map)
+            obj = (JSObject *)PR_HashTableLookup(map,
+                             LM_GET_MAPPING_KEY(LM_IMAGES, layer_id, index));
+        if (obj) {
+            image_data->mocha_object = obj;
+            goto done;
+        }
+    }
+
+    /* Get the document object that will hold this link */
+    document = lm_GetDocumentFromLayerId(decoder, layer_id);
+    if (!document)
+        goto done;
+
+    array_obj = lm_GetImageArray(decoder, document);
+    if (!array_obj)
+	goto done;
+
+    image = JS_malloc(cx, sizeof *image);
+    if (!image)
+	goto done;
+
+    XP_BZERO(image, sizeof *image);
+
+    /* if we got a tag passed in try to get the name out of there */
+    name = lo_FetchParamValue(context, tag, PARAM_NAME);
+
+    outer_obj = lm_GetOuterObject(decoder);
+
+    obj = JS_NewObject(cx, &lm_image_class, decoder->image_prototype,
+		       outer_obj);
+    if (!obj || !JS_SetPrivate(cx, obj, image)) {
+	JS_free(cx, image);
+	goto done;
+    }
+
+    if (name) {
+	JSObject *doc_obj;
+	extern JSClass lm_form_class;
+
+	if (!JS_DefineProperty(cx, outer_obj, (const char *) name, 
+			       OBJECT_TO_JSVAL(obj), NULL, NULL,
+			       JSPROP_ENUMERATE|JSPROP_READONLY)) {
+	    obj = NULL;
+	    goto done;
+	}
+	/* XXX backward compatibility with 3.0 bug: lo_BlockedImageLayout
+	       would eagerly reflect images outside of any active form, so
+	       they'd end up in document scope. */
+	if (JS_GetClass(cx, outer_obj) == &lm_form_class &&
+	    (doc_obj = JS_GetParent(cx, outer_obj)) != NULL &&
+	    !JS_DefineProperty(cx, doc_obj, (const char *) name, 
+			       OBJECT_TO_JSVAL(obj), NULL, NULL,
+			       JSPROP_ENUMERATE|JSPROP_READONLY)) {
+	    obj = NULL;
+	    goto done;
+	}
+    }
+
+    image->decoder = HOLD_BACK_COUNT(decoder);
+    image->index = index;
+    image->layer_id = layer_id;
+    image->name = JS_NewStringCopyZ(cx, (const char *) name);
+    if (!JS_LockGCThing(cx, image->name)) {
+	obj = NULL;
+	goto done;
+    }
+    image_data->mocha_object = obj;
+
+    if (!lm_AddObjectToArray(cx, array_obj, (const char *) name, 
+			     index, obj)) {
+	obj = NULL;
+	goto done;
+    }
+
+    /* Put it in the index to object hash table */
+    map = lm_GetIdToObjectMap(decoder);
+    if (map)
+        PR_HashTableAdd(map,
+                        LM_GET_MAPPING_KEY(LM_IMAGES, layer_id, index),
+                        obj);
+
+    /* OK, we've got our image, see if there are any event handlers
+     *   defined with it
+     */
+    if(tag) {
+	PA_Block onload   = lo_FetchParamValue(context, tag, PARAM_ONLOAD);
+	PA_Block onabort  = lo_FetchParamValue(context, tag, PARAM_ONABORT);
+	PA_Block onerror  = lo_FetchParamValue(context, tag, PARAM_ONERROR);
+	PA_Block onmousedown = lo_FetchParamValue(context, tag, PARAM_ONMOUSEDOWN);
+	PA_Block onmouseup = lo_FetchParamValue(context, tag, PARAM_ONMOUSEUP);
+	PA_Block id	  = lo_FetchParamValue(context, tag, PARAM_ID);
+
+	/* don't hold the layout lock across compiles */
+	LO_UnlockLayout();
+
+	if (onload != NULL) {
+	    (void) lm_CompileEventHandler(decoder, id, tag->data,
+					  tag->newline_count, obj,
+					  PARAM_ONLOAD, onload);
+	    PA_FREE(onload);
+	}
+
+	if (onabort != NULL) {
+	    (void) lm_CompileEventHandler(decoder, id, tag->data,
+					  tag->newline_count, obj,
+				          PARAM_ONABORT, onabort);
+	    PA_FREE(onabort);
+	}
+
+	if (onerror != NULL) {
+	    (void) lm_CompileEventHandler(decoder, id, tag->data,
+					  tag->newline_count, obj,
+					  PARAM_ONERROR, onerror);
+	    PA_FREE(onerror);
+	}
+	if (onmousedown != NULL) {
+	    (void) lm_CompileEventHandler(decoder, id, tag->data,
+					  tag->newline_count, obj,
+					  PARAM_ONMOUSEDOWN, onmousedown);
+	    PA_FREE(onmousedown);
+	}
+	if (onmouseup != NULL) {
+	    (void) lm_CompileEventHandler(decoder, id, tag->data,
+					  tag->newline_count, obj,
+					  PARAM_ONMOUSEUP, onmouseup);
+	    PA_FREE(onmouseup);
+	}
+
+	if (id)
+	    PA_FREE(id);
+
+	LO_LockLayout();
+    }
+
+done:
+
+    if(name)
+	PA_FREE(name);
+    LM_PutMochaDecoder(decoder);
+
+    return obj;
+}
+
+void
+lm_ProcessImageEvent(MWContext *context, JSObject *obj,
+                  LM_ImageEvent event)
+{
+    uint event_mask;
+    jsval result;
+    JSImage *image;
+
+    image = JS_GetPrivate(context->mocha_context, obj);
+    if (!image)
+        return;
+
+    image->pending_events |= PR_BIT(event);
+
+    /* Special event used to trigger deferred events */
+    if (! (image->pending_events & PR_BIT(LM_IMGUNBLOCK)))
+        return;
+
+    for (event = LM_IMGLOAD; event <= LM_LASTEVENT; event++) {
+        event_mask = PR_BIT(event);
+        if (image->pending_events & event_mask) {
+
+	    JSEvent *pEvent;
+	    pEvent=XP_NEW_ZAP(JSEvent);
+
+            image->pending_events &= ~event_mask;
+            switch (event) {
+            case LM_IMGLOAD:
+                pEvent->type = EVENT_LOAD;
+                image->complete = JS_TRUE;
+                break;
+            case LM_IMGABORT:
+                pEvent->type = EVENT_ABORT;
+                image->complete = JS_TRUE;
+                break;
+            case LM_IMGERROR:
+                pEvent->type = EVENT_ERROR;
+                image->complete = JS_TRUE;
+                break;
+            default:
+                XP_ABORT(("Unknown image event"));
+            }
+
+            lm_SendEvent(context, obj, pEvent, &result);
+        }
+    }
+}
+
+JSBool
+lm_InitImageClass(MochaDecoder *decoder)
+{
+    JSContext *cx;
+    JSObject *prototype;
+
+    cx = decoder->js_context;
+    prototype = JS_InitClass(cx, decoder->window_object, 
+			     decoder->event_receiver_prototype, &lm_image_class,
+			     Image, 0, image_props, NULL, NULL, NULL);
+    if (!prototype)
+	return JS_FALSE;
+    decoder->image_prototype = prototype;
+    return JS_TRUE;
+}
+
+/* Create an image context for anonymous images and attach it to the specified
+   mocha decoder. */
+JSBool
+lm_NewImageContext(MWContext *context, MochaDecoder *decoder)
+{
+    IL_GroupContext *img_cx;
+    IMGCB* img_cb;
+    JMCException *exc = NULL;
+    
+    if (!decoder->image_context) {
+        img_cb = IMGCBFactory_Create(&exc); /* JMC Module */
+        if (exc) {
+            JMC_DELETE_EXCEPTION(&exc); /* XXX Should really return
+                                           exception */
+            JS_ReportOutOfMemory(decoder->js_context);
+            return JS_FALSE;
+        }
+
+        /* Create an Image Group Context.  IL_NewGroupContext augments the
+           reference count for the JMC callback interface.  The opaque argument
+           to IL_NewGroupContext is the Front End's display context, which will
+           be passed back to all the Image Library's FE callbacks. */
+        img_cx = IL_NewGroupContext((void*)context, (IMGCBIF *)img_cb);
+        if (!img_cx) {
+            JS_ReportOutOfMemory(decoder->js_context);
+            return JS_FALSE;
+        }
+
+        /* Attach the IL_GroupContext to the mocha decoder. */
+        decoder->image_context = img_cx;
+
+		/* Allow the context to observe the decoder's image context. */
+		ET_il_SetGroupObserver(context, decoder->image_context, context, JS_TRUE);
+    }
+    return JS_TRUE;
+}

mozilla/lib/libmocha/lm_trggr.c

@@ -0,0 +1,287 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+/*
+ * lm_trggr.c
+ * 
+ * Reflects AutoInstall trigger methods
+ * into the global JavaScript config object.
+ *
+ * See Trigger.java for related functions.
+ */
+
+#include "lm.h"
+#include "prefapi.h"
+#include "VerReg.h"
+#include "softupdt.h"
+#include "gui.h"	/* XP_AppPlatform */
+
+JSBool PR_CALLBACK asd_Version(JSContext *cx, JSObject *obj, uint argc, jsval *argv, jsval *rval);
+JSBool PR_CALLBACK asd_get_version(JSContext *cx, JSObject *obj, uint argc, jsval *argv, jsval *rval);
+JSBool PR_CALLBACK asd_start_update(JSContext *cx, JSObject *obj, uint argc, jsval *argv, jsval *rval);
+JSBool PR_CALLBACK asd_conditional_update(JSContext *cx, JSObject *obj, uint argc, jsval *argv, jsval *rval);
+JSBool PR_CALLBACK asd_alert(JSContext *cx, JSObject *obj, uint argc, jsval *argv, jsval *rval);
+JSBool PR_CALLBACK asd_platform(JSContext *cx, JSObject *obj, uint argc, jsval *argv, jsval *rval);
+
+PRIVATE JSFunctionSpec autoinstall_methods[] = {
+    { "getVersion",	asd_get_version,	2 },
+    { "startUpdate",	asd_start_update,	2 },
+    { "conditionalUpdate",	asd_conditional_update, 4 },
+    { "startUpdateComponent",	asd_conditional_update,	4 },	/* old name */
+    { NULL,	NULL,	0 }
+};
+
+PRIVATE JSFunctionSpec globalconfig_methods[] = {
+    { "alert",	asd_alert,	1 },
+    { "getPlatform", asd_platform, 0 },
+    { NULL,	NULL,	0 }
+};
+
+PRIVATE JSClass autoinstall_class = {
+    "AutoInstall", 0,
+    JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
+    JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub
+};
+
+PRIVATE JSClass version_class = {
+    "VersionInfo", 0,
+    JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
+    JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub
+};
+
+JSBool lm_DefineTriggers()
+{
+	JSContext	*globalContext = NULL;
+	JSObject	*globalObject = NULL;
+	JSObject	*autoInstallObject, *versionObject;
+	JSBool          ans;
+
+	/* get global mocha context and object */
+    PREF_GetConfigContext(&globalContext);
+    PREF_GetGlobalConfigObject(&globalObject);
+
+    if (globalContext == NULL || globalObject == NULL)	{
+        return JS_FALSE;
+    }
+
+    JS_BeginRequest(globalContext);
+	/* define AutoInstall object in global object */
+	autoInstallObject = JS_DefineObject(globalContext, globalObject, 
+					    "AutoInstall",
+					    &autoinstall_class, 
+					    NULL, 
+					    JSPROP_ENUMERATE|JSPROP_READONLY);
+					    
+	if (!autoInstallObject)  {
+		JS_EndRequest(globalContext);
+		return JS_FALSE;
+	}
+
+	
+	/* define Version class in AutoInstall */
+    versionObject = JS_InitClass(globalContext, autoInstallObject, NULL,
+		        		&version_class, asd_Version, 0, NULL, NULL, NULL, NULL);
+	
+	if (!versionObject)  {
+		JS_EndRequest(globalContext);
+		return JS_FALSE;
+	}
+    
+    /* define some global config utility functions */
+    JS_DefineFunctions(globalContext, globalObject, globalconfig_methods);
+    
+    ans = JS_DefineFunctions(globalContext, autoInstallObject, 
+			     autoinstall_methods);
+    JS_EndRequest(globalContext);
+    return ans;
+}
+
+/* Convert VERSION type to Version JS object */
+static void asd_versToObj(JSContext *cx, VERSION* vers, JSObject* versObj)
+{
+	jsval val = INT_TO_JSVAL(vers->major);
+	JS_SetProperty(cx, versObj, "major", &val);
+	val = INT_TO_JSVAL(vers->minor);
+	JS_SetProperty(cx, versObj, "minor", &val);
+	val = INT_TO_JSVAL(vers->release);
+	JS_SetProperty(cx, versObj, "release", &val);
+	val = INT_TO_JSVAL(vers->build);
+	JS_SetProperty(cx, versObj, "build", &val);
+}
+
+/* Convert Version JS object to VERSION type */
+static void asd_objToVers(JSContext *cx, JSObject* versObj, VERSION* vers)
+{
+	jsval val;
+	JS_GetProperty(cx, versObj, "major", &val);
+	vers->major = JSVAL_TO_INT(val);
+	JS_GetProperty(cx, versObj, "minor", &val);
+	vers->minor = JSVAL_TO_INT(val);
+	JS_GetProperty(cx, versObj, "release", &val);
+	vers->release = JSVAL_TO_INT(val);
+	JS_GetProperty(cx, versObj, "build", &val);
+	vers->build = JSVAL_TO_INT(val);
+}
+
+/*
+ * ?? -- move this to VR?
+ * Returns 0 if versions are equal; < 0 if vers2 is newer; > 0 if vers1 is newer
+ */
+static int asd_compareVersion(VERSION* vers1, VERSION* vers2)
+{
+	int diff;
+	if (vers1 == NULL)
+		diff = -4;
+	else if (vers2 == NULL)
+		diff = 4;
+	else if (vers1->major == vers2->major) {
+		if (vers1->minor == vers2->minor) {
+			if (vers1->release == vers2->release) {
+				if (vers1->build == vers2->build) 
+					diff = 0;
+				else diff = (vers1->build > vers2->build) ? 1 : -1;
+			}
+			else diff = (vers1->release > vers2->release) ? 2 : -2;
+		}
+		else diff = (vers1->minor > vers2->minor) ? 3 : -3;
+	}
+	else diff = (vers1->major > vers2->major) ? 4 : -4;
+	return diff;
+}
+
+/* Version constructor
+   (accepts up to four int params to initialize fields) */
+JSBool PR_CALLBACK asd_Version
+	(JSContext *cx, JSObject *obj, uint argc, jsval *argv, jsval *rval)
+{
+	VERSION vers;
+	vers.major = (argc >= 1 && JSVAL_IS_INT(argv[0])) ? JSVAL_TO_INT(argv[0]) : 0;
+	vers.minor = (argc >= 2 && JSVAL_IS_INT(argv[1])) ? JSVAL_TO_INT(argv[1]) : 0;
+	vers.release = (argc >= 3 && JSVAL_IS_INT(argv[2])) ? JSVAL_TO_INT(argv[2]) : 0;
+	vers.build = (argc >= 4 && JSVAL_IS_INT(argv[3])) ? JSVAL_TO_INT(argv[3]) : 0;
+
+	asd_versToObj(cx, &vers, obj);
+    return JS_TRUE;
+}
+
+/* arguments:
+   0. component name
+   1. version no. to fill in
+   return:
+      error status */
+JSBool PR_CALLBACK asd_get_version
+	(JSContext *cx, JSObject *obj, uint argc, jsval *argv, jsval *rval)
+{
+	REGERR status = 0;
+	if (argc >= 2 && JSVAL_IS_STRING(argv[0])
+		&& JSVAL_IS_OBJECT(argv[1]))
+	{		
+		VERSION vers;
+		char* component_path = JS_GetStringBytes(JSVAL_TO_STRING(argv[0]));
+		status = VR_GetVersion(component_path, &vers);
+
+		if (status == REGERR_OK) {
+			JSObject* versObj = JSVAL_TO_OBJECT(argv[1]);
+			asd_versToObj(cx, &vers, versObj);
+		}
+	}
+	*rval = INT_TO_JSVAL(status);
+	return JS_TRUE;
+}
+
+/* arguments:
+   0. url
+   1. flags
+   return:
+      true if no errors */
+JSBool PR_CALLBACK asd_start_update
+	(JSContext *cx, JSObject *obj, uint argc, jsval *argv, jsval *rval)
+{
+	if (argc >= 2 && JSVAL_IS_STRING(argv[0]) &&
+		JSVAL_IS_INT(argv[1])) {
+		char* url = JS_GetStringBytes(JSVAL_TO_STRING(argv[0]));
+		/* Bookmarks is a hack, you should really get some SmartUpdate context */
+		MWContext* cx = XP_FindContextOfType(NULL, MWContextBookmarks);
+		
+		XP_Bool result = SU_StartSoftwareUpdate( cx, url,
+			NULL, NULL, NULL, JSVAL_TO_INT(argv[1]) );
+		*rval = BOOLEAN_TO_JSVAL(result);
+		return JS_TRUE;
+	}
+	*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
+	return JS_TRUE;
+}
+
+/* arguments:
+   0. url
+   1. component name
+   2. version no. to compare
+   3. flags
+   return:
+      true if update triggered and no errors */
+JSBool PR_CALLBACK asd_conditional_update
+	(JSContext *cx, JSObject *obj, uint argc, jsval *argv, jsval *rval)
+{
+	REGERR status = 0;
+	if (argc >= 4 && JSVAL_IS_STRING(argv[0]) &&
+		JSVAL_IS_STRING(argv[1]) &&
+		JSVAL_IS_OBJECT(argv[2]) &&
+		JSVAL_IS_INT(argv[3]))
+	{
+		VERSION curr_vers;
+		char* component_path = JS_GetStringBytes(JSVAL_TO_STRING(argv[1]));
+		status = VR_GetVersion(component_path, &curr_vers);
+
+		if (status == REGERR_OK) {
+			JSObject* versObj = JSVAL_TO_OBJECT(argv[2]);
+			VERSION req_vers;
+			asd_objToVers(cx, versObj, &req_vers);
+			if ( asd_compareVersion(&req_vers, &curr_vers) > 0 ) {
+				char* url = JS_GetStringBytes(JSVAL_TO_STRING(argv[0]));
+				MWContext* cx = XP_FindContextOfType(NULL, MWContextBookmarks);
+
+				XP_Bool result = SU_StartSoftwareUpdate( cx, url,
+					NULL, NULL, NULL, JSVAL_TO_INT(argv[3]) );
+				*rval = BOOLEAN_TO_JSVAL(result);
+				return JS_TRUE;
+			}
+		}
+	}
+	*rval = BOOLEAN_TO_JSVAL(JS_FALSE);	/*INT_TO_JSVAL(status);*/
+	return JS_TRUE;
+}
+
+JSBool PR_CALLBACK asd_alert
+	(JSContext *cx, JSObject *obj, uint argc, jsval *argv, jsval *rval)
+{
+	if (argc >= 1 && JSVAL_IS_STRING(argv[0])) {
+		char* msg = JS_GetStringBytes(JSVAL_TO_STRING(argv[0]));
+		MWContext* ctx = XP_FindSomeContext();
+		
+		if (ctx)
+			FE_Alert(ctx, msg);
+	}
+	return JS_TRUE;
+}
+
+JSBool PR_CALLBACK asd_platform
+	(JSContext *cx, JSObject *obj, uint argc, jsval *argv, jsval *rval)
+{
+	*rval = STRING_TO_JSVAL( JS_NewStringCopyZ(cx, XP_AppPlatform) );
+	return JS_TRUE;
+}
+

mozilla/lib/libmocha/lm_wngrp.c

@@ -0,0 +1,425 @@
+/*
+ * lm_wngrp.c: Structures and functions to deal with new LM window groups
+ *              and multiple LM threads and what not.
+ * 
+ * All blame to Mike McCool (mlm@netscape.com) 2/17/98
+ */
+
+#include "lm.h"
+#include "xp.h"
+#include "prclist.h"
+#include "prthread.h"
+#include "prmon.h"
+
+#ifdef XP_MAC
+#include "pprthred.h"  /* for PR_CreateThreadGCAble */
+#else
+#include "private/pprthred.h"
+#endif
+
+/* 
+ * Notes to self
+ * 
+ * - lm_window_count: do we care that there's only one? 
+ * - do we need to add a limit to number of threads we spawn()?
+ * - JRIEnv: do we need multiple?
+ * - JSRuntime: do we need multiple?
+ * - Threading changes: impact on debugger?
+ * - JS_SetGlobalObject(JSContext) will be important
+ * - If the global structure is on the mozilla thread, can other threads
+ *    creating a new thread group access, or do I have to post an event?
+ *
+ * ? Rename "MochaDecoder" to "LMWindow"
+ * ? Change so that there is only one JSContext
+ */
+
+PRMonitor *wingroups_mon;
+LMWindowGroup *wingroups;
+PRMonitor *request_mon;
+
+struct ContextListStr  {
+    ContextList *next;
+    ContextList *prev;
+    MWContext   *context;
+};
+
+LMWindowGroup *_lm_NewWindowGroup(int priority);
+
+/* Initialize my globals, from the Mozilla thread 
+ */
+void lm_InitWindowGroups(void)
+{
+    int priority;
+
+    /* run at slightly lower priority than the mozilla thread */
+    priority = PR_GetThreadPriority(PR_CurrentThread());
+    PR_ASSERT(priority >= PR_PRIORITY_FIRST && priority <= PR_PRIORITY_LAST);
+ 
+    if (priority == PR_PRIORITY_NORMAL)
+        priority = PR_PRIORITY_LOW;
+    else if (priority == PR_PRIORITY_HIGH)
+        priority = PR_PRIORITY_NORMAL;
+    else if (priority == PR_PRIORITY_URGENT)
+        priority = PR_PRIORITY_HIGH;
+    else
+        priority = PR_PRIORITY_LOW;
+
+    wingroups_mon = PR_NewMonitor();
+    request_mon = PR_NewMonitor();
+    wingroups = NULL;
+    wingroups = _lm_NewWindowGroup(priority);
+    if(wingroups != NULL)  {
+        PR_INIT_CLIST(wingroups);
+	lm_StartWindowGroup(wingroups);
+    }  /* else huh?! */
+}
+
+/* Create a new window group.  Create new context, create new monitor, create
+ *  new thread, event queue, queue stack, empty context list. 
+ */
+LMWindowGroup *lm_NewWindowGroup(void)
+{
+    int priority;
+
+    /* Run at same priority as current thread (which should be a JS 
+     * thread. 
+     */
+    priority = PR_GetThreadPriority(PR_CurrentThread());
+    PR_ASSERT(priority>=PR_PRIORITY_FIRST && priority<=PR_PRIORITY_LAST);
+    return _lm_NewWindowGroup(priority);
+}
+
+LMWindowGroup *_lm_NewWindowGroup(int priority)
+{
+    LMWindowGroup *newgrp = XP_NEW_ZAP(LMWindowGroup);
+    if(newgrp != NULL)  {
+        newgrp->done = PR_FALSE;
+        newgrp->hasLock = PR_FALSE;
+
+        /* Create a new JS Context for this set of windows. 
+         * Note: Need to get global runtime lm_runtime from somewhere, 
+         *        and perhaps the LM_STACK_SIZE? 
+         */
+/**************************************************** MLM *
+        newgrp->js_context = JS_NewContext(lm_runtime, LM_STACK_SIZE);
+        if(newgrp->js_context == NULL)  {
+            XP_DELETE(newgrp);
+            return NULL;
+        }
+ **************************************************** MLM */
+	newgrp->js_context = NULL;
+	/* JS_SetGCCallback(newgrp->js_context, LM_ShouldRunGC); */
+
+        newgrp->mw_contexts = XP_NEW_ZAP(ContextList);
+        if(newgrp->mw_contexts == NULL)  {
+            JS_DestroyContext(newgrp->js_context);
+            XP_DELETE(newgrp);
+            return NULL;
+        }
+        PR_INIT_CLIST(newgrp->mw_contexts);
+        newgrp->mw_contexts->context = NULL;
+        newgrp->current_context = NULL;
+
+        newgrp->queue_stack = XP_NEW_ZAP(QueueStackElement);
+        if(!newgrp->queue_stack)  {
+            JS_DestroyContext(newgrp->js_context);
+            XP_DELETE(newgrp->mw_contexts);
+            XP_DELETE(newgrp);
+            return NULL;
+        }
+
+        /* Do this here so we don't race ourselves in lm_wait_for_events */
+        PR_EnterMonitor(wingroups_mon);
+        if(wingroups != NULL)  {
+            PR_APPEND_LINK(newgrp, wingroups);
+        }
+        PR_ExitMonitor(wingroups_mon);
+
+        newgrp->waiting_list = NULL;
+
+        newgrp->owner_monitor = PR_NewMonitor();
+        newgrp->queue_monitor = PR_NewMonitor();
+
+        PR_EnterMonitor(newgrp->owner_monitor);
+        newgrp->thread = PR_CreateThreadGCAble(PR_USER_THREAD,
+                                               lm_wait_for_events, newgrp,
+                                               priority, PR_LOCAL_THREAD,
+                                               PR_UNJOINABLE_THREAD, 0);
+        newgrp->owner              = newgrp->thread;
+        newgrp->current_count      = 0;
+        newgrp->mozWantsLock       = PR_FALSE;
+        newgrp->mozGotLock         = PR_FALSE;
+        newgrp->interruptCurrentOp = PR_FALSE;
+        newgrp->queue_depth        = 0;
+        newgrp->queue_count        = 0;
+
+        /* Note: Need a unique identifier for this queue?
+         */
+        newgrp->interpret_queue = PR_CreateEventQueue("new_event_queue",
+                                                      newgrp->thread);
+        newgrp->queue_stack->queue = newgrp->interpret_queue;
+
+	newgrp->lock_context = NULL;
+	newgrp->js_timeout_insertion_point = NULL;
+	newgrp->js_timeout_running = NULL;
+	newgrp->inputRecurring = 0;
+    }
+    return newgrp;
+}
+
+void lm_StartWindowGroup(LMWindowGroup *grp)
+{
+    PR_Notify(grp->owner_monitor);
+    PR_ExitMonitor(grp->owner_monitor);
+}
+
+void lm_DestroyWindowGroup(LMWindowGroup *grp)
+{
+    PR_EnterMonitor(wingroups_mon);
+    /* Note: Thread terminates when the thread's main function (in
+     *        this case, lm_wait_for_events) exits.
+     */
+    /************************************ MLM *
+     * JS_DestroyContext(grp->js_context);
+     ************************************ MLM */
+    PR_DestroyMonitor(grp->owner_monitor);
+    PR_DestroyMonitor(grp->queue_monitor);
+    
+    /* Note: How to destroy an event queue or two?
+     */
+
+    /* Note: Context list should already be null
+     */
+
+    PR_REMOVE_LINK(grp);
+    XP_DELETE(grp);
+    PR_ExitMonitor(wingroups_mon);
+}
+
+LMWindowGroup *LM_GetDefaultWindowGroup(MWContext *mwc)
+{
+    LMWindowGroup *ans;
+
+    /* Check to see if this is a frame context.  If so, check its parent. */
+    if((mwc != NULL) && (mwc->is_grid_cell))  {
+        MWContext *grid_parent, *grid_child;
+	grid_child = mwc;
+	grid_parent = mwc->grid_parent;
+	/* Find the root parent.  I wonder if I need to add cycle checking. */
+	while(grid_parent != NULL)  {
+	    grid_child = grid_parent;
+	    grid_parent = grid_child->grid_parent;
+	}
+	if( (ans = lm_MWContextToGroup(grid_child)) != NULL)  {
+	    /* The parent's been found, return its group. */
+	    return ans;
+	}  else  {  /* Else add the parent to the default group, 
+		     *  and return that. */
+    	    PR_EnterMonitor(wingroups_mon);
+	    LM_AddContextToGroup(wingroups, grid_child);
+	    ans = wingroups;
+    	    PR_ExitMonitor(wingroups_mon);
+	    return ans;
+	}
+    }
+    PR_EnterMonitor(wingroups_mon);
+    ans = wingroups;
+    PR_ExitMonitor(wingroups_mon);
+    return ans;
+}
+
+LMWindowGroup *lm_MWContextToGroup(MWContext *mwc)
+{
+    LMWindowGroup *ptr = NULL;
+    LMWindowGroup *ans = NULL;
+
+    PR_EnterMonitor(wingroups_mon);
+
+    ptr = wingroups;
+ 
+    if(lm_GetEntryForContext(wingroups, mwc) != NULL)  {
+        ans = wingroups;
+        PR_ExitMonitor(wingroups_mon);
+        return ans;
+    }
+ 
+    ptr = PR_NEXT_LINK(ptr);
+    while(ptr != wingroups)  {
+        if(lm_GetEntryForContext(ptr, mwc) != NULL)  {
+            ans = ptr;
+            PR_ExitMonitor(wingroups_mon);
+            return ans;
+        }
+        ptr = PR_NEXT_LINK(ptr);
+    }
+    PR_ExitMonitor(wingroups_mon);
+    return NULL;
+}
+
+LMWindowGroup *lm_QueueStackToGroup(QueueStackElement *qse)
+{
+    LMWindowGroup *ptr = NULL;
+    LMWindowGroup *ans = NULL;
+
+    PR_EnterMonitor(wingroups_mon);
+    ptr = wingroups;
+ 
+    if(wingroups->queue_stack == qse)  {
+        ans = wingroups;
+        PR_ExitMonitor(wingroups_mon);
+        return ans;
+    }
+ 
+    ptr = PR_NEXT_LINK(ptr);
+    while(ptr != wingroups)  {
+        if(ptr->queue_stack == qse)  {
+            ans = ptr;
+            PR_ExitMonitor(wingroups_mon);
+            return ans;
+        }
+        ptr = PR_NEXT_LINK(ptr);
+    }
+    PR_ExitMonitor(wingroups_mon);
+    return NULL;
+}
+
+PREventQueue *LM_MWContextToQueue(MWContext *mwc)
+{
+    /* Note: This gets the interpret queue, need to get top queue as well
+     */
+    LMWindowGroup *grp = lm_MWContextToGroup(mwc);
+    if(grp != NULL)  {
+        return LM_WindowGroupToQueue(grp);
+    }
+    return NULL;
+}
+
+PREventQueue *LM_WindowGroupToQueue(LMWindowGroup *lmg)
+{
+    return lmg->interpret_queue;
+}
+
+ContextList *lm_GetEntryForContext(LMWindowGroup *grp, MWContext *cx)
+{
+    ContextList *cxl = grp->mw_contexts;
+    ContextList *ans = NULL;
+
+    if(PR_CLIST_IS_EMPTY(cxl))  {
+        return NULL;
+    }  else  {
+        ContextList *ptr = PR_NEXT_LINK(cxl);
+        while(ptr != cxl)  {
+            if(ptr->context == cx)  {
+                ans = ptr;
+                break;
+            }
+            ptr = PR_NEXT_LINK(ptr);
+        }
+    }
+    return ans;
+}
+
+void LM_AddContextToGroup(LMWindowGroup *grp, MWContext *cx)
+{
+    ContextList *cxl;
+
+    if(lm_MWContextToGroup(cx) != NULL)  {
+        /* Hey, why are we adding this stuff twice? */
+        XP_ASSERT(0);
+    }
+
+    cxl = XP_NEW_ZAP(ContextList);
+    /* Note: failure?!?!?!
+     */
+    cxl->context = cx;
+
+    PR_APPEND_LINK(cxl, grp->mw_contexts);
+}
+
+void lm_RemoveContextFromGroup(LMWindowGroup *grp, MWContext *cx);
+
+void LM_RemoveContextFromGroup(MWContext *cx)
+{
+    LMWindowGroup *grp = lm_MWContextToGroup(cx);
+    if(grp)  {
+        lm_RemoveContextFromGroup(grp, cx);
+    }
+}
+
+void lm_RemoveContextFromGroup(LMWindowGroup *grp, MWContext *cx)
+{
+    if(!PR_CLIST_IS_EMPTY(grp->mw_contexts))  {
+        ContextList *entry = lm_GetEntryForContext(grp, cx);
+        if(entry != NULL)  {
+            PR_REMOVE_LINK(entry);
+            XP_DELETE(entry);
+        }
+    }
+    if(PR_CLIST_IS_EMPTY(grp->mw_contexts) && (grp != wingroups))  {
+        grp->done = PR_TRUE;
+    }
+}
+
+PRBool LM_IsLocked(LMWindowGroup *grp)
+{
+    PRBool ans;
+    PR_EnterMonitor(request_mon);
+    ans = grp->hasLock;
+    PR_ExitMonitor(request_mon);
+    return ans;
+}
+
+void LM_BeginRequest(LMWindowGroup *grp, JSContext *jsc)
+{
+    PR_EnterMonitor(request_mon);
+    grp->hasLock = PR_TRUE;
+    grp->lock_context = jsc;
+    if((JS_GetContextThread(jsc)) != ((intN) grp->thread))  {
+        JS_SetContextThread(jsc);
+    }
+    PR_ExitMonitor(request_mon);
+    JS_BeginRequest(jsc);
+}
+
+void LM_EndRequest(LMWindowGroup *grp, JSContext *jsc)
+{
+    JS_EndRequest(jsc);
+    PR_EnterMonitor(request_mon);
+    grp->lock_context = NULL;
+    grp->hasLock = PR_FALSE;
+    PR_ExitMonitor(request_mon);
+}
+
+JSBool LM_ShouldRunGC(JSContext *cx, JSGCStatus status)
+{
+    JSBool ans = JS_TRUE;
+    JSContext *active;
+    LMWindowGroup *ptr;
+
+    if(status != JSGC_BEGIN)  {
+        return JS_TRUE;
+    }
+
+    PR_EnterMonitor(request_mon);
+    if(wingroups->hasLock)  {
+        active = wingroups->lock_context;
+        if(active != cx)  {
+            ans=JS_FALSE;
+	    goto bye;
+        }
+    }
+    ptr = PR_NEXT_LINK(wingroups);
+    while(ptr != wingroups)  {
+        if(ptr->hasLock)  {
+            active = ptr->lock_context;
+            if(active != cx)  {
+                ans=JS_FALSE;
+		goto bye;
+            }
+	}
+        ptr = PR_NEXT_LINK(ptr);
+    }
+bye:
+    PR_ExitMonitor(request_mon);
+    return ans;
+}

mozilla/lib/libnet/jscookie.c

@@ -0,0 +1,617 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+/*
+   jscookie.c -- javascript reflection of cookies for filters.
+   Created: Frederick G.M. Roeber <roeber@netscape.com>, 12-Jul-97.
+   Adopted: Judson Valeski, 1997.
+   Large chunks of this were stolen from jsmsg.c.
+ */
+
+#include "mkutils.h"
+#include "mkutils.h"
+#include "mkparse.h"
+#include "mkaccess.h"
+#include "prefapi.h"
+#include "jsapi.h"
+#include "xp_core.h"
+#include "xp_mcom.h"
+#include "jscookie.h"
+#include "ds.h"
+#include "htmldlgs.h"
+#include "xpgetstr.h"
+
+extern int MK_ACCESS_JAVASCRIPT_COOKIE_FILTER;
+
+static JSObject *filter_obj = NULL;
+static JSContext *filter_context = NULL;
+
+static JSBool error_reporter_installed = JS_FALSE;
+static JSErrorReporter previous_error_reporter;
+
+/* tells us when we should recompile the file. */
+static JSBool need_compile = JS_TRUE;
+
+/* This is the private instance data associated with a cookie */
+typedef struct JSCookieData {
+    JSContext *js_context;
+    JSObject *js_object;
+    JSCFCookieData *data;
+    PRPackedBool property_changed, rejected, accepted, ask, decision_made;
+} JSCookieData;
+
+/* The properties of a cookie that we reflect */
+enum cookie_slot {
+    COOKIE_PATH			= -1,
+    COOKIE_DOMAIN		= -2,
+    COOKIE_NAME			= -3,
+    COOKIE_VALUE		= -4,
+    COOKIE_EXPIRES		= -5,
+    COOKIE_URL			= -6,
+    COOKIE_IS_SECURE		= -7,
+    COOKIE_IS_DOMAIN		= -8,
+    COOKIE_PROMPT_PREF		= -9,
+    COOKIE_PREF			= -10
+};
+
+/* 
+ * Should more of these be readonly? What does it mean for a cookie
+ *   to de secure?  -chouck
+ */
+static JSPropertySpec cookie_props[] = {
+    { "path",       COOKIE_PATH,        JSPROP_ENUMERATE },
+    { "domain",     COOKIE_DOMAIN,      JSPROP_ENUMERATE },
+    { "name",       COOKIE_NAME,        JSPROP_ENUMERATE },
+    { "value",      COOKIE_VALUE,       JSPROP_ENUMERATE },
+    { "expires",    COOKIE_EXPIRES,     JSPROP_ENUMERATE },
+    { "url",        COOKIE_URL,         JSPROP_ENUMERATE|JSPROP_READONLY },
+    { "isSecure",   COOKIE_IS_SECURE,   JSPROP_ENUMERATE },
+    { "isDomain",   COOKIE_IS_DOMAIN,   JSPROP_ENUMERATE },
+    { "prompt",     COOKIE_PROMPT_PREF, JSPROP_ENUMERATE|JSPROP_READONLY },
+    { "preference", COOKIE_PREF,        JSPROP_ENUMERATE|JSPROP_READONLY },
+    { 0 }
+};
+
+PR_STATIC_CALLBACK(JSBool)
+cookie_getProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+    JSCookieData *data;
+    JSString *str;
+    jsint slot;
+
+    data = (JSCookieData *)JS_GetPrivate(cx, obj);
+    if (!data)
+	return JS_TRUE;
+
+    if (!JSVAL_IS_INT(id))
+        return JS_TRUE;
+
+    slot = JSVAL_TO_INT(id);
+
+    switch (slot) {
+    case COOKIE_PATH:
+        str = JS_NewStringCopyZ(cx, (const char *)data->data->path_from_header);
+        if( (JSString *)0 == str )
+            return JS_FALSE;
+        *vp = STRING_TO_JSVAL(str);
+        break;
+    case COOKIE_DOMAIN:
+        str = JS_NewStringCopyZ(cx, (const char *)data->data->host_from_header);
+        if( (JSString *)0 == str )
+            return JS_FALSE;
+        *vp = STRING_TO_JSVAL(str);
+        break;
+    case COOKIE_NAME:
+        str = JS_NewStringCopyZ(cx, (const char *)data->data->name_from_header);
+        if( (JSString *)0 == str )
+            return JS_FALSE;
+        *vp = STRING_TO_JSVAL(str);
+        break;
+    case COOKIE_VALUE:
+        str = JS_NewStringCopyZ(cx, (const char *)data->data->cookie_from_header);
+        if( (JSString *)0 == str )
+            return JS_FALSE;
+        *vp = STRING_TO_JSVAL(str);
+        break;
+    case COOKIE_EXPIRES:
+        *vp = INT_TO_JSVAL(data->data->expires);
+        break;
+    case COOKIE_URL:
+        str = JS_NewStringCopyZ(cx, (const char *)data->data->url);
+        if( (JSString *)0 == str )
+            return JS_FALSE;
+        *vp = STRING_TO_JSVAL(str);
+        break;
+    case COOKIE_IS_SECURE:
+        *vp = BOOLEAN_TO_JSVAL(data->data->secure);
+        break;
+    case COOKIE_IS_DOMAIN:
+        *vp = BOOLEAN_TO_JSVAL(data->data->domain);
+        break;
+    case COOKIE_PROMPT_PREF:
+        *vp = BOOLEAN_TO_JSVAL(data->data->prompt);
+        break;
+    case COOKIE_PREF:
+        *vp = INT_TO_JSVAL(data->data->preference);
+        break;
+    }
+
+    return JS_TRUE;
+}
+
+PR_STATIC_CALLBACK(JSBool)
+cookie_setProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+    JSCookieData *data;
+    jsint slot;
+    PRInt32 i;
+    JSBool b;
+
+    data = (JSCookieData *)JS_GetPrivate(cx, obj);
+    if (!data)
+		return JS_TRUE;
+
+    if (!JSVAL_IS_INT(id))
+        return JS_TRUE;
+
+    slot = JSVAL_TO_INT(id);
+
+	if (slot == COOKIE_PATH) {
+		data->data->path_from_header = JS_GetStringBytes(JSVAL_TO_STRING(*vp));
+	} 
+	else if (slot == COOKIE_DOMAIN) {
+		data->data->host_from_header = JS_GetStringBytes(JSVAL_TO_STRING(*vp));
+	}
+	else if (slot == COOKIE_NAME) {
+		data->data->name_from_header = JS_GetStringBytes(JSVAL_TO_STRING(*vp));
+	}
+	else if (slot == COOKIE_VALUE) {
+		data->data->cookie_from_header = JS_GetStringBytes(JSVAL_TO_STRING(*vp));
+	}
+	else if (slot == COOKIE_EXPIRES) {
+		if( !JS_ValueToInt32(cx, *vp, (long *)&i) )
+            return JS_FALSE;
+        data->data->expires = i;
+	}
+	else if (slot == COOKIE_IS_SECURE) {
+        if( !JS_ValueToBoolean(cx, *vp, &b) )
+            return JS_FALSE;
+        data->data->secure = b;		
+	}
+	else if (slot == COOKIE_IS_DOMAIN) {
+        if( !JS_ValueToBoolean(cx, *vp, &b) )
+            return JS_FALSE;
+        data->data->domain = b;		
+	}
+
+    data->property_changed = TRUE;
+    return JS_TRUE;
+}
+
+PR_STATIC_CALLBACK(void)
+cookie_finalize(JSContext *cx, JSObject *obj)
+{
+    JSCookieData *cookie;
+    cookie = JS_GetPrivate(cx, obj);
+    FREEIF(cookie);
+}
+
+/* So we can possibly add functions "global" to filters... */
+static JSClass global_class = {
+    "CookieFilters", 0 /* no private data */,
+    JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
+    JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub
+};
+
+static JSClass js_cookie_class = {
+    "Cookie", JSCLASS_HAS_PRIVATE,
+    JS_PropertyStub, JS_PropertyStub, cookie_getProperty, cookie_setProperty,
+    JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, cookie_finalize
+};
+
+/* cookie.accept() -- mark it okay */
+PR_STATIC_CALLBACK(JSBool)
+cookie_accept(JSContext *cx, JSObject *obj, uint argc, jsval *argv, jsval * rval)
+{
+    JSCookieData *data;
+
+    if (!(data = (JSCookieData*)JS_GetInstancePrivate(cx, obj, &js_cookie_class, argv)))
+        return JS_FALSE;
+
+    data->accepted = TRUE;
+    data->rejected = FALSE;
+    data->ask = FALSE;
+    data->decision_made = TRUE;
+
+    return JS_TRUE;
+}
+
+/* cookie.reject() -- reject it out of hand */
+PR_STATIC_CALLBACK(JSBool)
+cookie_reject(JSContext *cx, JSObject *obj, uint argc, jsval *argv, jsval * rval)
+{
+    JSCookieData *data;
+
+    if (!(data = (JSCookieData*)JS_GetInstancePrivate(cx, obj, &js_cookie_class, argv)))
+        return JS_FALSE;
+
+    data->accepted = FALSE;
+    data->rejected = TRUE;
+    data->ask = FALSE;
+    data->decision_made = TRUE;
+
+    return JS_TRUE;
+}
+
+/* cookie.ask() -- ask the luser, even if that pref is off */
+PR_STATIC_CALLBACK(JSBool)
+cookie_ask(JSContext *cx, JSObject *obj, uint argc, jsval *argv, jsval * rval)
+{
+    JSCookieData *data;
+
+    if (!(data = (JSCookieData*)JS_GetInstancePrivate(cx, obj, &js_cookie_class, argv)))
+        return JS_FALSE;
+
+    data->accepted = FALSE;
+    data->rejected = FALSE;
+    data->ask = TRUE;
+    data->decision_made = TRUE;
+
+    return JS_TRUE;
+}
+
+/* cookie.confirm() -- pop up a confirmation box */
+PR_STATIC_CALLBACK(JSBool)
+cookie_confirm(JSContext *cx, JSObject *obj, uint argc, jsval *argv, jsval * rval)
+{
+    JSCookieData *data;
+    JSString *str;
+    char *msg = (char *)0;
+    Bool result;
+    MWContext * context = XP_FindSomeContext();
+
+    if (argc < 1 || !context)
+        return JS_FALSE;
+
+    if (!(data = (JSCookieData*)JS_GetInstancePrivate(cx, obj, &js_cookie_class, argv)))
+        return JS_FALSE;
+
+    str = JS_ValueToString(cx, argv[0]);
+    if (!str)
+        return JS_FALSE;
+
+    StrAllocCopy(msg, XP_GetString(MK_ACCESS_JAVASCRIPT_COOKIE_FILTER));
+    StrAllocCat(msg, JS_GetStringBytes(str));
+    if (!msg)
+        return JS_FALSE;
+
+    result = FE_Confirm(context, msg);
+    FREEIF(msg);
+
+    *rval = BOOLEAN_TO_JSVAL(result);
+
+    return JS_TRUE;
+}
+
+#if DEBUG
+/* trace() -- outputs spew to stderr.  Actually, this (or something like it
+   that perhaps outputs to the same file that the rest of the filter logging code
+   writes to) would probably be very useful in the normal course of writing filters. */
+PR_STATIC_CALLBACK(JSBool)
+cookie_filter_trace(JSContext *cx, JSObject * obj, uint argc, jsval *argv, jsval * rval)
+{
+
+        if (argc > 0)
+                {
+                        JSString *str;
+                        const char *trace_str;
+                        if (!(str = JS_ValueToString(cx, argv[0])))
+                                return JS_FALSE;
+
+                        trace_str = JS_GetStringBytes(str);
+                        if (*trace_str != '\0')
+                                {
+                                        fprintf (stderr, "cookie filter trace: %s\n", trace_str);
+                                }
+                        return JS_TRUE;
+                }
+
+        return JS_FALSE;
+}
+#endif
+
+static JSFunctionSpec cookie_methods[] = {
+    { "accept", cookie_accept, 0 },
+    { "reject", cookie_reject, 0 },
+    { "ask",    cookie_ask, 0 },
+    { "confirm", cookie_confirm, 1 },
+    { 0 }
+};
+
+static JSFunctionSpec filter_methods[] = {
+#ifdef DEBUG
+    { "trace", cookie_filter_trace, 1 },
+#endif
+    { 0 }
+};
+
+PRIVATE void
+destroyJSCookieFilterStuff(void)
+{
+        filter_obj = NULL;
+}
+
+/*
+ * This function used to take an MWContext and store it as the private data
+ *   of the filter object.  That is a no-no since the filter_obj is going to
+ *   be around until the end of time but there is no guarentee that the
+ *   context won't get free'd out from under us.  The solution is to not
+ *   hold onto any particular context but just call XP_FindSomeContext() or
+ *   some derivative of it when we need to.
+ */
+PRIVATE JSContext *
+initializeJSCookieFilterStuff()
+{
+
+    /* Only bother initializing once */
+    if (filter_obj)
+        return filter_context;
+
+    /* If we can't get the mozilla-thread global context just bail */
+    PREF_GetConfigContext(&filter_context);
+    if (!filter_context)
+        return NULL;
+
+    JS_BeginRequest(filter_context);
+    /* create our "global" object.  We make the message object a child of this */
+    filter_obj = JS_NewObject(filter_context, &global_class, NULL, NULL);
+    
+    /* MLM - don't do JS_InitStandardClasses() twice */
+    if (!filter_obj
+            || !JS_DefineFunctions(filter_context, filter_obj, filter_methods))
+            {
+                JS_EndRequest(filter_context);
+                destroyJSCookieFilterStuff();
+                return NULL;
+            }
+
+    JS_EndRequest(filter_context);
+    return filter_context;
+}
+
+PRIVATE JSObject *
+newCookieObject(void)
+{
+    JSObject *rv;
+    JSCookieData *cookie_data;
+
+    rv = JS_DefineObject(filter_context, filter_obj,
+                         "cookie", &js_cookie_class,
+                         NULL, JSPROP_ENUMERATE);
+
+    if( (JSObject *)0 == rv )
+        return (JSObject *)0;
+
+    cookie_data = XP_NEW_ZAP(JSCookieData);
+
+    if( (JSCookieData *)0 == cookie_data )
+        return (JSObject *)0;
+
+    if( !JS_SetPrivate(filter_context, rv, cookie_data)
+        || !JS_DefineProperties(filter_context, rv, cookie_props)
+        || !JS_DefineFunctions(filter_context, rv, cookie_methods)) {
+        return (JSObject *)0;
+    }
+
+    return rv;
+}
+
+PR_STATIC_CALLBACK(void)
+jscookie_ErrorReporter(JSContext *cx, const char *message, JSErrorReport *report)
+{
+    char *msg = NULL;
+    MWContext *context;
+    
+    context = XP_FindSomeContext();
+    if(!context || !report)
+        return;
+
+    /*XXX: i18n-ise this */
+    msg = PR_sprintf_append(NULL,
+                            "JavaScript Cookie Filter Error:\n"
+                            "You will be prompted manually to accept or reject this cookie.\n"
+                            "Filename: %s\n"
+                            "Line #: %u\n"
+                            "%s\n"
+                            "%.*s\n",
+                            report->filename, 
+                            report->lineno, 
+                            report->linebuf,
+                            (int)(report->tokenptr - report->linebuf) + 1,
+                            "^"
+                            );
+
+    if (!msg)
+        return;
+
+    FE_Alert(context, msg);
+    XP_FREE(msg);
+
+    return;
+}
+
+PRIVATE JSBool
+compileJSCookieFilters(void)
+{
+    static time_t m_time = 0; /* the last modification time of filters.js */
+    static JSBool ret_val = JS_FALSE;
+    char *filename;
+    XP_File fp;
+    XP_StatStruct stats;
+
+    if (!need_compile)
+        return ret_val;
+
+    filename = WH_FileName("", xpJSCookieFilters);
+
+    XP_Trace("+Filename for script filter is %s\n", filename);
+
+	/* If we can't get to the file, get the hell outa dodge. */
+    if(XP_Stat(filename, &stats, xpJSCookieFilters))
+		return ret_val;
+
+    if (stats.st_mtime > m_time || need_compile)
+        {
+            long fileLength;
+            char *buffer;
+            jsval rval;
+            
+            m_time = stats.st_mtime;
+            
+            fileLength = stats.st_size;
+            if (fileLength <= 1)
+                    {
+                            ret_val = JS_FALSE;
+                            return ret_val;
+                    }
+            
+            if( !(fp = XP_FileOpen(filename, xpJSCookieFilters, "r")) ) {
+					    ret_val = JS_FALSE;
+					    return ret_val;
+				    }
+            
+            buffer = (char*)malloc(fileLength);
+            if (!buffer) {
+                XP_FileClose(fp);
+                ret_val = JS_FALSE;
+                return ret_val;
+            }
+            
+            fileLength = XP_FileRead(buffer, fileLength, fp);
+
+            XP_FileClose(fp);
+
+            XP_Trace("+Compiling filters.js...\n");
+
+            ret_val = JS_EvaluateScript(filter_context, filter_obj, buffer, fileLength,
+                                                                    filename, 1, &rval);
+
+            XP_Trace("+Done.\n");
+            
+            XP_FREE(buffer);
+
+            need_compile = JS_FALSE;
+        }
+
+    return ret_val;
+}
+
+PUBLIC JSCFResult 
+JSCF_Execute(
+                               MWContext *mwcontext,
+                               const char *script_name,
+                               JSCFCookieData *data,
+                               Bool *data_changed
+                               )
+{
+    jsval result;
+    jsval filter_arg; /* we will this in with the message object we create. */
+    JSObject *cookie_obj;
+    JSCookieData *cookie_data;
+
+    if (!script_name)
+        return JSCF_error;
+
+	/* initialize the filter stuff, and bomb out early if it fails */
+    if (!initializeJSCookieFilterStuff())
+        return JSCF_error;
+
+    JS_BeginRequest(filter_context);
+
+    /* 
+	 * try loading (reloading if necessary) the filter file before bothering 
+	 *   to create any JS-objects
+	 */
+    if (!compileJSCookieFilters())  {
+	JS_EndRequest(filter_context);
+        return JSCF_error;
+    }
+
+    if (!error_reporter_installed)
+        {
+            error_reporter_installed = JS_TRUE;
+            previous_error_reporter = JS_SetErrorReporter(filter_context,
+                                                          jscookie_ErrorReporter);
+        }
+
+
+    cookie_obj = newCookieObject();
+    if( (JSObject *)0 == cookie_obj )  {
+	JS_EndRequest(filter_context);
+        return JSCF_error;
+    }
+
+    cookie_data = (JSCookieData *)JS_GetPrivate(filter_context, cookie_obj);
+    cookie_data->js_context = filter_context;
+    cookie_data->js_object = cookie_obj;
+    cookie_data->data = data;
+    cookie_data->property_changed = FALSE;
+    cookie_data->rejected = FALSE;
+    cookie_data->accepted = FALSE;
+    cookie_data->decision_made = FALSE;
+
+    filter_arg = OBJECT_TO_JSVAL(cookie_obj);
+    JS_CallFunctionName(filter_context, filter_obj, script_name, 1, 
+                        &filter_arg, &result);
+
+    JS_EndRequest(filter_context);
+
+    *data_changed = cookie_data->property_changed;
+    if( cookie_data->decision_made ) {
+        if( cookie_data->rejected )
+            return JSCF_reject;
+        else if( cookie_data->accepted )
+            return JSCF_accept;
+        else if( cookie_data->ask )
+            return JSCF_ask;
+    }
+
+    return JSCF_whatever;
+}
+
+PUBLIC void
+JSCF_Cleanup(void)
+{
+    TRACEMSG(("+Cleaning up JS Cookie Filters"));
+
+    need_compile = JS_TRUE;
+
+    if (filter_context)
+    {
+	JS_BeginRequest(filter_context);
+        if (error_reporter_installed)
+            {
+                error_reporter_installed = JS_FALSE;
+                JS_SetErrorReporter(filter_context, previous_error_reporter);
+            }
+
+        JS_GC(filter_context);
+
+        destroyJSCookieFilterStuff();
+	JS_EndRequest(filter_context);
+	}
+}

mozilla/lib/libnet/mkmocha.c

@@ -0,0 +1,751 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/* Please leave at the top for windows precompiled headers */
+#include "mkutils.h"
+
+#include <stddef.h>
+#include <memory.h>
+#include <time.h>
+#include "net.h"
+#include "xp.h"
+#include "libmocha.h"
+#include "mkgeturl.h"
+#include "mkmocha.h"
+#include "libevent.h"
+#include "fe_proto.h"
+#include "pa_tags.h"	/* included via -I../libparse */
+#include "libi18n.h"    /* unicode */
+#include "layout.h"	/* for lo_ContextToCell only */
+
+extern char lm_unknown_origin_str[];
+
+extern int MK_OUT_OF_MEMORY;
+extern int MK_MALFORMED_URL_ERROR;
+
+typedef struct {
+    char *	  buffer;
+    size_t	  offset;
+    size_t  	  length;
+    MWContext	* context;
+    char	* content_type;
+    int16	  char_set;
+} MochaStream;
+
+typedef struct {
+    int32             ref_count;
+    ActiveEntry     * active_entry;
+    PRPackedBool      is_valid;
+    PRPackedBool      eval_what;
+    PRPackedBool      single_shot;
+    PRPackedBool      polling;
+    char            * str;
+    size_t            len;
+    MWContext       * context;
+    int               status;
+    char            * wysiwyg_url;
+    char	    * base_href;
+    NET_StreamClass * stream;
+} MochaConData;
+
+#define HOLD_CON_DATA(con_data) ((con_data)->ref_count++)
+#define DROP_CON_DATA(con_data) {                                             \
+    if (--(con_data)->ref_count == 0)                                         \
+	free_con_data(con_data);                                              \
+}
+
+static void
+free_con_data(MochaConData * con_data)
+{
+    XP_FREEIF(con_data->str);
+    XP_FREEIF(con_data->wysiwyg_url);
+    XP_FREEIF(con_data->base_href);
+    XP_FREE(con_data);
+}
+
+#define START_POLLING(ae, con_data) {                                         \
+    (con_data)->polling = TRUE;                                               \
+    NET_SetCallNetlibAllTheTime((ae)->window_id, "mkmocha");                              \
+}
+
+#define STOP_POLLING(ae, con_data) {                                          \
+	NET_ClearCallNetlibAllTheTime((ae)->window_id, "mkmocha");                        \
+    (con_data)->polling = FALSE;                                              \
+}
+
+/* forward decl */
+PRIVATE int32 net_ProcessMocha(ActiveEntry * ae);
+
+/*
+ * Add the new bits to our buffer
+ */
+PRIVATE int
+mocha_process(NET_StreamClass *stream, const char *str, int32 len)
+{
+    MochaStream * mocha_stream = (MochaStream *) stream->data_object;
+
+    mocha_stream->length += len;
+    if (!mocha_stream->buffer) {
+        mocha_stream->buffer = (char *)XP_ALLOC(mocha_stream->length);
+    } 
+    else {
+        mocha_stream->buffer = (char *)XP_REALLOC(mocha_stream->buffer, 
+						  mocha_stream->length);
+    }
+    if (!mocha_stream->buffer) {
+        return MK_OUT_OF_MEMORY;
+    }
+    memcpy(mocha_stream->buffer + mocha_stream->offset, str, len);
+    mocha_stream->offset += len;
+    return len;
+}
+
+PRIVATE unsigned int
+mocha_ready(NET_StreamClass *stream)
+{
+    return MAX_WRITE_READY;  /* always ready for writing */
+}
+
+
+/*
+ * All of the processing for this needs to be done in the mocha thread
+ */
+PRIVATE void 
+mocha_complete(NET_StreamClass *stream)
+{
+    void * data;
+    JSBool isUnicode = JS_FALSE;
+
+    MochaStream * mocha_stream = (MochaStream *) stream->data_object;
+
+    if (mocha_stream->char_set != CS_DEFAULT) {
+	uint32 len;
+	INTL_Unicode * unicode;
+
+	/* find out how many unicode characters we'll end up with */
+	len = INTL_TextToUnicodeLen(mocha_stream->char_set, 
+				    (unsigned char *) mocha_stream->buffer,
+				    mocha_stream->length);
+	unicode = XP_ALLOC(sizeof(INTL_Unicode) * len);
+	if (!unicode)
+	    return;
+
+	/* do the conversion */
+	mocha_stream->length = INTL_TextToUnicode(mocha_stream->char_set,
+						  (unsigned char *) mocha_stream->buffer,
+						  mocha_stream->length,
+						  unicode,
+						  len);
+
+	data = unicode;
+	isUnicode = JS_TRUE;
+
+	XP_FREE(mocha_stream->buffer);
+	mocha_stream->buffer = NULL;
+    }
+    else {
+	data = mocha_stream->buffer;
+    }
+
+    /* this will grab ownership of data */
+    ET_MochaStreamComplete(mocha_stream->context, data, 
+			   mocha_stream->length, 
+			   mocha_stream->content_type,
+			   isUnicode);
+
+    XP_FREEIF(mocha_stream->content_type);
+    XP_FREE(mocha_stream);
+
+}
+
+PRIVATE void 
+mocha_abort(NET_StreamClass *stream, int status)
+{
+    MochaStream * mocha_stream = (MochaStream *) stream->data_object;
+
+    ET_MochaStreamAbort(mocha_stream->context, status);
+    XP_FREE(mocha_stream->buffer);
+	XP_FREEIF(mocha_stream->content_type);
+    XP_FREE(mocha_stream);
+}
+
+int16
+net_check_for_charset(URL_Struct *url_struct)
+{
+    int i, max;
+    char *key, *value;
+    static char charset[] = "charset=";
+    int len = XP_STRLEN(charset);
+    
+    max = url_struct->all_headers.empty_index;
+
+    for (i = 0; i < max; i++) {
+	key = url_struct->all_headers.key[i];
+
+	/* keep looking until we find the content type one */
+	if (XP_STRCASECMP(key, "Content-type"))
+	    continue;
+
+	value = url_struct->all_headers.value[i];
+
+	/* don't bother unless this is a JS file to begin with */
+	if (!strcasestr(value, APPLICATION_JAVASCRIPT))
+	    return CS_DEFAULT;
+
+	value = XP_STRTOK(value, ";");
+	while (value) {
+	    value = XP_StripLine(value);
+
+	    if (!strncasecomp(value, charset, len)) {
+		value += len;
+		value = XP_StripLine(value);
+		return (INTL_CharSetNameToID(value));
+	    }
+
+	    /* move to next arg */
+	    value = XP_STRTOK(NULL, ";");
+
+	}
+
+	/* found content-type but no charset */
+	return CS_DEFAULT;
+
+    }
+
+    /* didn't find content-type */
+    return CS_DEFAULT;
+}
+
+static char *
+getOriginFromURLStruct(MWContext *context, URL_Struct *url_struct) 
+{
+    char *referer;
+    /*
+     * Look in url_struct->origin_url for this javascript: URL's
+     * original referrer.
+     *
+     * In the basis case, a javascript: or *.js URL targets a context
+     * from a (the same, or not) context loaded with a non-javascript URL.
+     * The referring document's URL is in url_struct->referer and we
+     * duplicate it as origin_url.  If we find a non-null origin_url
+     * later, we know by induction where it came from.
+     */
+    referer = url_struct->origin_url;
+    if (referer == NULL) {
+        /*
+         * url_struct->referer (sic) tells the URL of the page in
+         * which a javascript: or *.js link or form was clicked or submitted.
+         * If it's non-null, but the context is a frame cell that's
+         * being (re-)created for this load, don't use referer as the
+         * decoder's source URL for the evaluation, because the FE has
+         * arbitrarily set it to the top frameset's URL.  Instead, use
+         * the immediate parent frameset context's wysiwyg URL to get
+         * the origin of the generator (or the parent's address URL if
+         * not wysiwyg).
+         *
+         * If referer is null, the user typed this javascript: URL or
+         * its frameset's URL directly into the Location toolbar.
+         */
+        referer = url_struct->referer;
+        if (referer) {
+	    lo_GridRec *grid = NULL;
+
+	    if (context->is_grid_cell &&
+	        !lo_ContextToCell(context, FALSE, &grid)) {
+	        /*
+	         * Context is a frame being (re)created: veto referer.
+	         * The javascript: or *.js URL can't be a LAYER SRC= URL in a
+	         * frame because the frame's cell must point to its
+	         * context by the time the first tag (even LAYER) is
+	         * processed by layout.
+	         */
+	        referer = NULL;
+	    }
+        }
+        if (!referer) {
+	    History_entry *he;
+
+	    if (context->grid_parent) {
+	        /*
+	         * If grid parent, use its history entry to get the
+	         * wysiwyg or real URL, which tells the subject origin
+	         * of (any code in it that may have generated) this
+	         * javascript: or *.js URL open.  If no grid parent, this must
+	         * be a javascript: or *.js URL that was typed directly into
+	         * Location.
+	         */
+	        context = context->grid_parent;
+	    }
+	    he = SHIST_GetCurrent(&context->hist);
+	    if (!he) {
+	        referer = lm_unknown_origin_str;
+	    } else {
+	        referer = he->wysiwyg_url;
+	        if (!referer)
+		    referer = he->address;
+	    }
+        }
+    }
+
+    XP_ASSERT(referer);
+    referer = XP_STRDUP(referer);
+    if (!referer) {
+	return NULL;
+    }
+    url_struct->origin_url = referer;
+    return referer;
+}
+
+NET_StreamClass *
+NET_CreateMochaConverter(FO_Present_Types format_out,
+                         void             *data_object,
+                         URL_Struct       *url_struct,
+                         MWContext        *context)
+{
+    MochaStream * mocha_stream;
+    NET_StreamClass *stream;
+    char *origin;
+
+    mocha_stream = (MochaStream *) XP_NEW_ZAP(MochaStream);
+    if (!mocha_stream)
+	return NULL;
+
+    mocha_stream->context = context;
+    mocha_stream->content_type = XP_STRDUP(url_struct->content_type);
+    mocha_stream->char_set = net_check_for_charset(url_struct);
+
+    /* Get the origin from the URL struct. We don't have to free origin
+     * here because url_struct->origin_url owns it.
+     */
+    origin = getOriginFromURLStruct(context, url_struct);
+    if (origin == NULL)
+        return NULL;
+
+    if (NET_URL_Type(url_struct->address) == FILE_TYPE_URL &&
+        NET_URL_Type(origin) != FILE_TYPE_URL)
+    {
+        /*
+         * Don't allow loading a file: URL from a non-file URL to
+         * prevent privacy attacks against the local machine from
+         * web pages.
+         */
+        return NULL;
+    }
+
+    stream = NET_NewStream("mocha", mocha_process, mocha_complete, 
+			   mocha_abort, mocha_ready, mocha_stream, 
+			   context); 
+    return stream;
+}
+
+PRIVATE void
+mk_mocha_eval_exit_fn(void * data, char * str, size_t len, char * wysiwyg_url, 
+		      char * base_href, Bool valid)
+{
+    MochaConData * con_data = (MochaConData *) data;
+
+    if (!valid) {
+        con_data->status = MK_MALFORMED_URL_ERROR;
+        con_data->is_valid = TRUE;
+        return;
+    }
+    if (str == NULL) {
+        con_data->status = MK_DATA_LOADED;
+        con_data->is_valid = TRUE;
+        return;
+    }
+
+    con_data->base_href = base_href;
+    con_data->wysiwyg_url = wysiwyg_url;
+    con_data->str = str;
+    con_data->len = len;
+    con_data->is_valid = TRUE;
+
+}
+
+/*
+ * Handle both 'mocha:<stuff>' urls and the mocha type-in widget
+ */
+MODULE_PRIVATE int32
+net_MochaLoad(ActiveEntry *ae)
+{
+    MWContext *context;
+    URL_Struct *url_struct;
+    char *what;
+    Bool eval_what, single_shot;
+    MochaConData * con_data;
+
+    context = ae->window_id;
+    url_struct = ae->URL_s;
+    what = XP_STRCHR(url_struct->address, ':');
+    XP_ASSERT(what);
+    what++;
+    eval_what = FALSE;
+    single_shot = (*what != '?');
+
+    if (single_shot) {
+        /* Don't use an existing Mocha output window's stream. */
+        if (*what == '\0') {
+            /* Generate two grid cells, one for output and one for input. */
+            what = PR_smprintf("<frameset rows=\"75%%,25%%\">\n"
+                               "<frame name=MochaOutput src=about:blank>\n"
+                               "<frame name=MochaInput src=%.*s#input>\n"
+                               "</frameset>",
+                               what - url_struct->address,
+                               url_struct->address);
+        } else if (!XP_STRCMP(what, "#input")) {
+            /* The input cell contains a form with one magic isindex field. */
+            what = PR_smprintf("<b>%.*s typein</b>\n"
+                               "<form action=%.*s target=MochaOutput"
+                               " onsubmit='this.isindex.focus()'>\n"
+                               "<input name=isindex size=60>\n"
+                               "</form>",
+                               what - url_struct->address - 1,
+                               url_struct->address,
+                               what - url_struct->address,
+                               url_struct->address);
+            url_struct->internal_url = TRUE;
+        } else {
+            eval_what = TRUE;
+        }
+    } else {
+        /* Use the Mocha output window if it exists. */
+        url_struct->auto_scroll = 1000;
+
+        /* Skip the leading question-mark and clean up the string. */
+        what++;
+        NET_PlusToSpace(what);
+        NET_UnEscape(what);
+        eval_what = TRUE;
+    }
+
+    /* something got hosed.  bail */
+    if (!what) {
+        ae->status = MK_OUT_OF_MEMORY;
+	return -1;
+    }
+
+    /* make space for the connection data */
+    con_data = XP_NEW_ZAP(MochaConData);
+    if (!con_data) {
+        ae->status = MK_OUT_OF_MEMORY;
+        return -1;
+    }
+
+    /* remember for next time */
+    con_data->ref_count = 1;
+    con_data->active_entry = ae;
+    ae->con_data = con_data;
+
+    /* set up some state so we remember where we are */
+    con_data->eval_what = eval_what;
+    con_data->single_shot = single_shot;
+    con_data->context = context;
+
+    /* fake out netlib so we don't select on the socket id */
+    ae->socket = NULL;
+    ae->local_file = TRUE;
+
+    if (eval_what) {
+	char *referer;
+        JSPrincipals *principals;
+	ETEvalStuff *stuff;
+
+        referer = getOriginFromURLStruct(context, url_struct);
+	if (!referer) {
+	    ae->status = MK_OUT_OF_MEMORY;
+	    return -1;
+	}
+
+	principals = LM_NewJSPrincipals(NULL, NULL, referer);
+	if (!principals) {
+	    ae->status = MK_OUT_OF_MEMORY;
+	    return -1;
+	}
+
+        /* 
+         * send the buffer off to be evaluated 
+         */
+	stuff = (ETEvalStuff *) XP_NEW_ZAP(ETEvalStuff);
+	if (!stuff) {
+	    ae->status = MK_OUT_OF_MEMORY;
+	    return -1;
+	}
+
+	stuff->len = XP_STRLEN(what);
+	stuff->line_no = 0;
+	stuff->scope_to = NULL;
+	stuff->want_result = JS_TRUE;
+	stuff->data = con_data;
+	stuff->version = JSVERSION_UNKNOWN;
+	stuff->principals = principals;
+
+        ET_EvaluateScript(context, what, stuff, mk_mocha_eval_exit_fn);
+    
+    }
+    else {
+
+        /* allocated above, don't need to free */
+        con_data->str = what;
+	con_data->len = XP_STRLEN(what);
+        con_data->is_valid = TRUE;
+
+    }
+
+    /* make sure netlib gets called so we know when our data gets back */
+    START_POLLING(ae, con_data);
+
+    /* ya'll come back now, ya'hear? */
+    return net_ProcessMocha(ae);
+
+}
+
+PRIVATE int
+net_process_mocha(MochaConData * con_data)
+{
+    int32 ref_count;
+
+    ref_count = con_data->ref_count;
+    DROP_CON_DATA(con_data);
+    if (ref_count == 1 || !con_data->active_entry)
+	return -1;
+    return net_ProcessMocha(con_data->active_entry);
+}
+
+static char nscp_open_tag[] = "<" PT_NSCP_OPEN ">";
+
+/*
+ * If the mocha has finished evaluation shove the result
+ *   down the stream and continue else just wait
+ */
+PRIVATE int32
+net_ProcessMocha(ActiveEntry * ae)
+{
+    FO_Present_Types output_format;
+    Bool to_layout;
+    Bool first_time;
+    NET_StreamClass *stream = NULL;
+    MochaConData * con_data = (MochaConData *) ae->con_data;
+    MWContext * context;
+    int status;
+
+    /* if we haven't gotten our data yet just return and wait */
+    if (!con_data || !con_data->is_valid)
+        return 0;
+
+    context = ae->window_id;
+
+    /*
+     * Race with the mocha thread until we can grab the JSLock
+     */
+    if (!con_data->single_shot) {
+	MochaDecoder * decoder;
+
+	HOLD_CON_DATA(con_data);
+	if (!LM_AttemptLockJS(context, 
+                              (JSLockReleaseFunc)net_process_mocha, con_data))
+	    return 0;
+	DROP_CON_DATA(con_data);
+	decoder = LM_GetMochaDecoder(context);
+	if (!decoder) {
+	    LM_UnlockJS(context);
+	    ae->status = MK_OUT_OF_MEMORY;
+	    goto done;
+	}
+        stream = decoder->stream;
+        LM_PutMochaDecoder(decoder);
+	LM_UnlockJS(context);
+    }
+    else {
+	stream = con_data->stream;
+    }
+
+    /* we've gotten valid data, clear the callme all the time flag */
+    STOP_POLLING(ae, con_data);
+
+    /* see if there were any problems */
+    if (con_data->status < 0 || con_data->str == NULL) {
+	ET_SendLoadEvent(context, EVENT_LOAD, NULL, NULL, 
+                         LO_DOCUMENT_LAYER_ID, FALSE);
+        ae->status = con_data->status;
+	goto done;
+    }
+
+    /*
+     * If we don't already have a stream to take our output create one now
+     */
+    first_time = !stream;
+    if (first_time) {
+        StrAllocCopy(ae->URL_s->content_type, TEXT_HTML);
+        ae->format_out = CLEAR_CACHE_BIT(ae->format_out);
+
+        stream = NET_StreamBuilder(ae->format_out, ae->URL_s, ae->window_id);
+        if (!stream) {
+            ae->status = MK_UNABLE_TO_CONVERT;
+            goto done;
+        }
+    }
+
+    /*
+     * If the stream we just created isn't ready for writing just
+     *   hold onto the stream and try again later
+     */
+    if (!stream->is_write_ready(stream)) {
+	con_data->stream = stream;
+	START_POLLING(ae, con_data);
+	return 0;
+    }
+
+    /* XXX this condition is fairly bogus */
+    output_format = CLEAR_CACHE_BIT(ae->format_out);
+    to_layout = (output_format != FO_INTERNAL_IMAGE &&
+		 output_format != FO_MULTIPART_IMAGE &&
+		 output_format != FO_EMBED &&
+		 output_format != FO_PLUGIN);
+
+    if (to_layout) {
+	/* The string must end in a newline so the parser will flush it.  */
+	if (con_data->len != 0 && con_data->str[con_data->len-1] != '\n') {
+	    size_t new_len = con_data->len + 1;
+	    char * new_str = XP_ALLOC((new_len + 1) * sizeof(char));
+
+	    if (!new_str) {
+		ae->status = MK_OUT_OF_MEMORY;
+		goto done;
+	    }
+	    XP_MEMCPY(new_str, con_data->str, con_data->len);
+	    new_str[new_len-1] = '\n';
+	    new_str[new_len] = '\0';
+	    con_data->str = new_str;
+	    con_data->len = new_len;
+	}
+    }
+
+
+    /*
+     * If this is the first time do some initial setup.  We'll set
+     *   the window title and maybe shove out a <BASE> tag
+     */
+    status = 0;
+    if (to_layout && first_time && con_data->eval_what) {
+
+	/* Feed layout an internal tag so it will create a new top state. */
+	stream->put_block(stream, nscp_open_tag,
+			  sizeof nscp_open_tag - 1);
+
+        (void) LM_WysiwygCacheConverter(context, ae->URL_s, 
+					con_data->wysiwyg_url,
+					con_data->base_href);
+
+        if (*con_data->str != '<') {
+            char * prefix = NULL;
+            StrAllocCopy(prefix, "<TITLE>");
+            StrAllocCat(prefix, ae->URL_s->address);
+            StrAllocCat(prefix, "</TITLE><PLAINTEXT>");
+            if (!prefix) {
+		ae->status = MK_OUT_OF_MEMORY;
+		goto done;
+	    }
+            status = (*stream->put_block)(stream, prefix,
+                                          XP_STRLEN(prefix));
+            XP_FREE(prefix);
+        }
+	else {
+	    if (con_data->base_href) {
+		status = (*stream->put_block)(stream, 
+		    			      con_data->base_href,
+					      XP_STRLEN(con_data->base_href));
+	    }
+	}
+    }
+	 
+    if (status >= 0) {
+        status = (*stream->put_block)(stream, con_data->str,
+                                      (int32)con_data->len);
+    }
+
+    if (con_data->single_shot && status >= 0)
+        (*stream->complete)(stream);
+
+    if (!con_data->single_shot && status >= 0) {
+        if (first_time) {
+	    ET_SetDecoderStream(context, stream, ae->URL_s, JS_TRUE);
+	    goto done;
+        }
+    } else {
+        if (status < 0)
+            (*stream->abort)(stream, status);
+        if (first_time)
+            XP_DELETE(stream);
+    }
+
+    ae->status = MK_DATA_LOADED;
+
+done:
+    ae->con_data = NULL;
+    con_data->active_entry = NULL;
+    DROP_CON_DATA(con_data);
+    return -1;
+
+}
+
+PRIVATE int32
+net_InterruptMocha(ActiveEntry *ae)
+{
+    MochaConData * con_data = (MochaConData *) ae->con_data;
+
+    if (!con_data)
+	return MK_INTERRUPTED;
+
+    /* do we need to decrement the callme all the time flag? */
+    if (con_data->polling) {
+	STOP_POLLING(ae, con_data);
+    }
+
+    /* ae is about to go away, break its connection with con_data */
+    ae->con_data = NULL;
+    con_data->active_entry = NULL;
+
+    /* ae is about to go away, better get it off the JS lock waiters list */
+    if (LM_ClearAttemptLockJS(con_data->context,
+                              (JSLockReleaseFunc)net_process_mocha, con_data))
+	DROP_CON_DATA(con_data);
+
+    return ae->status = MK_INTERRUPTED;
+}
+
+PRIVATE void
+net_CleanupMocha(void)
+{
+    /* nothing so far needs freeing */
+    return;
+}
+
+MODULE_PRIVATE void
+NET_InitMochaProtocol(void)
+{
+        static NET_ProtoImpl mocha_proto_impl;
+
+        mocha_proto_impl.init = net_MochaLoad;
+        mocha_proto_impl.process = net_ProcessMocha;
+        mocha_proto_impl.interrupt = net_InterruptMocha;
+        mocha_proto_impl.cleanup = net_CleanupMocha;
+
+        NET_RegisterProtocolImplementation(&mocha_proto_impl, MOCHA_TYPE_URL);
+}
+

mozilla/modules/libhook/src/hk_hook.c

@@ -0,0 +1,187 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#include "xp_core.h"
+#include "xp_mcom.h"
+#include "jsapi.h"
+#include "prefapi.h"
+#include "hk_funcs.h"
+
+#include "hk_private.h"
+
+
+static JSObject *HookObject = NULL;
+
+
+JSObject *
+hk_GetHookObject(void)
+{
+	return HookObject;
+}
+
+
+void
+hk_SetHookObject(JSObject *hook_obj)
+{
+	HookObject = hook_obj;
+}
+
+
+/*
+ * Some hooks have dynamic names and can't be in the
+ * fast hook array lookup, this covers looking up those
+ * hooks.  For example, if I invented a <BLURT> tag,
+ * this would look for a BLURT_hook function.
+ */
+intn
+hk_IsUnknownTagHook(void *extra)
+{
+	const char *hook_func;
+	jsval tmp_val;
+	JSContext *j_context;
+
+	hook_func = HK_GetFunctionName(HK_TAG, extra);
+	if (hook_func == NULL)
+	{
+		return 0;
+	}
+
+	if (!PREF_GetConfigContext(&j_context))
+	{
+		return 0;
+	}
+
+	if ((j_context == NULL)||(HookObject == NULL))
+	{
+		return 0;
+	}
+
+        JS_BeginRequest(j_context);
+	if ((JS_GetProperty(j_context, HookObject, hook_func, &tmp_val))&&
+		(JS_TypeOfValue(j_context, tmp_val) == JSTYPE_FUNCTION))
+	{
+        	JS_EndRequest(j_context);
+		return 1;
+	}
+        JS_EndRequest(j_context);
+
+	return 0;
+}
+
+
+/*
+ * There is no guarantee that someone has checked the existence of the
+ * hook before calling it, so we check again here.  We don't use the
+ * fast array lookup since it can't catch all hooks anyway, and we
+ * may well have to fall back to the slow method.
+ */
+intn
+HK_CallHook(int32 hook_id, void *extra, int32 window_id,
+		char *hook_str, char **hook_ret)
+{
+	const char *hook_func;
+	intn ok;
+	jsval tmp_val;
+	jsval argv[2];
+	JSContext *j_context;
+	JSString *str;
+	const char *result_str;
+	char *return_str;
+
+	*hook_ret = NULL;
+
+	if (hook_str == NULL)
+	{
+		return 0;
+	}
+
+	/*
+	 * Make a function name form the hook_is and possibly the PA_Tag
+	 * pointed to by extra.
+	 */
+	hook_func = HK_GetFunctionName(hook_id, extra);
+	if (hook_func == NULL)
+	{
+		return 0;
+	}
+
+	/*
+	 * Make sure you have a javascript context and object.
+	 */
+	if (!PREF_GetConfigContext(&j_context))
+	{
+		return 0;
+	}
+	if ((j_context == NULL)||(HookObject == NULL))
+	{
+		return 0;
+	}
+
+        JS_BeginRequest(j_context);
+	/*
+	 * Check that there is a function to call.
+	 */
+	if ((!JS_GetProperty(j_context, HookObject, hook_func, &tmp_val))||
+		(JS_TypeOfValue(j_context, tmp_val) != JSTYPE_FUNCTION))
+	{
+                JS_EndRequest(j_context);
+		return 0;
+	}
+
+	/*
+	 * Create the argument/parameter list, and call the function.
+	 */
+	str = JS_NewStringCopyZ(j_context, hook_str);
+	if (str == NULL)
+	{
+                JS_EndRequest(j_context);
+		return 0;
+	}
+	argv[0] = STRING_TO_JSVAL(str);
+	argv[1] = INT_TO_JSVAL(window_id);
+	if (!JS_CallFunctionName(j_context, HookObject,	hook_func, 2, argv,
+							 &tmp_val))
+	{
+                JS_EndRequest(j_context);
+		return 0;
+	}
+
+	/*
+	 * A false return from the function means leave the
+	 * passed string unchanged.
+	 */
+	if (tmp_val != JSVAL_FALSE)
+	{
+		str = JS_ValueToString(j_context, tmp_val);
+		if (str == NULL)
+		{
+                	JS_EndRequest(j_context);
+			return 0;
+		}
+		result_str = JS_GetStringBytes(str);
+		return_str = XP_STRDUP(result_str);
+		if (return_str == NULL)
+		{
+                	JS_EndRequest(j_context);
+			return 0;
+		}
+		*hook_ret = return_str;
+	}
+      	JS_EndRequest(j_context);
+
+	return 1;
+}

mozilla/modules/libhook/src/hk_init.c

@@ -0,0 +1,414 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#include "xp_core.h"
+#include "xp_mcom.h"
+#include "hk_types.h"
+#include "jsapi.h"
+#include "prefapi.h"
+#include "ntypes.h"
+#include "structs.h"
+#include "pa_tags.h"
+
+#include "hk_private.h"
+
+#ifdef XP_MAC
+#include "hk_funcs.h"
+#endif
+
+
+static hk_FunctionRec **FunctionList = NULL;
+static int32 FunctionCount = 0;
+
+static char *hk_FunctionStrings[HK_MAX] = {
+	NULL,
+	"location_hook",
+	"_hook",
+	"document_start_hook"};
+
+static JSClass autoconf_class = {
+	"HookConfig", 0,
+	hk_HookObjectAddProperty, hk_HookObjectDeleteProperty,
+	JS_PropertyStub, hk_HookObjectSetProperty,
+	JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub
+};
+
+
+/*******************************************
+ * This function really bugs me!  It needs to
+ * be super fast since it will be called for every
+ * HTML tag ever processed.  This means it should be
+ * self-contained, and not call off to other functions.
+ * Making it do that means it can't call off into
+ * hk_tag.c to get inside the PA_Tag structure in extra,
+ * and thus makes me include ntypes.h, structs.h, and pa_tags.h.
+ ********************************************/
+/*
+ * A FAST function existence lookup, using an array set up in
+ * the initialization process.
+ */
+intn
+HK_IsHook(int32 hook_id, void *extra)
+{
+	int32 func_id;
+	hk_FunctionRec *rec_ptr;
+
+	/*
+	 * The no hook case never exists.
+	 */
+	if (hook_id == HK_NONE)
+	{
+		return 0;
+	}
+	/*
+	 * Tag hooks map to the tag types, or alternatly
+	 * unknown tags which are handled elsewhere.
+	 */
+	else if (hook_id == HK_TAG)
+	{
+		PA_Tag *tag;
+
+		tag = (PA_Tag *)extra;
+		if (tag->type != P_UNKNOWN)
+		{
+			func_id = HK_MAX - 1 + tag->type;
+		}
+		/*
+		 * P_UNKNOWN tags must be looked up the slow
+		 * dynamic way.
+		 */
+		else
+		{
+			return(hk_IsUnknownTagHook(extra));
+		}
+	}
+	else
+	{
+		func_id = hook_id - 1;
+	}
+
+	/*
+	 * If we are outside the known funtion array, fail.
+	 */
+	if ((func_id < 0)||(func_id >= FunctionCount))
+	{
+		return 0;
+	}
+
+	/*
+	 * If no function is registered, fail.
+	 */
+	rec_ptr = FunctionList[func_id];
+	if (rec_ptr == NULL)
+	{
+		return 0;
+	}
+
+	if (rec_ptr->func_exists == FALSE)
+	{
+		return 0;
+	}
+	else
+	{
+		return 1;
+	}
+}
+
+
+/*
+ * Set the existence state of a particular index in the array.
+ */
+static void
+hk_set_function_existence(int32 indx, XP_Bool exists)
+{
+	if ((indx < 0)||(indx >= FunctionCount))
+	{
+		return;
+	}
+
+	if (FunctionList[indx] != NULL)
+	{
+		FunctionList[indx]->func_exists = exists;
+	}
+}
+
+
+void
+hk_SetFunctionExistence(char *func_name, XP_Bool exists)
+{
+	int32 i, len;
+	char *tptr;
+	char *up_str;
+	char *ptr1, *ptr2;
+	int32 indx;
+
+	/*
+	 * A NULL function one too short for the hook suffix
+	 * cannot be a hook function.
+	 */
+	if (func_name == NULL)
+	{
+		return;
+	}
+	len = XP_STRLEN(func_name);
+	if (len < XP_STRLEN("_hook"))
+	{
+		return;
+	}
+
+	/*
+	 * If the function has no hook suffix we just don't care.
+	 */
+	tptr = func_name + len - XP_STRLEN("_hook");
+	if (XP_STRCMP(tptr, "_hook") != 0)
+	{
+		return;
+	}
+
+
+	/*
+	 * Make an all upper-case copy of the prefix.
+	 */
+	*tptr = '\0';
+	up_str = XP_ALLOC(XP_STRLEN(func_name) + 1);
+	/*
+	 * If allocation fails, restore original and return.
+	 */
+	if (up_str == NULL)
+	{
+		*tptr = '_';
+		return;
+	}
+	ptr1 = func_name;
+	ptr2 = up_str;
+	while (*ptr1 != '\0')
+	{
+		*ptr2 = (char)(XP_TO_UPPER(*ptr1));
+		ptr1++;
+		ptr2++;
+	}
+	*ptr2 = '\0';
+	*tptr = '_';
+
+	/*
+	 * Check if the prefix is a known TAG name.
+	 */
+	indx = hk_TagStringToIndex(up_str);
+	XP_FREE(up_str);
+	if (indx >= 0)
+	{
+		indx = HK_MAX - 1 + indx;
+		hk_set_function_existence(indx, exists);
+		return;
+	}
+
+	/*
+	 * Special check for the TEXT_hook which is a tag hook but
+	 * won't be caught by the hk_TagStringToIndex test.
+	 */
+	if (XP_STRCMP(func_name, "TEXT_hook") == 0)
+	{
+		indx = HK_MAX - 1 + 0;
+		hk_set_function_existence(indx, exists);
+		return;
+	}
+
+	/*
+	 * Finally, check the array of known tag hooks.
+	 */
+	for (i=1; i<HK_MAX; i++)
+	{
+		if ((hk_FunctionStrings[i] != NULL)&&
+			(XP_STRCMP(func_name, hk_FunctionStrings[i]) == 0))
+		{
+			indx = i - 1;
+			hk_set_function_existence(indx, exists);
+			return;
+		}
+	}
+}
+
+
+/*
+ * Free all members of the function list array up to
+ * the passed index.
+ */
+static void
+hk_free_function_list(int32 indx)
+{
+	int32 i;
+
+	for (i=0; i<indx; i++)
+	{
+		if (FunctionList[i] != NULL)
+		{
+			if (FunctionList[i]->func_name != NULL)
+			{
+				XP_FREE(FunctionList[i]->func_name);
+				FunctionList[i]->func_name = NULL;
+			}
+			XP_FREE(FunctionList[i]);
+			FunctionList[i] = NULL;
+		}
+	}
+	XP_FREE(FunctionList);
+	FunctionList = NULL;
+	FunctionCount = 0;
+}
+
+
+/*
+ * Initialize the function list array to contain all the known tags
+ * plus all the known special hook functions.
+ */
+static intn
+hk_initialize_function_list(void)
+{
+	int32 i, indx;
+	int32 tag_cnt;
+
+	/*
+	 * Subtract one from HK_MAX because it includes the unknown
+	 * at 0.  For the tag count, unknown is -1, so we can just
+	 * use it as is.
+	 */
+	tag_cnt = hk_NumKnownTags();
+	FunctionCount = HK_MAX - 1 + tag_cnt;
+	FunctionList = (hk_FunctionRec **)XP_ALLOC(FunctionCount *
+						sizeof(hk_FunctionRec *));
+	if (FunctionList == NULL)
+	{
+		return 0;
+	}
+
+	indx = 0;
+	/*
+	 * First allocate all the known special hooks.
+	 */
+	for (i=1; i < HK_MAX; i++)
+	{
+		hk_FunctionRec *rec_ptr;
+
+		rec_ptr = XP_NEW(hk_FunctionRec);
+		if (rec_ptr == NULL)
+		{
+			hk_free_function_list(indx);
+			return 0;
+		}
+		rec_ptr->func_exists = FALSE;
+		rec_ptr->func_name = hk_FunctionStrings[i];
+		FunctionList[indx] = rec_ptr;
+		indx++;
+	}
+
+	/*
+	 * Now do all known tags.
+	 */
+	for (i=0; i < tag_cnt; i++)
+	{
+		hk_FunctionRec *rec_ptr;
+
+		rec_ptr = XP_NEW(hk_FunctionRec);
+		if (rec_ptr == NULL)
+		{
+			hk_free_function_list(indx);
+			return 0;
+		}
+		rec_ptr->func_exists = FALSE;
+		rec_ptr->func_name = hk_TagIndexToFunctionString(i);
+		FunctionList[indx] = rec_ptr;
+		indx++;
+	}
+
+	return 1;
+}
+
+
+/*
+ * Initialize all the libhook stuff.  SHould only be called once.
+ * Usually just before reading hook.js.
+ */
+intn
+HK_Init(void)
+{
+	intn ret;
+	JSContext *j_context;
+	JSObject *j_object;
+	JSObject *hook_obj;
+
+	/*
+	 * If a hook object does not already exist, create
+	 * one.  If you cannot create one, then return failure.
+	 */
+	hook_obj = hk_GetHookObject();
+	if (hook_obj == NULL)
+	{
+		if ((!PREF_GetConfigContext(&j_context))||
+			(!PREF_GetGlobalConfigObject(&j_object)))
+		{
+			return 0;
+		}
+
+                JS_BeginRequest(j_context);
+		hook_obj = JS_DefineObject(j_context, j_object,
+			"HookConfig",
+			&autoconf_class,
+			NULL,
+			JSPROP_ENUMERATE|JSPROP_READONLY|JSPROP_PERMANENT);
+                JS_EndRequest(j_context);
+	}
+	if (hook_obj == NULL)
+	{
+		return 0;
+	}
+
+	hk_SetHookObject(hook_obj);
+
+	ret = hk_initialize_function_list();
+
+	return ret;
+}
+
+
+/*
+ * Get the hook know for the passed hook id.
+ */
+const char *
+HK_GetFunctionName(int32 hook_id, void *extra)
+{
+	if ((hook_id < 0)||(hook_id >= HK_MAX))
+	{
+		return NULL;
+	}
+
+	/*
+	 * Special name creation for tag hooks.
+	 */
+	if (hook_id == HK_TAG)
+	{
+		const char *ret_str;
+
+		ret_str = (const char *)hk_TagFunctionString(
+				hk_FunctionStrings[hook_id], extra);
+		return ret_str;
+	}
+	else
+	{
+		return hk_FunctionStrings[hook_id];
+	}
+}
+

mozilla/webshell/tests/viewer/Makefile.in

@@ -1,197 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH			= ../../..
-topsrcdir		= @top_srcdir@
-srcdir			= @srcdir@
-VPATH			= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DIRS			= public
-
-PROGRAM			= viewer
-
-CPPSRCS			= \
-			$(TOOLKIT_CPPSRCS) \
-			nsBaseDialog.cpp \
-			nsFindDialog.cpp \
-			nsXPBaseWindow.cpp \
-			nsTableInspectorDialog.cpp \
-			nsImageInspectorDialog.cpp \
-			nsPrintSetupDialog.cpp \
-			nsBrowserWindow.cpp \
-			nsEditorMode.cpp \
-			nsSetupRegistry.cpp \
-			nsThrobber.cpp \
-			nsViewerApp.cpp \
-			nsWebCrawler.cpp \
-			$(NULL)
-
-EXPORT_RESOURCE_SAMPLES	:= \
-			$(wildcard $(srcdir)/samples/test*.html) \
-			$(wildcard $(srcdir)/samples/toolbarTest*.xul) \
-			$(wildcard $(srcdir)/samples/treeTest*.xul) \
-			$(wildcard $(srcdir)/samples/treeTest*.css) \
-			$(wildcard $(srcdir)/samples/slider*.xul) \
-			$(wildcard $(srcdir)/samples/scrollbar*.xul) \
-			$(srcdir)/resources/find.html \
-			$(srcdir)/resources/printsetup.html \
-			$(srcdir)/resources/image_props.html \
-			$(srcdir)/samples/aform.css \
-			$(srcdir)/samples/bform.css \
-			$(srcdir)/samples/cform.css \
-			$(srcdir)/samples/demoform.css \
-			$(srcdir)/samples/mozform.css \
-			$(srcdir)/samples/xulTest.css \
-			$(srcdir)/samples/Anieyes.gif \
-			$(srcdir)/samples/gear1.gif \
-			$(srcdir)/samples/rock_gra.gif \
-			$(srcdir)/samples/beeptest.html \
-			$(srcdir)/samples/soundtest.html \
-			$(srcdir)/samples/bg.jpg \
-			$(srcdir)/samples/raptor.jpg \
-			$(srcdir)/samples/test.wav \
-			$(srcdir)/samples/checkboxTest.xul \
-			$(NULL)
-
-EXPORT_RESOURCE_THROBBER := $(wildcard $(srcdir)/throbber/anim*.gif)
-
-ifeq (,$(filter beos os2 rhapsody photon,$(MOZ_WIDGET_TOOLKIT)))
-DIRS			+= unix
-UNIX_VIEWER_TK_LIBS	= $(DIST)/lib/libviewer_$(MOZ_WIDGET_TOOLKIT)_s.a
-else
-ifeq ($(MOZ_WIDGET_TOOLKIT),beos)
-BEOS_PROGRAM_RESOURCE	= $(srcdir)/viewer-beos.rsrc
-TOOLKIT_CPPSRCS		= nsBeOSMain.cpp
-endif
-ifeq ($(MOZ_WIDGET_TOOLKIT),photon)
-TOOLKIT_CPPSRCS		= nsPhMain.cpp nsPhMenu.cpp
-endif
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk)
-GTK_GLUE		= -lgtksuperwin
-endif
-
-ifdef MOZ_OJI
-JSJ_LIB			= -ljsj
-endif
-
-XP_DIST_LIBS		= \
-			-lraptorgfx \
-			-lmozjs \
-			-lxpcom \
-			$(JSJ_LIB) \
-			$(NULL)
-
-XP_NS_UNDERBAR_CRAP	= \
-			$(MOZ_NECKO_UTIL_LIBS) \
-			$(MOZ_TIMER_LIBS) \
-			$(MOZ_WIDGET_SUPPORT_LIBS) \
-			$(NULL)
-
-XP_LIBS			= \
-			$(XP_NS_UNDERBAR_CRAP) \
-			$(XP_DIST_LIBS) \
-			$(NSPR_LIBS) \
-			$(NULL)
-
-ifdef MOZ_FULLCIRCLE
-XP_LIBS			+= $(FULLCIRCLE_LIBS)
-endif
-
-LIBS			= \
-			$(UNIX_VIEWER_TK_LIBS) \
-			$(GTK_GLUE) \
-			$(XP_LIBS) \
-			$(TK_LIBS) \
-			$(NULL)
-
-MOTIF_LIBS		= -lviewer_motif_s $(XP_LIBS) $(MOZ_MOTIF_LDFLAGS)
-QT_LIBS			= -lviewer_qt_s $(XP_LIBS) $(MOZ_QT_LDFLAGS)
-XLIB_LIBS		= -lviewer_xlib_s $(XP_LIBS) $(MOZ_XLIB_LDFLAGS)
-GTK_LIBS		= -lviewer_gtk_s -lgtksuperwin $(XP_LIBS) $(MOZ_GTK_LDFLAGS)
-
-EXTRA_DEPS		= \
-			$(addprefix $(DIST)/,$(patsubst -l%,bin/lib%.$(DLL_SUFFIX),$(XP_DIST_LIBS:-l%_s=lib/lib%_s.a))) \
-			$(UNIX_VIEWER_TK_LIBS) \
-			$(XP_NS_UNDERBAR_CRAP) \
-			$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
-CXXFLAGS		+= $(MOZ_TOOLKIT_REGISTRY_CFLAGS)
-
-install:: $(PROGRAM) $(srcdir)/mozilla-viewer.sh
-	$(INSTALL) $(EXPORT_RESOURCE_SAMPLES) $(DIST)/bin/res/samples
-	$(INSTALL) $(EXPORT_RESOURCE_THROBBER) $(DIST)/bin/res/throbber
-	$(INSTALL) $(srcdir)/resources/viewer.properties $(DIST)/bin/res
-	$(INSTALL) $(srcdir)/mozilla-viewer.sh $(DIST)/bin
-
-$(PROGRAM)_gtk: $(PROGOBJS) $(EXTRA_DEPS) Makefile Makefile.in $(DIST)/lib/libviewer_gtk_s.a
-	$(CCC) -o $@ $(PROGOBJS) $(LDFLAGS) $(LIBS_DIR) $(GTK_LIBS) $(OS_LIBS)
-	$(MOZ_POST_PROGRAM_COMMAND) $@
-
-$(PROGRAM)_motif: $(PROGOBJS) $(EXTRA_DEPS) Makefile Makefile.in $(DIST)/lib/libviewer_motif_s.a
-	$(CCC) -o $@ $(PROGOBJS) $(LDFLAGS) $(LIBS_DIR) $(MOTIF_LIBS) $(OS_LIBS)
-	$(MOZ_POST_PROGRAM_COMMAND) $@
-
-$(PROGRAM)_qt: $(PROGOBJS) $(EXTRA_DEPS) Makefile Makefile.in $(DIST)/lib/libviewer_qt_s.a
-	$(CCC) -o $@ $(PROGOBJS) $(LDFLAGS) $(LIBS_DIR) $(QT_LIBS) $(OS_LIBS)
-	$(MOZ_POST_PROGRAM_COMMAND) $@
-
-$(PROGRAM)_xlib: $(PROGOBJS) $(EXTRA_DEPS) Makefile Makefile.in $(DIST)/lib/libviewer_xlib_s.a
-	$(CCC) -o $@ $(PROGOBJS) $(LDFLAGS) $(LIBS_DIR) $(XLIB_LIBS) $(OS_LIBS)
-	$(MOZ_POST_PROGRAM_COMMAND) $@
-
-ifdef MOZ_ENABLE_GTK
-install:: $(PROGRAM)_gtk
-	$(INSTALL) -m 555 $< $(DIST)/bin
-
-clobber::
-	rm -f $(PROGRAM)_gtk
-endif
-
-ifdef MOZ_ENABLE_MOTIF
-install:: $(PROGRAM)_motif
-	$(INSTALL) -m 555 $< $(DIST)/bin
-
-clobber::
-	rm -f $(PROGRAM)_motif
-endif
-
-ifdef MOZ_ENABLE_QT
-install:: $(PROGRAM)_qt
-	$(INSTALL) -m 555 $< $(DIST)/bin
-
-clobber::
-	rm -f $(PROGRAM)_qt
-endif
-
-ifdef MOZ_ENABLE_XLIB
-install:: $(PROGRAM)_xlib
-	$(INSTALL) -m 555 $< $(DIST)/bin
-
-clobber::
-	rm -f $(PROGRAM)_xlib
-endif
-

mozilla/webshell/tests/viewer/unix/gtk/nsGtkMenu.cpp

@@ -1,179 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include <gtk/gtk.h>
-
-#include "gdksuperwin.h"
-#include "gtkmozbox.h"
-
-#include "nsBrowserWindow.h"
-#include "resources.h"
-#include "nscore.h"
-
-#include "stdio.h"
-
-typedef GtkItemFactoryCallback GIFC;
-
-void gtk_ifactory_cb (nsBrowserWindow *nbw,
-                      guint callback_action, 
-                      GtkWidget *widget)
-{
-  nbw->DispatchMenuItem(callback_action);
-}
-
-GtkItemFactoryEntry menu_items[] =
-{
-  { "/_File",				nsnull,	nsnull,			0,			"<Branch>" },
-  { "/File/_New Window",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_WINDOW_OPEN,	nsnull },
-  { "/File/_Open...",			nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_FILE_OPEN,	nsnull },
-  { "/File/_View Source",		nsnull, (GIFC)gtk_ifactory_cb,	VIEW_SOURCE,		nsnull },
-  { "/File/_Samples",			nsnull,	nsnull,			0,			"<Branch>" },
-  { "/File/Samples/demo #0",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO0,		nsnull },
-  { "/File/Samples/demo #1",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO1,		nsnull },
-  { "/File/Samples/demo #2",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO2,		nsnull },
-  { "/File/Samples/demo #3",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO3,		nsnull },
-  { "/File/Samples/demo #4",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO4,		nsnull },
-  { "/File/Samples/demo #5",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO5,		nsnull },
-  { "/File/Samples/demo #6",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO6,		nsnull },
-  { "/File/Samples/demo #7",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO7,		nsnull },
-  { "/File/Samples/demo #8",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO8,		nsnull },
-  { "/File/Samples/demo #9",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO9,		nsnull },
-  { "/File/Samples/demo #10",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO10,		nsnull },
-  { "/File/Samples/demo #11",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO11,		nsnull },
-  { "/File/Samples/demo #12",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO12,		nsnull },
-  { "/File/Samples/demo #13",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO13,		nsnull },
-  { "/File/Samples/demo #14",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO14,		nsnull },
-  { "/File/Samples/demo #15",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO15,		nsnull },
-  { "/File/Samples/demo #16",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO16,		nsnull },
-  { "/File/Samples/demo #17",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO17,		nsnull },
-  { "/File/_Test Sites",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_TOP100,		nsnull },
-  { "/File/XPToolkit Tests",		nsnull,	nsnull,			0,			"<Branch>" },
-  { "/File/XPToolkit Tests/Toolbar Test 1",       nsnull, (GIFC)gtk_ifactory_cb,  VIEWER_XPTOOLKITTOOLBAR1,     nsnull },
-  { "/File/XPToolkit Tests/Tree Test 1",       nsnull, (GIFC)gtk_ifactory_cb,  VIEWER_XPTOOLKITTREE1,     nsnull },
-  { "/File/sep1",			nsnull,	nsnull,			0,			"<Separator>" },
-  { "/File/Print Preview",	nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_ONE_COLUMN,	nsnull },
-  { "/File/Print",			nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_PRINT,		nsnull },
-  { "/File/Print Setup",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_PRINT_SETUP,	nsnull },
-  { "/File/sep2",			nsnull,	nsnull,			0,			"<Separator>" },
-  { "/File/_Exit",			nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_EXIT,		nsnull },
-
-  { "/_Edit",				nsnull,	nsnull,			0,			"<Branch>" },
-  { "/Edit/Cu_t",			nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_EDIT_CUT,	nsnull },
-  { "/Edit/_Copy",			nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_EDIT_COPY,	nsnull },
-  { "/Edit/_Paste",			nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_EDIT_PASTE,	nsnull },
-  { "/Edit/sep1",			nsnull,	nsnull,			0,			"<Separator>" },
-  { "/Edit/Select All",			nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_EDIT_SELECTALL,	nsnull },
-  { "/Edit/sep1",			nsnull,	nsnull,			0,			"<Separator>" },
-  { "/Edit/Find in Page",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_EDIT_FINDINPAGE,	nsnull },
-
-//#ifdef DEBUG // turning off for now
-  { "/_Debug",				nsnull,	nsnull,			0,			"<Branch>"	},
-  { "/Debug/_Visual Debugging",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_VISUAL_DEBUGGING,nsnull },
-  { "/Debug/sep1",			nsnull,	nsnull,			0,			"<Separator>" },
-  { "/Debug/Event Debugging/Toggle Paint Flashing",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_TOGGLE_PAINT_FLASHING,nsnull },
-  { "/Debug/Event Debugging/Toggle Paint Dumping",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_TOGGLE_PAINT_DUMPING,nsnull },
-  { "/Debug/Event Debugging/Toggle Invalidate Dumping",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_TOGGLE_INVALIDATE_DUMPING,nsnull },
-  { "/Debug/Event Debugging/Toggle Event Dumping",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_TOGGLE_EVENT_DUMPING,nsnull },
-  { "/Debug/Event Debugging/sep1", nsnull,	nsnull,			0,			"<Separator>" },
-  { "/Debug/Event Debugging/Toggle Motion Event Dumping",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_TOGGLE_MOTION_EVENT_DUMPING,nsnull },
-  { "/Debug/Event Debugging/Toggle Crossing Event Dumping",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_TOGGLE_CROSSING_EVENT_DUMPING,nsnull },
-  { "/Debug/sep1",			nsnull,	nsnull,			0,			"<Separator>" },
-  { "/Debug/_Reflow Test",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_REFLOW_TEST,	nsnull },
-  { "/Debug/sep1",			nsnull,	nsnull,			0,			"<Separator>" },
-  { "/Debug/Dump _Content",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DUMP_CONTENT,	nsnull },
-  { "/Debug/Dump _Frames",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DUMP_FRAMES,	nsnull },
-  { "/Debug/Dump _Views",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DUMP_VIEWS,	nsnull },
-  { "/Debug/sep1",			nsnull,	nsnull,			0,			"<Separator>" },
-  { "/Debug/Dump _Style Sheets",	nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DUMP_STYLE_SHEETS,	nsnull },
-  { "/Debug/Dump _Style Contexts",	nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DUMP_STYLE_CONTEXTS,	nsnull},
-  { "/Debug/sep1",			nsnull,	nsnull,			0,			"<Separator>" },
-  { "/Debug/Show Content Size",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_SHOW_CONTENT_SIZE,nsnull },
-  { "/Debug/Show Frame Size",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_SHOW_FRAME_SIZE,	nsnull },
-  { "/Debug/Show Style Size",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_SHOW_STYLE_SIZE,	nsnull },
-  { "/Debug/sep1",			nsnull,	nsnull,			0,			"<Separator>" },
-  { "/Debug/Debug Save",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEBUGSAVE,	nsnull },
-  { "/Debug/Debug Output Text",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DISPLAYTEXT,	nsnull },
-  { "/Debug/Debug Output HTML",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DISPLAYHTML,	nsnull },
-  { "/Debug/Debug Toggle Selection",	nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_TOGGLE_SELECTION,nsnull },
-  { "/Debug/sep1",			nsnull,	nsnull,			0,			"<Separator>" },
-  { "/Debug/Debug Robot",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEBUGROBOT,	nsnull },
-  { "/Debug/sep1",			nsnull,	nsnull,			0,			"<Separator>" },
-  { "/Debug/Show Content Quality",	nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_SHOW_CONTENT_QUALITY,	nsnull },
-  { "/_Style",				nsnull,	nsnull,			0,			"<Branch>"	},
-  { "/Style/Select _Style Sheet",	       nsnull, nsnull,        0,        "<Branch>" },
-  { "/Style/Select Style Sheet/List Available Sheets", nsnull, (GIFC)gtk_ifactory_cb, VIEWER_SELECT_STYLE_LIST, nsnull },
-  { "/Style/Select Style Sheet/sep1", nsnull, nsnull,        0,        "<Separator>" },
-  { "/Style/Select Style Sheet/Select Default", nsnull, (GIFC)gtk_ifactory_cb, VIEWER_SELECT_STYLE_DEFAULT, nsnull },
-  { "/Style/Select Style Sheet/sep1", nsnull, nsnull,        0,        "<Separator>" },
-  { "/Style/Select Style Sheet/Select Alternative 1", nsnull, (GIFC)gtk_ifactory_cb, VIEWER_SELECT_STYLE_ONE, nsnull },
-  { "/Style/Select Style Sheet/Select Alternative 2", nsnull, (GIFC)gtk_ifactory_cb, VIEWER_SELECT_STYLE_TWO, nsnull },
-  { "/Style/Select Style Sheet/Select Alternative 3", nsnull, (GIFC)gtk_ifactory_cb, VIEWER_SELECT_STYLE_THREE, nsnull },
-  { "/Style/Select Style Sheet/Select Alternative 4", nsnull, (GIFC)gtk_ifactory_cb, VIEWER_SELECT_STYLE_FOUR, nsnull },
-  { "/Style/_Compatibility Mode",		nsnull,	nsnull,			0,			"<Branch>" },
-  { "/Style/Compatibility Mode/Nav Quirks",	nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_NAV_QUIRKS_MODE,	nsnull },
-  { "/Style/Compatibility Mode/Standard",	nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_STANDARD_MODE,	nsnull },
-
-  { "/Style/_Widget Render Mode",		nsnull,	nsnull,			0,			"<Branch>" },
-  { "/Style/Widget Render Mode/Native",	nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_NATIVE_WIDGET_MODE,	nsnull },
-  { "/Style/Widget Render Mode/Gfx",	nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_GFX_WIDGET_MODE,	nsnull },
-//#endif
-
-  { "/_Tools",                                nsnull, nsnull,                 0,              "<Branch>" },
-  { "/Tools/_JavaScript Console",	nsnull,	(GIFC)gtk_ifactory_cb,	JS_CONSOLE,	nsnull },
-  { "/Tools/_Editor Mode",		nsnull,	(GIFC)gtk_ifactory_cb,	EDITOR_MODE,	nsnull }
-};
-
-void CreateViewerMenus(nsIWidget *   aParent, 
-                       gpointer      data,
-                       GtkWidget **  aMenuBarOut) 
-{
-  NS_ASSERTION(nsnull != aParent,"null parent.");
-  NS_ASSERTION(nsnull != aMenuBarOut,"null out param.");
-
-  GtkItemFactory *item_factory;
-  GtkWidget *menubar;
-
-  GdkSuperWin *gdkSuperWin;
-  GtkWidget   *mozBox;
-
-  gdkSuperWin = (GdkSuperWin*)aParent->GetNativeData(NS_NATIVE_WIDGET);
-  
-  int nmenu_items = sizeof (menu_items) / sizeof (menu_items[0]);
-  item_factory = gtk_item_factory_new (GTK_TYPE_MENU_BAR, "<main>", nsnull);
-
-  gtk_item_factory_create_items (item_factory, nmenu_items, menu_items, data);
-
-  menubar = gtk_item_factory_get_widget (item_factory, "<main>");
-
-  gtk_menu_bar_set_shadow_type (GTK_MENU_BAR(menubar), GTK_SHADOW_NONE);
-
-  NS_ASSERTION(GDK_IS_SUPERWIN(gdkSuperWin), "code assumes a gdksuperwin.");
-  mozBox = gtk_mozbox_new(gdkSuperWin->bin_window);
-  NS_ASSERTION((mozBox != NULL), "failed to create mozBox.");
-
-  gtk_container_add(GTK_CONTAINER(mozBox), menubar);
-  gtk_mozbox_set_position(GTK_MOZBOX(mozBox), 0, 0 );
-  gtk_widget_show(mozBox);
-  gtk_widget_show(menubar);
-
-  *aMenuBarOut = menubar;
-}

mozilla/widget/src/Makefile.in

@@ -1,67 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DIRS		= xpwidgets support
-
-#
-# Dont build the DSO under the 'build' directory as windows does.
-#
-# The DSOs get built in the toolkit dir itself.  Do this so that 
-# multiple implementations of widget can be built on the same
-# source tree.
-#
-ifndef MOZ_MONOLITHIC_TOOLKIT
-
-ifdef MOZ_ENABLE_GTK
-DIRS		+= gtksuperwin
-DIRS		+= gtk
-endif
-
-ifdef MOZ_ENABLE_MOTIF
-DIRS		+= motif
-endif
-
-ifdef MOZ_ENABLE_XLIB
-DIRS		+= xlib
-endif
-
-ifdef MOZ_ENABLE_QT
-DIRS		+= qt
-endif
-
-else
-DIRS		+= $(MOZ_WIDGET_TOOLKIT)
-endif
-
-# unix_services are only useful in unix, duh...
-ifeq (,$(filter beos os2 rhapsody photon,$(MOZ_WIDGET_TOOLKIT)))
-DIRS		+= unix_services
-endif
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/widget/src/gtk/Makefile.in

@@ -1,100 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public License
-# Version 1.0 (the "NPL"); you may not use this file except in
-# compliance with the NPL.  You may obtain a copy of the NPL at
-# http://www.mozilla.org/NPL/
-#
-# Software distributed under the NPL is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
-# for the specific language governing rights and limitations under the
-# NPL.
-#
-# The Initial Developer of this code under the NPL is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-# Reserved.
-#
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-LIBRARY_NAME	= widget_gtk
-
-REQUIRES	= util img xpcom raptor netlib
-
-CPPSRCS		= \
-		nsAppShell.cpp \
-		nsButton.cpp \
-		nsCheckButton.cpp \
-		nsClipboard.cpp \
-		nsComboBox.cpp \
-		nsContextMenu.cpp \
-		nsDragService.cpp \
-		nsFilePicker.cpp \
-		nsFileWidget.cpp \
-		nsFontRetrieverService.cpp \
-		nsFontSizeIterator.cpp \
-		nsGtkEventHandler.cpp \
-		nsGtkUtils.cpp \
-		nsLabel.cpp \
-		nsListBox.cpp \
-		nsLookAndFeel.cpp \
-		nsMenu.cpp \
-		nsMenuBar.cpp \
-		nsMenuItem.cpp \
-		nsPopUpMenu.cpp \
-		nsRadioButton.cpp \
-		nsScrollbar.cpp \
-		nsSound.cpp \
-		nsTextAreaWidget.cpp \
-		nsTextHelper.cpp \
-		nsTextWidget.cpp \
-		nsToolkit.cpp \
-		nsWidget.cpp \
-		nsWidgetFactory.cpp \
-		nsWindow.cpp \
-		$(NULL)
-
-SHARED_LIBRARY_LIBS = $(DIST)/lib/libraptorbasewidget_s.a
-
-EXTRA_DSO_LDOPTS = \
-		$(MKSHLIB_FORCE_ALL) \
-		$(SHARED_LIBRARY_LIBS) \
-		$(MKSHLIB_UNFORCE_ALL) \
-		$(MOZ_COMPONENT_LIBS) \
-		-lraptorgfx \
-		$(NULL)
-
-ifndef MOZ_MONOLITHIC_TOOLKIT
-EXTRA_DSO_LDOPTS +=  -L$(DIST)/lib -lgtksuperwin $(MOZ_GTK_LDFLAGS)
-else
-EXTRA_DSO_LDOPTS += $(TK_LIBS)
-endif
-
-include $(topsrcdir)/config/rules.mk
-
-ifndef MOZ_MONOLITHIC_TOOLKIT
-CXXFLAGS	+= $(MOZ_GTK_CFLAGS)
-CFLAGS		+= $(MOZ_GTK_CFLAGS)
-else
-CXXFLAGS	+= $(TK_CFLAGS)
-CFLAGS		+= $(TK_CFLAGS)
-endif
-
-DEFINES		+= -D_IMPL_NS_WIDGET -DUSE_XIM
-
-ifeq ($(OS_ARCH), Linux)
-DEFINES		+= -D_BSD_SOURCE
-endif
-
-INCLUDES	+= \
-		-I$(srcdir)/../xpwidgets \
-		-I$(srcdir) \
-		$(NULL)
-
-$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
-

mozilla/widget/src/gtk/mozicon.xpm

@@ -1,292 +0,0 @@
-/* XPM */
-static char * mozilla_icon_xpm[] = {
-"32 32 257 2",
-"  	c None",
-". 	c #AA7303",
-"+ 	c #A67003",
-"@ 	c #B77C03",
-"# 	c #8D6003",
-"$ 	c #8D6004",
-"% 	c #6C4A04",
-"& 	c #3A2804",
-"* 	c #6B4802",
-"= 	c #9B6903",
-"- 	c #5A2C04",
-"; 	c #411B04",
-"> 	c #9D6A03",
-", 	c #7A5203",
-"' 	c #510D04",
-") 	c #6B1104",
-"! 	c #7D5503",
-"~ 	c #674604",
-"{ 	c #C21E04",
-"] 	c #C21D04",
-"^ 	c #523804",
-"/ 	c #513702",
-"( 	c #552904",
-"_ 	c #DD2204",
-": 	c #DF2204",
-"< 	c #582904",
-"[ 	c #5F3F02",
-"} 	c #6B2504",
-"| 	c #FE2604",
-"1 	c #AB7303",
-"2 	c #9B6904",
-"3 	c #C31F04",
-"4 	c #FE2704",
-"5 	c #A81904",
-"6 	c #926304",
-"7 	c #4D3302",
-"8 	c #483104",
-"9 	c #C61E04",
-"0 	c #B11B04",
-"a 	c #891604",
-"b 	c #761204",
-"c 	c #614304",
-"d 	c #775102",
-"e 	c #795102",
-"f 	c #785102",
-"g 	c #C58603",
-"h 	c #642404",
-"i 	c #B21A04",
-"j 	c #1F0604",
-"k 	c #550E04",
-"l 	c #631004",
-"m 	c #402404",
-"n 	c #AF7703",
-"o 	c #3D2902",
-"p 	c #7F5602",
-"q 	c #805604",
-"r 	c #0C0904",
-"s 	c #080604",
-"t 	c #080706",
-"u 	c #090604",
-"v 	c #060404",
-"w 	c #620F04",
-"x 	c #7A1304",
-"y 	c #030204",
-"z 	c #570E04",
-"A 	c #721204",
-"B 	c #270704",
-"C 	c #080504",
-"D 	c #0A0604",
-"E 	c #533804",
-"F 	c #A56F02",
-"G 	c #B87C03",
-"H 	c #3B2804",
-"I 	c #A51904",
-"J 	c #FC2704",
-"K 	c #D62004",
-"L 	c #691004",
-"M 	c #C01E04",
-"N 	c #6D1004",
-"O 	c #9C1804",
-"P 	c #B31C04",
-"Q 	c #150404",
-"R 	c #801404",
-"S 	c #DD2304",
-"T 	c #120404",
-"U 	c #130404",
-"V 	c #500C04",
-"W 	c #CC1E04",
-"X 	c #AA1A04",
-"Y 	c #100904",
-"Z 	c #B47A03",
-"` 	c #A77103",
-" .	c #513704",
-"..	c #891704",
-"+.	c #F62604",
-"@.	c #BA1D04",
-"#.	c #3C0A04",
-"$.	c #EB2304",
-"%.	c #DE2304",
-"&.	c #560E04",
-"*.	c #E82304",
-"=.	c #FE2804",
-"-.	c #BE1D04",
-";.	c #F12404",
-">.	c #661004",
-",.	c #020204",
-"'.	c #5E0F04",
-").	c #A61A04",
-"!.	c #4A3204",
-"~.	c #BC7E03",
-"{.	c #8E6002",
-"].	c #684604",
-"^.	c #390D04",
-"/.	c #EE2404",
-"(.	c #FE2904",
-"_.	c #7D1304",
-":.	c #8C1504",
-"<.	c #200604",
-"[.	c #A81A04",
-"}.	c #E72204",
-"|.	c #DA2004",
-"1.	c #070204",
-"2.	c #280704",
-"3.	c #543904",
-"4.	c #9F6C02",
-"5.	c #674602",
-"6.	c #B47B04",
-"7.	c #311004",
-"8.	c #B11C04",
-"9.	c #AA1B04",
-"0.	c #6A1104",
-"a.	c #801504",
-"b.	c #2B0704",
-"c.	c #09090A",
-"d.	c #450B04",
-"e.	c #360904",
-"f.	c #DC2204",
-"g.	c #EE2504",
-"h.	c #C11D04",
-"i.	c #6F1104",
-"j.	c #704B04",
-"k.	c #9C6902",
-"l.	c #A56F03",
-"m.	c #5F4004",
-"n.	c #8D1604",
-"o.	c #440A04",
-"p.	c #1A0504",
-"q.	c #931604",
-"r.	c #621004",
-"s.	c #7F1404",
-"t.	c #921704",
-"u.	c #F82504",
-"v.	c #F52504",
-"w.	c #981804",
-"x.	c #241804",
-"y.	c #5B3E04",
-"z.	c #D82204",
-"A.	c #D02004",
-"B.	c #DA2104",
-"C.	c #D52104",
-"D.	c #2A1A04",
-"E.	c #AC7403",
-"F.	c #2B1C04",
-"G.	c #D04004",
-"H.	c #FC3C04",
-"I.	c #F94E04",
-"J.	c #881504",
-"K.	c #FC2604",
-"L.	c #792804",
-"M.	c #AC7503",
-"N.	c #9A6803",
-"O.	c #782804",
-"P.	c #F66504",
-"Q.	c #F94B04",
-"R.	c #F46804",
-"S.	c #F46604",
-"T.	c #F76504",
-"U.	c #FB4204",
-"V.	c #C13D04",
-"W.	c #5D0E04",
-"X.	c #DA2204",
-"Y.	c #741604",
-"Z.	c #8C5E03",
-"`.	c #885B03",
-" +	c #8B1904",
-".+	c #DE2204",
-"++	c #D22D04",
-"@+	c #C42D04",
-"#+	c #580E04",
-"$+	c #9F1804",
-"%+	c #895D04",
-"&+	c #D62204",
-"*+	c #371904",
-"=+	c #2C1A04",
-"-+	c #4A0C04",
-";+	c #140404",
-">+	c #AB1A04",
-",+	c #DA2304",
-"'+	c #6A4702",
-")+	c #754F02",
-"!+	c #821404",
-"~+	c #462B04",
-"{+	c #B37A03",
-"]+	c #B17803",
-"^+	c #714C04",
-"/+	c #580F04",
-"(+	c #E32204",
-"_+	c #DD2104",
-":+	c #611D04",
-"<+	c #BA7F03",
-"[+	c #B27803",
-"}+	c #6F1D04",
-"|+	c #FD2704",
-"1+	c #F22504",
-"2+	c #634304",
-"3+	c #875B03",
-"4+	c #734F02",
-"5+	c #805704",
-"6+	c #1D0504",
-"7+	c #DB2204",
-"8+	c #EA2404",
-"9+	c #2E0804",
-"0+	c #815803",
-"a+	c #941704",
-"b+	c #C11E04",
-"c+	c #391B04",
-"d+	c #A77104",
-"e+	c #B67C04",
-"f+	c #371D04",
-"g+	c #360A04",
-"h+	c #573A04",
-"i+	c #372604",
-"j+	c #3E2104",
-"k+	c #B57A03",
-"l+	c #B57B03",
-"m+	c #603F04",
-"n+	c #430A04",
-"o+	c #351904",
-"p+	c #A36E03",
-"q+	c #BE8103",
-"r+	c #1D1404",
-"s+	c #483004",
-"t+	c #A26E03",
-"u+	c #6D4B02",
-"v+	c #825804",
-"w+	c #0B0804",
-"x+	c #976603",
-"y+	c #815703",
-"z+	c #926404",
-"A+	c #895D03",
-"B+	c #614202",
-"C+	c #9A6804",
-"D+	c #C88704",
-"E+	c #C18303",
-"F+	c #654302",
-"G+	c #744F02",
-"H+	c #704B02",
-"                                                                ",
-"                                .                               ",
-"                              + @                               ",
-"                              # $                               ",
-"                              % & *                             ",
-"                            = - ; >                             ",
-"                            , ' ) !                             ",
-"                            ~ { ] ^                             ",
-"                          / ( _ : < [                           ",
-"                          . } | | } 1                           ",
-"                          2 3 | 4 5 6                           ",
-"                        7 8 9 0 a b c                           ",
-"  d e f f f d d d d d d g h i j k l m n d d d d d d d d d d d o ",
-"  p q r s s s s t s s u v w x y z A B C D D D D D s s s s E F   ",
-"      G H I J 4 | 4 | K L L M N O P Q R | S T U V W X Y Z       ",
-"        `  ...+.| 4 @.#.$.4 | %.&.*.4 =.-.;.>.,.'.).!.~.        ",
-"          {.].^./.(.X _.;.| :.T <.[.| }.z | |.1.2.3.4.          ",
-"            5.6.7.8.9.0.a.b.c.d.e.f.g.h.&.| i.u j.k.            ",
-"                l.m.n.o.p.q._.r.a.s.t.u.v.w.x.Z                 ",
-"                  {.y.P z.R A.v.x j B.| C.D.E.                  ",
-"                    F.G.H.I.4 | 4 t.J.f.K.L.M.                  ",
-"                  N.O.P.Q.R.S.T.U.V.W.X.4 Y.Z.                  ",
-"                  `. +4 =.| | .+++@+#+$+| K %+                  ",
-"                  %+&+| | | I *+=+-+;+>+,+&+x.'+                ",
-"                )+=+X.=.| !+~+{+]+^+,./+(+_+:+<+                ",
-"                [+}+|+1+) 2+3+    4+5+6+7+8+9+0+                ",
-"                $ a+b+c+d+            e+f+0.g+h+                ",
-"                i+A j+k+                l+m+n+o+p+              ",
-"              q+r+s+t+                    u+v+w+x+              ",
-"              y+z+A+                        B+C+2               ",
-"              D+                                E+F+            ",
-"            G+                                    H+            "};

mozilla/widget/src/gtk/mozicon50.xpm

@@ -1,63 +0,0 @@
-/* XPM */
-static char * mozicon50_xpm[] = {
-"50 51 9 1",
-" 	c None",
-".	c #000000",
-"+	c #FF0000",
-"@	c #808000",
-"#	c #800000",
-"$	c #FF6633",
-"%	c #990066",
-"&	c #FF00FF",
-"*	c #222222",
-"                                                  ",
-"                         @                        ",
-"                        $@                        ",
-"                        @@                        ",
-"                        @@$                       ",
-"                       $@*@                       ",
-"                       @@.@                       ",
-"                       @..@                       ",
-"                      $@..@@                      ",
-"                      $@##*@                      ",
-"                      @*#+.@                      ",
-"                      @.++.@$                     ",
-"                     $@.++.@$                     ",
-"                     @*#++#*@                     ",
-"                     @.++++.@                     ",
-"                    $@.++++.@$                    ",
-"                    @*#++++**@                    ",
-"                    @.#++++#.@                    ",
-"                   $@.++####.@                    ",
-"                   @@*+#*##*.@@                   ",
-"*@@@@@@@@@@@@@@@@@@@.#+..*##*#@@@@@@@@@@@@@@@@@@@*",
-" *@@*................+#..*###.................@@* ",
-"  %@@@.#++++++++++++#**#*#++.###++*...#+++#.*@@*  ",
-"    *@@.#+++++++++#.##++#+#+*.#+++#..##++#.@@@%   ",
-"      $@..+++++++.#++++++##++++#++#...++*.@@$     ",
-"       @@*.#+++++.#+++++*.#++++##++#.*...@@       ",
-"        $@@.#+++#*++++#....#+++*#+++...*@$        ",
-"         *@@..++#*++#**.*.*+++#.#++*..@@$         ",
-"           $@*.++******#+++++#+#+++..@@           ",
-"            $@@.##..*$#**#+#*#++++..@@            ",
-"             $@@.#+#***##...#++++.*@@             ",
-"              %@@*++++++++#.#++++.@@              ",
-"               @.#+++++++++.##+++.@$              ",
-"               @.+$$$$$+$$$#*#+++*@@              ",
-"              $@*+$$$$$$$+$#.#+++#.@              ",
-"              @*#+++++++++++.#++++.@              ",
-"              @.#+++++++#*++.##+++.@$             ",
-"             $@.+++++++....#..+#++*@@             ",
-"             @@*+++++#.*@@@...*+++#.@             ",
-"             @.#++++#.@@@ @@..#++++.@             ",
-"             @.++++*.@@$  %@@..+++#.@@            ",
-"            $@.+++..@@*     $@*.#+#**@            ",
-"            @@#+#.*@$%       $@@.##..@            ",
-"            @.##.@@            @@..#.@$           ",
-"           $@.*.@@$             @@**.@$           ",
-"           $@.*@@               %$@@.*@           ",
-"           @.@@$                  *@@.@           ",
-"           @@@$                    %@@@$          ",
-"          $@@%                      %@@@          ",
-"          @@                          $@          ",
-"          $                            *          "};

mozilla/widget/src/gtk/nsAppShell.cpp

@@ -1,459 +0,0 @@
-/* -*- Mode: c++; tab-width: 2; indent-tabs-mode: nil; -*- */
-/*
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "prmon.h"
-#include "nsCOMPtr.h"
-#include "nsAppShell.h"
-#include "nsIAppShell.h"
-#include "nsIServiceManager.h"
-#include "nsIEventQueueService.h"
-#include "nsICmdLineService.h"
-#include "nsGtkEventHandler.h"
-#include <stdlib.h>
-
-#ifdef MOZ_GLE
-#include <gle/gle.h>
-#endif
-
-#include "nsIWidget.h"
-#include "nsIPref.h"
-
-
-#include "glib.h"
-
-struct OurGdkIOClosure {
-  GdkInputFunction  function;
-  gpointer          data;
-};
-
-static gboolean
-our_gdk_io_invoke(GIOChannel* source, GIOCondition condition, gpointer data)
-{
-  OurGdkIOClosure* ioc = (OurGdkIOClosure*) data;
-  if (ioc) {
-    (*ioc->function)(ioc->data, g_io_channel_unix_get_fd(source),
-                     GDK_INPUT_READ);
-  }
-  return TRUE;
-}
-
-static void
-our_gdk_io_destroy(gpointer data)
-{
-  OurGdkIOClosure* ioc = (OurGdkIOClosure*) data;
-  if (ioc) {
-    g_free(ioc);
-  }
-}
-
-static gint
-our_gdk_input_add (gint              source,
-                   GdkInputFunction  function,
-                   gpointer          data,
-                   gint              priority)
-{
-  guint result;
-  OurGdkIOClosure *closure = g_new (OurGdkIOClosure, 1);
-  GIOChannel *channel;
-
-  closure->function = function;
-  closure->data = data;
-
-  channel = g_io_channel_unix_new (source);
-  result = g_io_add_watch_full (channel, priority, G_IO_IN,
-                                our_gdk_io_invoke,
-                                closure, our_gdk_io_destroy);
-  g_io_channel_unref (channel);
-
-  return result;
-}
-
-
-//-------------------------------------------------------------------------
-//
-// XPCOM CIDs
-//
-//-------------------------------------------------------------------------
-static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
-static NS_DEFINE_CID(kCmdLineServiceCID, NS_COMMANDLINE_SERVICE_CID);
-static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID);
-
-// a linked, ordered list of event queues and their tokens
-class EventQueueToken {
-public:
-  EventQueueToken(nsIEventQueue *aQueue, const gint aToken);
-  virtual ~EventQueueToken();  
-  nsIEventQueue   *mQueue;
-  gint mToken;
-  EventQueueToken *mNext;
-};
-
-EventQueueToken::EventQueueToken(nsIEventQueue *aQueue, const gint aToken) {
-  mQueue = aQueue;
-  NS_IF_ADDREF(mQueue);
-  mToken = aToken;
-  mNext = 0;
-}
-
-EventQueueToken::~EventQueueToken(){
- NS_IF_RELEASE(mQueue);
-}
-
-class EventQueueTokenQueue {
-public:
-  EventQueueTokenQueue();
-  virtual ~EventQueueTokenQueue();
-  nsresult PushToken(nsIEventQueue *aQueue, gint aToken);
-  PRBool PopToken(nsIEventQueue *aQueue, gint *aToken);
-
-private:
-  EventQueueToken *mHead;
-};
-
-EventQueueTokenQueue::EventQueueTokenQueue() {
-  mHead = 0;
-}
-
-EventQueueTokenQueue::~EventQueueTokenQueue() {
-
-  // if we reach this point with an empty token queue, well, fab. however,
-  // we expect the first event queue to still be active. so we take
-  // special care to unhook that queue (not that failing to do so seems
-  // to hurt anything). more queues than that would be an error.
-//NS_ASSERTION(!mHead || !mHead->mNext, "event queue token list deleted when not empty");
-  // (and skip the assertion for now. we're leaking event queues because they
-  // are referenced by things that leak, so this assertion goes off a lot.)
-  if (mHead) {
-    gdk_input_remove(mHead->mToken);
-    delete mHead;
-    // and leak the rest. it's an error, anyway
-  }
-}
-
-nsresult EventQueueTokenQueue::PushToken(nsIEventQueue *aQueue, gint aToken) {
-  EventQueueToken *newToken = new EventQueueToken(aQueue, aToken);
-  NS_ASSERTION(newToken, "couldn't allocate token queue element");
-  if (!newToken)
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  newToken->mNext = mHead;
-  mHead = newToken;
-  return NS_OK;
-}
-
-PRBool EventQueueTokenQueue::PopToken(nsIEventQueue *aQueue, gint *aToken) {
-  EventQueueToken *token, *lastToken;
-  PRBool          found = PR_FALSE;
-  NS_ASSERTION(mHead, "attempt to retrieve event queue token from empty queue");
-  if (mHead)
-    NS_ASSERTION(mHead->mQueue == aQueue, "retrieving event queue from past head of queue queue");
-
-  token = mHead;
-  lastToken = 0;
-  while (token && token->mQueue != aQueue) {
-    lastToken = token;
-    token = token->mNext;
-  }
-  if (token) {
-    if (lastToken)
-      lastToken->mNext = token->mNext;
-    else
-      mHead = token->mNext;
-    found = PR_TRUE;
-    *aToken = token->mToken;
-    delete token;
-  }
-  return found;
-}
-
-//-------------------------------------------------------------------------
-//
-// nsAppShell constructor
-//
-//-------------------------------------------------------------------------
-nsAppShell::nsAppShell()
-{
-  NS_INIT_REFCNT();
-  mDispatchListener = 0;
-  mEventQueueTokens = new EventQueueTokenQueue();
-  // throw on error would really be civilized here
-  NS_ASSERTION(mEventQueueTokens, "couldn't allocate event queue token queue");
-}
-
-//-------------------------------------------------------------------------
-//
-// nsAppShell destructor
-//
-//-------------------------------------------------------------------------
-nsAppShell::~nsAppShell()
-{
-  delete mEventQueueTokens;
-}
-
-//-------------------------------------------------------------------------
-//
-// nsISupports implementation macro
-//
-//-------------------------------------------------------------------------
-
-NS_IMPL_ISUPPORTS1(nsAppShell, nsIAppShell)
-
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsAppShell::SetDispatchListener(nsDispatchListener* aDispatchListener)
-{
-  mDispatchListener = aDispatchListener;
-  return NS_OK;
-}
-
-static void event_processor_callback(gpointer data,
-                                     gint source,
-                                     GdkInputCondition condition)
-{
-  nsIEventQueue *eventQueue = (nsIEventQueue*)data;
-  if (eventQueue)
-    eventQueue->ProcessPendingEvents();
-}
-
-#define PREF_NCOLS "browser.ncols"
-#define PREF_INSTALLCMAP "browser.installcmap"
-
-static void
-HandleColormapPrefs( void )
-{
-	PRInt32 ivalue = 0;
-        PRBool bvalue;
-	nsresult rv;
-
-	/* The default is to do nothing. INSTALLCMAP has precedence over
-	   NCOLS. Ignore the fact we can't do this if it fails, as it is
-	   not critical */
- 
-	NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &rv);
-	if (NS_FAILED(rv) || (!prefs)) 
-		return;
-       
-	/* first check ncols */
- 
-	rv = prefs->GetIntPref(PREF_NCOLS, &ivalue);
-	if (NS_SUCCEEDED(rv) && ivalue >= 0 && ivalue <= 255 ) {
-		gdk_rgb_set_min_colors( ivalue );
-		return;
-	}
-
-	/* next check installcmap */
-
-	rv = prefs->GetBoolPref(PREF_INSTALLCMAP, &bvalue);
-	if (NS_SUCCEEDED(rv)) {
-		if ( PR_TRUE == bvalue )
-			gdk_rgb_set_min_colors( 255 );	// force it
-		else
-			gdk_rgb_set_min_colors( 0 );
-	}
-}
-	
-//-------------------------------------------------------------------------
-//
-// Create the application shell
-//
-//-------------------------------------------------------------------------
-
-NS_IMETHODIMP nsAppShell::Create(int *bac, char **bav)
-{
-  gchar *home=nsnull;
-  gchar *path=nsnull;
-
-  int argc = bac ? *bac : 0;
-  char **argv = bav;
-#if 1
-  nsresult rv;
-
-  NS_WITH_SERVICE(nsICmdLineService, cmdLineArgs, kCmdLineServiceCID, &rv);
-  if (NS_SUCCEEDED(rv))
-  {
-    rv = cmdLineArgs->GetArgc(&argc);
-    if(NS_FAILED(rv))
-      argc = bac ? *bac : 0;
-
-    rv = cmdLineArgs->GetArgv(&argv);
-    if(NS_FAILED(rv))
-      argv = bav;
-  }
-#endif
-
-  gtk_set_locale ();
-
-  gtk_init (&argc, &argv);
-
-  // It is most convenient for us to intercept our events after
-  // they have been converted to GDK, but before GTK+ gets them
-  gdk_event_handler_set (handle_gdk_event, NULL, NULL);
-
-#ifdef MOZ_GLE
-  gle_init (&argc, &argv);
-#endif
-
-  // delete the cmdLineArgs thing?
-
-  HandleColormapPrefs();
-  gdk_rgb_init();
-
-  home = g_get_home_dir();
-  if ((char*)nsnull != home) {
-    path = g_strdup_printf("%s%c%s", home, G_DIR_SEPARATOR, ".gtkrc");
-    if ((char *)nsnull != path) {
-      gtk_rc_parse(path);
-      g_free(path);
-    }
-  }
-
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-// Spinup - do any preparation necessary for running a message loop
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsAppShell::Spinup()
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-// Spindown - do any cleanup necessary for finishing a message loop
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsAppShell::Spindown()
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-// Run
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsAppShell::Run()
-{
-  NS_ADDREF_THIS();
-  nsresult   rv = NS_OK;
-  nsIEventQueue * EQueue = nsnull;
-
-  // Get the event queue service 
-  NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv);
-  if (NS_FAILED(rv)) {
-    NS_ASSERTION("Could not obtain event queue service", PR_FALSE);
-    return rv;
-  }
-
-#ifdef DEBUG
-  printf("Got the event queue from the service\n");
-#endif /* DEBUG */
-
-  //Get the event queue for the thread.
-  rv = eventQService->GetThreadEventQueue(PR_GetCurrentThread(), &EQueue);
-
-  // If a queue already present use it.
-  if (EQueue)
-    goto done;
-
-  // Create the event queue for the thread
-  rv = eventQService->CreateThreadEventQueue();
-  if (NS_OK != rv) {
-    NS_ASSERTION("Could not create the thread event queue", PR_FALSE);
-    return rv;
-  }
-  //Get the event queue for the thread
-  rv = eventQService->GetThreadEventQueue(PR_GetCurrentThread(), &EQueue);
-  if (NS_OK != rv) {
-    NS_ASSERTION("Could not obtain the thread event queue", PR_FALSE);
-    return rv;
-  }    
-
-
-done:
-
-#ifdef DEBUG
-  printf("Calling gdk_input_add with event queue\n");
-#endif /* DEBUG */
-
-  // (has to be called explicitly for this, the primordial appshell, because
-  // of startup ordering problems.)
-  ListenToEventQueue(EQueue, PR_TRUE);
-
-  gtk_main();
-
-  NS_IF_RELEASE(EQueue);
-  Release();
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-// Exit a message handler loop
-//
-//-------------------------------------------------------------------------
-
-NS_IMETHODIMP nsAppShell::Exit()
-{
-  gtk_main_quit ();
-
-  return NS_OK;
-}
-
-// does nothing. used by xp code with non-gtk expectations.
-// this method will be removed once xp eventloops are working.
-NS_IMETHODIMP nsAppShell::GetNativeEvent(PRBool &aRealEvent, void *& aEvent)
-{
-  aRealEvent = PR_FALSE;
-  aEvent = 0;
-  return NS_OK;
-}
-
-// simply executes one iteration of the event loop. used by xp code with
-// non-gtk expectations.
-// this method will be removed once xp eventloops are working.
-NS_IMETHODIMP nsAppShell::DispatchNativeEvent(PRBool aRealEvent, void *aEvent)
-{
-  g_main_iteration(PR_TRUE);
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsAppShell::ListenToEventQueue(nsIEventQueue *aQueue,
-                                             PRBool aListen)
-{
-  // tell gdk to listen to the event queue or not
-
-  gint queueToken;
-  if (aListen) {
-    queueToken = our_gdk_input_add(aQueue->GetEventQueueSelectFD(),
-                                   event_processor_callback,
-                                   aQueue, G_PRIORITY_DEFAULT_IDLE);
-    mEventQueueTokens->PushToken(aQueue, queueToken);
-  } else {
-    if (mEventQueueTokens->PopToken(aQueue, &queueToken))
-      gdk_input_remove(queueToken);
-  }
-  return NS_OK;
-}
-

mozilla/widget/src/gtk/nsAppShell.h

@@ -1,50 +0,0 @@
-/* -*- Mode: c++; tab-width: 2; indent-tabs-mode: nil; -*- */
-/*
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsAppShell_h__
-#define nsAppShell_h__
-
-#include "nsIAppShell.h"
-#include <gtk/gtk.h>
-
-/**
- * Native GTK+ Application shell wrapper
- */
-
-class  EventQueueTokenQueue;
-
-class nsAppShell : public nsIAppShell
-{
-public:
-  nsAppShell();
-  virtual ~nsAppShell();
-
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIAPPSHELL
-
-private:
-  nsDispatchListener   *mDispatchListener;
-  EventQueueTokenQueue *mEventQueueTokens;
-};
-
-#endif // nsAppShell_h__
-

mozilla/widget/src/gtk/nsButton.cpp

@@ -1,156 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include <gtk/gtk.h>
-
-#include "nsGtkEventHandler.h"
-
-#include "nsButton.h"
-#include "nsString.h"
-
-NS_IMPL_ADDREF_INHERITED(nsButton, nsWidget)
-NS_IMPL_RELEASE_INHERITED(nsButton, nsWidget)
-NS_IMPL_QUERY_INTERFACE2(nsButton, nsIButton, nsIWidget)
-
-//-------------------------------------------------------------------------
-//
-// nsButton constructor
-//
-//-------------------------------------------------------------------------
-nsButton::nsButton() : nsWidget() , nsIButton()
-{
-}
-
-//-------------------------------------------------------------------------
-//
-// Create the native Button widget
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsButton::CreateNative(GtkObject *parentWindow)
-{
-#ifdef USE_SUPERWIN
-    if (!GDK_IS_SUPERWIN(parentWindow)) {
-    g_print("Damn, brother.  That's not a superwin.\n");
-    return NS_ERROR_FAILURE;
-  }
-  
-  GdkSuperWin *superwin = GDK_SUPERWIN(parentWindow);
-
-  mMozBox = gtk_mozbox_new(superwin->bin_window);
-
-#endif
-
-  mWidget = gtk_button_new_with_label("");
-  gtk_widget_set_name(mWidget, "nsButton");
-
-#ifdef USE_SUPERWIN
-
-  // make sure that we put the scrollbar into the mozbox
-
-  gtk_container_add(GTK_CONTAINER(mMozBox), mWidget);
-
-#endif /* USE_SUPERWIN */
-
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-// nsButton destructor
-//
-//-------------------------------------------------------------------------
-nsButton::~nsButton()
-{
-}
-
-void nsButton::InitCallbacks(char * aName)
-{
-  InstallButtonPressSignal(mWidget);
-  InstallButtonReleaseSignal(mWidget);
-
-  InstallEnterNotifySignal(mWidget);
-  InstallLeaveNotifySignal(mWidget);
-
-  // These are needed so that the events will go to us and not our parent.
-  AddToEventMask(mWidget,
-                 GDK_BUTTON_PRESS_MASK |
-                 GDK_BUTTON_RELEASE_MASK |
-                 GDK_ENTER_NOTIFY_MASK |
-                 GDK_EXPOSURE_MASK |
-                 GDK_FOCUS_CHANGE_MASK |
-                 GDK_KEY_PRESS_MASK |
-                 GDK_KEY_RELEASE_MASK |
-                 GDK_LEAVE_NOTIFY_MASK |
-                 GDK_POINTER_MOTION_MASK);
-}
-
-//-------------------------------------------------------------------------
-//
-// Set this button label
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsButton::SetLabel(const nsString& aText)
-{
-  NS_ALLOC_STR_BUF(label, aText, 256);
-
-  gtk_label_set(GTK_LABEL(GTK_BIN (mWidget)->child), label);
-
-  NS_FREE_STR_BUF(label);
-  return (NS_OK);
-}
-
-//-------------------------------------------------------------------------
-//
-// Get this button label
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsButton::GetLabel(nsString& aBuffer)
-{
-  char * text;
-
-  gtk_label_get(GTK_LABEL(GTK_BIN (mWidget)->child), &text);
-  aBuffer.SetLength(0);
-  aBuffer.Append(text);
-
-  return (NS_OK);
-
-}
-
-//-------------------------------------------------------------------------
-//
-// set font for button
-//
-//-------------------------------------------------------------------------
-/* virtual */
-void nsButton::SetFontNative(GdkFont *aFont)
-{
-  GtkStyle *style = gtk_style_copy(GTK_BIN (mWidget)->child->style);
-  // gtk_style_copy ups the ref count of the font
-  gdk_font_unref (style->font);
-  
-  style->font = aFont;
-  gdk_font_ref(style->font);
-  
-  gtk_widget_set_style(GTK_BIN (mWidget)->child, style);
-  
-  gtk_style_unref(style);
-}

mozilla/widget/src/gtk/nsButton.h

@@ -1,53 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsButton_h__
-#define nsButton_h__
-
-#include "nsWidget.h"
-#include "nsIButton.h"
-
-/**
- * Native GTK+ button wrapper
- */
-class nsButton : public nsWidget,
-                 public nsIButton
-{
-
-public:
-  nsButton();
-  virtual ~nsButton();
-
-  NS_DECL_ISUPPORTS_INHERITED
-
-  // nsIButton part
-  NS_IMETHOD     SetLabel(const nsString& aText);
-  NS_IMETHOD     GetLabel(nsString& aBuffer);
-
-  virtual void SetFontNative(GdkFont *aFont);
-
-protected:
-  NS_METHOD CreateNative(GtkObject *parentWindow);
-  virtual void InitCallbacks(char * aName = nsnull);
-};
-
-#endif // nsButton_h__

mozilla/widget/src/gtk/nsCheckButton.cpp

@@ -1,250 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsCheckButton.h"
-#include "nsString.h"
-
-NS_IMPL_ADDREF_INHERITED(nsCheckButton, nsWidget)
-NS_IMPL_RELEASE_INHERITED(nsCheckButton, nsWidget)
-NS_IMPL_QUERY_INTERFACE2(nsCheckButton, nsICheckButton, nsIWidget)
-
-//-------------------------------------------------------------------------
-//
-// nsCheckButton constructor
-//
-//-------------------------------------------------------------------------
-nsCheckButton::nsCheckButton() : nsWidget() , nsICheckButton()
-{
-  NS_INIT_REFCNT();
-  mLabel = nsnull;
-  mCheckButton = nsnull;
-  mState = PR_FALSE;
-}
-
-//-------------------------------------------------------------------------
-//
-// nsCheckButton destructor
-//
-//-------------------------------------------------------------------------
-nsCheckButton::~nsCheckButton()
-{
-}
-
-void
-nsCheckButton::OnDestroySignal(GtkWidget* aGtkWidget)
-{
-  if (aGtkWidget == mCheckButton) {
-    mCheckButton = nsnull;
-  }
-  else if (aGtkWidget == mLabel) {
-    mLabel = nsnull;
-  }
-  else {
-    nsWidget::OnDestroySignal(aGtkWidget);
-  }
-}
-
-//-------------------------------------------------------------------------
-//
-// Create the native CheckButton widget
-//
-//-------------------------------------------------------------------------
-NS_METHOD  nsCheckButton::CreateNative(GtkObject *parentWindow)
-{
-  mWidget = gtk_event_box_new();
-  mCheckButton = gtk_check_button_new();
-
-  gtk_container_add(GTK_CONTAINER(mWidget), mCheckButton);
-
-  gtk_widget_show(mCheckButton);
-
-  gtk_widget_set_name(mWidget, "nsCheckButton");
-
-  return NS_OK;
-}
-
-void nsCheckButton::InitCallbacks(char * aName)
-{
-  InstallButtonPressSignal(mCheckButton);
-  InstallButtonReleaseSignal(mCheckButton);
-
-  InstallEnterNotifySignal(mWidget);
-  InstallLeaveNotifySignal(mWidget);
-
-  // These are needed so that the events will go to us and not our parent.
-  AddToEventMask(mWidget,
-                 GDK_BUTTON_PRESS_MASK |
-                 GDK_BUTTON_RELEASE_MASK |
-                 GDK_ENTER_NOTIFY_MASK |
-                 GDK_EXPOSURE_MASK |
-                 GDK_FOCUS_CHANGE_MASK |
-                 GDK_KEY_PRESS_MASK |
-                 GDK_KEY_RELEASE_MASK |
-                 GDK_LEAVE_NOTIFY_MASK |
-                 GDK_POINTER_MOTION_MASK);
-
-  // Add in destroy callback
-  gtk_signal_connect(GTK_OBJECT(mCheckButton),
-                     "destroy",
-                     GTK_SIGNAL_FUNC(DestroySignal),
-                     this);
-
-  InstallSignal((GtkWidget *)mCheckButton,
-                (gchar *)"toggled",
-                GTK_SIGNAL_FUNC(nsCheckButton::ToggledSignal));
-}
-
-//-------------------------------------------------------------------------
-//
-// Set this button label
-//
-//-------------------------------------------------------------------------
-NS_METHOD nsCheckButton::SetState(const PRBool aState)
-{
-  mState = aState;
-
-  if (mWidget && mCheckButton) 
-  {
-    GtkToggleButton * item = GTK_TOGGLE_BUTTON(mCheckButton);
-
-    item->active = (gboolean) mState;
-
-    gtk_widget_queue_draw(GTK_WIDGET(item));
-  }
-
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-// Set this button label
-//
-//-------------------------------------------------------------------------
-NS_METHOD nsCheckButton::GetState(PRBool& aState)
-{
-  aState = mState;
-    
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-// Set this Checkbox label
-//
-//-------------------------------------------------------------------------
-NS_METHOD nsCheckButton::SetLabel(const nsString& aText)
-{
-  if (mWidget) {
-    NS_ALLOC_STR_BUF(label, aText, 256);
-    if (mLabel) {
-      gtk_label_set(GTK_LABEL(mLabel), label);
-    } else {
-      mLabel = gtk_label_new(label);
-      gtk_misc_set_alignment (GTK_MISC (mLabel), 0.0, 0.5);
-      gtk_container_add(GTK_CONTAINER(mCheckButton), mLabel);
-      gtk_widget_show(mLabel);
-      gtk_signal_connect(GTK_OBJECT(mLabel),
-                         "destroy",
-                         GTK_SIGNAL_FUNC(DestroySignal),
-                         this);
-    }
-    NS_FREE_STR_BUF(label);
-  }
-  return NS_OK;
-}
-
-
-//-------------------------------------------------------------------------
-//
-// Get this button label
-//
-//-------------------------------------------------------------------------
-NS_METHOD nsCheckButton::GetLabel(nsString& aBuffer)
-{
-  aBuffer.SetLength(0);
-  if (mWidget) {
-    char * text;
-    if (mLabel) {
-      gtk_label_get(GTK_LABEL(mLabel), &text);
-      aBuffer.Append(text);
-    }
-  }
-  return NS_OK;
-}
-
-/* virtual */ void
-nsCheckButton::OnToggledSignal(const gboolean aState)
-{
-  // Untoggle the sonofabitch
-  if (mWidget && mCheckButton) 
-  {
-    GtkToggleButton * item = GTK_TOGGLE_BUTTON(mCheckButton);
-
-    item->active = !item->active;
-
-    gtk_widget_queue_draw(GTK_WIDGET(item));
-  }
-}
-//////////////////////////////////////////////////////////////////////
-
-/* static */ gint 
-nsCheckButton::ToggledSignal(GtkWidget *      aWidget, 
-                             gpointer         aData)
-{
-  NS_ASSERTION( nsnull != aWidget, "widget is null");
-
-  nsCheckButton * button = (nsCheckButton *) aData;
-
-  NS_ASSERTION( nsnull != button, "instance pointer is null");
-
-  button->OnToggledSignal(GTK_TOGGLE_BUTTON(aWidget)->active);
-
-  return PR_TRUE;
-}
-
-//////////////////////////////////////////////////////////////////////
-// SetBackgroundColor for CheckButton
-/*virtual*/
-void nsCheckButton::SetBackgroundColorNative(GdkColor *aColorNor,
-                                        GdkColor *aColorBri,
-                                        GdkColor *aColorDark)
-{
-  // use same style copy as SetFont
-  GtkStyle *style = gtk_style_copy(GTK_WIDGET (g_list_nth_data(gtk_container_children(GTK_CONTAINER (mWidget)),0))->style);
-  
-  style->bg[GTK_STATE_NORMAL]=*aColorNor;
-  
-  // Mouse over button
-  style->bg[GTK_STATE_PRELIGHT]=*aColorBri;
-
-  // Button is down
-  style->bg[GTK_STATE_ACTIVE]=*aColorDark;
-
-  // other states too? (GTK_STATE_ACTIVE, GTK_STATE_PRELIGHT,
-  //               GTK_STATE_SELECTED, GTK_STATE_INSENSITIVE)
-  gtk_widget_set_style(GTK_WIDGET (g_list_nth_data(gtk_container_children(GTK_CONTAINER (mWidget)),0)), style);
-  // set style for eventbox too
-  gtk_widget_set_style(mWidget, style);
-
-  gtk_style_unref(style);
-}
-

mozilla/widget/src/gtk/nsCheckButton.h

@@ -1,75 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsCheckButton_h__
-#define nsCheckButton_h__
-
-#include "nsWidget.h"
-#include "nsICheckButton.h"
-
-/**
- * Native GTK+ Checkbox wrapper
- */
-
-
-class nsCheckButton : public nsWidget,
-                      public nsICheckButton
-{
-
-public:
-  nsCheckButton();
-  virtual                 ~nsCheckButton();
-
-  NS_DECL_ISUPPORTS_INHERITED
-
-  // nsICheckButton part
-  NS_IMETHOD SetLabel(const nsString &aText);
-  NS_IMETHOD GetLabel(nsString &aBuffer);
-  NS_IMETHOD SetState(const PRBool aState);
-  NS_IMETHOD GetState(PRBool& aState);
-
-  virtual void OnToggledSignal(const gboolean aState);
-
-protected:
-  NS_IMETHOD CreateNative(GtkObject *parentWindow);
-  virtual void InitCallbacks(char * aName = nsnull);
-  virtual void OnDestroySignal(GtkWidget* aGtkWidget);
-
-  // Sets background for checkbutton
-  virtual void SetBackgroundColorNative(GdkColor *aColorNor,
-                                        GdkColor *aColorBri,
-                                        GdkColor *aColorDark);
-
-  GtkWidget *mLabel;
-  GtkWidget *mCheckButton;
-
-  // We need to maintain our own state to be in sync with the
-  // gecko check controlling frame.
-  PRBool     mState;
-
-private:
-
-  static gint ToggledSignal(GtkWidget *      aWidget, 
-                            gpointer         aData);
-};
-
-#endif // nsCheckButton_h__

mozilla/widget/src/gtk/nsClipboard.cpp

@@ -1,872 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsClipboard.h"
-
-#include "nsCOMPtr.h"
-
-#include "nsISupportsArray.h"
-#include "nsIClipboardOwner.h"
-#include "nsITransferable.h"   // kTextMime
-#include "nsISupportsPrimitives.h"
-
-#include "nsIWidget.h"
-#include "nsIComponentManager.h"
-#include "nsIServiceManager.h"
-#include "nsWidgetsCID.h"
-#include "nsXPIDLString.h"
-#include "nsPrimitiveHelpers.h"
-
-#include "nsVoidArray.h"
-
-
-// The class statics:
-GtkWidget* nsClipboard::sWidget = 0;
-
-
-#if defined(DEBUG_mcafee) || defined(DEBUG_pavlov)
-#define DEBUG_CLIPBOARD
-#endif
- 
-enum {
-  TARGET_NONE,
-  TARGET_TEXT_PLAIN,
-  TARGET_TEXT_XIF,
-  TARGET_TEXT_UNICODE,
-  TARGET_TEXT_HTML,
-  TARGET_AOLMAIL,
-  TARGET_IMAGE_PNG,
-  TARGET_IMAGE_JPEG,
-  TARGET_IMAGE_GIF,
-  // compatibility types
-  TARGET_UTF8,
-  TARGET_UNKNOWN,
-  TARGET_LAST
-};
-
-static GdkAtom sSelTypes[TARGET_LAST];
-
-
-//-------------------------------------------------------------------------
-//
-// nsClipboard constructor
-//
-//-------------------------------------------------------------------------
-nsClipboard::nsClipboard() : nsBaseClipboard()
-{
-#ifdef DEBUG_CLIPBOARD
-  g_print("nsClipboard::nsClipboard()\n");
-#endif /* DEBUG_CLIPBOARD */
-
-  //NS_INIT_REFCNT();
-  mIgnoreEmptyNotification = PR_FALSE;
-  mClipboardOwner = nsnull;
-  mTransferable   = nsnull;
-  mSelectionData.data = nsnull;
-  mSelectionData.length = 0;
-
-  // initialize the widget, etc we're binding to
-  Init();
-}
-
-// XXX if GTK's internal code changes this isn't going to work
-// copied from gtk code because it is a static function we can't get to it.
-// need to bug owen taylor about getting this code public.
-
-typedef struct _GtkSelectionTargetList GtkSelectionTargetList;
-
-struct _GtkSelectionTargetList {
-  GdkAtom selection;
-  GtkTargetList *list;
-};
-
-static const char *gtk_selection_handler_key = "gtk-selection-handlers";
-
-void __gtk_selection_target_list_remove (GtkWidget *widget)
-{
-  GtkSelectionTargetList *sellist;
-  GList *tmp_list;
-  GList *lists;
-  lists = (GList*)gtk_object_get_data (GTK_OBJECT (widget), gtk_selection_handler_key);
-  tmp_list = lists;
-  while (tmp_list)
-    {
-      sellist = (GtkSelectionTargetList*)tmp_list->data;
-      gtk_target_list_unref (sellist->list);
-      g_free (sellist);
-      tmp_list = tmp_list->next;
-    }
-  g_list_free (lists);
-  gtk_object_set_data (GTK_OBJECT (widget), gtk_selection_handler_key, NULL);
-}
-
-//-------------------------------------------------------------------------
-//
-// nsClipboard destructor
-//
-//-------------------------------------------------------------------------
-nsClipboard::~nsClipboard()
-{
-#ifdef DEBUG_CLIPBOARD
-  printf("nsClipboard::~nsClipboard()\n");  
-#endif /* DEBUG_CLIPBOARD */
-
-  // Remove all our event handlers:
-  if (sWidget &&
-      (gdk_selection_owner_get(GDK_SELECTION_PRIMARY) == sWidget->window))
-    gtk_selection_remove_all(sWidget);
-
-  // free the selection data, if any
-  if (mSelectionData.data != nsnull)
-    g_free(mSelectionData.data);
-
-  nsClipboard *cb = (nsClipboard*)gtk_object_get_data(GTK_OBJECT(sWidget), "cb");
-  if (cb != nsnull)
-  {
-    NS_RELEASE(cb);
-    gtk_object_remove_data(GTK_OBJECT(sWidget), "cb");
-  }
-
-  if (sWidget)
-  {
-    gtk_widget_destroy(sWidget);
-    sWidget = nsnull;
-  }
-}
-
-
-// 
-// GTK Weirdness!
-// This is here in the hope of being able to call
-//  gtk_selection_add_targets(w, GDK_SELECTION_PRIMARY,
-//                            targets,
-//                            1);
-// instead of
-//   gtk_selection_add_target(sWidget, 
-//                            GDK_SELECTION_PRIMARY,
-//                            GDK_SELECTION_TYPE_STRING,
-//                            GDK_SELECTION_TYPE_STRING);
-// but it turns out that this changes the whole gtk selection model;
-// when calling add_targets copy uses selection_clear_event and the
-// data structure needs to be filled in in a way that we haven't
-// figured out; when using add_target copy uses selection_get and
-// the data structure is already filled in as much as it needs to be.
-// Some gtk internals wizard will need to solve this mystery before
-// we can use add_targets().
-//static GtkTargetEntry targets[] = {
-//  { "strings n stuff", GDK_SELECTION_TYPE_STRING, GDK_SELECTION_TYPE_STRING }
-//};
-//
-
-//-------------------------------------------------------------------------
-void nsClipboard::Init(void)
-{
-#ifdef DEBUG_CLIPBOARD
-  g_print("nsClipboard::Init\n");
-#endif
-
-  sSelTypes[TARGET_NONE]          = GDK_NONE;
-  sSelTypes[TARGET_TEXT_PLAIN]    = gdk_atom_intern(kTextMime, FALSE);
-  sSelTypes[TARGET_TEXT_XIF]      = gdk_atom_intern(kXIFMime, FALSE);
-  sSelTypes[TARGET_TEXT_UNICODE]  = gdk_atom_intern(kUnicodeMime, FALSE);
-  sSelTypes[TARGET_UTF8]          = gdk_atom_intern("UTF8", FALSE);
-  sSelTypes[TARGET_TEXT_HTML]     = gdk_atom_intern(kHTMLMime, FALSE);
-  sSelTypes[TARGET_AOLMAIL]       = gdk_atom_intern(kAOLMailMime, FALSE);
-  sSelTypes[TARGET_IMAGE_PNG]     = gdk_atom_intern(kPNGImageMime, FALSE);
-  sSelTypes[TARGET_IMAGE_JPEG]    = gdk_atom_intern(kJPEGImageMime, FALSE);
-  sSelTypes[TARGET_IMAGE_GIF]     = gdk_atom_intern(kGIFImageMime, FALSE);
-  // compatibility with other apps
-
-
-  // create invisible widget to use for the clipboard
-  sWidget = gtk_invisible_new();
-
-  // add the clipboard pointer to the widget so we can get it.
-  gtk_object_set_data(GTK_OBJECT(sWidget), "cb", this);
-
-  NS_ADDREF_THIS();
-
-  // Handle selection requests if we called gtk_selection_add_target:
-  gtk_signal_connect(GTK_OBJECT(sWidget), "selection_get",
-                     GTK_SIGNAL_FUNC(nsClipboard::SelectionGetCB),
-                     nsnull);
-
-  // When someone else takes the selection away:
-  gtk_signal_connect(GTK_OBJECT(sWidget), "selection_clear_event",
-                     GTK_SIGNAL_FUNC(nsClipboard::SelectionClearCB),
-                     nsnull);
-
-  // Set up the paste handler:
-  gtk_signal_connect(GTK_OBJECT(sWidget), "selection_received",
-                     GTK_SIGNAL_FUNC(nsClipboard::SelectionReceivedCB),
-                     nsnull);
-}
-
-
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsClipboard::SetNativeClipboardData()
-{
-  mIgnoreEmptyNotification = PR_TRUE;
-
-#ifdef DEBUG_CLIPBOARD
-  printf("  nsClipboard::SetNativeClipboardData()\n");
-#endif /* DEBUG_CLIPBOARD */
-
-  // make sure we have a good transferable
-  if (nsnull == mTransferable) {
-    printf("nsClipboard::SetNativeClipboardData(): no transferable!\n");
-    return NS_ERROR_FAILURE;
-  }
-
-  // are we already the owner?
-  if (gdk_selection_owner_get(GDK_SELECTION_PRIMARY) == sWidget->window)
-  {
-    // if so, clear all the targets
-    __gtk_selection_target_list_remove(sWidget);
-    //    gtk_selection_remove_all(sWidget);
-  }
-
-  // we arn't already the owner, so we will become it
-  gint have_selection = gtk_selection_owner_set(sWidget,
-                                                GDK_SELECTION_PRIMARY,
-                                                GDK_CURRENT_TIME);
-  if (have_selection == 0)
-    return NS_ERROR_FAILURE;
-
-  // get flavor list that includes all flavors that can be written (including ones 
-  // obtained through conversion)
-  nsCOMPtr<nsISupportsArray> flavorList;
-  nsresult errCode = mTransferable->FlavorsTransferableCanExport ( getter_AddRefs(flavorList) );
-  if ( NS_FAILED(errCode) )
-    return NS_ERROR_FAILURE;
-
-  PRUint32 cnt;
-  flavorList->Count(&cnt);
-  for ( PRUint32 i=0; i<cnt; ++i )
-  {
-    nsCOMPtr<nsISupports> genericFlavor;
-    flavorList->GetElementAt ( i, getter_AddRefs(genericFlavor) );
-    nsCOMPtr<nsISupportsString> currentFlavor ( do_QueryInterface(genericFlavor) );
-    if ( currentFlavor ) {
-      nsXPIDLCString flavorStr;
-      currentFlavor->ToString(getter_Copies(flavorStr));
-      gint format = GetFormat(flavorStr);
-
-      // add these types as selection targets
-      RegisterFormat(format);
-    }
-  }
-
-  mIgnoreEmptyNotification = PR_FALSE;
-
-  return NS_OK;
-}
-
-void nsClipboard::AddTarget(GdkAtom aAtom)
-{
-  gtk_selection_add_target(sWidget,
-                           GDK_SELECTION_PRIMARY,
-                           aAtom, aAtom);
-}
-
-gint nsClipboard::GetFormat(const char* aMimeStr)
-{
-  gint type = TARGET_NONE;
-  nsCAutoString mimeStr ( CBufDescriptor(NS_CONST_CAST(char*,aMimeStr), PR_TRUE, PL_strlen(aMimeStr)+1) );
-#ifdef DEBUG_CLIPBOARD
-  g_print("  nsClipboard::GetFormat(%s)\n", aMimeStr);
-#endif
-  if (mimeStr.Equals(kTextMime)) {
-    type = TARGET_TEXT_PLAIN;
-  } else if (mimeStr.Equals("STRING")) {
-    type = TARGET_TEXT_PLAIN;
-  } else if (mimeStr.Equals(kXIFMime)) {
-    type = TARGET_TEXT_XIF;
-  } else if (mimeStr.Equals(kUnicodeMime)) {
-    type = TARGET_TEXT_UNICODE;
-  } else if (mimeStr.Equals(kHTMLMime)) {
-    type = TARGET_TEXT_HTML;
-  } else if (mimeStr.Equals(kAOLMailMime)) {
-    type = TARGET_AOLMAIL;
-  } else if (mimeStr.Equals(kPNGImageMime)) {
-    type = TARGET_IMAGE_PNG;
-  } else if (mimeStr.Equals(kJPEGImageMime)) {
-    type = TARGET_IMAGE_JPEG;
-  } else if (mimeStr.Equals(kGIFImageMime)) {
-    type = TARGET_IMAGE_GIF;
-  }
-
-#ifdef WE_DO_DND
-  else if (mimeStr.Equals(kDropFilesMime)) {
-    format = CF_HDROP;
-  } else {
-    format = ::RegisterClipboardFormat(aMimeStr);
-  }
-#endif
-  return type;
-}
-
-void nsClipboard::RegisterFormat(gint format)
-{
-#ifdef DEBUG_CLIPBOARD
-  g_print("  nsClipboard::RegisterFormat(%s)\n", gdk_atom_name(sSelTypes[format]));
-#endif
-
-  /* when doing the selection_add_target, each case should have the same last parameter
-     which matches the case match */
-  switch(format)
-  {
-  case TARGET_TEXT_PLAIN:
-    // text/plain (default)
-    AddTarget(sSelTypes[format]);
-
-    // STRING (what X uses)
-    AddTarget(GDK_SELECTION_TYPE_STRING);
-    break;
-
-
-  case TARGET_TEXT_XIF:
-    // text/xif (default)
-    AddTarget(sSelTypes[format]);
-    break;
-
-
-  case TARGET_TEXT_UNICODE:
-    // text/unicode (default)
-    AddTarget(sSelTypes[format]);
-
-    // UTF8 (what X uses)
-    AddTarget(sSelTypes[TARGET_UTF8]);
-    break;
-
-
-  case TARGET_TEXT_HTML:
-    // text/html (default)
-    AddTarget(sSelTypes[format]);
-    break;
-
-
-  case TARGET_AOLMAIL:
-    // text/aolmail (default)
-    AddTarget(sSelTypes[format]);
-    break;
-
-
-  case TARGET_IMAGE_PNG:
-    // image/png (default)
-    AddTarget(sSelTypes[format]);
-    break;
-
-
-  case TARGET_IMAGE_JPEG:
-    // image/jpeg (default)
-    AddTarget(sSelTypes[format]);
-    break;
-
-
-  case TARGET_IMAGE_GIF:
-    // image/gif (default)
-    AddTarget(sSelTypes[format]);
-    break;
-
-
-  default:
-    // if we don't match something above, then just add it like its something we know about...
-    AddTarget(sSelTypes[format]);
-  }
-}
-
-PRBool nsClipboard::DoRealConvert(GdkAtom type)
-{
-#ifdef DEBUG_CLIPBOARD
-  g_print("    nsClipboard::DoRealConvert(%li)\n    {\n", type);
-#endif
-  int e = 0;
-  // Set a flag saying that we're blocking waiting for the callback:
-  mBlocking = PR_TRUE;
-
-  //
-  // ask X what kind of data we can get
-  //
-#ifdef DEBUG_CLIPBOARD
-  g_print("     Doing real conversion of atom type '%s'\n", gdk_atom_name(type));
-#endif
-  gtk_selection_convert(sWidget,
-                        GDK_SELECTION_PRIMARY,
-                        type,
-                        GDK_CURRENT_TIME);
-
-  // Now we need to wait until the callback comes in ...
-  // i is in case we get a runaway (yuck).
-#ifdef DEBUG_CLIPBOARD
-  printf("      Waiting for the callback... mBlocking = %d\n", mBlocking);
-#endif /* DEBUG_CLIPBOARD */
-  for (e=0; mBlocking == PR_TRUE && e < 1000; ++e)
-  {
-    gtk_main_iteration_do(PR_TRUE);
-  }
-
-#ifdef DEBUG_CLIPBOARD
-  g_print("    }\n");
-#endif
-
-  if (mSelectionData.length > 0)
-    return PR_TRUE;
-
-  return PR_FALSE;
-}
-
-/* return PR_TRUE if we have converted or PR_FALSE if we havn't and need to keep being called */
-PRBool nsClipboard::DoConvert(gint format)
-{
-#ifdef DEBUG_CLIPBOARD
-  g_print("  nsClipboard::DoConvert(%s)\n", gdk_atom_name(sSelTypes[format]));
-#endif
-
-  /* when doing the selection_add_target, each case should have the same last parameter
-     which matches the case match */
-  PRBool r = PR_FALSE;
-
-  switch(format)
-  {
-  case TARGET_TEXT_PLAIN:
-    r = DoRealConvert(sSelTypes[format]);
-    if (r) return r;
-    r = DoRealConvert(GDK_SELECTION_TYPE_STRING);
-    if (r) return r;
-    break;
-
-  case TARGET_TEXT_XIF:
-    r = DoRealConvert(sSelTypes[format]);
-    if (r) return r;
-    break;
-
-  case TARGET_TEXT_UNICODE:
-    r = DoRealConvert(sSelTypes[format]);
-    if (r) return r;
-    r = DoRealConvert(sSelTypes[TARGET_UTF8]);
-    if (r) return r;
-    break;
-
-  case TARGET_TEXT_HTML:
-    r = DoRealConvert(sSelTypes[format]);
-    if (r) return r;
-    break;
-
-  case TARGET_AOLMAIL:
-    r = DoRealConvert(sSelTypes[format]);
-    if (r) return r;
-    break;
-
-  case TARGET_IMAGE_PNG:
-    r = DoRealConvert(sSelTypes[format]);
-    if (r) return r;
-    break;
-
-  case TARGET_IMAGE_JPEG:
-    r = DoRealConvert(sSelTypes[format]);
-    if (r) return r;
-    break;
-
-  case TARGET_IMAGE_GIF:
-    r = DoRealConvert(sSelTypes[format]);
-    if (r) return r;
-    break;
-
-  default:
-    g_print("DoConvert called with bogus format\n");
-  }
-  return r;
-}
-
-//-------------------------------------------------------------------------
-//
-// The blocking Paste routine
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP
-nsClipboard::GetNativeClipboardData(nsITransferable * aTransferable)
-{
-
-#ifdef DEBUG_CLIPBOARD
-  printf("nsClipboard::GetNativeClipboardData()\n");
-#endif /* DEBUG_CLIPBOARD */
-
-  // make sure we have a good transferable
-  if (nsnull == aTransferable) {
-    printf("  GetNativeClipboardData: Transferable is null!\n");
-    return NS_ERROR_FAILURE;
-  }
-
-  // get flavor list that includes all acceptable flavors (including ones obtained through
-  // conversion)
-  nsCOMPtr<nsISupportsArray> flavorList;
-  nsresult errCode = aTransferable->FlavorsTransferableCanImport ( getter_AddRefs(flavorList) );
-  if ( NS_FAILED(errCode) )
-    return NS_ERROR_FAILURE;
-
-  // Walk through flavors and see which flavor matches the one being pasted:
-  PRUint32 cnt;
-  flavorList->Count(&cnt);
-  nsCAutoString foundFlavor;
-  for ( PRUint32 i = 0; i < cnt; ++i ) {
-    nsCOMPtr<nsISupports> genericFlavor;
-    flavorList->GetElementAt ( i, getter_AddRefs(genericFlavor) );
-    nsCOMPtr<nsISupportsString> currentFlavor ( do_QueryInterface(genericFlavor) );
-    if ( currentFlavor ) {
-      nsXPIDLCString flavorStr;
-      currentFlavor->ToString ( getter_Copies(flavorStr) );
-      gint format = GetFormat(flavorStr);
-      if (DoConvert(format)) {
-        foundFlavor = flavorStr;
-        break;
-      }
-    }
-  }
-
-#ifdef DEBUG_CLIPBOARD
-  printf("  Got the callback: '%s', %d\n",
-         mSelectionData.data, mSelectionData.length);
-#endif /* DEBUG_CLIPBOARD */
-
-  // We're back from the callback, no longer blocking:
-  mBlocking = PR_FALSE;
-
-  // 
-  // Now we have data in mSelectionData.data.
-  // We just have to copy it to the transferable.
-  // 
-
-#if 0  
-// pinkerton - we have the flavor already from above, so we don't need
-// to re-derrive it.
-  nsString *name = new nsString((const char*)gdk_atom_name(mSelectionData.type));
-  int format = GetFormat(*name);
-  df->SetString((const char*)gdk_atom_name(sSelTypes[format]));
-#endif
-
-  nsCOMPtr<nsISupports> genericDataWrapper;
-  nsPrimitiveHelpers::CreatePrimitiveForData ( foundFlavor, mSelectionData.data, mSelectionData.length, getter_AddRefs(genericDataWrapper) );
-  aTransferable->SetTransferData(foundFlavor,
-                                 genericDataWrapper,
-                                 mSelectionData.length);
-
-//delete name;
-  
-  // transferable is now copying the data, so we can free it.
-  //  g_free(mSelectionData.data);
-  mSelectionData.data = nsnull;
-  mSelectionData.length = 0;
-
-  return NS_OK;
-}
-
-/**
- * Called when the data from a paste comes in (recieved from gdk_selection_convert)
- *
- * @param  aWidget the widget
- * @param  aSelectionData gtk selection stuff
- * @param  aTime time the selection was requested
- */
-void
-nsClipboard::SelectionReceivedCB (GtkWidget        *aWidget,
-                                  GtkSelectionData *aSelectionData,
-                                  guint             aTime)
-{
-#ifdef DEBUG_CLIPBOARD
-  printf("      nsClipboard::SelectionReceivedCB\n      {\n");
-#endif /* DEBUG_CLIPBOARD */
-  nsClipboard *cb =(nsClipboard *)gtk_object_get_data(GTK_OBJECT(aWidget),
-                                                      "cb");
-  if (!cb)
-  {
-    g_print("no clipboard found.. this is bad.\n");
-    return;
-  }
-  cb->SelectionReceiver(aWidget, aSelectionData);
-#ifdef DEBUG_CLIPBOARD
-  g_print("      }\n");
-#endif
-}
-
-
-/**
- * local method (called from nsClipboard::SelectionReceivedCB)
- *
- * @param  aWidget the widget
- * @param  aSelectionData gtk selection stuff
- */
-void
-nsClipboard::SelectionReceiver (GtkWidget *aWidget,
-                                GtkSelectionData *aSD)
-{
-  gint type;
-
-  mBlocking = PR_FALSE;
-
-  if (aSD->length < 0)
-  {
-    printf("        Error retrieving selection: length was %d\n",
-           aSD->length);
-    return;
-  }
-
-  type = TARGET_NONE;
-  for (int i=0; i < TARGET_LAST; i++)
-  {
-    if (sSelTypes[i] == aSD->type)
-    {
-      type = i;
-      break;
-    }
-  }
-
-  switch (type)
-  {
-  case GDK_TARGET_STRING:
-  case TARGET_UTF8:
-  case TARGET_TEXT_PLAIN:
-  case TARGET_TEXT_XIF:
-  case TARGET_TEXT_UNICODE:
-  case TARGET_TEXT_HTML:
-#ifdef DEBUG_CLIPBOARD
-    g_print("        Copying mSelectionData pointer -- ");
-#endif
-    mSelectionData = *aSD;
-    mSelectionData.data = g_new(guchar, aSD->length + 1);
-#ifdef DEBUG_CLIPBOARD
-    g_print("        Data = %s\n    Length = %i\n", aSD->data, aSD->length);
-#endif
-    memcpy(mSelectionData.data,
-           aSD->data,
-           aSD->length);
-    // Null terminate in case anyone cares,
-    // and so we can print the string for debugging:
-    mSelectionData.data[aSD->length] = '\0';
-    mSelectionData.length = aSD->length;
-    return;
-
-  default:
-    mSelectionData = *aSD;
-    mSelectionData.data = g_new(guchar, aSD->length + 1);
-    memcpy(mSelectionData.data,
-           aSD->data,
-           aSD->length);
-    mSelectionData.length = aSD->length;
-    return;
-  }
-}
-
-
-
-/**
- * Some platforms support deferred notification for putting data on the clipboard
- * This method forces the data onto the clipboard in its various formats
- * This may be used if the application going away.
- *
- * @result NS_OK if successful.
- */
-NS_IMETHODIMP nsClipboard::ForceDataToClipboard()
-{
-#ifdef DEBUG_CLIPBOARD
-  printf("  nsClipboard::ForceDataToClipboard()\n");
-#endif /* DEBUG_CLIPBOARD */
-
-  // make sure we have a good transferable
-  if (nsnull == mTransferable) {
-    return NS_ERROR_FAILURE;
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsClipboard::HasDataMatchingFlavors(nsISupportsArray* aFlavorList, PRBool * outResult)
-{
-  *outResult = PR_TRUE;  // say we always do.
-  return NS_OK;
-}
-
-
-/**
- * This is the callback which is called when another app
- * requests the selection.
- *
- * @param  widget The widget
- * @param  aSelectionData Selection data
- * @param  info Value passed in from the callback init
- * @param  time Time when the selection request came in
- */
-void nsClipboard::SelectionGetCB(GtkWidget        *widget,
-                                 GtkSelectionData *aSelectionData,
-                                 guint            aInfo,
-                                 guint            aTime)
-{ 
-#ifdef DEBUG_CLIPBOARD
-  printf("nsClipboard::SelectionGetCB\n"); 
-#endif /* DEBUG_CLIPBOARD */
-
-  nsClipboard *cb = (nsClipboard *)gtk_object_get_data(GTK_OBJECT(widget),
-                                                       "cb");
-
-  void     *clipboardData;
-  PRUint32 dataLength;
-  nsresult rv;
-
-  // Make sure we have a transferable:
-  if (!cb->mTransferable) {
-    printf("Clipboard has no transferable!\n");
-    return;
-  }
-
-#ifdef DEBUG_CLIPBOARD
-  g_print("  aInfo == %d -", aInfo);
-#endif
-
-  char* dataFlavor = nsnull;
-
-  // switch aInfo (atom) to our enum
-  int type = (int)aInfo;
-  for (int i=0; i < TARGET_LAST; i++)
-  {
-    if (sSelTypes[i] == aInfo)
-    {
-      type = i;
-      break;
-    }
-  }
-
-  switch(type)
-    {
-    case GDK_TARGET_STRING:
-    case TARGET_TEXT_PLAIN:
-      dataFlavor = kTextMime;
-      break;
-    case TARGET_TEXT_XIF:
-      dataFlavor = kXIFMime;
-      break;
-    case TARGET_TEXT_UNICODE:
-    case TARGET_UTF8:
-      dataFlavor = kUnicodeMime;
-      break;
-    case TARGET_TEXT_HTML:
-      dataFlavor = kHTMLMime;
-      break;
-    case TARGET_AOLMAIL:
-      dataFlavor = kAOLMailMime;
-      break;
-    case TARGET_IMAGE_PNG:
-      dataFlavor = kPNGImageMime;
-      break;
-    case TARGET_IMAGE_JPEG:
-      dataFlavor = kJPEGImageMime;
-      break;
-    case TARGET_IMAGE_GIF:
-      dataFlavor = kGIFImageMime;
-      break;
-    default:
-      {
-        /* handle outside things */
-      }
-    }
-#ifdef DEBUG_CLIPBOARD
-  g_print("- aInfo is for %s\n", gdk_atom_name(aInfo));
-#endif
-
-  // Get data out of transferable.
-  nsCOMPtr<nsISupports> genericDataWrapper;
-  rv = cb->mTransferable->GetTransferData(dataFlavor, 
-                                          getter_AddRefs(genericDataWrapper),
-                                          &dataLength);
-  nsPrimitiveHelpers::CreateDataFromPrimitive ( dataFlavor, genericDataWrapper, &clipboardData, dataLength );
-  if (NS_SUCCEEDED(rv) && clipboardData && dataLength > 0) {
-    size_t size = 1;
-    // find the number of bytes in the data for the below thing
-    //    size_t size = sizeof((void*)((unsigned char)clipboardData[0]));
-    //    g_print("************  *****************      ******************* %i\n", size);
-
-    gtk_selection_data_set(aSelectionData,
-                           aInfo, size*8,
-                           (unsigned char *)clipboardData,
-                           dataLength);
-    nsCRT::free ( NS_REINTERPRET_CAST(char*, clipboardData) );
-  }
-  else
-    printf("Transferable didn't support the data flavor\n");
-}
-
-
-/**
- * Called when another app requests selection ownership
- *
- * @param  aWidget the widget
- * @param  aEvent the GdkEvent for the selection
- * @param  aData value passed in from the callback init
- */
-void nsClipboard::SelectionClearCB(GtkWidget *aWidget,
-                                   GdkEventSelection *aEvent,
-                                   gpointer aData)
-{
-#ifdef DEBUG_CLIPBOARD
-  printf("  nsClipboard::SelectionClearCB\n");
-#endif /* DEBUG_CLIPBOARD */
-
-  nsClipboard *cb = (nsClipboard *)gtk_object_get_data(GTK_OBJECT(aWidget),
-                                                       "cb");
-
-  cb->EmptyClipboard();
-}
-
-
-/**
- * The routine called when another app asks for the content of the selection
- *
- * @param  aWidget the widget
- * @param  aSelectionData gtk selection stuff
- * @param  aData value passed in from the callback init
- */
-void
-nsClipboard::SelectionRequestCB (GtkWidget *aWidget,
-                                 GtkSelectionData *aSelectionData,
-                                 gpointer aData)
-{
-#ifdef DEBUG_CLIPBOARD
-  printf("  nsClipboard::SelectionRequestCB\n");
-#endif /* DEBUG_CLIPBOARD */
-}
-
-/**
- * ...
- *
- * @param  aWidget the widget
- * @param  aSelectionData gtk selection stuff
- * @param  aData value passed in from the callback init
- */
-void
-nsClipboard::SelectionNotifyCB (GtkWidget *aWidget,
-                                GtkSelectionData *aSelectionData,
-                                gpointer aData)
-{
-#ifdef DEBUG_CLIPBOARD
-  printf("  nsClipboard::SelectionNotifyCB\n");
-#endif /* DEBUG_CLIPBOARD */
-}

mozilla/widget/src/gtk/nsClipboard.h

@@ -1,132 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsClipboard_h__
-#define nsClipboard_h__
-
-#include "nsBaseClipboard.h"
-#include <gtk/gtk.h>
-#include <gtk/gtkinvisible.h>
-
-class nsITransferable;
-class nsIClipboardOwner;
-class nsIWidget;
-
-/**
- * Native Gtk Clipboard wrapper
- */
-
-class nsClipboard : public nsBaseClipboard
-{
-
-public:
-  nsClipboard();
-  virtual ~nsClipboard();
-
-  // nsIClipboard  
-  NS_IMETHOD ForceDataToClipboard();
-  NS_IMETHOD HasDataMatchingFlavors(nsISupportsArray* aFlavorList, PRBool * outResult);
-
-  // invisible widget.  also used by dragndrop
-  static GtkWidget *sWidget;
-
-protected:
-  NS_IMETHOD SetNativeClipboardData();
-  NS_IMETHOD GetNativeClipboardData(nsITransferable * aTransferable);
-
-  PRBool  mIgnoreEmptyNotification;
-
-  void AddTarget(GdkAtom aAtom);
-
-  gint GetFormat(const char* aMimeStr);
-  void RegisterFormat(gint format);
-
-
-  PRBool DoRealConvert(GdkAtom type);
-  PRBool DoConvert(gint format);
-
-  void Init(void);
-
-  // Used for communicating pasted data
-  // from the asynchronous X routines back to a blocking paste:
-  GtkSelectionData mSelectionData;
-  PRBool mBlocking;
-
-  void SelectionReceiver(GtkWidget *aWidget,
-                         GtkSelectionData *aSD);
-
-  /**
-   * This is the callback which is called when another app
-   * requests the selection.
-   *
-   * @param  widget The widget
-   * @param  aSelectionData Selection data
-   * @param  info Value passed in from the callback init
-   * @param  time Time when the selection request came in
-   */
-  static void SelectionGetCB(GtkWidget *aWidget, 
-                             GtkSelectionData *aSelectionData,
-                             guint      /*info*/,
-                             guint      /*time*/);
-
-  /**
-   * Called when another app requests selection ownership
-   *
-   * @param  aWidget the widget
-   * @param  aEvent the GdkEvent for the selection
-   * @param  aData value passed in from the callback init
-   */
-  static void SelectionClearCB(GtkWidget *aWidget, 
-                               GdkEventSelection *aEvent,
-                               gpointer aData);
-
-  /**
-   * The routine called when another app asks for the content of the selection
-   *
-   * @param  aWidget the widget
-   * @param  aSelectionData gtk selection stuff
-   * @param  aData value passed in from the callback init
-   */
-  static void SelectionRequestCB(GtkWidget *aWidget,
-                                 GtkSelectionData *aSelectionData,
-                                 gpointer data);
-  
-  /**
-   * Called when the data from a paste comes in
-   *
-   * @param  aWidget the widget
-   * @param  aSelectionData gtk selection stuff
-   * @param  aTime time the selection was requested
-   */
-  static void SelectionReceivedCB(GtkWidget *aWidget,
-                                  GtkSelectionData *aSelectionData,
-                                  guint aTime);
-
-
-  static void SelectionNotifyCB(GtkWidget *aWidget,
-                                GtkSelectionData *aSelectionData,
-                                gpointer aData);
-  
-
-};
-
-#endif // nsClipboard_h__

mozilla/widget/src/gtk/nsComboBox.cpp

@@ -1,357 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include <gtk/gtk.h>
-
-#include "nsComboBox.h"
-#include "nsGUIEvent.h"
-#include "nsString.h"
-
-#define DBG 0
-
-#define INITIAL_MAX_ITEMS 128
-#define ITEMS_GROWSIZE    128
-
-NS_IMPL_ADDREF_INHERITED(nsComboBox, nsWidget)
-NS_IMPL_RELEASE_INHERITED(nsComboBox, nsWidget)
-NS_IMPL_QUERY_INTERFACE3(nsComboBox, nsIComboBox, nsIListWidget, nsIWidget)
-
-//-------------------------------------------------------------------------
-//
-// nsComboBox constructor
-//
-//-------------------------------------------------------------------------
-nsComboBox::nsComboBox() : nsWidget(), nsIListWidget(), nsIComboBox()
-{
-  NS_INIT_REFCNT();
-  mMultiSelect = PR_FALSE;
-  mItems = nsnull;
-  mNumItems = 0;
-}
-
-//-------------------------------------------------------------------------
-//
-// nsComboBox:: destructor
-//
-//-------------------------------------------------------------------------
-nsComboBox::~nsComboBox()
-{
-  if (mItems) {
-    for (GList *items = mItems; items; items = (GList*) g_list_next(items)){
-      g_free(items->data);
-    }
-    g_list_free(mItems);
-  }
-  gtk_widget_destroy(mCombo);
-}
-
-void nsComboBox::InitCallbacks(char * aName)
-{
-  InstallButtonPressSignal(mWidget);
-  InstallButtonReleaseSignal(mWidget);
-
-  InstallEnterNotifySignal(mWidget);
-  InstallLeaveNotifySignal(mWidget);
-   
-  // These are needed so that the events will go to us and not our parent.
-  AddToEventMask(mWidget,
-                 GDK_BUTTON_PRESS_MASK |
-                 GDK_BUTTON_RELEASE_MASK |
-                 GDK_ENTER_NOTIFY_MASK |
-                 GDK_EXPOSURE_MASK |
-                 GDK_FOCUS_CHANGE_MASK |
-                 GDK_KEY_PRESS_MASK |
-                 GDK_KEY_RELEASE_MASK |
-                 GDK_LEAVE_NOTIFY_MASK |  
-                 GDK_POINTER_MOTION_MASK);
-}
-
-
-//-------------------------------------------------------------------------
-//
-//  initializer
-//
-//-------------------------------------------------------------------------
-
-NS_METHOD nsComboBox::SetMultipleSelection(PRBool aMultipleSelections)
-{
-  mMultiSelect = aMultipleSelections;
-  return NS_OK;
-}
-
-
-//-------------------------------------------------------------------------
-//
-//  AddItemAt
-//
-//-------------------------------------------------------------------------
-
-NS_METHOD nsComboBox::AddItemAt(nsString &aItem, PRInt32 aPosition)
-{
-  NS_ALLOC_STR_BUF(val, aItem, 256);
-  mItems = g_list_insert( mItems, g_strdup(val), aPosition );
-  mNumItems++;
-  if (mCombo) {
-    gtk_combo_set_popdown_strings( GTK_COMBO( mCombo ), mItems );
-  }
-  NS_FREE_STR_BUF(val);
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-//  Finds an item at a postion
-//
-//-------------------------------------------------------------------------
-PRInt32  nsComboBox::FindItem(nsString &aItem, PRInt32 aStartPos)
-{
-  NS_ALLOC_STR_BUF(val, aItem, 256);
-  int i;
-  PRInt32 inx = -1;
-  GList *items = g_list_nth(mItems, aStartPos);
-  for(i=0; items != NULL; items = (GList *) g_list_next(items), i++ )
-    {
-      if(!strcmp(val, (gchar *) items->data))
-        {
-          inx = i;
-          break;
-        }
-    }
-  NS_FREE_STR_BUF(val);
-  return inx;
-}
-
-//-------------------------------------------------------------------------
-//
-//  CountItems - Get Item Count
-//
-//-------------------------------------------------------------------------
-PRInt32  nsComboBox::GetItemCount()
-{
-  return (PRInt32)mNumItems;
-}
-
-//-------------------------------------------------------------------------
-//
-//  Removes an Item at a specified location
-//
-//-------------------------------------------------------------------------
-PRBool  nsComboBox::RemoveItemAt(PRInt32 aPosition)
-{ 
-  if (aPosition >= 0 && aPosition < mNumItems) {
-
-    g_free(g_list_nth(mItems, aPosition)->data);
-    mItems = g_list_remove_link(mItems, g_list_nth(mItems, aPosition));
-    mNumItems--;
-    if (mCombo) {
-      gtk_combo_set_popdown_strings(GTK_COMBO( mCombo ), mItems);
-    }
-    return PR_TRUE;
-  }
-  else
-    return PR_FALSE;
-}
-
-//-------------------------------------------------------------------------
-//
-//  Removes an Item at a specified location
-//
-//-------------------------------------------------------------------------
-PRBool nsComboBox::GetItemAt(nsString& anItem, PRInt32 aPosition)
-{
-  if (aPosition >= 0 && aPosition < mNumItems) {
-    anItem = (gchar *) g_list_nth(mItems, aPosition)->data;
-    return PR_TRUE;
-  }
-  return PR_FALSE;
-}
-
-//-------------------------------------------------------------------------
-//
-//  Gets the selected of selected item
-//
-//-------------------------------------------------------------------------
-NS_METHOD nsComboBox::GetSelectedItem(nsString& aItem)
-{
-  aItem.Truncate();
-  if (mCombo) {
-    aItem = gtk_entry_get_text (GTK_ENTRY (GTK_COMBO(mCombo)->entry));
-  }
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-//  Gets the list of selected otems
-//
-//-------------------------------------------------------------------------
-PRInt32 nsComboBox::GetSelectedIndex()
-{
-  nsString nsstring;
-  GetSelectedItem(nsstring);
-  return FindItem(nsstring, 0);
-}
-
-//-------------------------------------------------------------------------
-//
-//  SelectItem
-//
-//-------------------------------------------------------------------------
-NS_METHOD nsComboBox::SelectItem(PRInt32 aPosition)
-{
-  GList *pos;
-  if (!mItems)
-    return NS_ERROR_FAILURE;
-
-  pos = g_list_nth(mItems, aPosition);
-  if (!pos)
-    return NS_ERROR_FAILURE;
-
-  if (mCombo) {
-    gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(mCombo)->entry),
-                       (gchar *) pos->data);
-  }
-
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-//  GetSelectedCount
-//
-//-------------------------------------------------------------------------
-PRInt32 nsComboBox::GetSelectedCount()
-{
-  if (!mMultiSelect) {
-    PRInt32 inx = GetSelectedIndex();
-    return (inx == -1? 0 : 1);
-  } else {
-    return 0;
-  }
-}
-
-//-------------------------------------------------------------------------
-//
-//  GetSelectedIndices
-//
-//-------------------------------------------------------------------------
-NS_METHOD nsComboBox::GetSelectedIndices(PRInt32 aIndices[], PRInt32 aSize)
-{
-  // this is an error
-  return NS_ERROR_FAILURE;
-}
-
-//-------------------------------------------------------------------------
-//
-//  Deselect
-//
-//-------------------------------------------------------------------------
-NS_METHOD nsComboBox::Deselect()
-{
-  if (mMultiSelect) {
-    return NS_ERROR_FAILURE;
-  }
-
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-// Create the native GtkCombo widget
-//
-//-------------------------------------------------------------------------
-NS_METHOD  nsComboBox::CreateNative(GtkObject *parentWindow)
-{
-  mWidget = ::gtk_event_box_new();
-
-  ::gtk_widget_set_name(mWidget, "nsComboBox");
-  mCombo = ::gtk_combo_new();
-  gtk_widget_show(mCombo);
-
-  /* make the stuff uneditable */
-  gtk_entry_set_editable(GTK_ENTRY(GTK_COMBO(mCombo)->entry), PR_FALSE);
-
-  gtk_signal_connect(GTK_OBJECT(mCombo),
-                     "destroy",
-                     GTK_SIGNAL_FUNC(DestroySignal),
-                     this);
-  gtk_signal_connect(GTK_OBJECT(GTK_COMBO(mCombo)->popwin),
-                     "unmap",
-                     GTK_SIGNAL_FUNC(UnmapSignal),
-                     this);
-
-  gtk_container_add(GTK_CONTAINER(mWidget), mCombo);
-
-  return NS_OK;
-}
-
-void
-nsComboBox::OnDestroySignal(GtkWidget* aGtkWidget)
-{
-  if (aGtkWidget == mCombo) {
-    mCombo = nsnull;
-  }
-  else {
-    nsWidget::OnDestroySignal(aGtkWidget);
-  }
-}
-
-gint
-nsComboBox::UnmapSignal(GtkWidget* aGtkWidget, nsComboBox* aCombo)
-{
-  if (!aCombo) return PR_FALSE;
-  aCombo->OnUnmapSignal(aGtkWidget);
-  return PR_TRUE;
-}
-
-void
-nsComboBox::OnUnmapSignal(GtkWidget * aWidget)
-{
-  if (!aWidget) return;
-
-  // Generate a NS_CONTROL_CHANGE event and send it to the frame
-  nsGUIEvent event;
-  event.eventStructType = NS_GUI_EVENT;
-  nsPoint point(0,0);
-  InitEvent(event, NS_CONTROL_CHANGE, &point);
-  DispatchWindowEvent(&event);
-}
-
-//-------------------------------------------------------------------------
-//
-// Get handle for style
-//
-//-------------------------------------------------------------------------
-/*virtual*/
-void nsComboBox::SetFontNative(GdkFont *aFont)
-{
-  GtkStyle *style = gtk_style_copy(GTK_WIDGET (g_list_nth_data(gtk_container_children(GTK_CONTAINER (mWidget)),0))->style);
-  // gtk_style_copy ups the ref count of the font
-  gdk_font_unref (style->font);
-  
-  style->font = aFont;
-  gdk_font_ref(style->font);
-  
-  gtk_widget_set_style(GTK_BIN (mWidget)->child, style);
-  
-  gtk_style_unref(style);
-}

mozilla/widget/src/gtk/nsComboBox.h

@@ -1,75 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsComboBox_h__
-#define nsComboBox_h__
-
-#include "nsWidget.h"
-#include "nsIComboBox.h"
-
-/**
- * Native GTK+ Listbox wrapper
- */
-
-class nsComboBox : public nsWidget,
-                   public nsIListWidget,
-                   public nsIComboBox
-{
-
-public:
-  nsComboBox();
-  virtual ~nsComboBox();
-
-  NS_DECL_ISUPPORTS_INHERITED
-
-  // nsIComboBox interface
-  NS_IMETHOD      AddItemAt(nsString &aItem, PRInt32 aPosition);
-  virtual PRInt32 FindItem(nsString &aItem, PRInt32 aStartPos);
-  virtual PRInt32 GetItemCount();
-  virtual PRBool  RemoveItemAt(PRInt32 aPosition);
-  virtual PRBool  GetItemAt(nsString& anItem, PRInt32 aPosition);
-  NS_IMETHOD      GetSelectedItem(nsString& aItem);
-  virtual PRInt32 GetSelectedIndex();
-  NS_IMETHOD      SelectItem(PRInt32 aPosition);
-  NS_IMETHOD      Deselect() ;
-
-  // nsIComboBox interface
-  NS_IMETHOD      SetMultipleSelection(PRBool aMultipleSelections);
-  PRInt32         GetSelectedCount();
-  NS_IMETHOD      GetSelectedIndices(PRInt32 aIndices[], PRInt32 aSize);
-
-  virtual void SetFontNative(GdkFont *aFont);
-
-protected:
-  NS_IMETHOD  CreateNative(GtkObject *parentWindow);
-  virtual void InitCallbacks(char * aName = nsnull);
-  virtual void OnDestroySignal(GtkWidget* aGtkWidget);
-  virtual void OnUnmapSignal(GtkWidget* aWidget);
-  static gint UnmapSignal(GtkWidget* aGtkWidget, nsComboBox* aCombo);
-
-  GtkWidget  *mCombo;  /* workaround for gtkcombo bug */
-  GList *mItems;
-  PRBool  mMultiSelect;
-  int     mNumItems;
-};
-
-#endif // nsComboBox_h__

mozilla/widget/src/gtk/nsContextMenu.cpp

@@ -1,744 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include <gtk/gtk.h>
-
-#include "nsContextMenu.h"
-#include "nsIComponentManager.h"
-#include "nsIDOMElement.h"
-#include "nsIDOMNode.h"
-#include "nsIMenuBar.h"
-#include "nsIMenuItem.h"
-#include "nsIMenuListener.h"
-#include "nsString.h"
-#include "nsGtkEventHandler.h"
-#include "nsCOMPtr.h"
-#include "nsWidgetsCID.h"
-
-static NS_DEFINE_CID(kMenuCID,             NS_MENU_CID);
-static NS_DEFINE_CID(kMenuItemCID,         NS_MENUITEM_CID);
-
-static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
-
-//-------------------------------------------------------------------------
-nsresult nsContextMenu::QueryInterface(REFNSIID aIID, void** aInstancePtr)
-{
-  if (NULL == aInstancePtr) {
-    return NS_ERROR_NULL_POINTER;
-  }
-
-  *aInstancePtr = NULL;
-
-  if (aIID.Equals(nsIMenu::GetIID())) {
-    *aInstancePtr = (void*)(nsIMenu*) this;
-    NS_ADDREF_THIS();
-    return NS_OK;
-  }
-  if (aIID.Equals(kISupportsIID)) {
-    *aInstancePtr = (void*)(nsISupports*)(nsIMenu*)this;
-    NS_ADDREF_THIS();
-    return NS_OK;
-  }
-  if (aIID.Equals(nsIMenuListener::GetIID())) {
-    *aInstancePtr = (void*)(nsIMenuListener*)this;
-    NS_ADDREF_THIS();
-    return NS_OK;
-  }
-  return NS_NOINTERFACE;
-}
-
-//-------------------------------------------------------------------------
-NS_IMPL_ADDREF(nsContextMenu)
-NS_IMPL_RELEASE(nsContextMenu)
-
-//-------------------------------------------------------------------------
-//
-// nsContextMenu constructor
-//
-//-------------------------------------------------------------------------
-nsContextMenu::nsContextMenu()
-{
-  NS_INIT_REFCNT();
-  mNumMenuItems  = 0;
-  mMenu          = nsnull;
-  mParent        = nsnull;
-  mListener      = nsnull;
-  mConstructCalled = PR_FALSE;
-  
-  mDOMNode       = nsnull;
-  mWebShell      = nsnull;
-  mDOMElement    = nsnull;
-
-  mAlignment      = "topleft";
-  mAnchorAlignment = "none";
-}
-
-//-------------------------------------------------------------------------
-//
-// nsContextMenu destructor
-//
-//-------------------------------------------------------------------------
-nsContextMenu::~nsContextMenu()
-{
-
-}
-
-
-//-------------------------------------------------------------------------
-//
-// Create the proper widget
-//
-//-------------------------------------------------------------------------
-NS_METHOD nsContextMenu::Create(nsISupports *aParent,
-                                const nsString& anAlignment,
-                                const nsString& anAnchorAlignment)
-{
-  if(aParent)
-  {
-    nsIWidget *parent = nsnull;
-    aParent->QueryInterface(nsIWidget::GetIID(), (void**) &parent);
-    if(parent)
-    {
-      mParent = parent;
-      NS_RELEASE(parent);
-    }
-  }
-
-  mAlignment       = anAlignment;
-  mAnchorAlignment = anAnchorAlignment;
-
-  mMenu = gtk_menu_new();
-
-  gtk_signal_connect (GTK_OBJECT (mMenu), "map",
-                      GTK_SIGNAL_FUNC(menu_map_handler),
-                      this);
-  gtk_signal_connect (GTK_OBJECT (mMenu), "unmap",
-                      GTK_SIGNAL_FUNC(menu_unmap_handler),
-                      this);
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsContextMenu::GetParent(nsISupports*& aParent)
-{
-  aParent = nsnull;
-  if (nsnull != mParent) {
-    return mParent->QueryInterface(kISupportsIID,
-                                   (void**)&aParent);
-  }
-
-  return NS_ERROR_FAILURE;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsContextMenu::AddItem(nsISupports * aItem)
-{
-  if(aItem)
-  {
-    nsIMenuItem * menuitem = nsnull;
-    aItem->QueryInterface(nsIMenuItem::GetIID(),
-                          (void**)&menuitem);
-    if(menuitem)
-    {
-      AddMenuItem(menuitem); // nsMenu now owns this
-      NS_RELEASE(menuitem);
-    }
-    else
-    {
-      nsIMenu * menu = nsnull;
-      aItem->QueryInterface(nsIMenu::GetIID(),
-                            (void**)&menu);
-      if(menu)
-      {
-        AddMenu(menu); // nsMenu now owns this
-        NS_RELEASE(menu);
-      }
-    }
-  }
-
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsContextMenu::AddMenuItem(nsIMenuItem * aMenuItem)
-{
-  GtkWidget *widget;
-  void      *voidData;
-  
-  aMenuItem->GetNativeData(voidData);
-  widget = GTK_WIDGET(voidData);
-
-  gtk_menu_shell_append (GTK_MENU_SHELL (mMenu), widget);
-
-  // XXX add aMenuItem to internal data structor list
-  // Need to be adding an nsISupports *, not nsIMenuItem *
-  nsISupports * supports = nsnull;
-  aMenuItem->QueryInterface(kISupportsIID,
-                            (void**)&supports);
-  {
-    mMenuItemVoidArray.AppendElement(supports);
-    mNumMenuItems++;
-  }
-  
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsContextMenu::AddMenu(nsIMenu * aMenu)
-{
-  nsString Label;
-  GtkWidget *newmenu=nsnull;
-  char *labelStr;
-  void *voidData=NULL;
-  
-  aMenu->GetLabel(Label);
-  labelStr = Label.ToNewCString();
-
-  // Create nsMenuItem
-  nsIMenuItem * pnsMenuItem = nsnull;
-  nsresult rv = nsComponentManager::CreateInstance(kMenuItemCID,
-                                                   nsnull,
-                                                   nsIMenuItem::GetIID(),
-                                                   (void**)&pnsMenuItem);
-  if (NS_OK == rv) {
-    nsISupports * supports = nsnull;
-    QueryInterface(kISupportsIID, (void**) &supports);
-    pnsMenuItem->Create(supports, labelStr, PR_FALSE); //PR_TRUE); 
-    NS_RELEASE(supports);               
-    
-    pnsMenuItem->QueryInterface(kISupportsIID, (void**) &supports);
-    AddItem(supports); // Parent should now own menu item
-    NS_RELEASE(supports);
-          
-    void * menuitem = nsnull;
-    pnsMenuItem->GetNativeData(menuitem);
-  
-    voidData = NULL;
-    aMenu->GetNativeData(&voidData);
-    newmenu = GTK_WIDGET(voidData);
-
-    gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), newmenu);
-  
-    NS_RELEASE(pnsMenuItem);
-  } 
-
-  nsCRT::free(labelStr);
-
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsContextMenu::AddSeparator() 
-{
-  // Create nsMenuItem
-  nsIMenuItem * pnsMenuItem = nsnull;
-  nsresult rv = nsComponentManager::CreateInstance(
-    kMenuItemCID, nsnull, nsIMenuItem::GetIID(), (void**)&pnsMenuItem);
-  if (NS_OK == rv) {
-    nsString tmp = "separator";
-    nsISupports * supports = nsnull;
-    QueryInterface(kISupportsIID, (void**) &supports);
-    pnsMenuItem->Create(supports, tmp, PR_TRUE);  
-    NS_RELEASE(supports);
-    
-    pnsMenuItem->QueryInterface(kISupportsIID, (void**) &supports);
-    AddItem(supports); // Parent should now own menu item
-    NS_RELEASE(supports); 
-          
-    NS_RELEASE(pnsMenuItem);
-  } 
-  
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsContextMenu::GetItemCount(PRUint32 &aCount)
-{
-  // this should be right.. does it need to be +1 ?
-  aCount = g_list_length(GTK_MENU_SHELL(mMenu)->children);
-  //g_print("nsMenu::GetItemCount = %i\n", aCount);
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsContextMenu::GetItemAt(const PRUint32 aCount, nsISupports *& aMenuItem)
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsContextMenu::InsertItemAt(const PRUint32 aCount, nsISupports * aMenuItem)
-{
-  return NS_OK;
-}
-
-
-//-------------------------------------------------------------------------
-NS_METHOD nsContextMenu::InsertSeparator(const PRUint32 aCount)
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsContextMenu::RemoveItem(const PRUint32 aCount)
-{
-#if 0
-  // this may work here better than Removeall(), but i'm not sure how to test this one
-  nsISupports *item = mMenuItemVoidArray[aPos];
-  delete item;
-  mMenuItemVoidArray.RemoveElementAt(aPos);
-#endif
-  /*
-  gtk_menu_shell_remove (GTK_MENU_SHELL (mMenu), item);
-
-  nsCRT::free(labelStr);
-
-  voidData = NULL;
-
-  aMenu->GetNativeData(&voidData);
-  newmenu = GTK_WIDGET(voidData);
-
-  gtk_menu_item_remove_submenu (GTK_MENU_ITEM (item));
-  */
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsContextMenu::RemoveAll()
-{
-  //g_print("nsMenu::RemoveAll()\n");
-#undef DEBUG_pavlov
-#ifdef DEBUG_pavlov
-  // this doesn't work quite right, but this is about all that should really be needed
-  int i=0;
-  nsIMenu *menu = nsnull;
-  nsIMenuItem *menuitem = nsnull;
-  nsISupports *item = nsnull;
-
-  for (i=mMenuItemVoidArray.Count(); i>0; i--)
-  {
-    item = (nsISupports*)mMenuItemVoidArray[i-1];
-
-    if(nsnull != item)
-    {
-      if (NS_OK == item->QueryInterface(nsIMenuItem::GetIID(), (void**)&menuitem))
-      {
-        // we do this twice because we have to do it once for QueryInterface,
-        // then we want to get rid of it.
-        // g_print("remove nsMenuItem\n");
-        NS_RELEASE(menuitem);
-        NS_RELEASE(item);
-        menuitem = nsnull;
-      } else if (NS_OK == item->QueryInterface(nsIMenu::GetIID(), (void**)&menu)) {
-#ifdef NOISY_MENUS
-        g_print("remove nsMenu\n");
-#endif
-        NS_RELEASE(menu);
-        NS_RELEASE(item);
-        menu = nsnull;
-      }
-      // mMenuItemVoidArray.RemoveElementAt(i-1);
-    }
-  }
-  mMenuItemVoidArray.Clear();
-
-  return NS_OK;
-#else
-  for (int i = mMenuItemVoidArray.Count(); i > 0; i--) {
-    if(nsnull != mMenuItemVoidArray[i-1]) {
-      nsIMenuItem * menuitem = nsnull;
-      ((nsISupports*)mMenuItemVoidArray[i-1])->QueryInterface(nsIMenuItem::GetIID(),
-                                                              (void**)&menuitem);
-      if(menuitem) {
-        void *gtkmenuitem = nsnull;
-        menuitem->GetNativeData(gtkmenuitem);
-        if (gtkmenuitem) {
-          gtk_widget_ref(GTK_WIDGET(gtkmenuitem));
-          //gtk_widget_destroy(GTK_WIDGET(gtkmenuitem));
-          g_print("%p, %p\n",
-                  GTK_WIDGET(GTK_CONTAINER(GTK_MENU_SHELL(GTK_MENU(mMenu)))),
-                  GTK_WIDGET(GTK_WIDGET(gtkmenuitem)->parent));
-          gtk_container_remove(GTK_CONTAINER(GTK_MENU_SHELL(GTK_MENU(mMenu))),
-                               GTK_WIDGET(gtkmenuitem));
-        }
- 
-      } else {
- 
-        nsIMenu * menu= nsnull;
-        ((nsISupports*)mMenuItemVoidArray[i-1])->QueryInterface(nsIMenu::GetIID(),
-                                                                (void**)&menu);
-        if(menu)
-          {
-            void * gtkmenu = nsnull;
-            menu->GetNativeData(&gtkmenu);
- 
-            if(gtkmenu){
-              g_print("nsMenu::RemoveAll() trying to remove nsMenu");
- 
-              //gtk_menu_item_remove_submenu (GTK_MENU_ITEM (item));
-            }
-          }
- 
-      }
-    }
-  }
-//g_print("end RemoveAll\n");
-  return NS_OK;
-#endif
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsContextMenu::GetNativeData(void ** aData)
-{
-  *aData = (void *)mMenu;
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsContextMenu::AddMenuListener(nsIMenuListener * aMenuListener)
-{
-  mListener = aMenuListener;
-  NS_ADDREF(mListener);
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsContextMenu::RemoveMenuListener(nsIMenuListener * aMenuListener)
-{
-  if (aMenuListener == mListener) {
-    NS_IF_RELEASE(mListener);
-  }
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-// nsIMenuListener interface
-//-------------------------------------------------------------------------
-nsEventStatus nsContextMenu::MenuItemSelected(const nsMenuEvent & aMenuEvent)
-{
-  if (nsnull != mListener) {
-    mListener->MenuSelected(aMenuEvent);
-  }
-  return nsEventStatus_eIgnore;
-}
-
-void menu_popup_position(GtkMenu *menu,
-                         gint *x,
-                         gint *y,
-                         gpointer data)
-{
-  nsContextMenu *cm = (nsContextMenu*)data;
-  *x = cm->GetX();
-  *y = cm->GetY();
-}
-
-nsEventStatus nsContextMenu::MenuSelected(const nsMenuEvent & aMenuEvent)
-{
-  MenuConstruct(aMenuEvent,
-                mParent,
-                mDOMNode,
-                mWebShell);
-
-  //GtkWidget *parent = GTK_WIDGET(mParent->GetNativeData(NS_NATIVE_WIDGET));
-  gtk_menu_popup (GTK_MENU(mMenu),
-                  (GtkWidget*)nsnull, (GtkWidget*)nsnull,
-                  menu_popup_position,
-                  this, 1, GDK_CURRENT_TIME);
-  /*
-  if (nsnull != mListener) {
-    mListener->MenuSelected(aMenuEvent);
-  }
-  */
-  return nsEventStatus_eIgnore;
-}
-
-//-------------------------------------------------------------------------
-nsIMenuItem * nsContextMenu::FindMenuItem(nsIContextMenu * aMenu, PRUint32 aId)
-{
-  return nsnull;
-}
-
-//-------------------------------------------------------------------------
-nsEventStatus nsContextMenu::MenuDeselected(const nsMenuEvent & aMenuEvent)
-{
-  if (nsnull != mListener) {
-    mListener->MenuDeselected(aMenuEvent);
-  }
-  return nsEventStatus_eIgnore;
-}
-
-//-------------------------------------------------------------------------
-nsEventStatus nsContextMenu::MenuConstruct(const nsMenuEvent &aMenuEvent,
-                                           nsIWidget         *aParentWindow, 
-                                           void              *menuNode,
-                                           void              *aWebShell)
-{
-  //g_print("nsMenu::MenuConstruct called \n");
-  if(menuNode){
-    SetDOMNode((nsIDOMNode*)menuNode);
-  }
-  
-  if(!aWebShell){
-    aWebShell = mWebShell;
-  }
-
-  // First open the menu.
-  nsCOMPtr<nsIDOMElement> domElement = do_QueryInterface(mDOMNode);
-  if (domElement)
-    domElement->SetAttribute("open", "true");
-
-   // Begin menuitem inner loop
-    nsCOMPtr<nsIDOMNode> menuitemNode;
-    ((nsIDOMNode*)mDOMNode)->GetFirstChild(getter_AddRefs(menuitemNode));
- 
-    unsigned short menuIndex = 0;
-
-    while (menuitemNode) {
-      nsCOMPtr<nsIDOMElement> menuitemElement(do_QueryInterface(menuitemNode));
-      if (menuitemElement) {
-        nsString menuitemNodeType;
-        nsString menuitemName;
-        menuitemElement->GetNodeName(menuitemNodeType);
-        if (menuitemNodeType.Equals("menuitem")) {
-          // LoadMenuItem
-          LoadMenuItem(this,
-                       menuitemElement,
-                       menuitemNode,
-                       menuIndex,
-                       (nsIWebShell*)aWebShell);
-        } else if (menuitemNodeType.Equals("separator")) {
-          AddSeparator();
-        } else if (menuitemNodeType.Equals("menu")) {
-          // Load a submenu
-          LoadSubMenu(this, menuitemElement, menuitemNode);
-        }
-      }
-      
-      ++menuIndex;
-      
-      nsCOMPtr<nsIDOMNode> oldmenuitemNode(menuitemNode);
-      oldmenuitemNode->GetNextSibling(getter_AddRefs(menuitemNode));
-    } // end menu item innner loop
-  return nsEventStatus_eIgnore;
-}
-
-//-------------------------------------------------------------------------
-nsEventStatus nsContextMenu::MenuDestruct(const nsMenuEvent & aMenuEvent)
-{
-  // Close the node.
-  nsCOMPtr<nsIDOMElement> domElement = do_QueryInterface(mDOMNode);
-  if (domElement)
-    domElement->RemoveAttribute("open");
-
-  //g_print("nsMenu::MenuDestruct called \n");
-  mConstructCalled = PR_FALSE;
-  RemoveAll();
-  return nsEventStatus_eIgnore;
-}
-
-//----------------------------------------
-void nsContextMenu::LoadMenuItem(nsIMenu        *pParentMenu,
-                                 nsIDOMElement  *menuitemElement,
-                                 nsIDOMNode     *menuitemNode,
-                                 unsigned short  menuitemIndex,
-                                 nsIWebShell    *aWebShell)
-{
-  static const char* NS_STRING_TRUE = "true";
-  nsString disabled;
-  nsString menuitemName;
-  nsString menuitemCmd;
-
-  menuitemElement->GetAttribute(nsAutoString("disabled"), disabled);
-  menuitemElement->GetAttribute(nsAutoString("name"), menuitemName);
-  menuitemElement->GetAttribute(nsAutoString("cmd"), menuitemCmd);
-      
-  // Create nsMenuItem
-  nsIMenuItem * pnsMenuItem = nsnull;
-  nsresult rv = nsComponentManager::CreateInstance(kMenuItemCID,
-                                                   nsnull, 
-                                                   nsIMenuItem::GetIID(), 
-                                                   (void**)&pnsMenuItem);
-  if (NS_OK == rv) {
-    pnsMenuItem->Create(pParentMenu, menuitemName, PR_FALSE);
-                     
-    nsISupports * supports = nsnull;
-    pnsMenuItem->QueryInterface(kISupportsIID, (void**) &supports);
-    pParentMenu->AddItem(supports); // Parent should now own menu item
-    NS_RELEASE(supports);
-            
-    if(disabled == NS_STRING_TRUE) {
-      pnsMenuItem->SetEnabled(PR_FALSE);
-    }
-  
-    // Create MenuDelegate - this is the intermediator inbetween 
-    // the DOM node and the nsIMenuItem
-    // The nsWebShellWindow wacthes for Document changes and then notifies the 
-    // the appropriate nsMenuDelegate object
-    nsCOMPtr<nsIDOMElement> domElement(do_QueryInterface(menuitemNode));
-    if (!domElement) {
-      //return NS_ERROR_FAILURE;
-		return;
-    }
-    
-    nsAutoString cmdAtom("onclick");
-    nsString cmdName;
-
-    domElement->GetAttribute(cmdAtom, cmdName);
-
-    pnsMenuItem->SetCommand(cmdName);
-   // DO NOT use passed in webshell because of messed up windows dynamic loading
-      // code. 
-    pnsMenuItem->SetWebShell(mWebShell);
-    pnsMenuItem->SetDOMElement(domElement);
-
-    NS_RELEASE(pnsMenuItem);
-    
-  } 
-  return;
-}
-
-//----------------------------------------
-void nsContextMenu::LoadSubMenu(nsIMenu         *pParentMenu,
-                                nsIDOMElement   *menuElement,
-                                nsIDOMNode      *menuNode)
-{
-  nsString menuName;
-  menuElement->GetAttribute(nsAutoString("name"), menuName);
-  //printf("Creating Menu [%s] \n", menuName.ToNewCString()); // this leaks
-
-  // Create nsMenu
-  nsIMenu * pnsMenu = nsnull;
-  nsresult rv = nsComponentManager::CreateInstance(kMenuCID,
-                                                   nsnull,
-                                                   nsIMenu::GetIID(),
-                                                   (void**)&pnsMenu);
-  if (NS_OK == rv) {
-    // Call Create
-    nsISupports * supports = nsnull;
-    pParentMenu->QueryInterface(kISupportsIID, (void**) &supports);
-    pnsMenu->Create(supports, menuName);
-    NS_RELEASE(supports); // Balance QI
-
-    // Set nsMenu Name
-    pnsMenu->SetLabel(menuName); 
-
-    supports = nsnull;
-    pnsMenu->QueryInterface(kISupportsIID, (void**) &supports);
-    pParentMenu->AddItem(supports); // parent takes ownership
-    NS_RELEASE(supports);
-
-    pnsMenu->SetWebShell(mWebShell);
-    pnsMenu->SetDOMNode(menuNode);
-
-    /*
-    // Begin menuitem inner loop
-    unsigned short menuIndex = 0;
-
-    nsCOMPtr<nsIDOMNode> menuitemNode;
-    menuNode->GetFirstChild(getter_AddRefs(menuitemNode));
-    while (menuitemNode) {
-      nsCOMPtr<nsIDOMElement> menuitemElement(do_QueryInterface(menuitemNode));
-      if (menuitemElement) {
-        nsString menuitemNodeType;
-        menuitemElement->GetNodeName(menuitemNodeType);
-
-#ifdef DEBUG_saari
-        printf("Type [%s] %d\n", menuitemNodeType.ToNewCString(), menuitemNodeType.Equals("separator"));
-#endif
-
-        if (menuitemNodeType.Equals("menuitem")) {
-          // Load a menuitem
-          LoadMenuItem(pnsMenu, menuitemElement, menuitemNode, menuIndex, mWebShell);
-        } else if (menuitemNodeType.Equals("separator")) {
-          pnsMenu->AddSeparator();
-        } else if (menuitemNodeType.Equals("menu")) {
-          // Add a submenu
-          LoadSubMenu(pnsMenu, menuitemElement, menuitemNode);
-        }
-      }
-	  ++menuIndex;
-      nsCOMPtr<nsIDOMNode> oldmenuitemNode(menuitemNode);
-      oldmenuitemNode->GetNextSibling(getter_AddRefs(menuitemNode));
-    } // end menu item innner loop
-    */
-  }     
-}
-
-//----------------------------------------
-void nsContextMenu::LoadMenuItem(nsIContextMenu *pParentMenu,
-                                 nsIDOMElement  *menuitemElement,
-                                 nsIDOMNode     *menuitemNode,
-                                 unsigned short  menuitemIndex,
-                                 nsIWebShell    *aWebShell)
-{
-
-}
-
-//----------------------------------------
-void nsContextMenu::LoadSubMenu(nsIContextMenu  *pParentMenu,
-                                nsIDOMElement   *menuElement,
-                                nsIDOMNode      *menuNode)
-{
-
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsContextMenu::SetLocation(PRInt32 aX, PRInt32 aY)
-{
-  mX = aX;
-  mY = aY;
-  return NS_OK;
-}
-
-
-// local methods
-gint nsContextMenu::GetX(void)
-{
-  return mX;
-}
-
-gint nsContextMenu::GetY(void)
-{
-  return mY;
-}
-// end silly local methods
-
-//-------------------------------------------------------------------------
-NS_METHOD nsContextMenu::SetDOMNode(nsIDOMNode *aMenuNode)
-{
-  mDOMNode = aMenuNode;
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsContextMenu::SetDOMElement(nsIDOMElement *aMenuElement)
-{
-  mDOMElement = aMenuElement;
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsContextMenu::SetWebShell(nsIWebShell *aWebShell)
-{
-  mWebShell = aWebShell;
-  return NS_OK;
-}

mozilla/widget/src/gtk/nsContextMenu.h

@@ -1,139 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsContextMenu_h__
-#define nsContextMenu_h__
-
-#include "nsIContextMenu.h"
-#include "nsISupportsArray.h"
-#include "nsVoidArray.h"
-
-#include "nsIDOMElement.h"
-#include "nsIWebShell.h"
-
-class nsIMenuListener;
-
-/**
- * Native Win32 button wrapper
- */
-
-class nsContextMenu : public nsIContextMenu, public nsIMenuListener
-{
-
-public:
-  nsContextMenu();
-  virtual ~nsContextMenu();
-
-  NS_DECL_ISUPPORTS
-  
-  //nsIMenuListener interface
-  nsEventStatus MenuItemSelected(const nsMenuEvent & aMenuEvent);
-  nsEventStatus MenuSelected(const nsMenuEvent & aMenuEvent);
-  nsEventStatus MenuDeselected(const nsMenuEvent & aMenuEvent);
-  nsEventStatus MenuConstruct(const nsMenuEvent & aMenuEvent,
-                              nsIWidget         * aParentWindow, 
-                              void              * menubarNode,
-                              void              * aWebShell);
-  nsEventStatus MenuDestruct(const nsMenuEvent & aMenuEvent);
-
-  // nsIMenu Methods
-  NS_IMETHOD Create(nsISupports * aParent,
-                    const nsString& anAlignment,
-                    const nsString& aAnchorAlign);
-  NS_IMETHOD GetParent(nsISupports *&aParent);
-
-  NS_IMETHOD AddItem(nsISupports * aItem);
-
-  NS_IMETHOD AddSeparator();
-  NS_IMETHOD GetItemCount(PRUint32 &aCount);
-  NS_IMETHOD GetItemAt(const PRUint32 aPos, nsISupports *& aMenuItem);
-  NS_IMETHOD InsertItemAt(const PRUint32 aPos, nsISupports * aMenuItem);
-  NS_IMETHOD RemoveItem(const PRUint32 aPos);
-  NS_IMETHOD RemoveAll();
-  NS_IMETHOD GetNativeData(void** aData);
-
-  NS_IMETHOD AddMenuListener(nsIMenuListener * aMenuListener);
-  NS_IMETHOD RemoveMenuListener(nsIMenuListener * aMenuListener);
-
-  //
-  NS_IMETHOD AddMenuItem(nsIMenuItem * aMenuItem);
-  NS_IMETHOD AddMenu(nsIMenu * aMenu);
-  NS_IMETHOD InsertSeparator(const PRUint32 aCount);
-
-  NS_IMETHOD SetDOMNode(nsIDOMNode * menuNode);
-  NS_IMETHOD SetDOMElement(nsIDOMElement * menuElement);
-  NS_IMETHOD SetWebShell(nsIWebShell * aWebShell);
-  NS_IMETHOD SetLocation(PRInt32 aX, PRInt32 aY);
-
-  gint GetX(void);
-  gint GetY(void);
-
-
-protected:
-  nsIMenuBar * GetMenuBar(nsIMenu * aMenu);
-  nsIWidget *  GetParentWidget();
-  char* GetACPString(nsString& aStr);
-
-  void LoadMenuItem(nsIMenu       * pParentMenu,
-                    nsIDOMElement * menuitemElement,
-                    nsIDOMNode    * menuitemNode,
-                    unsigned short  menuitemIndex,
-                    nsIWebShell   * aWebShell);
-  
-  void LoadSubMenu(nsIMenu       * pParentMenu,
-                   nsIDOMElement * menuElement,
-                   nsIDOMNode    * menuNode);
-
-  void LoadMenuItem(nsIContextMenu * pParentMenu,
-                    nsIDOMElement  * menuitemElement,
-                    nsIDOMNode     * menuitemNode,
-                    unsigned short   menuitemIndex,
-                    nsIWebShell    * aWebShell);
-  
-  void LoadSubMenu(nsIContextMenu * pParentMenu,
-                   nsIDOMElement  * menuElement,
-                   nsIDOMNode     * menuNode);
-
-  nsIMenuItem * FindMenuItem(nsIContextMenu * aMenu, PRUint32 aId);
-
-  nsString   mLabel;
-  PRUint32   mNumMenuItems;
-  GtkWidget  *mMenu;
-  
-  nsVoidArray mMenuItemVoidArray;
-
-  nsIWidget  *mParent;
-  nsIMenuListener * mListener;
-  
-  PRBool mConstructCalled;
-  nsIDOMNode    * mDOMNode;
-  nsIWebShell   * mWebShell;
-  nsIDOMElement * mDOMElement;
-
-  nsString        mAlignment;
-  nsString        mAnchorAlignment;
-
-  PRInt32         mX;
-  PRInt32         mY;
-};
-
-#endif // nsContextMenu_h__

mozilla/widget/src/gtk/nsDragService.cpp

@@ -1,592 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsDragService.h"
-
-#include "nsITransferable.h"
-#include "nsString.h"
-#include "nsClipboard.h"
-#include "nsIRegion.h"
-#include "nsVoidArray.h"
-#include "nsISupportsPrimitives.h"
-#include "nsPrimitiveHelpers.h"
-#include "nsCOMPtr.h"
-#include "nsXPIDLString.h"
-
-#include "nsWidgetsCID.h"
-
-NS_IMPL_ADDREF_INHERITED(nsDragService, nsBaseDragService)
-NS_IMPL_RELEASE_INHERITED(nsDragService, nsBaseDragService)
-NS_IMPL_QUERY_INTERFACE2(nsDragService, nsIDragService, nsIDragSession)
-
-#define DEBUG_DRAG 1
-
-//-------------------------------------------------------------------------
-//
-// DragService constructor
-//
-//-------------------------------------------------------------------------
-nsDragService::nsDragService()
-{
-  NS_INIT_REFCNT();
-  mWidget = nsnull;
-  mNumFlavors = 0;
-}
-
-//-------------------------------------------------------------------------
-//
-// DragService destructor
-//
-//-------------------------------------------------------------------------
-nsDragService::~nsDragService()
-{
-}
-
-enum {
-  TARGET_STRING,
-  TARGET_ROOTWIN
-};
-
-static GtkTargetEntry target_table[] = {
-  { "STRING",     0, TARGET_STRING },
-  { "text/plain", 0, TARGET_STRING },
-  { "application/x-rootwin-drop", 0, TARGET_ROOTWIN }
-};
-
-static guint n_targets = sizeof(target_table) / sizeof(target_table[0]);
-
-
-NS_IMETHODIMP nsDragService::StartDragSession()
-{
-  printf("nsDragService::StartDragSession()\n");
-  nsBaseDragService::StartDragSession();
-  
-  /*
-  gtk_drag_source_set(mWidget,
-                      GDK_MODIFIER_MASK,
-                      targetlist,
-                      mNumFlavors,
-                      action);
-  */
-  gtk_drag_source_set(mWidget,
-                      GDK_MODIFIER_MASK,
-                      target_table,
-                      n_targets,
-                      mActionType);
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsDragService::EndDragSession()
-{
-  printf("nsDragService::EndDragSession()\n");
-  nsBaseDragService::EndDragSession();
-  
-  gtk_drag_source_unset(mWidget);
-
-  return NS_OK;
-}
-
-
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsDragService::InvokeDragSession (nsISupportsArray *aTransferableArray,
-                                                nsIScriptableRegion *aRegion,
-                                                PRUint32 aActionType)
-{
-  mWidget = gtk_get_event_widget(gtk_get_current_event());
-
-  // add the flavors from the transferables. Cache this array for the send data proc
-  GtkTargetList *targetlist = RegisterDragItemsAndFlavors(aTransferableArray);
-
-  switch (aActionType)
-  {
-    case DRAGDROP_ACTION_NONE:
-      mActionType = GDK_ACTION_DEFAULT;
-      break;
-    case DRAGDROP_ACTION_COPY:
-      mActionType = GDK_ACTION_COPY;
-      break;
-    case DRAGDROP_ACTION_MOVE:
-      mActionType = GDK_ACTION_MOVE;
-      break;
-    case DRAGDROP_ACTION_LINK:
-      mActionType = GDK_ACTION_LINK;
-      break;
-  }
-
-  StartDragSession();
-
-  // XXX 3rd param ???    &                last param should be a real event...
-  gtk_drag_begin(mWidget, targetlist, mActionType, 1, gtk_get_current_event());
-
-
-
-
-#if 0  
-  // we have to synthesize the native event because we may be called from JavaScript
-  // through XPConnect. In that case, we only have a DOM event and no way to
-  // get to the native event. As a consequence, we just always fake it.
-  Point globalMouseLoc;
-  ::GetMouse(&globalMouseLoc);
-  ::LocalToGlobal(&globalMouseLoc);
-  WindowPtr theWindow = nsnull;
-  if ( ::FindWindow(globalMouseLoc, &theWindow) != inContent ) {
-    // debugging sanity check
-    #ifdef NS_DEBUG
-    DebugStr("\pAbout to start drag, but FindWindow() != inContent; g");
-    #endif
-  }  
-  EventRecord theEvent;
-  theEvent.what = mouseDown;
-  theEvent.message = reinterpret_cast<UInt32>(theWindow);
-  theEvent.when = 0;
-  theEvent.where = globalMouseLoc;
-  theEvent.modifiers = 0;
-  
-  RgnHandle theDragRgn = ::NewRgn();
-  BuildDragRegion ( aDragRgn, globalMouseLoc, theDragRgn );
-
-  // register drag send proc which will call us back when asked for the actual
-  // flavor data (instead of placing it all into the drag manager)
-  ::SetDragSendProc ( theDragRef, sDragSendDataUPP, this );
-
-  // start the drag. Be careful, mDragRef will be invalid AFTER this call (it is
-  // reset by the dragTrackingHandler).
-  ::TrackDrag ( theDragRef, &theEvent, theDragRgn );
-
-  // clean up after ourselves 
-  ::DisposeRgn ( theDragRgn );
-  result = ::DisposeDrag ( theDragRef );
-  NS_ASSERTION ( result == noErr, "Error disposing drag" );
-  mDragRef = 0L;
-  mDataItems = nsnull;
-
-  return NS_OK; 
-
-#endif
-
-
-
-
-  return NS_OK;
-}
-
-
-
-
-GtkTargetList *
-nsDragService::RegisterDragItemsAndFlavors(nsISupportsArray *inArray)
-{
-  unsigned int numDragItems = 0;
-  inArray->Count(&numDragItems);
-
-  GtkTargetList *targetlist;
-  targetlist = gtk_target_list_new(nsnull, numDragItems);
-
-  for (unsigned int i = 0; i < numDragItems; ++i)
-  {
-    nsCOMPtr<nsISupports> genericItem;
-    inArray->GetElementAt (i, getter_AddRefs(genericItem));
-    nsCOMPtr<nsITransferable> currItem (do_QueryInterface(genericItem));
-    if (currItem)
-    {
-      nsCOMPtr<nsISupportsArray> flavorList;
-      if (NS_SUCCEEDED(currItem->FlavorsTransferableCanExport(getter_AddRefs(flavorList))))
-      {
-        flavorList->Count (&mNumFlavors);
-        for (PRUint32 flavorIndex = 0; flavorIndex < mNumFlavors; ++flavorIndex)
-        {
-          nsCOMPtr<nsISupports> genericWrapper;
-          flavorList->GetElementAt ( flavorIndex, getter_AddRefs(genericWrapper) );
-          nsCOMPtr<nsISupportsString> currentFlavor ( do_QueryInterface(genericWrapper) );
-          if ( currentFlavor )
-          {
-            nsXPIDLCString flavorStr;
-            currentFlavor->ToString ( getter_Copies(flavorStr) );
-
-            // register native flavors
-            GdkAtom atom = gdk_atom_intern(flavorStr, PR_TRUE);
-            gtk_target_list_add(targetlist, atom, 1, atom);
-          }
-
-        } // foreach flavor in item              
-      } // if valid flavor list
-    } // if item is a transferable
-  } // foreach drag item
-
-  return targetlist;
-}
-
-
-/* return PR_TRUE if we have converted or PR_FALSE if we havn't and need to keep being called */
-PRBool nsDragService::DoConvert(GdkAtom type)
-{
-#ifdef DEBUG_DRAG
-  g_print("    nsDragService::DoRealConvert(%li)\n    {\n", type);
-#endif
-  int e = 0;
-  // Set a flag saying that we're blocking waiting for the callback:
-  mBlocking = PR_TRUE;
-
-  //
-  // ask X what kind of data we can get
-  //
-#ifdef DEBUG_DRAG
-  g_print("     Doing real conversion of atom type '%s'\n", gdk_atom_name(type));
-#endif
-  gtk_selection_convert(mWidget,
-                        GDK_SELECTION_PRIMARY,
-                        type,
-                        GDK_CURRENT_TIME);
-
-  // Now we need to wait until the callback comes in ...
-  // i is in case we get a runaway (yuck).
-#ifdef DEBUG_DRAG
-  printf("      Waiting for the callback... mBlocking = %d\n", mBlocking);
-#endif /* DEBUG_CLIPBOARD */
-  for (e=0; mBlocking == PR_TRUE && e < 1000; ++e)
-  {
-    gtk_main_iteration_do(PR_TRUE);
-  }
-
-#ifdef DEBUG_DRAG
-  g_print("    }\n");
-#endif
-
-  if (mSelectionData.length > 0)
-    return PR_TRUE;
-
-  return PR_FALSE;
-}
-
-#if 0
-
-/**
- * Called when the data from a drag comes in (recieved from gdk_selection_convert)
- *
- * @param  aWidget the widget
- * @param  aSelectionData gtk selection stuff
- * @param  aTime time the selection was requested
- */
-void
-nsDragService::SelectionReceivedCB (GtkWidget        *aWidget,
-                                    GdkDragContext   *aContext,
-                                    gint              aX,
-                                    gint              aY,
-                                    GtkSelectionData *aSelectionData,
-                                    guint             aInfo,
-                                    guint             aTime)
-{
-#ifdef DEBUG_DRAG
-  printf("      nsDragService::SelectionReceivedCB\n      {\n");
-#endif
-  nsDragService *ds =(nsDragSession *)gtk_object_get_data(GTK_OBJECT(aWidget),
-                                                        "ds");
-  if (!cb)
-  {
-    g_print("no dragservice found.. this is bad.\n");
-    return;
-  }
-
-
-  ds->SelectionReceiver(aWidget, aSelectionData);
-#ifdef DEBUG_DRAG
-  g_print("      }\n");
-#endif
-}
-
-
-/**
- * local method (called from nsClipboard::SelectionReceivedCB)
- *
- * @param  aWidget the widget
- * @param  aSelectionData gtk selection stuff
- */
-void
-nsDragService::SelectionReceiver (GtkWidget *aWidget,
-                                GtkSelectionData *aSD)
-{
-  gint type;
-
-  mBlocking = PR_FALSE;
-
-  if (aSD->length < 0)
-  {
-    printf("        Error retrieving selection: length was %d\n",
-           aSD->length);
-    return;
-  }
-
-
-  switch (type)
-  {
-  case GDK_TARGET_STRING:
-  case TARGET_COMPOUND_TEXT:
-  case TARGET_TEXT_PLAIN:
-  case TARGET_TEXT_XIF:
-  case TARGET_TEXT_UNICODE:
-  case TARGET_TEXT_HTML:
-#ifdef DEBUG_CLIPBOARD
-    g_print("        Copying mSelectionData pointer -- ");
-#endif
-    mSelectionData = *aSD;
-    mSelectionData.data = g_new(guchar, aSD->length + 1);
-#ifdef DEBUG_CLIPBOARD
-    g_print("        Data = %s\n    Length = %i\n", aSD->data, aSD->length);
-#endif
-    memcpy(mSelectionData.data,
-           aSD->data,
-           aSD->length);
-    // Null terminate in case anyone cares,
-    // and so we can print the string for debugging:
-    mSelectionData.data[aSD->length] = '\0';
-    mSelectionData.length = aSD->length;
-    return;
-
-  default:
-    mSelectionData = *aSD;
-    mSelectionData.data = g_new(guchar, aSD->length + 1);
-    memcpy(mSelectionData.data,
-           aSD->data,
-           aSD->length);
-    mSelectionData.length = aSD->length;
-    return;
-  }
-}
-
-#endif
-
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsDragService::GetNumDropItems (PRUint32 * aNumItems)
-{
-  *aNumItems = 0;
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsDragService::GetData (nsITransferable * aTransferable, PRUint32 anItem)
-{
-
-#ifdef DEBUG_DRAG
-  printf("nsClipboard::GetNativeClipboardData()\n");
-#endif /* DEBUG_CLIPBOARD */
-
-  // make sure we have a good transferable
-  if (!aTransferable) {
-    printf("  GetData: Transferable is null!\n");
-    return NS_ERROR_FAILURE;
-  }
-
-  // get flavor list that includes all acceptable flavors (including ones obtained through
-  // conversion)
-  nsCOMPtr<nsISupportsArray> flavorList;
-  nsresult errCode = aTransferable->FlavorsTransferableCanImport ( getter_AddRefs(flavorList) );
-  if ( NS_FAILED(errCode) )
-    return NS_ERROR_FAILURE;
-
-  // Walk through flavors and see which flavor matches the one being pasted:
-  PRUint32 cnt;
-  flavorList->Count(&cnt);
-  nsCAutoString foundFlavor;
-  for ( PRUint32 i = 0; i < cnt; ++i ) {
-    nsCOMPtr<nsISupports> genericFlavor;
-    flavorList->GetElementAt ( i, getter_AddRefs(genericFlavor) );
-    nsCOMPtr<nsISupportsString> currentFlavor (do_QueryInterface(genericFlavor));
-    if ( currentFlavor ) {
-      nsXPIDLCString flavorStr;
-      currentFlavor->ToString(getter_Copies(flavorStr));
-      if (DoConvert(gdk_atom_intern(flavorStr, 1))) {
-        foundFlavor = flavorStr;
-        break;
-      }
-    }
-  }
-
-#ifdef DEBUG_CLIPBOARD
-  printf("  Got the callback: '%s', %d\n",
-         mSelectionData.data, mSelectionData.length);
-#endif /* DEBUG_CLIPBOARD */
-
-  // We're back from the callback, no longer blocking:
-  mBlocking = PR_FALSE;
-
-  // 
-  // Now we have data in mSelectionData.data.
-  // We just have to copy it to the transferable.
-  // 
-
-#if 0  
-// pinkerton - we have the flavor already from above, so we don't need
-// to re-derrive it.
-  nsString *name = new nsString((const char*)gdk_atom_name(mSelectionData.type));
-  int format = GetFormat(*name);
-  df->SetString((const char*)gdk_atom_name(sSelTypes[format]));
-#endif
-
-  nsCOMPtr<nsISupports> genericDataWrapper;
-  nsPrimitiveHelpers::CreatePrimitiveForData ( foundFlavor, mSelectionData.data, mSelectionData.length, getter_AddRefs(genericDataWrapper) );
-  aTransferable->SetTransferData(foundFlavor,
-                                 genericDataWrapper,
-                                 mSelectionData.length);
-
-  //delete name;
-  
-  // transferable is now copying the data, so we can free it.
-  //  g_free(mSelectionData.data);
-  mSelectionData.data = nsnull;
-  mSelectionData.length = 0;
-
-  gtk_drag_source_unset(mWidget);
-
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsDragService::IsDataFlavorSupported(const char *aDataFlavor, PRBool *_retval)
-{
-  return NS_ERROR_FAILURE;
-}
-
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsDragService::GetCurrentSession (nsIDragSession **aSession)
-{
-  return NS_ERROR_FAILURE;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-//-------------------------------------------------------------------------
-void  
-nsDragService::DragLeave (GtkWidget	       *widget,
-			                    GdkDragContext   *context,
-			                    guint             time)
-{
-  g_print("leave\n");
-  //gHaveDrag = PR_FALSE;
-}
-
-//-------------------------------------------------------------------------
-PRBool
-nsDragService::DragMotion(GtkWidget	       *widget,
-			                    GdkDragContext   *context,
-			                    gint              x,
-			                    gint              y,
-			                    guint             time)
-{
-  g_print("drag motion\n");
-  GtkWidget *source_widget;
-
-#if 0
-  if (!gHaveDrag) {
-      gHaveDrag = PR_TRUE;
-  }
-#endif
-
-  source_widget = gtk_drag_get_source_widget (context);
-  g_print("motion, source %s\n", source_widget ?
-	          gtk_type_name (GTK_OBJECT (source_widget)->klass->type) :
-	          "unknown");
-
-  gdk_drag_status (context, context->suggested_action, time);
-  
-  return PR_TRUE;
-}
-
-//-------------------------------------------------------------------------
-PRBool
-nsDragService::DragDrop(GtkWidget	       *widget,
-			                  GdkDragContext   *context,
-			                  gint              x,
-			                  gint              y,
-			                  guint             time)
-{
-  g_print("drop\n");
-  //gHaveDrag = PR_FALSE;
-
-  if (context->targets){
-    gtk_drag_get_data (widget, context, 
-			                 GPOINTER_TO_INT (context->targets->data), 
-			                 time);
-    return PR_TRUE;
-  }
-  
-  return PR_FALSE;
-}
-
-//-------------------------------------------------------------------------
-void  
-nsDragService::DragDataReceived  (GtkWidget          *widget,
-			                            GdkDragContext     *context,
-			                            gint                x,
-			                            gint                y,
-			                            GtkSelectionData   *data,
-			                            guint               info,
-			                            guint               time)
-{
-  if ((data->length >= 0) && (data->format == 8)) {
-    g_print ("Received \"%s\"\n", (gchar *)data->data);
-    gtk_drag_finish (context, PR_TRUE, PR_FALSE, time);
-    return;
-  }
-  
-  gtk_drag_finish (context, PR_FALSE, PR_FALSE, time);
-}
-  
-//-------------------------------------------------------------------------
-void  
-nsDragService::DragDataGet(GtkWidget          *widget,
-		                       GdkDragContext     *context,
-		                       GtkSelectionData   *selection_data,
-		                       guint               info,
-		                       guint               time,
-		                       gpointer            data)
-{
-  gtk_selection_data_set (selection_data,
-                          selection_data->target,
-                          8, (guchar *)"I'm Data!", 9);
-}
-
-//-------------------------------------------------------------------------
-void  
-nsDragService::DragDataDelete(GtkWidget          *widget,
-			                        GdkDragContext     *context,
-			                        gpointer            data)
-{
-  g_print ("Delete the data!\n");
-}

mozilla/widget/src/gtk/nsDragService.h

@@ -1,109 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsDragService_h__
-#define nsDragService_h__
-
-#include "nsBaseDragService.h"
-#include <gtk/gtk.h>
-
-
-/**
- * Native GTK DragService wrapper
- */
-
-class nsDragService : public nsBaseDragService
-{
-
-public:
-  nsDragService();
-  virtual ~nsDragService();
-  
-  NS_DECL_ISUPPORTS_INHERITED
-
-  // nsIDragService
-  NS_IMETHOD InvokeDragSession (nsISupportsArray * anArrayTransferables,
-                                nsIScriptableRegion * aRegion, PRUint32 aActionType);
-  NS_IMETHOD GetCurrentSession (nsIDragSession ** aSession);
-
-  // nsIDragSession
-  NS_IMETHOD GetData (nsITransferable * aTransferable, PRUint32 anItem);
-  NS_IMETHOD GetNumDropItems (PRUint32 * aNumItems);
-  NS_IMETHOD IsDataFlavorSupported(const char *aDataFlavor, PRBool *_retval);
-
-  NS_IMETHOD StartDragSession();
-  NS_IMETHOD EndDragSession();
-    
-
-  GtkTargetList *RegisterDragItemsAndFlavors(nsISupportsArray *inArray);
-
-protected:
-
-  PRBool DoConvert(GdkAtom type);
-
-  static PRBool gHaveDrag;
-
-  static void DragLeave(GtkWidget      *widget,
-                        GdkDragContext *context,
-                        guint           time);
-
-  static PRBool DragMotion(GtkWidget      *widget,
-                           GdkDragContext *context,
-                           gint            x,
-                           gint            y,
-                           guint           time);
-
-  static PRBool DragDrop(GtkWidget   *widget,
-                         GdkDragContext *context,
-                         gint            x,
-                         gint            y,
-                         guint            time);
-
-  static void DragDataReceived(GtkWidget        *widget,
-			                         GdkDragContext   *context,
-			                         gint              x,
-			                         gint              y,
-			                         GtkSelectionData *data,
-			                         guint             info,
-			                         guint             time);
-
-  static void DragDataGet(GtkWidget          *widget,
-		                      GdkDragContext     *context,
-		                      GtkSelectionData   *selection_data,
-		                      guint               info,
-		                      guint               time,
-		                      gpointer            data);
-
-  static void  DragDataDelete(GtkWidget          *widget,
-			                        GdkDragContext     *context,
-			                        gpointer            data);
-
-private:
-  GdkDragAction mActionType;
-  PRUint32 mNumFlavors;
-  GtkWidget *mWidget;
-  GdkDragContext *mDragContext;
-  GtkSelectionData mSelectionData;
-  PRBool mBlocking;
-};
-
-#endif // nsDragService_h__

mozilla/widget/src/gtk/nsFilePicker.cpp

@@ -1,304 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Mozilla browser.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1999 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#include "nsCOMPtr.h"
-#include "nsIComponentManager.h"
-#include "nsFilePicker.h"
-
-NS_IMPL_ISUPPORTS1(nsFilePicker, nsIFilePicker)
-
-//-------------------------------------------------------------------------
-//
-// nsFilePicker constructor
-//
-//-------------------------------------------------------------------------
-nsFilePicker::nsFilePicker()
-{
-  NS_INIT_REFCNT();
-  mWidget = nsnull;
-  mDisplayDirectory = nsnull;
-  mFilterMenu = nsnull;
-  mOptionMenu = nsnull;
-  mNumberOfFilters = 0;
-}
-
-//-------------------------------------------------------------------------
-//
-// nsFilePicker destructor
-//
-//-------------------------------------------------------------------------
-nsFilePicker::~nsFilePicker()
-{
-  if (mFilterMenu)
-  {
-    GtkWidget *menu_item;
-    GList *list = g_list_first(GTK_MENU_SHELL(mFilterMenu)->children);
-
-    for (;list; list = list->next)
-    {
-      menu_item = GTK_WIDGET(list->data);
-      gchar *data = (gchar*)gtk_object_get_data(GTK_OBJECT(menu_item), "filters");
-      
-      if (data)
-        nsCRT::free(data);
-    }
-  }
-
-  gtk_widget_destroy(mWidget);
-}
-
-
-static void file_ok_clicked(GtkWidget *w, PRBool *ret)
-{
-  g_print("user hit ok\n");
-  *ret = PR_TRUE;
-  gtk_main_quit();
-}
-
-static void file_cancel_clicked(GtkWidget *w, PRBool *ret)
-{
-  g_print("user hit cancel\n");
-  *ret = PR_FALSE;
-  gtk_main_quit();
-}
-
-static void filter_item_activated(GtkWidget *w, gpointer data)
-{
-  //  nsFilePicker *f = (nsFilePicker*)data;
-  gchar *foo = (gchar*)gtk_object_get_data(GTK_OBJECT(w), "filters");
-  g_print("filter_item_activated(): %s\n", foo);
-}
-
-//-------------------------------------------------------------------------
-//
-// Show - Display the file dialog
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsFilePicker::Show(PRInt16 *retval)
-{
-  NS_ENSURE_ARG_POINTER(retval);
-
-  PRBool ret;
-  if (mWidget) {
-    // make things shorter
-    GtkFileSelection *fs = GTK_FILE_SELECTION(mWidget);
-
-    if (mNumberOfFilters != 0)
-    {
-      gtk_option_menu_set_menu(GTK_OPTION_MENU(mOptionMenu), mFilterMenu);
-    }
-    else
-      gtk_widget_hide(mOptionMenu);
-
-#if 0
-    if (mDisplayDirectory)
-      gtk_file_selection_complete(fs, "/");
-#endif
-
-    //    gtk_window_set_modal(GTK_WINDOW(mWidget), PR_TRUE);
-    gtk_widget_show(mWidget);
-
-    // handle close, destroy, etc on the dialog
-    gtk_signal_connect(GTK_OBJECT(fs->ok_button), "clicked",
-                       GTK_SIGNAL_FUNC(file_ok_clicked),
-                       &ret);
-    gtk_signal_connect(GTK_OBJECT(fs->cancel_button), "clicked",
-                       GTK_SIGNAL_FUNC(file_cancel_clicked),
-                       &ret);
-    // start new loop.   ret is set in the above callbacks.
-    gtk_main();
-  }
-  else {
-    ret = PR_FALSE;
-  }
-
-  if (ret)
-    *retval = returnOK;
-  else
-    *retval = returnCancel;
-
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-// Set the list of filters
-//
-//-------------------------------------------------------------------------
-
-NS_IMETHODIMP nsFilePicker::SetFilterList(PRInt32 aNumberOfFilters,
-                                          const PRUnichar **aTitles,
-                                          const PRUnichar **filters)
-{
-#if 0
-  GtkWidget *menu_item;
-
-  mNumberOfFilters  = aNumberOfFilters;
-  mTitles           = aTitles;
-  mFilters          = aFilters;
-
-  mFilterMenu = gtk_menu_new();
-
-  for(unsigned int i=0; i < aNumberOfFilters; i++)
-  {
-    // we need *.{htm, html, xul, etc}
-    char *foo = aTitles[i].ToNewCString();
-    char *filters = aFilters[i].ToNewCString();
-    printf("%20s %s\n", foo, filters);
-
-    menu_item = gtk_menu_item_new_with_label(nsAutoCString(aTitles[i]));
-
-    gtk_object_set_data(GTK_OBJECT(menu_item), "filters", filters);
-
-    gtk_signal_connect(GTK_OBJECT(menu_item),
-                       "activate",
-                       GTK_SIGNAL_FUNC(filter_item_activated),
-                       this);
-
-    gtk_menu_append(GTK_MENU(mFilterMenu), menu_item);
-    gtk_widget_show(menu_item);
-
-    nsCRT::free(foo);
-  }
-#endif
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsFilePicker::GetFile(nsIFileSpec **aFile)
-{
-  NS_ENSURE_ARG_POINTER(*aFile);
-  if (mWidget) {
-    gchar *fn = gtk_file_selection_get_filename(GTK_FILE_SELECTION(mWidget));
-
-    nsCOMPtr<nsIFileSpec> fileSpec(do_CreateInstance("component://netscape/filespec"));
-    
-    NS_ENSURE_TRUE(fileSpec, NS_ERROR_FAILURE);
-
-    fileSpec->SetNativePath(fn);
-
-    *aFile = fileSpec;
-    NS_ADDREF(*aFile);
-  }
-  return NS_OK;
-}
-
-
-//-------------------------------------------------------------------------
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsFilePicker::GetSelectedFilter(PRInt32 *aType)
-{
-  NS_ENSURE_ARG_POINTER(aType);
-  *aType = mSelectedType;
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-// Get the file + path
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsFilePicker::SetDefaultString(const PRUnichar *aString)
-{
-  if (mWidget) {
-    gtk_file_selection_set_filename(GTK_FILE_SELECTION(mWidget),
-                                    (const gchar*)nsAutoCString(aString));
-  }
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsFilePicker::GetDefaultString(PRUnichar **aString)
-{
-  return NS_ERROR_FAILURE;
-}
-
-//-------------------------------------------------------------------------
-//
-// Set the display directory
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsFilePicker::SetDisplayDirectory(nsIFileSpec *aDirectory)
-{
-  mDisplayDirectory = aDirectory;
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-// Get the display directory
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsFilePicker::GetDisplayDirectory(nsIFileSpec **aDirectory)
-{
-  *aDirectory = mDisplayDirectory;
-  NS_IF_ADDREF(*aDirectory);
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsFilePicker::Create(nsIDOMWindow *aParent,
-                                   const PRUnichar *aTitle,
-                                   PRInt16 aMode)
-{
-  return nsBaseFilePicker::Create(aParent, aTitle, aMode);
-}
-
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsFilePicker::CreateNative(nsIWidget *aParent,
-                                         const PRUnichar *aTitle,
-                                         PRInt16 aMode)
-{
-  mWidget = gtk_file_selection_new((const gchar *)nsAutoCString(aTitle));
-  gtk_signal_connect(GTK_OBJECT(mWidget),
-                     "destroy",
-                     GTK_SIGNAL_FUNC(DestroySignal),
-                     this);
-
-  gtk_button_box_set_layout(GTK_BUTTON_BOX(GTK_FILE_SELECTION(mWidget)->button_area), GTK_BUTTONBOX_SPREAD);
-
-  mOptionMenu = gtk_option_menu_new();
-
-  gtk_box_pack_start(GTK_BOX(GTK_FILE_SELECTION(mWidget)->main_vbox), mOptionMenu, PR_FALSE, PR_FALSE, 0);
-  gtk_widget_show(mOptionMenu);
-
-  // Hide the file column for the folder case.
-  if (aMode == nsIFilePicker::modeGetFolder) {
-    gtk_widget_hide((GTK_FILE_SELECTION(mWidget)->file_list)->parent);
-  }
-
-  return NS_OK;
-}
-
-gint
-nsFilePicker::DestroySignal(GtkWidget *  aGtkWidget,
-                            nsFilePicker* aWidget)
-{
-  aWidget->OnDestroySignal(aGtkWidget);
-  return TRUE;
-}
-
-void
-nsFilePicker::OnDestroySignal(GtkWidget* aGtkWidget)
-{
-  if (aGtkWidget == mWidget) {
-    mWidget = nsnull;
-  }
-}

mozilla/widget/src/gtk/nsFilePicker.h

@@ -1,68 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Mozilla browser.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1999 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#ifndef nsFilePicker_h__
-#define nsFilePicker_h__
-
-#include "nsBaseFilePicker.h"
-
-#include <gtk/gtk.h>
-
-/**
- * Native GTK FileSelector wrapper
- */
-
-class nsFilePicker : public nsBaseFilePicker
-{
-public:
-  nsFilePicker(); 
-  virtual ~nsFilePicker();
-
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIFILEPICKER
-
-protected:
-  /* method from nsBaseFilePicker */
-  NS_IMETHOD CreateNative(nsIWidget *aParent,
-                          const PRUnichar *aTitle,
-                          PRInt16 aMode);
-
-  static gint DestroySignal(GtkWidget *  aGtkWidget,
-                            nsFilePicker* aWidget);
-
-  virtual void OnDestroySignal(GtkWidget* aGtkWidget);
-
-  GtkWidget		*mWidget;
-  GtkWidget   *mOptionMenu;
-  GtkWidget   *mFilterMenu;
-
-
-  PRUint32		    mNumberOfFilters;  
-  const nsString*	mTitles;
-  const nsString*	mFilters;
-  nsString		  mDefault;
-  nsIFileSpec  *mDisplayDirectory;
-  PRInt16       mSelectedType;
-};
-
-#endif // nsFilePicker_h__

mozilla/widget/src/gtk/nsFileWidget.cpp

@@ -1,322 +0,0 @@
-/* -*- Mode: c++; tab-width: 2; indent-tabs-mode: nil; -*- */
-/*
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsFileWidget.h"
-#include "nsIToolkit.h"
-
-NS_IMPL_ISUPPORTS1(nsFileWidget, nsIFileWidget)
-
-//-------------------------------------------------------------------------
-//
-// nsFileWidget constructor
-//
-//-------------------------------------------------------------------------
-nsFileWidget::nsFileWidget() : nsIFileWidget()
-{
-  NS_INIT_REFCNT();
-  mWidget = nsnull;
-  mDisplayDirectory = nsnull;
-  mFilterMenu = nsnull;
-  mOptionMenu = nsnull;
-  mNumberOfFilters = 0;
-}
-
-//-------------------------------------------------------------------------
-//
-// nsFileWidget destructor
-//
-//-------------------------------------------------------------------------
-nsFileWidget::~nsFileWidget()
-{
-  if (mFilterMenu)
-  {
-    GtkWidget *menu_item;
-    GList *list = g_list_first(GTK_MENU_SHELL(mFilterMenu)->children);
-
-    for (;list; list = list->next)
-    {
-      menu_item = GTK_WIDGET(list->data);
-      gchar *data = (gchar*)gtk_object_get_data(GTK_OBJECT(menu_item), "filters");
-      
-      if (data)
-        nsCRT::free(data);
-    }
-  }
-
-  gtk_widget_destroy(mWidget);
-}
-
-
-static void file_ok_clicked(GtkWidget *w, PRBool *ret)
-{
-  g_print("user hit ok\n");
-  *ret = PR_TRUE;
-  gtk_main_quit();
-}
-
-static void file_cancel_clicked(GtkWidget *w, PRBool *ret)
-{
-  g_print("user hit cancel\n");
-  *ret = PR_FALSE;
-  gtk_main_quit();
-}
-
-static void filter_item_activated(GtkWidget *w, gpointer data)
-{
-  //  nsFileWidget *f = (nsFileWidget*)data;
-  gchar *foo = (gchar*)gtk_object_get_data(GTK_OBJECT(w), "filters");
-  g_print("filter_item_activated(): %s\n", foo);
-}
-
-//-------------------------------------------------------------------------
-//
-// Show - Display the file dialog
-//
-//-------------------------------------------------------------------------
-PRBool nsFileWidget::Show()
-{
-  PRBool ret;
-  if (mWidget) {
-    // make things shorter
-    GtkFileSelection *fs = GTK_FILE_SELECTION(mWidget);
-
-    if (mNumberOfFilters != 0)
-    {
-      gtk_option_menu_set_menu(GTK_OPTION_MENU(mOptionMenu), mFilterMenu);
-    }
-    else
-      gtk_widget_hide(mOptionMenu);
-
-#if 0
-    if (mDisplayDirectory)
-      gtk_file_selection_complete(fs, "/");
-#endif
-
-    //    gtk_window_set_modal(GTK_WINDOW(mWidget), PR_TRUE);
-    gtk_widget_show(mWidget);
-
-    // handle close, destroy, etc on the dialog
-    gtk_signal_connect(GTK_OBJECT(fs->ok_button), "clicked",
-                       GTK_SIGNAL_FUNC(file_ok_clicked),
-                       &ret);
-    gtk_signal_connect(GTK_OBJECT(fs->cancel_button), "clicked",
-                       GTK_SIGNAL_FUNC(file_cancel_clicked),
-                       &ret);
-    // start new loop.   ret is set in the above callbacks.
-    gtk_main();
-  }
-  else {
-    ret = PR_FALSE;
-  }
-  return ret;
-}
-
-//-------------------------------------------------------------------------
-//
-// Set the list of filters
-//
-//-------------------------------------------------------------------------
-
-NS_IMETHODIMP nsFileWidget::SetFilterList(PRUint32 aNumberOfFilters,
-                                          const nsString aTitles[],
-                                          const nsString aFilters[])
-{
-  GtkWidget *menu_item;
-
-  mNumberOfFilters  = aNumberOfFilters;
-  mTitles           = aTitles;
-  mFilters          = aFilters;
-
-  mFilterMenu = gtk_menu_new();
-
-  for(unsigned int i=0; i < aNumberOfFilters; i++)
-  {
-    // we need *.{htm, html, xul, etc}
-    char *foo = aTitles[i].ToNewCString();
-    char *filters = aFilters[i].ToNewCString();
-    printf("%20s %s\n", foo, filters);
-
-    menu_item = gtk_menu_item_new_with_label(nsAutoCString(aTitles[i]));
-
-    gtk_object_set_data(GTK_OBJECT(menu_item), "filters", filters);
-
-    gtk_signal_connect(GTK_OBJECT(menu_item),
-                       "activate",
-                       GTK_SIGNAL_FUNC(filter_item_activated),
-                       this);
-
-    gtk_menu_append(GTK_MENU(mFilterMenu), menu_item);
-    gtk_widget_show(menu_item);
-
-    nsCRT::free(foo);
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP  nsFileWidget::GetFile(nsFileSpec& aFile)
-{
-  if (mWidget) {
-    gchar *fn = gtk_file_selection_get_filename(GTK_FILE_SELECTION(mWidget));
-    aFile = fn; // Put the filename into the nsFileSpec instance.
-  }
-  return NS_OK;
-}
-
-
-//-------------------------------------------------------------------------
-//-------------------------------------------------------------------------
-NS_IMETHODIMP  nsFileWidget::GetSelectedType(PRInt16& theType)
-{
-  theType = mSelectedType;
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-// Get the file + path
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP  nsFileWidget::SetDefaultString(const nsString& aString)
-{
-  if (mWidget) {
-    gtk_file_selection_set_filename(GTK_FILE_SELECTION(mWidget),
-                                    (const gchar*)nsAutoCString(aString));
-  }
-  return NS_OK;
-}
-
-
-//-------------------------------------------------------------------------
-//
-// Set the display directory
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP  nsFileWidget::SetDisplayDirectory(const nsFileSpec& aDirectory)
-{
-  mDisplayDirectory = aDirectory;
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-// Get the display directory
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP  nsFileWidget::GetDisplayDirectory(nsFileSpec& aDirectory)
-{
-  aDirectory = mDisplayDirectory;
-  return NS_OK;
-}
-
-
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsFileWidget::Create(nsIWidget *aParent,
-                                   const nsString& aTitle,
-                                   nsFileDlgMode aMode,
-                                   nsIDeviceContext *aContext,
-                                   nsIAppShell *aAppShell,
-                                   nsIToolkit *aToolkit,
-                                   void *aInitData)
-{
-  mMode = aMode;
-  mTitle.SetLength(0);
-  mTitle.Append(aTitle);
-
-  mWidget = gtk_file_selection_new((const gchar *)nsAutoCString(aTitle));
-  gtk_signal_connect(GTK_OBJECT(mWidget),
-                     "destroy",
-                     GTK_SIGNAL_FUNC(DestroySignal),
-                     this);
-
-  gtk_button_box_set_layout(GTK_BUTTON_BOX(GTK_FILE_SELECTION(mWidget)->button_area), GTK_BUTTONBOX_SPREAD);
-
-  mOptionMenu = gtk_option_menu_new();
-
-  gtk_box_pack_start(GTK_BOX(GTK_FILE_SELECTION(mWidget)->main_vbox), mOptionMenu, PR_FALSE, PR_FALSE, 0);
-  gtk_widget_show(mOptionMenu);
-
-
-  // Hide the file column for the folder case.
-  if (aMode == eMode_getfolder) {
-    gtk_widget_hide((GTK_FILE_SELECTION(mWidget)->file_list)->parent);
-  }
-
-  return NS_OK;
-}
-
-gint
-nsFileWidget::DestroySignal(GtkWidget *  aGtkWidget,
-                            nsFileWidget* aWidget)
-{
-  aWidget->OnDestroySignal(aGtkWidget);
-  return TRUE;
-}
-
-void
-nsFileWidget::OnDestroySignal(GtkWidget* aGtkWidget)
-{
-  if (aGtkWidget == mWidget) {
-    mWidget = nsnull;
-  }
-}
-
-nsFileDlgResults nsFileWidget::GetFile(nsIWidget *aParent,
-                                       const nsString &promptString,
-                                       nsFileSpec &theFileSpec)
-{
-	Create(aParent, promptString, eMode_load, nsnull, nsnull);
-	if (Show() == PR_TRUE)
-	{
-		GetFile(theFileSpec);
-		return nsFileDlgResults_OK;
-	}
-
-  return nsFileDlgResults_Cancel;
-}
-
-nsFileDlgResults nsFileWidget::GetFolder(nsIWidget *aParent,
-                                         const nsString &promptString,
-                                         nsFileSpec &theFileSpec)
-{
-	Create(aParent, promptString, eMode_getfolder, nsnull, nsnull);
-	if (Show() == PR_TRUE)
-	{
-		GetFile(theFileSpec);
-		return nsFileDlgResults_OK;
-	}
-
-  return nsFileDlgResults_Cancel;
-}
-
-nsFileDlgResults nsFileWidget::PutFile(nsIWidget *aParent,
-                                       const nsString &promptString,
-                                       nsFileSpec &theFileSpec)
-{ 
-	Create(aParent, promptString, eMode_save, nsnull, nsnull);
-	if (Show() == PR_TRUE)
-	{
-		GetFile(theFileSpec);
-		return nsFileDlgResults_OK;
-	}
-  return nsFileDlgResults_Cancel; 
-}

mozilla/widget/src/gtk/nsFileWidget.h

@@ -1,102 +0,0 @@
-/* -*- Mode: c++; tab-width: 2; indent-tabs-mode: nil; -*- */
-/*
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsFileWidget_h__
-#define nsFileWidget_h__
-
-#include "nsIWidget.h"
-#include "nsIFileWidget.h"
-
-#include <gtk/gtk.h>
-
-class nsIToolkit;
-
-/**
- * Native GTK FileSelector wrapper
- */
-
-class nsFileWidget : public nsIFileWidget 
-{
-public:
-  nsFileWidget(); 
-  virtual ~nsFileWidget();
-
-  NS_DECL_ISUPPORTS
-
-  // nsIWidget interface
-  
-  NS_IMETHOD		Create(nsIWidget *aParent,
-                       const nsString& aTitle,
-                       nsFileDlgMode aMode,
-                       nsIDeviceContext *aContext = nsnull,
-                       nsIAppShell *aAppShell = nsnull,
-                       nsIToolkit *aToolkit = nsnull,
-                       void *aInitData = nsnull);
-
-  // nsIFileWidget part
-  virtual PRBool	Show();
-  NS_IMETHOD GetFile(nsFileSpec& aFile);
-  NS_IMETHOD SetDefaultString(const nsString& aFile);
-  NS_IMETHOD SetFilterList(PRUint32 aNumberOfFilters,
-                           const nsString aTitles[],
-                           const nsString aFilters[]);
-
-  NS_IMETHOD GetDisplayDirectory(nsFileSpec& aDirectory);
-  NS_IMETHOD SetDisplayDirectory(const nsFileSpec& aDirectory);
-  
-  virtual nsFileDlgResults GetFile(nsIWidget *aParent,
-                                   const nsString &promptString,
-                                   nsFileSpec &theFileSpec);
-  
-  virtual nsFileDlgResults GetFolder(nsIWidget *aParent,
-                                     const nsString &promptString,
-                                     nsFileSpec &theFileSpec);
-
-  virtual nsFileDlgResults PutFile(nsIWidget *aParent,
-                                   const nsString &promptString,
-                                   nsFileSpec &theFileSpec);
-
-
-  NS_IMETHOD            GetSelectedType(PRInt16& theType);
-
-protected:
-  static gint DestroySignal(GtkWidget *  aGtkWidget,
-                            nsFileWidget* aWidget);
-
-  virtual void OnDestroySignal(GtkWidget* aGtkWidget);
-
-  GtkWidget		*mWidget;
-  nsString		mTitle;
-  GtkWidget   *mOptionMenu;
-  GtkWidget   *mFilterMenu;
-
-
-  nsFileDlgMode   mMode;
-  PRUint32		    mNumberOfFilters;  
-  const nsString*	mTitles;
-  const nsString*	mFilters;
-  nsString		mDefault;
-  nsFileSpec    mDisplayDirectory;
-  PRInt16       mSelectedType;
-};
-
-#endif // nsFileWidget_h__

mozilla/widget/src/gtk/nsFontRetrieverService.cpp

@@ -1,395 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsFontRetrieverService.h"
-#include "nsIWidget.h"
-#include <ctype.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkx.h>
-#include "X11/Xlib.h"
-#include "X11/Xutil.h"
- 
-#include "nsFont.h"
-#include "nsVoidArray.h"
-#include "nsFontSizeIterator.h"
- 
-NS_IMPL_ISUPPORTS2(nsFontRetrieverService, nsIFontRetrieverService, nsIFontNameIterator)
-
-//----------------------------------------------------------
-nsFontRetrieverService::nsFontRetrieverService()
-{
-  NS_INIT_REFCNT();
-
-  mFontList     = nsnull;
-  mSizeIter     = nsnull;
-  mNameIterInx  = 0;
-
-}
-
-//----------------------------------------------------------
-nsFontRetrieverService::~nsFontRetrieverService()
-{
-  if (nsnull != mFontList) {
-    for (PRInt32 i=0;i<mFontList->Count();i++) {
-      FontInfo * font = (FontInfo *)mFontList->ElementAt(i);
-      if (font->mSizes) {
-        delete font->mSizes;
-      }
-      delete font;
-    }
-    delete mFontList;
-  }
-  NS_IF_RELEASE(mSizeIter);
-}
-
-
-
-//----------------------------------------------------------
-//-- nsIFontRetrieverService
-//----------------------------------------------------------
-NS_IMETHODIMP nsFontRetrieverService::CreateFontNameIterator( nsIFontNameIterator** aIterator )
-{
-  if (nsnull == aIterator) {
-    return NS_ERROR_FAILURE;
-  }
-
-  if (nsnull == mFontList) {
-    LoadFontList();
-  }
-  *aIterator = this;
-  NS_ADDREF_THIS();
-  return NS_OK;
-}
-
-//----------------------------------------------------------
-NS_IMETHODIMP nsFontRetrieverService::CreateFontSizeIterator( const nsString & aFontName, 
-                                                              nsIFontSizeIterator** aIterator )
-{
-  // save value in case someone externally is using it
-  PRInt32 saveIterInx = mNameIterInx;
-
-  PRBool found = PR_FALSE;
-  Reset();
-  do {
-    nsAutoString name;
-    Get(&name);
-    if (name.Equals(aFontName)) {
-      found = PR_TRUE;
-      break;
-    }
-  } while (Advance() == NS_OK);
-
-  if (found) {
-    if (nsnull == mSizeIter) {
-      mSizeIter = new nsFontSizeIterator();
-    }
-    NS_ASSERTION( nsnull != mSizeIter, "nsFontSizeIterator instance pointer is null");
-
-    *aIterator = (nsIFontSizeIterator *)mSizeIter;
-    NS_ADDREF(mSizeIter);
-
-    FontInfo * fontInfo = (FontInfo *)mFontList->ElementAt(mNameIterInx);
-    mSizeIter->SetFontInfo(fontInfo);
-    mNameIterInx = saveIterInx;
-    return NS_OK;
-  }
-  mNameIterInx = saveIterInx;
-  return NS_ERROR_FAILURE;
-}
-
-//----------------------------------------------------------
-//-- nsIFontNameIterator
-//----------------------------------------------------------
-NS_IMETHODIMP nsFontRetrieverService::Reset()
-{
-  mNameIterInx = 0;
-  return NS_OK;
-}
-
-//----------------------------------------------------------
-NS_IMETHODIMP nsFontRetrieverService::Get( nsString* aFontName )
-{
-  if (mNameIterInx < mFontList->Count()) {
-    FontInfo * fontInfo = (FontInfo *)mFontList->ElementAt(mNameIterInx);
-    *aFontName = fontInfo->mName;
-    return NS_OK;
-  }
-  return NS_ERROR_FAILURE;
-}
-
-//----------------------------------------------------------
-NS_IMETHODIMP nsFontRetrieverService::Advance()
-{
-  if (mNameIterInx < mFontList->Count()-1) {
-    mNameIterInx++;
-    return NS_OK;
-  }
-  return NS_ERROR_FAILURE;
-}
-
-//------------------------------
-static FontInfo * GetFontInfo(nsVoidArray * aFontList, char * aName)
-{
-  nsAutoString name(aName);
-  PRInt32 i;
-  PRInt32 cnt = aFontList->Count();
-  for (i=0;i<cnt;i++) {
-    FontInfo * fontInfo = (FontInfo *)aFontList->ElementAt(i);
-    if (fontInfo->mName.Equals(name)) {
-      return fontInfo;
-    }
-  }
-
-  FontInfo * fontInfo   = new FontInfo();
-  fontInfo->mName       = aName;
-  //printf("Adding [%s]\n", aName);fflush(stdout); 
-  fontInfo->mIsScalable = PR_FALSE; // X fonts aren't scalable right??
-  fontInfo->mSizes      = nsnull;
-  aFontList->AppendElement(fontInfo);
-  return fontInfo;
-}
-
-//------------------------------
-static void AddSizeToFontInfo(FontInfo * aFontInfo, PRInt32 aSize)
-{
-  nsVoidArray * sizes;
-  if (nsnull == aFontInfo->mSizes) {
-    sizes = new nsVoidArray();
-    aFontInfo->mSizes = sizes;
-  } else {
-    sizes = aFontInfo->mSizes;
-  }
-  PRInt32 i;
-  PRInt32 cnt = sizes->Count();
-  for (i=0;i<cnt;i++) {
-    PRInt32 size = (int)sizes->ElementAt(i);
-    if (size == aSize) {
-      return;
-    }
-  }
-  sizes->AppendElement((void *)aSize);
-}
-
-//---------------------------------------------------
-// XXX - Hack - Parts of this will need to be reworked
-//
-// This method does brute force parcing for 4 different formats:
-//
-// 1) The format -*-*-*-*-*-* etc.
-//    -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-8
-//
-// 2) Name-size format 
-//    lucidasans-10
-//
-// 3) Name-style-size
-//    lucidasans-bold-10
-//
-// 4) Name only (implicit size)
-//    6x13
-//
-//--------------------------------------------------
-NS_IMETHODIMP nsFontRetrieverService::LoadFontList()
-{
-  char    * pattern = "*";
-  int nnames = 1024;
-
-  int available = nnames+1;
-  int i;
-  char **fonts;
-  XFontStruct *info;
-
-  if (nsnull == mFontList) { 
-    mFontList = new nsVoidArray(); 
-    if (nsnull == mFontList) { 
-      return NS_ERROR_FAILURE; 
-    } 
-  } 
-
-  /* Get list of fonts matching pattern */
-  for (;;) {
-    // the following line is VERY slow to return
-    fonts = XListFontsWithInfo(GDK_DISPLAY(), pattern, nnames, 
-                               &available, &info);
-    if (fonts == NULL || available < nnames)
-      break;
-
-    XFreeFontInfo(fonts, info, available);
-    nnames = available * 2;
-  }
-
-  if (fonts == NULL) {
-    fprintf(stderr, "pattern \"%s\" unmatched\n", pattern);
-    return NS_ERROR_FAILURE;
-  }
-
-#if 0 // debug
-  // print out all the retrieved fonts
-  printf("-----------------------------\n");
-  for (i=0; i<available; i++) {
-    printf("[%s]i\n", fonts[i]);
-  }
-  printf("-----------------------------\n");
-#endif
-
-  // this code assumes all like fonts are grouped together
-  // currentName is the current name of the font we are gathering
-  // sizes for, when the name changes we create a new FontInfo object
-  // but it also takes into account fonts of similar names when it 
-  // goes to add then and disregards duplicates
-  char buffer[1024];
-  char currentName[1024];
-  FontInfo * font = nsnull;
-
-  currentName[0]  = 0;
-  for (i=0; i<available; i++) {
-
-    // This is kind of lame, but it will have to do for now
-    strcpy(buffer, fonts[i]);
-
-    // Start by checking to see if the name begins with a dash
-    char * ptr  = buffer;
-    if (buffer[0] == '-') { //Format #1
-      
-      PRInt32 cnt = 0;
-      // skip first two '-'
-      do {
-        if (*ptr == '-') cnt++;
-        ptr++;
-      } while (cnt < 2);
-      
-      // find the dash at the end of the name
-      char * end = strchr(ptr, '-');
-      if (end) {
-        *end = 0;
-        
-        // Check to see if we need to create a new FontInfo obj
-        // and set the currentName var to this guys font name
-        if (strcmp(currentName, ptr) || NULL == font) {
-          font = GetFontInfo(mFontList, ptr);
-          strcpy(currentName, ptr);
-        }
-        if (nsnull == font->mSizes) {
-          font->mSizes = new nsVoidArray();
-        }
-        ptr = end+1; // skip past the dash that was set to zero
-        
-        cnt = 0;
-        // now skip ahead 4 dashes
-        do {
-          if (*ptr == '-') cnt++;
-          ptr++;
-        } while (cnt < 4);
-        
-        // find the dash after the size
-        end = strchr(ptr, '-');
-        
-        if (end) {
-	  *end = 0;
-          PRInt32 size;
-          sscanf(ptr, "%d", &size);
-	  AddSizeToFontInfo(font, size);
-        }
-      }
-    } else { // formats 2,3,4
-      
-      // no leading dash means the start of the 
-      // buffer is the start of the name
-      // this checks for a dash at the end of the font name
-      // which means there is a size at the end
-      char * end = strchr(buffer, '-');
-      if (end) { // Format 2,3
-        *end = 0;
-        // Check to see if we need to create a new FontInfo obj
-        // and set the currentName var to this guys font name
-        if (strcmp(currentName, buffer) || NULL == font) { 
-          font = GetFontInfo(mFontList, buffer);
-          strcpy(currentName, buffer);
-        }
-        end++; // advance past the dash
-	// check to see if we have a number
-	ptr = end;
-	if (isalpha(*ptr)) {  // Format 3
-	  // skip until next dash
-	  end = strchr(ptr, '-');
-	  if (end) {
-            *end = 0;
-	    ptr = end+1;
-	  }
-	}
-        PRInt32 size;
-        // yes, it has a dash at the end so it must have the size
-        // check to see if the size is terminated by a dash
-        // it shouldn't be
-        char * end2 = strchr(ptr, '-');
-        if (end2) *end2 = 0; // put terminator at the dash
-        sscanf(end, "%d", &size);
-	AddSizeToFontInfo(font, size);
-
-      } else { // Format #4
-        // The font has an implicit size, 
-        // so there is nothing to parse for size
-        // so we can't really do much here
-        // Check to see if we need to create a new FontInfo obj
-        // and set the currentName var to this guys font name
-        if (strcmp(currentName, buffer) || NULL == font) {
-          font = GetFontInfo(mFontList, buffer);
-          strcpy(currentName, buffer);
-        }
-      } 
-    }
-
-  }
-
-  XFreeFontInfo(fonts, info, available);
-
-  return NS_OK;
-}
-
-
-//---------------------------------------------------------- 
-NS_IMETHODIMP nsFontRetrieverService::IsFontScalable(const nsString & aFontName,
-                                                     PRBool* aResult ) 
-{ 
-  // save value in case someone externally is using it
-  PRInt32 saveIterInx = mNameIterInx;
-   
-  PRBool found = PR_FALSE; 
-  Reset(); 
-  do { 
-    nsAutoString name; 
-    Get(&name); 
-    if (name.Equals(aFontName)) { 
-      found = PR_TRUE; 
-      break; 
-    } 
-  } while (Advance() == NS_OK); 
-
-  if (found) { 
-    FontInfo * fontInfo = (FontInfo *)mFontList->ElementAt(mNameIterInx); 
-    *aResult = fontInfo->mIsScalable; 
-    mNameIterInx = saveIterInx;
-    return NS_OK; 
-  } 
-
-  mNameIterInx = saveIterInx;
-  return NS_ERROR_FAILURE; 
-} 

mozilla/widget/src/gtk/nsFontRetrieverService.h

@@ -1,65 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef __nsFontRetrieverService
-#define __nsFontRetrieverService
-
-#include "nsIFontRetrieverService.h"
-#include "nsIFontNameIterator.h"
-
-class nsVoidArray;
-class nsFontSizeIterator;
-
-class nsFontRetrieverService: public nsIFontRetrieverService, 
-                              public nsIFontNameIterator
-{
-public:
-  nsFontRetrieverService();
-  virtual ~nsFontRetrieverService();
-
-  NS_DECL_ISUPPORTS
-
-  // nsIFontRetrieverService
-  NS_IMETHOD CreateFontNameIterator( nsIFontNameIterator** aIterator );
-
-  NS_IMETHOD CreateFontSizeIterator( const nsString & aFontName, nsIFontSizeIterator** aIterator );
-  NS_IMETHOD IsFontScalable( const nsString & aFontName, PRBool* aResult );
-
-  // nsIFontNameIterator
-
-  NS_IMETHOD Reset();
-  NS_IMETHOD Get( nsString* aFontName );
-  NS_IMETHOD Advance();
-
-
-
-protected:
-  NS_IMETHOD LoadFontList();
-
-  nsVoidArray * mFontList;
-
-  PRInt32 mNameIterInx;
-
-  nsFontSizeIterator * mSizeIter;
-};
-
-#endif

mozilla/widget/src/gtk/nsFontSizeIterator.cpp

@@ -1,88 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsFontSizeIterator.h"
-
-#include "nsFont.h"
-#include "nsVoidArray.h"
- 
-
-NS_IMPL_ADDREF(nsFontSizeIterator)
-NS_IMPL_RELEASE(nsFontSizeIterator)
-NS_IMPL_QUERY_INTERFACE(nsFontSizeIterator, nsIFontSizeIterator::GetIID())
-
-//----------------------------------------------------------
-nsFontSizeIterator::nsFontSizeIterator() 
-{
-  NS_INIT_REFCNT();
-  mFontInfo     = nsnull;
-  mSizeIterInx  = 0;
-
-}
-
-//----------------------------------------------------------
-nsFontSizeIterator::~nsFontSizeIterator()
-{
-}
-
-///----------------------------------------------------------
-//-- nsIFontNameIterator
-//----------------------------------------------------------
-NS_IMETHODIMP nsFontSizeIterator::Reset()
-{
-  mSizeIterInx = 0;
-  return NS_OK;
-}
-
-//----------------------------------------------------------
-NS_IMETHODIMP nsFontSizeIterator::Get( double* aFontSize  )
-{
-  if (nsnull != mFontInfo->mSizes && 
-      mFontInfo->mSizes->Count() > 0 && 
-      mSizeIterInx < mFontInfo->mSizes->Count()) {
-    PRUint32 size = (PRUint32)mFontInfo->mSizes->ElementAt(mSizeIterInx);
-    *aFontSize = (double)size;
-    return NS_OK;
-  }
-  return NS_ERROR_FAILURE;
-}
-
-
-//----------------------------------------------------------
-NS_IMETHODIMP nsFontSizeIterator::Advance()
-{
-  if (nsnull != mFontInfo->mSizes && 
-      mFontInfo->mSizes->Count() > 0 &&
-      mSizeIterInx < mFontInfo->mSizes->Count()-2) {
-    mSizeIterInx++;
-    return NS_OK;
-  }
-
-  return NS_ERROR_FAILURE;
-}
-
-//----------------------------------------------------------
-NS_IMETHODIMP nsFontSizeIterator::SetFontInfo( FontInfo * aFontInfo )
-{
-  mFontInfo = aFontInfo;
-  return NS_OK;
-}

mozilla/widget/src/gtk/nsFontSizeIterator.h

@@ -1,59 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef __nsFontSizeIterator
-#define __nsFontSizeIterator
-
-#include "nsIFontSizeIterator.h"
-#include "nsString.h"
-
-class nsVoidArray;
-
-typedef struct {
-  nsString      mName;
-  PRBool        mIsScalable;
-  nsVoidArray * mSizes;
-} FontInfo;
-
-
-class nsFontSizeIterator: public nsIFontSizeIterator {
-public:
-  nsFontSizeIterator();
-  virtual ~nsFontSizeIterator();
-
-  NS_DECL_ISUPPORTS
-
-  // nsIFontSizeIterator
-	NS_IMETHOD Reset();
-	NS_IMETHOD Get( double* aFontSize );
-	NS_IMETHOD Advance();
-
-  // Native impl
-	NS_IMETHOD SetFontInfo( FontInfo * aFontInfo );
-
-protected:
-
-  FontInfo * mFontInfo;      
-  PRInt32  mSizeIterInx;   // current index of iter
-};
-
-#endif

mozilla/widget/src/gtk/nsGtkEventHandler.cpp

@@ -1,967 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsWidget.h"
-#include "nsWindow.h"
-
-#include "nsScrollbar.h"
-#include "nsIFileWidget.h"
-#include "nsGUIEvent.h"
-#include "nsIMenu.h"
-#include "nsIMenuItem.h"
-#include "nsIMenuListener.h"
-
-#include "nsTextWidget.h"
-
-#include "nsICharsetConverterManager.h"
-#include "nsIPlatformCharset.h"
-#include "nsIServiceManager.h"
-static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID);
-
-#include "stdio.h"
-#include "ctype.h"
-
-#include "gtk/gtk.h"
-#include "nsGtkEventHandler.h"
-
-#include <gdk/gdkkeysyms.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-
-#ifdef DEBUG_pavlov
-//#define DEBUG_EVENTS 1
-#endif
-
-struct EventInfo {
-  nsWidget *widget;  // the widget
-  nsRect   *rect;    // the rect
-};
-
-//==============================================================
-void InitAllocationEvent(GtkAllocation *aAlloc,
-                         gpointer   p,
-                         nsSizeEvent &anEvent,
-                         PRUint32   aEventType)
-{
-  anEvent.message = aEventType;
-  anEvent.widget  = (nsWidget *) p;
-
-  anEvent.eventStructType = NS_SIZE_EVENT;
-
-  if (aAlloc != nsnull) {
-    // HACK
-    //    nsRect *foo = new nsRect(aAlloc->x, aAlloc->y, aAlloc->width, aAlloc->height);
-    nsRect *foo = new nsRect(0, 0, aAlloc->width, aAlloc->height);
-    anEvent.windowSize = foo;
-    //    anEvent.point.x = aAlloc->x;
-    //    anEvent.point.y = aAlloc->y;
-    // HACK
-    anEvent.point.x = 0;
-    anEvent.point.y = 0;
-    anEvent.mWinWidth = aAlloc->width;
-    anEvent.mWinHeight = aAlloc->height;
-  }
-
-  anEvent.time = PR_IntervalNow();
-}
-
-//==============================================================
-void InitConfigureEvent(GdkEventConfigure *aConf,
-                            gpointer   p,
-                            nsSizeEvent &anEvent,
-                            PRUint32   aEventType)
-{
-  anEvent.message = aEventType;
-  anEvent.widget  = (nsWidget *) p;
-
-  anEvent.eventStructType = NS_SIZE_EVENT;
-
-  if (aConf != nsnull) {
-  /* do we accually need to alloc a new rect, or can we just set the
-     current one */
-    nsRect *foo = new nsRect(aConf->x, aConf->y, aConf->width, aConf->height);
-    anEvent.windowSize = foo;
-    anEvent.point.x = aConf->x;
-    anEvent.point.y = aConf->y;
-    anEvent.mWinWidth = aConf->width;
-    anEvent.mWinHeight = aConf->height;
-  }
-// this usually returns 0
-  anEvent.time = 0;
-}
-
-//==============================================================
-void InitExposeEvent(GdkEventExpose *aGEE,
-                     gpointer   p,
-                     nsPaintEvent &anEvent,
-                     PRUint32   aEventType)
-{
-  anEvent.message = aEventType;
-  anEvent.widget  = (nsWidget *) p;
-
-  anEvent.eventStructType = NS_PAINT_EVENT;
-
-  if (aGEE != nsnull)
-  {
-#ifdef DEBUG_EVENTS
-    g_print("expose event: x = %i , y = %i , w = %i , h = %i\n",
-            aGEE->area.x, aGEE->area.y,
-            aGEE->area.width, aGEE->area.height);
-#endif
-    anEvent.point.x = aGEE->area.x;
-    anEvent.point.y = aGEE->area.y;
-
-    nsRect *rect = new nsRect(aGEE->area.x, aGEE->area.y,
-                              aGEE->area.width, aGEE->area.height);
-    anEvent.rect = rect;
-    anEvent.time = gdk_event_get_time((GdkEvent*)aGEE);
-  }
-}
-
-//=============================================================
-void UninitExposeEvent(GdkEventExpose *aGEE,
-                       gpointer   p,
-                       nsPaintEvent &anEvent,
-                       PRUint32   aEventType)
-{
-  if (aGEE != nsnull) {
-    delete anEvent.rect;
-  }
-}
-
-struct nsKeyConverter {
-  int vkCode; // Platform independent key code
-  int keysym; // GDK keysym key code
-};
-
-//
-// Netscape keycodes are defined in widget/public/nsGUIEvent.h
-// GTK keycodes are defined in <gdk/gdkkeysyms.h>
-//
-struct nsKeyConverter nsKeycodes[] = {
-  { NS_VK_CANCEL,     GDK_Cancel },
-  { NS_VK_BACK,       GDK_BackSpace },
-  { NS_VK_TAB,        GDK_Tab },
-  { NS_VK_TAB,        GDK_ISO_Left_Tab },
-  { NS_VK_CLEAR,      GDK_Clear },
-  { NS_VK_RETURN,     GDK_Return },
-  { NS_VK_SHIFT,      GDK_Shift_L },
-  { NS_VK_SHIFT,      GDK_Shift_R },
-  { NS_VK_CONTROL,    GDK_Control_L },
-  { NS_VK_CONTROL,    GDK_Control_R },
-  { NS_VK_ALT,        GDK_Alt_L },
-  { NS_VK_ALT,        GDK_Alt_R },
-  { NS_VK_PAUSE,      GDK_Pause },
-  { NS_VK_CAPS_LOCK,  GDK_Caps_Lock },
-  { NS_VK_ESCAPE,     GDK_Escape },
-  { NS_VK_SPACE,      GDK_space },
-  { NS_VK_PAGE_UP,    GDK_Page_Up },
-  { NS_VK_PAGE_DOWN,  GDK_Page_Down },
-  { NS_VK_END,        GDK_End },
-  { NS_VK_HOME,       GDK_Home },
-  { NS_VK_LEFT,       GDK_Left },
-  { NS_VK_UP,         GDK_Up },
-  { NS_VK_RIGHT,      GDK_Right },
-  { NS_VK_DOWN,       GDK_Down },
-  { NS_VK_PRINTSCREEN, GDK_Print },
-  { NS_VK_INSERT,     GDK_Insert },
-  { NS_VK_DELETE,     GDK_Delete },
-
-  { NS_VK_MULTIPLY,   GDK_KP_Multiply },
-  { NS_VK_ADD,        GDK_KP_Add },
-  { NS_VK_SEPARATOR,  GDK_KP_Separator },
-  { NS_VK_SUBTRACT,   GDK_KP_Subtract },
-  { NS_VK_DECIMAL,    GDK_KP_Decimal },
-  { NS_VK_DIVIDE,     GDK_KP_Divide },
-  { NS_VK_RETURN,     GDK_KP_Enter },
-
-  // NS doesn't have dash or equals distinct from the numeric keypad ones,
-  // so we'll use those for now.  See bug 17008:
-  { NS_VK_SUBTRACT, GDK_minus },
-  { NS_VK_EQUALS, GDK_equal },
-  // and we don't have a single-quote symbol either:
-  { NS_VK_QUOTE, GDK_apostrophe },
-
-  { NS_VK_COMMA,      GDK_comma },
-  { NS_VK_PERIOD,     GDK_period },
-  { NS_VK_SLASH,      GDK_slash },
-  { NS_VK_BACK_SLASH, GDK_backslash },
-  { NS_VK_BACK_QUOTE, GDK_grave },
-  { NS_VK_OPEN_BRACKET, GDK_bracketleft },
-  { NS_VK_CLOSE_BRACKET, GDK_bracketright },
-  { NS_VK_QUOTE, GDK_quotedbl },
-
-  // Some shifted keys, see bug 15463.
-  // These should be subject to different keyboard mappings;
-  // how do we do that in gtk?
-  { NS_VK_SEMICOLON, GDK_colon },
-  { NS_VK_BACK_QUOTE, GDK_asciitilde },
-  { NS_VK_COMMA, GDK_less },
-  { NS_VK_PERIOD, GDK_greater },
-  { NS_VK_SLASH,      GDK_question },
-  { NS_VK_1, GDK_exclam },
-  { NS_VK_2, GDK_at },
-  { NS_VK_3, GDK_numbersign },
-  { NS_VK_4, GDK_dollar },
-  { NS_VK_5, GDK_percent },
-  { NS_VK_6, GDK_asciicircum },
-  { NS_VK_7, GDK_ampersand },
-  { NS_VK_8, GDK_asterisk },
-  { NS_VK_9, GDK_parenleft },
-  { NS_VK_0, GDK_parenright },
-  { NS_VK_SUBTRACT, GDK_underscore },
-  { NS_VK_EQUALS, GDK_plus }
-};
-
-void nsGtkWidget_InitNSKeyEvent(int aEventType, nsKeyEvent& aKeyEvent,
-                                GtkWidget *w, gpointer p, GdkEventKey * event);
-
-//==============================================================
-
-// Input keysym is in gtk format; output is in NS_VK format
-int nsPlatformToDOMKeyCode(GdkEventKey *aGEK)
-{
-  int i;
-  int length = sizeof(nsKeycodes) / sizeof(struct nsKeyConverter);
-
-  int keysym = aGEK->keyval;
-
-  // First, try to handle alphanumeric input, not listed in nsKeycodes:
-  // most likely, more letters will be getting typed in than things in
-  // the key list, so we will look through these first.
-
-  // since X has different key symbols for upper and lowercase letters and
-  // mozilla does not, convert gdk's to mozilla's
-  if (keysym >= GDK_a && keysym <= GDK_z)
-    return keysym - GDK_a + NS_VK_A;
-  if (keysym >= GDK_A && keysym <= GDK_Z)
-    return keysym - GDK_A + NS_VK_A;
-
-  // numbers
-  if (keysym >= GDK_0 && keysym <= GDK_9)
-    return keysym - GDK_0 + NS_VK_0;
-
-  // keypad numbers
-  if (keysym >= GDK_KP_0 && keysym <= GDK_KP_9)
-    return keysym - GDK_KP_0 + NS_VK_NUMPAD0;
-
-  // misc other things
-  for (i = 0; i < length; i++) {
-    if (nsKeycodes[i].keysym == keysym)
-      return(nsKeycodes[i].vkCode);
-  }
-
-  // function keys
-  if (keysym >= GDK_F1 && keysym <= GDK_F24)
-    return keysym - GDK_F1 + NS_VK_F1;
-
-#if defined(DEBUG_akkana) || defined(DEBUG_ftang)
-  printf("No match in nsPlatformToDOMKeyCode: keysym is 0x%x, string is %s\n", keysym, aGEK->string);
-#endif
-
-  return((int)0);
-}
-
-//==============================================================
-
-PRUint32 nsConvertCharCodeToUnicode(GdkEventKey* aGEK)
-{
-  // For control chars, GDK sets string to be the actual ascii value.
-  // Map that to what nsKeyEvent wants, which currently --
-  // TEMPORARILY (the spec has changed and will be switched over
-  // when the tree opens for M11) --
-  // is the ascii for the actual event (e.g. 1 for control-a).
-  // This is only true for control chars; for alt chars, send the
-  // ascii for the key, i.e. a for alt-a.
-  if (aGEK->state & GDK_CONTROL_MASK)
-  {
-    if (aGEK->state & GDK_SHIFT_MASK)
-      return aGEK->string[0] + 'A' - 1;
-    else
-      return aGEK->string[0] + 'a' - 1;
-  }
-
-  // For now (obviously this will need to change for IME),
-  // only set a char code if the result is printable:
-  if (!isprint(aGEK->string[0]))
-    return 0;
-
-  // ALT keys in gdk give the upper case character in string,
-  // but we want the lower case char in char code
-  // unless shift was also pressed.
-  if (((aGEK->state & GDK_MOD1_MASK))
-      && !(aGEK->state & GDK_SHIFT_MASK)
-      && isupper(aGEK->string[0]))
-    return tolower(aGEK->string[0]);
-
-  //
-  // placeholder for something a little more interesting and correct
-  //
-  return aGEK->string[0];
-}
-
-//==============================================================
-void InitKeyEvent(GdkEventKey *aGEK,
-                            gpointer   p,
-                            nsKeyEvent &anEvent,
-                            PRUint32   aEventType)
-{
-  anEvent.message = aEventType;
-  anEvent.widget  = (nsWidget *) p;
-
-  anEvent.eventStructType = NS_KEY_EVENT;
-
-  if (aGEK != nsnull) {
-    anEvent.keyCode = nsPlatformToDOMKeyCode(aGEK);
-    anEvent.charCode = 0;
-    anEvent.time = aGEK->time;
-    anEvent.isShift = (aGEK->state & GDK_SHIFT_MASK) ? PR_TRUE : PR_FALSE;
-    anEvent.isControl = (aGEK->state & GDK_CONTROL_MASK) ? PR_TRUE : PR_FALSE;
-    anEvent.isAlt = (aGEK->state & GDK_MOD1_MASK) ? PR_TRUE : PR_FALSE;
-    // XXX
-    anEvent.isMeta = PR_FALSE; //(aGEK->state & GDK_MOD2_MASK) ? PR_TRUE : PR_FALSE;
-    anEvent.point.x = 0;
-    anEvent.point.y = 0;
-  }
-}
-
-void InitKeyPressEvent(GdkEventKey *aGEK,
-                       gpointer p,
-                       nsKeyEvent &anEvent)
-{
-  //
-  // init the basic event fields
-  //
-  anEvent.eventStructType = NS_KEY_EVENT;
-  anEvent.message = NS_KEY_PRESS;
-  anEvent.widget = (nsWidget*)p;
-
-  if (aGEK!=nsnull)
-  {
-    anEvent.isShift = (aGEK->state & GDK_SHIFT_MASK) ? PR_TRUE : PR_FALSE;
-    anEvent.isControl = (aGEK->state & GDK_CONTROL_MASK) ? PR_TRUE : PR_FALSE;
-    anEvent.isAlt = (aGEK->state & GDK_MOD1_MASK) ? PR_TRUE : PR_FALSE;
-    // XXX
-    anEvent.isMeta = PR_FALSE; //(aGEK->state & GDK_MOD2_MASK) ? PR_TRUE : PR_FALSE;
-
-    if(aGEK->length)
-       anEvent.charCode = nsConvertCharCodeToUnicode(aGEK);
-    else 
-       anEvent.charCode = 0;
-
-    if (anEvent.charCode) {
-      anEvent.keyCode = 0;
-      anEvent.isShift = PR_FALSE;
-    } else
-      anEvent.keyCode = nsPlatformToDOMKeyCode(aGEK);
-
-#if defined(DEBUG_akkana) || defined(DEBUG_pavlov) || defined (DEBUG_ftang)
-    printf("Key Press event: keyCode = 0x%x, char code = '%c'",
-           anEvent.keyCode, anEvent.charCode);
-    if (anEvent.isShift)
-      printf(" [shift]");
-    if (anEvent.isControl)
-      printf(" [ctrl]");
-    if (anEvent.isAlt)
-      printf(" [alt]");
-    if (anEvent.isMeta)
-      printf(" [meta]");
-    printf("\n");
-#endif
-
-    anEvent.time = aGEK->time;
-    anEvent.point.x = 0;
-    anEvent.point.y = 0;
-  }
-}
-
-//=============================================================
-void UninitKeyEvent(GdkEventKey *aGEK,
-                              gpointer   p,
-                              nsKeyEvent &anEvent,
-                              PRUint32   aEventType)
-{
-}
-
-/*==============================================================
-  ==============================================================
-  =============================================================
-  ==============================================================*/
-
-void handle_size_allocate(GtkWidget *w, GtkAllocation *alloc, gpointer p)
-{
-  nsWindow *widget = (nsWindow *)p;
-  nsSizeEvent event;
-
-  InitAllocationEvent(alloc, p, event, NS_SIZE);
-  NS_ADDREF(widget);
-  widget->OnResize(event);
-  NS_RELEASE(widget);
-
-  delete event.windowSize;
-}
-
-gint handle_expose_event(GtkWidget *w, GdkEventExpose *event, gpointer p)
-{
-  if (event->type == GDK_NO_EXPOSE)
-    return PR_FALSE;
-
-  nsPaintEvent pevent;
-  InitExposeEvent(event, p, pevent, NS_PAINT);
-
-  nsWindow *win = (nsWindow *)p;
-  win->AddRef();
-  win->OnExpose(pevent);
-  win->Release();
-
-  UninitExposeEvent(event, p, pevent, NS_PAINT);
-
-  return PR_TRUE;
-}
-
-//==============================================================
-void menu_item_activate_handler(GtkWidget *w, gpointer p)
-{
-  // g_print("menu_item_activate_handler\n");
-
-  nsIMenuListener *menuListener = nsnull;
-  nsIMenuItem *menuItem = (nsIMenuItem *)p;
-  if (menuItem != nsnull) {
-    nsMenuEvent mevent;
-    mevent.message = NS_MENU_SELECTED;
-    mevent.eventStructType = NS_MENU_EVENT;
-    mevent.point.x = 0;
-    mevent.point.y = 0;
-    // mevent.widget = menuItem;
-    mevent.widget = nsnull;
-    menuItem->GetCommand(mevent.mCommand);
-
-    mevent.mMenuItem = menuItem;
-    mevent.time = PR_IntervalNow();
-
-    // FIXME - THIS SHOULD WORK.  FIX EVENTS FOR XP CODE!!!!! (pav)
-    //    nsEventStatus status;
-    //    mevent.widget->DispatchEvent((nsGUIEvent *)&mevent, status);
-
-    menuItem->QueryInterface(nsIMenuListener::GetIID(), (void**)&menuListener);
-    if(menuListener) {
-      menuListener->MenuItemSelected(mevent);
-      NS_IF_RELEASE(menuListener);
-    }
-  }
-}
-
-//==============================================================
-void menu_map_handler(GtkWidget *w, gpointer p)
-{ 
-  nsIMenuListener *menuListener = nsnull;
-  nsIMenu *menu = (nsIMenu *)p;
-  if (menu != nsnull) {
-    nsMenuEvent mevent;
-    mevent.message = NS_MENU_SELECTED;
-    mevent.eventStructType = NS_MENU_EVENT;
-    mevent.point.x = 0;
-    mevent.point.y = 0;
-    mevent.widget = nsnull;
-
-    mevent.time = PR_IntervalNow();
-
-    menu->QueryInterface(nsIMenuListener::GetIID(), (void**)&menuListener);
-
-    if(menuListener) {
-      menuListener->MenuConstruct(
-        mevent,
-      	nsnull,   //parent window
-        nsnull,   //menuNode
-        nsnull ); // webshell
-      NS_IF_RELEASE(menuListener);
-    }
-  }
-}
-
-//==============================================================
-void menu_unmap_handler(GtkWidget *w, gpointer p)
-{
-  nsIMenuListener *menuListener = nsnull;
-  nsIMenu *menu = (nsIMenu *)p;
-  if (menu != nsnull) {
-    nsMenuEvent mevent;
-    mevent.message = NS_MENU_SELECTED;
-    mevent.eventStructType = NS_MENU_EVENT;
-    mevent.point.x = 0;
-    mevent.point.y = 0;
-    mevent.widget = nsnull;
-
-    mevent.time = PR_IntervalNow();
-
-    menu->QueryInterface(nsIMenuListener::GetIID(), (void**)&menuListener);
-    if(menuListener) {
-      menuListener->MenuDestruct(mevent);
-      NS_IF_RELEASE(menuListener);
-    }
-  }
-}
-
-
-//==============================================================
-void handle_scrollbar_value_changed(GtkAdjustment *adj, gpointer p)
-{
-  nsScrollbar *widget = (nsScrollbar*) p;
-  nsScrollbarEvent sevent;
-
-  sevent.message = NS_SCROLLBAR_POS;
-  sevent.widget  = (nsWidget *) p;
-  sevent.eventStructType = NS_SCROLLBAR_EVENT;
-
-  GdkWindow *win = (GdkWindow *)widget->GetNativeData(NS_NATIVE_WINDOW);
-  gdk_window_get_pointer(win, &sevent.point.x, &sevent.point.y, nsnull);
-
-  widget->AddRef();
-  widget->OnScroll(sevent, adj->value);
-  widget->Release();
-
-/* FIXME we need to set point.* from the event stuff. */
-#if 0
-  nsWindow * widgetWindow = (nsWindow *) p ;
-  XmScrollBarCallbackStruct * cbs = (XmScrollBarCallbackStruct*) call_data;
-  sevent.widget  = (nsWindow *) p;
-  if (cbs->event != nsnull) {
-    sevent.point.x = cbs->event->xbutton.x;
-    sevent.point.y = cbs->event->xbutton.y;
-  } else {
-    sevent.point.x = 0;
-    sevent.point.y = 0;
-  }
-  sevent.time    = 0; //XXX Implement this
-
-  switch (cbs->reason) {
-
-    case XmCR_INCREMENT:
-      sevent.message = NS_SCROLLBAR_LINE_NEXT;
-      break;
-
-    case XmCR_DECREMENT:
-      sevent.message = NS_SCROLLBAR_LINE_PREV;
-      break;
-
-    case XmCR_PAGE_INCREMENT:
-      sevent.message = NS_SCROLLBAR_PAGE_NEXT;
-      break;
-
-    case XmCR_PAGE_DECREMENT:
-      sevent.message = NS_SCROLLBAR_PAGE_PREV;
-      break;
-
-    case XmCR_DRAG:
-      sevent.message = NS_SCROLLBAR_POS;
-      break;
-
-    case XmCR_VALUE_CHANGED:
-      sevent.message = NS_SCROLLBAR_POS;
-      break;
-
-    default:
-      break;
-  }
-#endif
-}
-
-static gint composition_start(GdkEventKey *aEvent, nsWindow *aWin,
-                              nsEventStatus *aStatus) {
-  nsCompositionEvent compEvent;
-
-  compEvent.widget = (nsWidget*)aWin;
-  compEvent.point.x = 0;
-  compEvent.point.y = 0;
-  compEvent.time = aEvent->time;
-  compEvent.message = NS_COMPOSITION_START;
-  compEvent.eventStructType = NS_COMPOSITION_START;
-  compEvent.compositionMessage = NS_COMPOSITION_START;
-  aWin->DispatchEvent(&compEvent, *aStatus);
-
-  // set SpotLocation
-  aWin->SetXICSpotLocation(compEvent.theReply.mCursorPosition);
-
-  return PR_TRUE;
-}
-
-static gint composition_draw(GdkEventKey *aEvent, nsWindow *aWin,
-                             nsIUnicodeDecoder *aDecoder,
-                             nsEventStatus *aStatus) {
-  if (!aWin->mIMECompositionUniString) {
-    aWin->mIMECompositionUniStringSize = 128;
-    aWin->mIMECompositionUniString =
-      new PRUnichar[aWin->mIMECompositionUniStringSize];
-  }
-  PRUnichar *uniChar;
-  PRInt32 uniCharSize;
-  PRInt32 srcLen = aEvent->length;
-  for (;;) {
-    uniChar = aWin->mIMECompositionUniString;
-    uniCharSize = aWin->mIMECompositionUniStringSize - 1;
-    aDecoder->Convert((char*)aEvent->string, &srcLen, uniChar, &uniCharSize);
-    if (srcLen == aEvent->length &&
-        uniCharSize < aWin->mIMECompositionUniStringSize - 1) {
-      break;
-    }
-    aWin->mIMECompositionUniStringSize += 32;
-    aWin->mIMECompositionUniString =
-      new PRUnichar[aWin->mIMECompositionUniStringSize];
-  }
-  aWin->mIMECompositionUniString[uniCharSize] = 0;
-
-  nsTextEvent textEvent;
-  textEvent.message = NS_TEXT_EVENT;
-  textEvent.widget = (nsWidget*)aWin;
-  textEvent.time = aEvent->time;
-  textEvent.point.x = 0;
-  textEvent.point.y = 0;
-  textEvent.theText = aWin->mIMECompositionUniString;
-  textEvent.rangeCount = 0;
-  textEvent.rangeArray = nsnull;
-  textEvent.isShift = (aEvent->state & GDK_SHIFT_MASK) ? PR_TRUE : PR_FALSE;
-  textEvent.isControl = (aEvent->state & GDK_CONTROL_MASK) ? PR_TRUE : PR_FALSE;
-  textEvent.isAlt = (aEvent->state & GDK_MOD1_MASK) ? PR_TRUE : PR_FALSE;
-  // XXX
-  textEvent.isMeta = PR_FALSE; //(aEvent->state & GDK_MOD2_MASK) ? PR_TRUE : PR_FALSE;
-  textEvent.eventStructType = NS_TEXT_EVENT;
-  aWin->DispatchEvent(&textEvent, *aStatus);
-
-  aWin->SetXICSpotLocation(textEvent.theReply.mCursorPosition);
-  return True;
-}
-
-static gint composition_end(GdkEventKey *aEvent, nsWindow *aWin,
-                            nsEventStatus *aStatus) {
-  nsCompositionEvent compEvent;
-
-  compEvent.widget = (nsWidget*)aWin;
-  compEvent.point.x = 0;
-  compEvent.point.y = 0;
-  compEvent.time = aEvent->time;
-  compEvent.message = NS_COMPOSITION_END;
-  compEvent.eventStructType = NS_COMPOSITION_END;
-  compEvent.compositionMessage = NS_COMPOSITION_END;
-  aWin->DispatchEvent(&compEvent, *aStatus);
-
-  return PR_TRUE;
-}
-
-static nsIUnicodeDecoder*
-open_unicode_decoder(void) {
-  nsresult result = NS_ERROR_FAILURE;
-  nsIUnicodeDecoder *decoder = nsnull;
-  NS_WITH_SERVICE(nsIPlatformCharset, platform, NS_PLATFORMCHARSET_PROGID,
-                  &result);
-  if (platform && NS_SUCCEEDED(result)) {
-    nsAutoString charset("");
-    result = platform->GetCharset(kPlatformCharsetSel_Menu, charset);
-    if (NS_FAILED(result) || (charset.Length() == 0)) {
-      charset = "ISO-8859-1";   // default
-    }
-    nsICharsetConverterManager* manager = nsnull;
-    nsresult res = nsServiceManager::
-      GetService(kCharsetConverterManagerCID,
-                 nsCOMTypeInfo<nsICharsetConverterManager>::GetIID(),
-                 (nsISupports**)&manager);
-    if (manager && NS_SUCCEEDED(res)) {
-      manager->GetUnicodeDecoder(&charset, &decoder);
-      nsServiceManager::ReleaseService(kCharsetConverterManagerCID, manager);
-    }
-  }
-  return decoder;
-}
-
-// GTK's text widget already does XIM, so we don't want to do this again
-gint handle_key_press_event_for_text(GtkObject *w, GdkEventKey* event,
-                                     gpointer p)
-{
-  nsKeyEvent kevent;
-  nsTextWidget* win = (nsTextWidget*)p;
-
-  // work around for annoying things.
-  if (event->keyval == GDK_Tab)
-    if (event->state & GDK_CONTROL_MASK)
-      if (event->state & GDK_MOD1_MASK)
-        return PR_FALSE;
-
-  // Don't pass shift, control and alt as key press events
-  if (event->keyval == GDK_Shift_L
-      || event->keyval == GDK_Shift_R
-      || event->keyval == GDK_Control_L
-      || event->keyval == GDK_Control_R)
-    return PR_TRUE;
-
-  win->AddRef();
-  InitKeyEvent(event, p, kevent, NS_KEY_DOWN);
-  win->OnKey(kevent);
-
-  //
-  // Second, dispatch the Key event as a key press event w/ a Unicode
-  //  character code.  Note we have to check for modifier keys, since
-  // gtk returns a character value for them
-  //
-  InitKeyPressEvent(event,p, kevent);
-  win->OnKey(kevent);
-
-  win->Release();
-  if (w)
-  {
-    gtk_signal_emit_stop_by_name (GTK_OBJECT(w), "key_press_event");
-  }
-
-  return PR_TRUE;
-}
-
-// GTK's text widget already does XIM, so we don't want to do this again
-gint handle_key_release_event_for_text(GtkObject *w, GdkEventKey* event,
-                                       gpointer p)
-{
-  nsKeyEvent kevent;
-  nsTextWidget* win = (nsTextWidget*)p;
-
-  // Don't pass shift, control and alt as key release events
-  if (event->keyval == GDK_Shift_L
-      || event->keyval == GDK_Shift_R
-      || event->keyval == GDK_Control_L
-      || event->keyval == GDK_Control_R)
-    return PR_TRUE;
-
-  InitKeyEvent(event, p, kevent, NS_KEY_UP);
-  win->AddRef();
-  win->OnKey(kevent);
-  win->Release();
-  
-  if (w)
-  {
-    gtk_signal_emit_stop_by_name (GTK_OBJECT(w), "key_release_event");
-  }
-
-  return PR_TRUE;
-}
-
-
-//==============================================================
-gint handle_key_press_event(GtkObject *w, GdkEventKey* event, gpointer p)
-{
-  nsKeyEvent kevent;
-  nsWindow* win = (nsWindow*)p;
-
-  // work around for annoying things.
-  if (event->keyval == GDK_Tab)
-    if (event->state & GDK_CONTROL_MASK)
-      if (event->state & GDK_MOD1_MASK)
-        return PR_FALSE;
-
-  // Don't pass shift, control and alt as key press events
-  if (event->keyval == GDK_Shift_L
-      || event->keyval == GDK_Shift_R
-      || event->keyval == GDK_Control_L
-      || event->keyval == GDK_Control_R)
-    return PR_TRUE;
-
-  win->AddRef();
-  //
-  // First, dispatch the Key event as a virtual key down event
-  //
-  InitKeyEvent(event, p, kevent, NS_KEY_DOWN);
-  win->OnKey(kevent);
- 
-
-
-  //
-  // Second, dispatch the Key event as a key press event w/ a Unicode
-  //  character code.  Note we have to check for modifier keys, since
-  // gtk returns a character value for them
-  //
-  if (event->length) {
-    static nsIUnicodeDecoder *decoder = nsnull;
-    if (!decoder) {
-      decoder = open_unicode_decoder();
-    }
-    if (decoder && (!kevent.keyCode)) {
-      nsEventStatus status;
-      composition_start(event, win, &status);
-      composition_draw(event, win, decoder, &status);
-      composition_end(event, win, &status);
-    } else {
-      InitKeyPressEvent(event,p, kevent);
-      win->OnKey(kevent);
-      nsEventStatus status;
-      composition_start(event, win, &status);
-      composition_end(event, win, &status);
-    }
-  } else { // for Home/End/Up/Down/Left/Right/PageUp/PageDown key
-    InitKeyPressEvent(event,p, kevent);
-    win->OnKey(kevent);
-  }
-
-  win->Release();
-  if (w)
-  {
-    gtk_signal_emit_stop_by_name (GTK_OBJECT(w), "key_press_event");
-  }
-
-  return PR_TRUE;
-}
-
-//==============================================================
-gint handle_key_release_event(GtkObject *w, GdkEventKey* event, gpointer p)
-{
-  // Don't pass shift, control and alt as key release events
-  if (event->keyval == GDK_Shift_L
-      || event->keyval == GDK_Shift_R
-      || event->keyval == GDK_Control_L
-      || event->keyval == GDK_Control_R)
-    return PR_TRUE;
-
-  nsKeyEvent kevent;
-  InitKeyEvent(event, p, kevent, NS_KEY_UP);
-
-  nsWindow * win = (nsWindow *) p;
-  win->AddRef();
-  win->OnKey(kevent);
-  win->Release();
-
-  if (w)
-  {
-    gtk_signal_emit_stop_by_name (GTK_OBJECT(w), "key_release_event");
-  }
-
-  return PR_TRUE;
-}
-
-//==============================================================
-void 
-handle_gdk_event (GdkEvent *event, gpointer data)
-{
-  GtkObject *object = nsnull;
-
-  if (event->any.window)
-    gdk_window_get_user_data (event->any.window, (void **)&object);
-
-  if (object != nsnull &&
-      GDK_IS_SUPERWIN (object))
-    {
-      // It was an event on one of our superwindows
-
-      nsWindow *window = (nsWindow *)gtk_object_get_data (object, "nsWindow");
-      
-      if (gtk_grab_get_current () != nsnull)
-        {
-          // A GTK+ grab is in effect. Rewrite the event to point to
-          // our toplevel, and pass it through.
-          // XXX: We should actually translate the coordinates
-
-          gdk_window_unref (event->any.window);
-          event->any.window = GTK_WIDGET (window->GetMozArea())->window;
-          gdk_window_ref (event->any.window);
-        }
-      else
-        {
-          // Handle it ourselves.
-
-          switch (event->type)
-            {
-            case GDK_KEY_PRESS:
-              handle_key_press_event (NULL, &event->key, window);
-              break;
-            case GDK_KEY_RELEASE:
-              handle_key_release_event (NULL, &event->key, window);
-              break;
-            default:
-              window->HandleEvent (event);
-            }
-          return;
-        }
-    }
-
-  gtk_main_do_event (event);
-}
-
-//==============================================================
-void
-handle_xlib_shell_event(GdkSuperWin *superwin, XEvent *event, gpointer p)
-{
-  nsWindow *window = (nsWindow *)p;
-  switch(event->xany.type) {
-  case ConfigureNotify:
-    window->HandleXlibConfigureNotifyEvent(event);
-    break;
-  default:
-    break;
-  }
-}
-
-//==============================================================
-void
-handle_xlib_bin_event(GdkSuperWin *superwin, XEvent *event, gpointer p)
-{
-  nsWindow *window = (nsWindow *)p;
-
-  switch(event->xany.type) {
-  case Expose:
-    window->HandleXlibExposeEvent(event);
-    break;
-  case ButtonPress:
-  case ButtonRelease:
-    window->HandleXlibButtonEvent((XButtonEvent *)event);
-    break;
-  case MotionNotify:
-    window->HandleXlibMotionNotifyEvent((XMotionEvent *) event);
-    break;
-  case EnterNotify:
-  case LeaveNotify:
-    window->HandleXlibCrossingEvent((XCrossingEvent *) event);
-    break;
-  default:
-    break;
-  }
-}
-
-//==============================================================
-gint nsGtkWidget_FSBCancel_Callback(GtkWidget *w, gpointer p)
-{
-#if 0
-  nsWindow *widgetWindow = (nsWindow*)gtk_object_get_user_data(GTK_OBJECT(w));
-  nsFileWidget * widgetWindow = (nsFileWidget *) p ;
-  if (p != nsnull) {
-    widgetWindow->OnCancel();
-  }
-#endif
-
-  return PR_FALSE;
-}
-
-//==============================================================
-gint nsGtkWidget_FSBOk_Callback(GtkWidget *w, gpointer p)
-{
-#if 0
-  nsWindow *widgetWindow = (nsWindow*)gtk_object_get_user_data(GTK_OBJECT(w));
-  nsFileWidget * widgetWindow = (nsFileWidget *) p;
-  if (p != nsnull) {
-    widgetWindow->OnOk();
-  }
-#endif
-
-  return PR_FALSE;
-}

mozilla/widget/src/gtk/nsGtkEventHandler.h

@@ -1,72 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef __nsGtkEventHandler_h
-#define __nsGtkEventHandler_h
-
-#include <gtk/gtk.h>
-#include <gdk/gdkx.h>
-#include "gdksuperwin.h"
-
-class nsIWidget;
-class nsIMenuItem;
-class nsIMenu;
-
-gint handle_configure_event(GtkWidget *w, GdkEventConfigure *conf, gpointer p);
-void handle_size_allocate(GtkWidget *w, GtkAllocation *alloc, gpointer p);
-gint handle_expose_event(GtkWidget *w, GdkEventExpose *event, gpointer p);
-
-
-gint handle_key_release_event_for_text(GtkObject *w, GdkEventKey* event, gpointer p);
-gint handle_key_press_event_for_text(GtkObject *w, GdkEventKey* event, gpointer p);
-
-gint handle_key_release_event(GtkObject *w, GdkEventKey* event, gpointer p);
-gint handle_key_press_event(GtkObject *w, GdkEventKey* event, gpointer p);
-
-void handle_scrollbar_value_changed(GtkAdjustment *adjustment, gpointer p);
-
-void menu_item_activate_handler(GtkWidget *w, gpointer p);
-
-void menu_map_handler(GtkWidget *w, gpointer p);
-void menu_unmap_handler(GtkWidget *w, gpointer p);
-
-//----------------------------------------------------
-
-gint nsGtkWidget_FSBCancel_Callback(GtkWidget *w, gpointer p);
-gint nsGtkWidget_FSBOk_Callback(GtkWidget *w, gpointer p);
-
-//----------------------------------------------------
-gint CheckButton_Toggle_Callback(GtkWidget *w, gpointer p);
-
-gint nsGtkWidget_RadioButton_ArmCallback(GtkWidget *w, gpointer p);
-gint nsGtkWidget_RadioButton_DisArmCallback(GtkWidget *w, gpointer p);
-
-gint nsGtkWidget_Text_Callback(GtkWidget *w, GdkEventKey* event, gpointer p);
-gint nsGtkWidget_Expose_Callback(GtkWidget *w, gpointer p);
-
-gint nsGtkWidget_Refresh_Callback(gpointer call_data);
-
-void handle_xlib_shell_event(GdkSuperWin *superwin, XEvent *event, gpointer p);
-void handle_xlib_bin_event(GdkSuperWin *superwin, XEvent *event, gpointer p);
-void handle_gdk_event (GdkEvent *event, gpointer data);
-
-#endif  // __nsGtkEventHandler.h

mozilla/widget/src/gtk/nsGtkUtils.cpp

@@ -1,213 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include <unistd.h>
-#include <string.h>
-
-#include "nsGtkUtils.h"
-
-#include <gdk/gdkx.h>
-#include <gdk/gdkprivate.h>
-
-#if defined(__osf__) && !defined(_XOPEN_SOURCE_EXTENDED)
-/*
-** DEC's compiler requires _XOPEN_SOURCE_EXTENDED to be defined in
-** order for it to see the prototype for usleep in unistd.h, but if
-** we define that the build breaks long before getting here.  So
-** put the prototype here explicitly.
-*/
-int usleep(useconds_t);
-#endif
-#if defined(__QNX__)
-#define usleep(s)	sleep(s)
-#endif
-
-//////////////////////////////////////////////////////////////////
-#if 0
-/* staitc */ gint
-nsGtkUtils::gdk_query_pointer(GdkWindow * window,
-							  gint *      x_out,
-							  gint *      y_out)
-{
-  g_return_val_if_fail(NULL != window, FALSE);
-  g_return_val_if_fail(NULL != x_out, FALSE);
-  g_return_val_if_fail(NULL != y_out, FALSE);
-
-  Window root;
-  Window child;
-  int rootx, rooty;
-  int winx = 0;
-  int winy = 0;
-  unsigned int xmask = 0;
-  gint result = FALSE;
-  
-  *x_out = -1;
-  *y_out = -1;
-  
-  result = XQueryPointer(GDK_WINDOW_XDISPLAY(window),
-                         GDK_WINDOW_XWINDOW(window),
-                         &root, 
-                         &child,
-                         &rootx,
-                         &rooty,
-                         &winx,
-                         &winy,
-                         &xmask);
-  
-  if (result)
-  {
-    *x_out = rootx;
-    *y_out = rooty;
-  }
-
-  return result;
-}
-#endif
-//////////////////////////////////////////////////////////////////
-/* static */ void 
-nsGtkUtils::gtk_widget_set_color(GtkWidget *  widget,
-								 GtkRcFlags   flags,
-								 GtkStateType state,
-								 GdkColor *   color)
-{
-  GtkRcStyle * rc_style;
-
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_WIDGET (widget));
-  g_return_if_fail (color != NULL);
-  g_return_if_fail (flags == 0);
-
-  rc_style = (GtkRcStyle *) gtk_object_get_data (GTK_OBJECT (widget), 
-												 "modify-style");
-
-  if (!rc_style)
-  {
-	rc_style = gtk_rc_style_new ();
-
-	gtk_widget_modify_style (widget, rc_style);
-
-	gtk_object_set_data (GTK_OBJECT (widget), "modify-style", rc_style);
-  }
-
-  if (flags & GTK_RC_FG)
-  {
-    rc_style->color_flags[state] = GtkRcFlags(rc_style->color_flags[state] | GTK_RC_FG);
-    rc_style->fg[state] = *color;
-  }
-
-  if (flags & GTK_RC_BG)
-  {
-    rc_style->color_flags[state] = GtkRcFlags(rc_style->color_flags[state] | GTK_RC_BG);
-    rc_style->bg[state] = *color;
-  }
-
-  if (flags & GTK_RC_TEXT)
-  {
-    rc_style->color_flags[state] = GtkRcFlags(rc_style->color_flags[state] | GTK_RC_TEXT);
-    rc_style->text[state] = *color;
-  }
-
-  if (flags & GTK_RC_BASE)
-  {
-    rc_style->color_flags[state] = GtkRcFlags(rc_style->color_flags[state] | GTK_RC_BASE);
-    rc_style->base[state] = *color;
-  }
-}
-//////////////////////////////////////////////////////////////////
-/* static */ GdkModifierType
-nsGtkUtils::gdk_keyboard_get_modifiers()
-{
-  GdkModifierType m = (GdkModifierType) 0;
-
-  gdk_window_get_pointer(NULL,NULL,NULL,&m);
-
-  return m;
-}
-//////////////////////////////////////////////////////////////////
-/* static */ void
-nsGtkUtils::gdk_window_flash(GdkWindow *    aGdkWindow,
-                             unsigned int   aTimes,
-                             unsigned long  aInterval,
-                             GdkRectangle * aArea)
-{
-  gint         x;
-  gint         y;
-  gint         width;
-  gint         height;
-  guint        i;
-  GdkGC *      gc = 0;
-  GdkColor     white;
-
-  gdk_window_get_geometry(aGdkWindow,
-                          NULL,
-                          NULL,
-                          &width,
-                          &height,
-                          NULL);
-
-  gdk_window_get_origin (aGdkWindow,
-                         &x,
-                         &y);
-
-  gc = gdk_gc_new(GDK_ROOT_PARENT());
-
-  white.pixel = WhitePixel(gdk_display,DefaultScreen(gdk_display));
-
-  gdk_gc_set_foreground(gc,&white);
-  gdk_gc_set_function(gc,GDK_XOR);
-  gdk_gc_set_subwindow(gc,GDK_INCLUDE_INFERIORS);
-  
-  /* 
-   * If an area is given, use that.  Notice how out of whack coordinates
-   * and dimentsions are not checked!!!
-   */
-  if (aArea)
-  {
-    x += aArea->x;
-    y += aArea->y;
-    
-    width = aArea->width;
-    height = aArea->height;
-  }
-
-  /*
-   * Need to do this twice so that the XOR effect can replace 
-   * the original window contents.
-   */
-  for (i = 0; i < aTimes * 2; i++)
-  {
-    gdk_draw_rectangle(GDK_ROOT_PARENT(),
-                       gc,
-                       TRUE,
-                       x,
-                       y,
-                       width,
-                       height);
-
-    gdk_flush();
-    
-    usleep(aInterval);
-  }
-
-  gdk_gc_destroy(gc);
-}
-//////////////////////////////////////////////////////////////////

mozilla/widget/src/gtk/nsGtkUtils.h

@@ -1,85 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef __nsGtkUtils_h
-#define __nsGtkUtils_h
-
-#include <gtk/gtk.h>
-
-struct nsGtkUtils
-{
-  //
-  // Wrapper for XQueryPointer
-  //
-#if 0
-  static gint gdk_query_pointer(GdkWindow * window,
-                                gint *      x_out,
-                                gint *      y_out);
-#endif
-
-  //
-  // Change a widget's background
-  //
-  // flags isa bit mask of the following bits:
-  //
-  //   GTK_RC_FG
-  //   GTK_RC_BG
-  //   GTK_RC_TEXT
-  //   GTK_RC_BASE
-  //
-  // state is an enum:
-  //
-  //   GTK_STATE_NORMAL,
-  //   GTK_STATE_ACTIVE,
-  //   GTK_STATE_PRELIGHT,
-  //   GTK_STATE_SELECTED,
-  //   GTK_STATE_INSENSITIVE
-  //
-  static void gtk_widget_set_color(GtkWidget *  widget,
-                                   GtkRcFlags   flags,
-                                   GtkStateType state,
-                                   GdkColor *   color);
-
-  /**
-   * Return the current keyboard modifier state.
-   *
-   * @return the current keyboard modifier state.
-   *
-   */
-  static GdkModifierType gdk_keyboard_get_modifiers();
-
-  /**
-   * Flash an area within a GDK window (or the whole window)
-   *
-   * @param aGdkWindow   The GDK window to flash.
-   * @param aTimes       Number of times to flash the area.
-   * @param aInterval    Interval between flashes in milliseconds.
-   * @param aArea        The area to flash.  The whole window if NULL.
-   *
-   */
-  static void gdk_window_flash(GdkWindow *     aGdkWindow,
-                               unsigned int    aTimes,
-                               unsigned long   aInterval,
-                               GdkRectangle *  aArea);
-};
-
-#endif  // __nsGtkEventHandler.h

mozilla/widget/src/gtk/nsLabel.cpp

@@ -1,141 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include <gtk/gtk.h>
-
-#include "nsLabel.h"
-#include "nsString.h"
-
-NS_IMPL_ADDREF_INHERITED(nsLabel, nsWidget)
-NS_IMPL_RELEASE_INHERITED(nsLabel, nsWidget)
-NS_IMPL_QUERY_INTERFACE2(nsLabel, nsILabel, nsIWidget)
-
-//-------------------------------------------------------------------------
-//
-// nsLabel constructor
-//
-//-------------------------------------------------------------------------
-nsLabel::nsLabel() : nsWidget(), nsILabel()
-{
-  NS_INIT_REFCNT();
-  mAlignment = eAlign_Left;
-}
-
-//-------------------------------------------------------------------------
-//
-// nsLabel destructor
-//
-//-------------------------------------------------------------------------
-nsLabel::~nsLabel()
-{
-}
-
-
-//-------------------------------------------------------------------------
-//
-// Create the nativeLabel widget
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP  nsLabel::CreateNative(GtkObject *parentWindow)
-{
-  unsigned char alignment = GetNativeAlignment();
-
-  mWidget = gtk_label_new("");
-  gtk_widget_set_name(mWidget, "nsLabel");
-  gtk_misc_set_alignment(GTK_MISC(mWidget), 0.0, alignment);
-
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsLabel::PreCreateWidget(nsWidgetInitData *aInitData)
-{
-  if (nsnull != aInitData) {
-    nsLabelInitData* data = (nsLabelInitData *) aInitData;
-    mAlignment = data->mAlignment;
-  }
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-// Set alignment
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsLabel::SetAlignment(nsLabelAlignment aAlignment)
-{
-  GtkJustification align;
-
-  mAlignment = aAlignment;
-
-  align = GetNativeAlignment();
-  gtk_misc_set_alignment(GTK_MISC(mWidget), 0.0, align);
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-//
-//
-//-------------------------------------------------------------------------
-GtkJustification nsLabel::GetNativeAlignment()
-{
-  switch (mAlignment) {
-    case eAlign_Right : return GTK_JUSTIFY_RIGHT;
-    case eAlign_Left  : return GTK_JUSTIFY_LEFT;
-    case eAlign_Center: return GTK_JUSTIFY_CENTER;
-    default :
-      return GTK_JUSTIFY_LEFT;
-  }
-  return GTK_JUSTIFY_LEFT;
-}
-
-//-------------------------------------------------------------------------
-//
-// Set this button label
-//
-//-------------------------------------------------------------------------
-NS_METHOD nsLabel::SetLabel(const nsString& aText)
-{
-  NS_ALLOC_STR_BUF(label, aText, 256);
-  gtk_label_set(GTK_LABEL(mWidget), label);
-  NS_FREE_STR_BUF(label);
-  return NS_OK;
-
-}
-
-//-------------------------------------------------------------------------
-//
-// Get this button label
-//
-//-------------------------------------------------------------------------
-NS_METHOD nsLabel::GetLabel(nsString& aBuffer)
-{
-  char * text;
-  gtk_label_get(GTK_LABEL(mWidget), &text);
-  aBuffer.SetLength(0);
-  aBuffer.Append(text);
-  return NS_OK;
-}

mozilla/widget/src/gtk/nsLabel.h

@@ -1,62 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsLabel_h__
-#define nsLabel_h__
-
-#include "nsWidget.h"
-#include "nsILabel.h"
-
-/**
- * Native GTK+ Label wrapper
- */
-class nsLabel :  public nsWidget,
-                 public nsILabel
-{
-
-public:
-
-  nsLabel();
-  virtual ~nsLabel();
-
-  NS_DECL_ISUPPORTS_INHERITED
-
-  // nsILabel part
-  NS_IMETHOD SetLabel(const nsString &aText);
-  NS_IMETHOD GetLabel(nsString &aBuffer);
-  NS_IMETHOD SetAlignment(nsLabelAlignment aAlignment);
-
-  NS_IMETHOD PreCreateWidget(nsWidgetInitData *aInitData);
-
-  virtual PRBool OnMove(PRInt32 aX, PRInt32 aY) { return PR_FALSE; }
-  virtual PRBool OnResize(nsRect &aRect) { return PR_FALSE; }
-
-
-protected:
-  NS_METHOD CreateNative(GtkObject *parentWindow);
-  GtkJustification GetNativeAlignment();
-
-  nsLabelAlignment mAlignment;
-
-};
-
-#endif // nsLabel_h__

mozilla/widget/src/gtk/nsListBox.cpp

@@ -1,394 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include <gtk/gtk.h>
-
-#include "nsListBox.h"
-#include "nsString.h"
-
-NS_IMPL_ADDREF_INHERITED(nsListBox, nsWidget)
-NS_IMPL_RELEASE_INHERITED(nsListBox, nsWidget)
-NS_IMPL_QUERY_INTERFACE3(nsListBox, nsIListBox, nsIListWidget, nsIWidget)
-
-//-------------------------------------------------------------------------
-//
-// nsListBox constructor
-//
-//-------------------------------------------------------------------------
-nsListBox::nsListBox() : nsWidget(), nsIListWidget(), nsIListBox()
-{
-  NS_INIT_REFCNT();
-  mMultiSelect = PR_FALSE;
-  mCList = nsnull;
-}
-
-//-------------------------------------------------------------------------
-//
-// nsListBox:: destructor
-//
-//-------------------------------------------------------------------------
-nsListBox::~nsListBox()
-{
-}
-
-void nsListBox::InitCallbacks(char * aName)
-{
-  InstallButtonPressSignal(mCList);
-  InstallButtonReleaseSignal(mCList);
-
-  InstallEnterNotifySignal(mCList);
-  InstallLeaveNotifySignal(mCList);
-
-  // These are needed so that the events will go to us and not our parent.
-  AddToEventMask(mCList,
-                 GDK_BUTTON_PRESS_MASK |
-                 GDK_BUTTON_RELEASE_MASK |
-                 GDK_ENTER_NOTIFY_MASK |
-                 GDK_EXPOSURE_MASK |
-                 GDK_FOCUS_CHANGE_MASK |
-                 GDK_KEY_PRESS_MASK |
-                 GDK_KEY_RELEASE_MASK |
-                 GDK_LEAVE_NOTIFY_MASK |
-                 GDK_POINTER_MOTION_MASK);
-}
-
-//-------------------------------------------------------------------------
-//
-//  initializer
-//
-//-------------------------------------------------------------------------
-
-NS_IMETHODIMP nsListBox::SetMultipleSelection(PRBool aMultipleSelections)
-{
-  mMultiSelect = aMultipleSelections;
-  if (mCList) {
-    if (mMultiSelect)
-      gtk_clist_set_selection_mode(GTK_CLIST(mCList), GTK_SELECTION_MULTIPLE);
-    else
-      gtk_clist_set_selection_mode(GTK_CLIST(mCList), GTK_SELECTION_BROWSE);
-  }
-  return NS_OK;
-}
-
-
-//-------------------------------------------------------------------------
-//
-//  AddItemAt
-//
-//-------------------------------------------------------------------------
-
-NS_IMETHODIMP nsListBox::AddItemAt(nsString &aItem, PRInt32 aPosition)
-{
-  if (mCList) {
-    gchar *text[2];
-    const nsAutoCString tempStr(aItem);
-    text[0] = (gchar*)(const char *)tempStr;
-    text[1] = (gchar*)NULL;
-    gtk_clist_insert(GTK_CLIST(mCList), (int)aPosition, text);
-
-    // XXX Im not sure using the string address is the right thing to 
-    // store in the row data.
-    gtk_clist_set_row_data(GTK_CLIST(mCList), aPosition, (gpointer)&aItem);
-  }
-
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-//  Finds an item at a postion
-//
-//-------------------------------------------------------------------------
-PRInt32  nsListBox::FindItem(nsString &aItem, PRInt32 aStartPos)
-{
-  int i = -1;
-  if (mCList) {
-    i = gtk_clist_find_row_from_data(GTK_CLIST(mCList), (gpointer)&aItem);
-    if (i < aStartPos) {
-      i = -1;
-    }
-  }
-  return i;
-}
-
-//-------------------------------------------------------------------------
-//
-//  CountItems - Get Item Count
-//
-//-------------------------------------------------------------------------
-PRInt32  nsListBox::GetItemCount()
-{
-  if (mCList) {
-    return GTK_CLIST(mCList)->rows;
-  }
-  else {
-    return 0;
-  }
-}
-
-//-------------------------------------------------------------------------
-//
-//  Removes an Item at a specified location
-//
-//-------------------------------------------------------------------------
-PRBool  nsListBox::RemoveItemAt(PRInt32 aPosition)
-{
-  if (mCList) {
-    gtk_clist_remove(GTK_CLIST(mCList), aPosition);
-  }
-  return PR_TRUE;
-}
-
-//-------------------------------------------------------------------------
-//
-//
-//
-//-------------------------------------------------------------------------
-PRBool nsListBox::GetItemAt(nsString& anItem, PRInt32 aPosition)
-{
-  PRBool result = PR_FALSE;
-  anItem.Truncate();
-  if (mCList) {
-    char *text = nsnull;
-    gtk_clist_get_text(GTK_CLIST(mCList),aPosition,0,&text);
-    if (text) {
-      anItem.Append(text);
-      result = PR_TRUE;
-    }
-  }
-  return result;
-}
-
-//-------------------------------------------------------------------------
-//
-//  Gets the selected of selected item
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsListBox::GetSelectedItem(nsString& aItem)
-{
-  aItem.Truncate();
-  if (mCList) {
-    PRInt32 i=0, idx=-1;
-    GtkCList *clist = GTK_CLIST(mCList);
-    GList *list = clist->row_list;
-
-    for (i=0; i < clist->rows && idx == -1; i++, list = list->next) {
-      if (GTK_CLIST_ROW (list)->state == GTK_STATE_SELECTED) {
-        char *text = nsnull;
-        gtk_clist_get_text(GTK_CLIST(mCList),i,0,&text);
-        if (text) {
-          aItem.Append(text);
-        }
-        return NS_OK;
-      }
-    }
-  }
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-//  Gets the list of selected otems
-//
-//-------------------------------------------------------------------------
-PRInt32 nsListBox::GetSelectedIndex()
-{
-  PRInt32 i=0, idx=-1;
-  if (mCList) {
-    if (!mMultiSelect) {
-      GtkCList *clist = GTK_CLIST(mCList);
-      GList *list = clist->row_list;
-
-      for (i=0; i < clist->rows && idx == -1; i++, list = list->next) {
-        if (GTK_CLIST_ROW (list)->state == GTK_STATE_SELECTED) {
-          idx = i;
-        }
-      }
-    } else {
-      NS_ASSERTION(PR_FALSE, "Multi selection list box does not support GetSelectedIndex()");
-    }
-  }
-  return idx;
-}
-
-//-------------------------------------------------------------------------
-//
-//  SelectItem
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsListBox::SelectItem(PRInt32 aPosition)
-{
-  if (mCList) {
-    gtk_clist_select_row(GTK_CLIST(mCList), aPosition, 0);
-  }
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-//  GetSelectedCount
-//
-//-------------------------------------------------------------------------
-PRInt32 nsListBox::GetSelectedCount()
-{
-  if (mCList) {
-    if (!GTK_CLIST(mCList)->selection)
-      return 0;
-    else
-      return (PRInt32)g_list_length(GTK_CLIST(mCList)->selection);
-  }
-  else {
-    return 0;
-  }
-}
-
-//-------------------------------------------------------------------------
-//
-//  GetSelectedIndices
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsListBox::GetSelectedIndices(PRInt32 aIndices[], PRInt32 aSize)
-{
-  if (mCList) {
-    PRInt32 i=0, num = 0;
-    GtkCList *clist = GTK_CLIST(mCList);
-    GList *list = clist->row_list;
-
-    for (i=0; i < clist->rows && num < aSize; i++, list = list->next) {
-      if (GTK_CLIST_ROW (list)->state == GTK_STATE_SELECTED) {
-        aIndices[num] = i;
-        num++;
-      }
-    }
-  }
-  else {
-    PRInt32 i = 0;
-    for (i = 0; i < aSize; i++) aIndices[i] = 0;
-  }
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-//  SetSelectedIndices
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsListBox::SetSelectedIndices(PRInt32 aIndices[], PRInt32 aSize)
-{
-  if (mCList) {
-    gtk_clist_unselect_all(GTK_CLIST(mCList));
-    int i;
-    for (i=0;i<aSize;i++) {
-      SelectItem(aIndices[i]);
-    }
-  }
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-//  Deselect
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsListBox::Deselect()
-{
-  if (mCList) {
-    gtk_clist_unselect_all(GTK_CLIST(mCList));
-  }
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-// Set initial parameters
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsListBox::PreCreateWidget(nsWidgetInitData *aInitData)
-{
-  if (nsnull != aInitData) {
-    nsListBoxInitData* data = (nsListBoxInitData *) aInitData;
-    mMultiSelect = data->mMultiSelect;
-  }
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-// Create the native widget
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsListBox::CreateNative(GtkObject *parentWindow)
-{
-  // to handle scrolling
-  mWidget = gtk_scrolled_window_new (nsnull, nsnull);
-  gtk_widget_set_name(mWidget, "nsListBox");
-  gtk_container_set_border_width(GTK_CONTAINER(mWidget), 0);
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (mWidget),
-                                  GTK_POLICY_NEVER,
-                                  GTK_POLICY_AUTOMATIC);
-
-  mCList = ::gtk_clist_new(1);
-  gtk_clist_column_titles_hide(GTK_CLIST(mCList));
-  // Default (it may be changed)
-  gtk_clist_set_selection_mode(GTK_CLIST(mCList), GTK_SELECTION_BROWSE);
-  SetMultipleSelection(mMultiSelect);
-  gtk_widget_show(mCList);
-  gtk_signal_connect(GTK_OBJECT(mCList),
-                     "destroy",
-                     GTK_SIGNAL_FUNC(DestroySignal),
-                     this);
-
-  gtk_container_add (GTK_CONTAINER (mWidget), mCList);
-
-  return NS_OK;
-}
-
-void
-nsListBox::OnDestroySignal(GtkWidget* aGtkWidget)
-{
-  if (aGtkWidget == mCList) {
-    mCList = nsnull;
-  }
-  else {
-    nsWidget::OnDestroySignal(aGtkWidget);
-  }
-}
-
-//-------------------------------------------------------------------------
-//
-// set font for listbox
-//
-//-------------------------------------------------------------------------
-/*virtual*/
-void nsListBox::SetFontNative(GdkFont *aFont)
-{
-  GtkStyle *style = gtk_style_copy(GTK_WIDGET (g_list_nth_data(gtk_container_children(GTK_CONTAINER (mWidget)),0))->style);
-  // gtk_style_copy ups the ref count of the font
-  gdk_font_unref (style->font);
-  
-  style->font = aFont;
-  gdk_font_ref(style->font);
-  
-  gtk_widget_set_style(GTK_WIDGET (g_list_nth_data(gtk_container_children(GTK_CONTAINER (mWidget)),0)), style);
-  
-  gtk_style_unref(style);
-}

mozilla/widget/src/gtk/nsListBox.h

@@ -1,70 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsListBox_h__
-#define nsListBox_h__
-
-#include "nsWidget.h"
-#include "nsIListBox.h"
-
-/**
- * Native GTK+ Listbox wrapper
- */
-class nsListBox :   public nsWidget,
-                    public nsIListWidget,
-                    public nsIListBox
-{
-
-public:
-  nsListBox();
-  virtual ~nsListBox();
-
-  NS_DECL_ISUPPORTS_INHERITED
-
-  // nsIListBox interface
-  NS_IMETHOD PreCreateWidget(nsWidgetInitData *aInitData);
-  NS_IMETHOD SetMultipleSelection(PRBool aMultipleSelections);
-  NS_IMETHOD AddItemAt(nsString &aItem, PRInt32 aPosition);
-  PRInt32    FindItem(nsString &aItem, PRInt32 aStartPos);
-  PRInt32    GetItemCount();
-  PRBool     RemoveItemAt(PRInt32 aPosition);
-  PRBool     GetItemAt(nsString& anItem, PRInt32 aPosition);
-  NS_IMETHOD GetSelectedItem(nsString& aItem);
-  PRInt32    GetSelectedIndex();
-  PRInt32    GetSelectedCount();
-  NS_IMETHOD GetSelectedIndices(PRInt32 aIndices[], PRInt32 aSize);
-  NS_IMETHOD SetSelectedIndices(PRInt32 aIndices[], PRInt32 aSize);
-  NS_IMETHOD SelectItem(PRInt32 aPosition);
-  NS_IMETHOD Deselect() ;
-
-  virtual void SetFontNative(GdkFont *aFont);
-
-protected:
-  NS_IMETHOD CreateNative(GtkObject *parentWindow);
-  virtual void InitCallbacks(char * aName = nsnull);
-  virtual void OnDestroySignal(GtkWidget* aGtkWidget);
-
-  GtkWidget *mCList;
-  PRBool  mMultiSelect;
-};
-
-#endif // nsListBox_h__

mozilla/widget/src/gtk/nsLookAndFeel.cpp

@@ -1,316 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsLookAndFeel.h"
-#include <gtk/gtkinvisible.h>
-
-#define GDK_COLOR_TO_NS_RGB(c) \
-    ((nscolor) NS_RGB(c.red, c.green, c.blue))
-
-
-NS_IMPL_ISUPPORTS1(nsLookAndFeel, nsILookAndFeel)
-
-//-------------------------------------------------------------------------
-//
-// Query interface implementation
-//
-//-------------------------------------------------------------------------
-nsLookAndFeel::nsLookAndFeel()
-{
-  NS_INIT_REFCNT();
-  mWidget = gtk_invisible_new();
-  gtk_widget_ensure_style(mWidget);
-  mStyle = gtk_widget_get_style(mWidget);
-}
-
-nsLookAndFeel::~nsLookAndFeel()
-{
-  gtk_widget_destroy(mWidget);
-}
-
-NS_IMETHODIMP nsLookAndFeel::GetColor(const nsColorID aID, nscolor &aColor)
-{
-  nsresult res = NS_OK;
-  aColor = 0; // default color black
-
-  switch (aID) {
-  case eColor_WindowBackground:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_NORMAL]);
-    break;
-  case eColor_WindowForeground:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->fg[GTK_STATE_NORMAL]);
-    break;
-  case eColor_WidgetBackground:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_NORMAL]);
-    break;
-  case eColor_WidgetForeground:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->fg[GTK_STATE_NORMAL]);
-    break;
-  case eColor_WidgetSelectBackground:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_SELECTED]);
-    break;
-  case eColor_WidgetSelectForeground:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->fg[GTK_STATE_SELECTED]);
-    break;
-  case eColor_Widget3DHighlight:
-    aColor = NS_RGB(0xa0,0xa0,0xa0);
-    break;
-  case eColor_Widget3DShadow:
-    aColor = NS_RGB(0x40,0x40,0x40);
-    break;
-  case eColor_TextBackground:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_NORMAL]);
-    break;
-  case eColor_TextForeground: 
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->fg[GTK_STATE_NORMAL]);
-    break;
-  case eColor_TextSelectBackground:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_SELECTED]);
-    break;
-  case eColor_TextSelectForeground:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->text[GTK_STATE_SELECTED]);
-    break;
-
-    // css2  http://www.w3.org/TR/REC-CSS2/ui.html#system-colors
-  case eColor_activeborder:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_NORMAL]);
-    break;
-  case eColor_activecaption:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_NORMAL]);
-    break;
-  case eColor_appworkspace:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_NORMAL]);
-    break;
-  case eColor_background:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_NORMAL]);
-    break;
-
-  case eColor_captiontext:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->fg[GTK_STATE_NORMAL]);
-    break;
-  case eColor_graytext:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->fg[GTK_STATE_INSENSITIVE]);
-    break;
-  case eColor_highlight:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_SELECTED]);
-    break;
-  case eColor_highlighttext:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->fg[GTK_STATE_SELECTED]);
-    break;
-  case eColor_inactiveborder:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_NORMAL]);
-    break;
-  case eColor_inactivecaption:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_INSENSITIVE]);
-    break;
-  case eColor_inactivecaptiontext:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->fg[GTK_STATE_INSENSITIVE]);
-    break;
-  case eColor_infobackground:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_NORMAL]);
-    break;
-  case eColor_infotext:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->fg[GTK_STATE_NORMAL]);
-    break;
-  case eColor_menu:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_NORMAL]);
-    break;
-  case eColor_menutext:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->fg[GTK_STATE_NORMAL]);
-    break;
-  case eColor_scrollbar:
-    break;
-
-  case eColor_threedface:
-  case eColor_buttonface:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_NORMAL]);
-    break;
-
-  case eColor_buttonhighlight:  // ?
-  case eColor_threedhighlight:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_ACTIVE]);
-    break;
-
-  case eColor_buttontext:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->fg[GTK_STATE_NORMAL]);
-    break;
-
-  case eColor_buttonshadow:
-  case eColor_threeddarkshadow:
-  case eColor_threedshadow: // i think these should be the same
-    aColor = NS_DarkenColor(NS_DarkenColor(NS_DarkenColor(NS_DarkenColor(NS_DarkenColor(GDK_COLOR_TO_NS_RGB(mStyle->light[GTK_STATE_NORMAL]))))));
-    //    aColor = GDK_COLOR_TO_NS_RGB(mStyle->dark[GTK_STATE_NORMAL]);   // dark style gives me bright green?!
-    break;
-
-  case eColor_threedlightshadow:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->light[GTK_STATE_NORMAL]);
-    break;
-
-  case eColor_window:
-  case eColor_windowframe:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_NORMAL]);
-    break;
-
-  case eColor_windowtext:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->fg[GTK_STATE_NORMAL]);
-    break;
-
-  default:
-    /* default color is BLACK */
-    aColor = 0;
-    res    = NS_ERROR_FAILURE;
-    break;
-  }
-
-  //  printf("%i, %i, %i\n", NS_GET_R(aColor), NS_GET_B(aColor), NS_GET_G(aColor));
-
-  return res;
-}
-
-NS_IMETHODIMP nsLookAndFeel::GetMetric(const nsMetricID aID, PRInt32 & aMetric)
-{
-  nsresult res = NS_OK;
-  switch (aID) {
-  case eMetric_WindowTitleHeight:
-    aMetric = 0;
-    break;
-  case eMetric_WindowBorderWidth:
-    //    aMetric = mStyle->klass->xthickness;
-    break;
-  case eMetric_WindowBorderHeight:
-    //    aMetric = mStyle->klass->ythickness;
-    break;
-  case eMetric_Widget3DBorder:
-    //    aMetric = 4;
-    break;
-  case eMetric_TextFieldHeight:
-    {
-      GtkRequisition req;
-      GtkWidget *text = gtk_entry_new();
-      // needed to avoid memory leak
-      gtk_widget_ref(text);
-      gtk_object_sink(GTK_OBJECT(text));
-      gtk_widget_size_request(text,&req);
-      aMetric = req.height;
-      gtk_widget_destroy(text);
-      gtk_widget_unref(text);
-    }
-    break;
-  case eMetric_TextFieldBorder:
-    aMetric = 2;
-    break;
-  case eMetric_TextVerticalInsidePadding:
-    aMetric = 0;
-    break;
-  case eMetric_TextShouldUseVerticalInsidePadding:
-    aMetric = 0;
-    break;
-  case eMetric_TextHorizontalInsideMinimumPadding:
-    aMetric = 15;
-    break;
-  case eMetric_TextShouldUseHorizontalInsideMinimumPadding:
-    aMetric = 1;
-    break;
-  case eMetric_ButtonHorizontalInsidePaddingNavQuirks:
-    aMetric = 10;
-    break;
-  case eMetric_ButtonHorizontalInsidePaddingOffsetNavQuirks:
-    aMetric = 8;
-    break;
-  case eMetric_CheckboxSize:
-    aMetric = 15;
-    break;
-  case eMetric_RadioboxSize:
-    aMetric = 15;
-    break;
-  case eMetric_ListShouldUseHorizontalInsideMinimumPadding:
-    aMetric = 15;
-    break;
-  case eMetric_ListHorizontalInsideMinimumPadding:
-    aMetric = 15;
-    break;
-  case eMetric_ListShouldUseVerticalInsidePadding:
-    aMetric = 1;
-    break;
-  case eMetric_ListVerticalInsidePadding:
-    aMetric = 1;
-    break;
-  case eMetric_CaretBlinkTime:
-    aMetric = 500;
-    break;
-  case eMetric_CaretWidthTwips:
-    aMetric = 20;
-    break;
-  default:
-    aMetric = 0;
-    res     = NS_ERROR_FAILURE;
-  }
-
-  return res;
-}
-
-NS_IMETHODIMP nsLookAndFeel::GetMetric(const nsMetricFloatID aID, float & aMetric)
-{
-  nsresult res = NS_OK;
-  switch (aID) {
-  case eMetricFloat_TextFieldVerticalInsidePadding:
-    aMetric = 0.25f;
-    break;
-  case eMetricFloat_TextFieldHorizontalInsidePadding:
-    aMetric = 0.95f; // large number on purpose so minimum padding is used
-    break;
-  case eMetricFloat_TextAreaVerticalInsidePadding:
-    aMetric = 0.40f;    
-    break;
-  case eMetricFloat_TextAreaHorizontalInsidePadding:
-    aMetric = 0.40f; // large number on purpose so minimum padding is used
-    break;
-  case eMetricFloat_ListVerticalInsidePadding:
-    aMetric = 0.10f;
-    break;
-  case eMetricFloat_ListHorizontalInsidePadding:
-    aMetric = 0.40f;
-    break;
-  case eMetricFloat_ButtonVerticalInsidePadding:
-    aMetric = 0.25f;
-    break;
-  case eMetricFloat_ButtonHorizontalInsidePadding:
-    aMetric = 0.25f;
-    break;
-  default:
-    aMetric = -1.0;
-    res = NS_ERROR_FAILURE;
-  }
-  return res;
-}
-
-#ifdef NS_DEBUG
-NS_IMETHODIMP nsLookAndFeel::GetNavSize(const nsMetricNavWidgetID aWidgetID,
-                                        const nsMetricNavFontID   aFontID, 
-                                        const PRInt32             aFontSize, 
-                                        nsSize &aSize)
-{
-  aSize.width  = 0;
-  aSize.height = 0;
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-#endif

mozilla/widget/src/gtk/nsLookAndFeel.h

@@ -1,55 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef __nsLookAndFeel
-#define __nsLookAndFeel
-#include "nsILookAndFeel.h"
-#include <gtk/gtk.h>
-
-class nsLookAndFeel: public nsILookAndFeel {
-  NS_DECL_ISUPPORTS
-
-public:
-  nsLookAndFeel();
-  virtual ~nsLookAndFeel();
-
-  NS_IMETHOD GetColor(const nsColorID aID, nscolor &aColor);
-  NS_IMETHOD GetMetric(const nsMetricID aID, PRInt32 & aMetric);
-  NS_IMETHOD GetMetric(const nsMetricFloatID aID, float & aMetric);
-
-#ifdef NS_DEBUG
-  // This method returns the actual (or nearest estimate) 
-  // of the Navigator size for a given form control for a given font
-  // and font size. This is used in NavQuirks mode to see how closely
-  // we match its size
-  NS_IMETHOD GetNavSize(const nsMetricNavWidgetID aWidgetID,
-                        const nsMetricNavFontID   aFontID, 
-                        const PRInt32             aFontSize, 
-                        nsSize &aSize);
-#endif
-
-protected:
-  GtkStyle *mStyle;
-  GtkWidget *mWidget;
-};
-
-#endif

mozilla/widget/src/gtk/nsMenu.cpp

@@ -1,792 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include <gtk/gtk.h>
-
-#include "nsMenu.h"
-#include "nsIComponentManager.h"
-#include "nsIDOMElement.h"
-#include "nsIDOMNode.h"
-#include "nsIMenuBar.h"
-#include "nsIMenuItem.h"
-#include "nsIMenuListener.h"
-#include "nsString.h"
-#include "nsGtkEventHandler.h"
-#include "nsCOMPtr.h"
-#include "nsWidgetsCID.h"
-
-static NS_DEFINE_CID(kMenuCID,             NS_MENU_CID);
-static NS_DEFINE_CID(kMenuItemCID,         NS_MENUITEM_CID);
-
-static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
-
-nsresult nsMenu::QueryInterface(REFNSIID aIID, void** aInstancePtr)
-{
-  if (NULL == aInstancePtr) {
-    return NS_ERROR_NULL_POINTER;
-  }
-
-  *aInstancePtr = NULL;
-
-  if (aIID.Equals(nsIMenu::GetIID())) {
-    *aInstancePtr = (void*)(nsIMenu*) this;
-    NS_ADDREF_THIS();
-    return NS_OK;
-  }
-  if (aIID.Equals(kISupportsIID)) {
-    *aInstancePtr = (void*)(nsISupports*)(nsIMenu*)this;
-    NS_ADDREF_THIS();
-    return NS_OK;
-  }
-  if (aIID.Equals(nsIMenuListener::GetIID())) {
-    *aInstancePtr = (void*)(nsIMenuListener*)this;
-    NS_ADDREF_THIS();
-    return NS_OK;
-  }
-  return NS_NOINTERFACE;
-}
-
-NS_IMPL_ADDREF(nsMenu)
-NS_IMPL_RELEASE(nsMenu)
-
-//-------------------------------------------------------------------------
-//
-// nsMenu constructor
-//
-//-------------------------------------------------------------------------
-nsMenu::nsMenu() : nsIMenu()
-{
-  NS_INIT_REFCNT();
-  mNumMenuItems  = 0;
-  mMenu          = nsnull;
-  mMenuParent    = nsnull;
-  mMenuBarParent = nsnull;
-  mListener      = nsnull;
-  mConstructCalled = PR_FALSE;
-  
-  mDOMNode       = nsnull;
-  mWebShell      = nsnull;
-  mDOMElement    = nsnull;
-  mAccessKey     = "_";
-}
-
-//-------------------------------------------------------------------------
-//
-// nsMenu destructor
-//
-//-------------------------------------------------------------------------
-nsMenu::~nsMenu()
-{
-  //g_print("nsMenu::~nsMenu() called\n");
-  NS_IF_RELEASE(mListener);
-  // Free our menu items
-  RemoveAll();
-  gtk_widget_destroy(mMenu);
-  mMenu = nsnull;
-}
-
-//-------------------------------------------------------------------------
-//
-// Create the proper widget
-//-------------------------------------------------------------------------
-NS_METHOD nsMenu::Create(nsISupports *aParent, const nsString &aLabel)
-{
-  if(aParent)
-  {
-    nsIMenuBar * menubar = nsnull;
-    aParent->QueryInterface(nsIMenuBar::GetIID(), (void**) &menubar);
-    if(menubar)
-    {
-      mMenuBarParent = menubar;
-      NS_RELEASE(menubar);
-    }
-    else
-    {
-      nsIMenu * menu = nsnull;
-      aParent->QueryInterface(nsIMenu::GetIID(), (void**) &menu);
-      if(menu)
-      {
-        mMenuParent = menu;
-        NS_RELEASE(menu);
-      }
-    }
-  }
-
-  mLabel = aLabel;
-  mMenu = gtk_menu_new();
-
-  gtk_signal_connect (GTK_OBJECT (mMenu), "map",
-                      GTK_SIGNAL_FUNC(menu_map_handler),
-                      this);
-  gtk_signal_connect (GTK_OBJECT (mMenu), "unmap",
-                      GTK_SIGNAL_FUNC(menu_unmap_handler),
-                      this);
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenu::GetParent(nsISupports*& aParent)
-{
-  aParent = nsnull;
-  if (nsnull != mMenuParent) {
-    return mMenuParent->QueryInterface(kISupportsIID,
-                                       (void**)&aParent);
-  } else if (nsnull != mMenuBarParent) {
-    return mMenuBarParent->QueryInterface(kISupportsIID,
-                                          (void**)&aParent);
-  }
-
-  return NS_ERROR_FAILURE;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenu::GetLabel(nsString &aText)
-{
-  aText = mLabel;
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenu::SetLabel(const nsString &aText)
-{
-  /* we Do GetLabel() when we are adding the menu...
-   *  but we might want to redo this.
-   */
-  mLabel = aText;
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenu::GetAccessKey(nsString &aText)
-{
-  aText = mAccessKey;
-  char *foo = mAccessKey.ToNewCString();
-
-#ifdef DEBUG_pavlov
-  g_print("GetAccessKey returns \"%s\"\n", foo);
-#endif
-
-  nsCRT::free(foo);
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenu::SetAccessKey(const nsString &aText)
-{
-  mAccessKey = aText;
-  char *foo = mAccessKey.ToNewCString();
-
-#ifdef DEBUG_pavlov
-  g_print("SetAccessKey setting to \"%s\"\n", foo);
-#endif
-
-  nsCRT::free(foo);
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-/**
-* Set enabled state
-*
-*/
-NS_METHOD nsMenu::SetEnabled(PRBool aIsEnabled)
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-/**
-* Get enabled state
-*
-*/
-NS_METHOD nsMenu::GetEnabled(PRBool* aIsEnabled)
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-/**
-* Query if this is the help menu
-*
-*/
-NS_METHOD nsMenu::IsHelpMenu(PRBool* aIsHelpMenu)
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenu::AddItem(nsISupports * aItem)
-{
-  if(aItem)
-  {
-    nsIMenuItem * menuitem = nsnull;
-    aItem->QueryInterface(nsIMenuItem::GetIID(),
-                          (void**)&menuitem);
-    if(menuitem)
-    {
-      AddMenuItem(menuitem); // nsMenu now owns this
-      NS_RELEASE(menuitem);
-    }
-    else
-    {
-      nsIMenu * menu = nsnull;
-      aItem->QueryInterface(nsIMenu::GetIID(),
-                            (void**)&menu);
-      if(menu)
-      {
-        AddMenu(menu); // nsMenu now owns this
-        NS_RELEASE(menu);
-      }
-    }
-  }
-
-  return NS_OK;
-}
-
-// local method used by nsMenu::AddItem
-//-------------------------------------------------------------------------
-NS_METHOD nsMenu::AddMenuItem(nsIMenuItem * aMenuItem)
-{
-  GtkWidget *widget;
-  void      *voidData;
-  
-  aMenuItem->GetNativeData(voidData);
-  widget = GTK_WIDGET(voidData);
-
-  gtk_menu_shell_append (GTK_MENU_SHELL (mMenu), widget);
-
-  // XXX add aMenuItem to internal data structor list
-  // Need to be adding an nsISupports *, not nsIMenuItem *
-  nsISupports * supports = nsnull;
-  aMenuItem->QueryInterface(kISupportsIID,
-                            (void**)&supports);
-  {
-    mMenuItemVoidArray.AppendElement(supports);
-    mNumMenuItems++;
-  }
-  
-  return NS_OK;
-}
-
-// local method used by nsMenu::AddItem
-//-------------------------------------------------------------------------
-NS_METHOD nsMenu::AddMenu(nsIMenu * aMenu)
-{
-  nsString Label;
-  GtkWidget *newmenu=nsnull;
-  void *voidData=NULL;
-  
-  aMenu->GetLabel(Label);
-
-  // Create nsMenuItem
-  nsIMenuItem * pnsMenuItem = nsnull;
-  nsresult rv = nsComponentManager::CreateInstance(kMenuItemCID,
-                                                   nsnull,
-                                                   nsIMenuItem::GetIID(),
-                                                   (void**)&pnsMenuItem);
-  if (NS_OK == rv) {
-    nsISupports * supports = nsnull;
-    QueryInterface(kISupportsIID, (void**) &supports);
-    pnsMenuItem->Create(supports, Label, PR_FALSE); //PR_TRUE); 
-    NS_RELEASE(supports);               
-    
-    pnsMenuItem->QueryInterface(kISupportsIID, (void**) &supports);
-    AddItem(supports); // Parent should now own menu item
-    NS_RELEASE(supports);
-          
-    void * menuitem = nsnull;
-    pnsMenuItem->GetNativeData(menuitem);
-  
-    voidData = NULL;
-    aMenu->GetNativeData(&voidData);
-    newmenu = GTK_WIDGET(voidData);
-
-    gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), newmenu);
-  
-    NS_RELEASE(pnsMenuItem);
-  } 
-
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenu::AddSeparator() 
-{
-  // Create nsMenuItem
-  nsIMenuItem * pnsMenuItem = nsnull;
-  nsresult rv = nsComponentManager::CreateInstance(
-    kMenuItemCID, nsnull, nsIMenuItem::GetIID(), (void**)&pnsMenuItem);
-  if (NS_OK == rv) {
-    nsString tmp = "menuseparator";
-    nsISupports * supports = nsnull;
-    QueryInterface(kISupportsIID, (void**) &supports);
-    pnsMenuItem->Create(supports, tmp, PR_TRUE);  
-    NS_RELEASE(supports);
-    
-    pnsMenuItem->QueryInterface(kISupportsIID, (void**) &supports);
-    AddItem(supports); // Parent should now own menu item
-    NS_RELEASE(supports); 
-          
-    NS_RELEASE(pnsMenuItem);
-  } 
-  
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenu::GetItemCount(PRUint32 &aCount)
-{
-  // this should be right.. does it need to be +1 ?
-  aCount = g_list_length(GTK_MENU_SHELL(mMenu)->children);
-  //g_print("nsMenu::GetItemCount = %i\n", aCount);
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenu::GetItemAt(const PRUint32 aPos,
-                            nsISupports *&aMenuItem)
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenu::InsertItemAt(const PRUint32 aPos,
-                               nsISupports *aMenuItem)
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenu::RemoveItem(const PRUint32 aPos)
-{
-#if 0
-  // this may work here better than Removeall(), but i'm not sure how to test this one
-  nsISupports *item = mMenuItemVoidArray[aPos];
-  delete item;
-  mMenuItemVoidArray.RemoveElementAt(aPos);
-#endif
-  /*
-  gtk_menu_shell_remove (GTK_MENU_SHELL (mMenu), item);
-
-  nsCRT::free(labelStr);
-
-  voidData = NULL;
-
-  aMenu->GetNativeData(&voidData);
-  newmenu = GTK_WIDGET(voidData);
-
-  gtk_menu_item_remove_submenu (GTK_MENU_ITEM (item));
-  */
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenu::RemoveAll()
-{
-  //g_print("nsMenu::RemoveAll()\n");
-#if 0
-  // this doesn't work quite right, but this is about all that should really be needed
-  int i=0;
-  nsIMenu *menu = nsnull;
-  nsIMenuItem *menuitem = nsnull;
-  nsISupports *item = nsnull;
-
-  for (i=mMenuItemVoidArray.Count(); i>0; i--)
-  {
-    item = (nsISupports*)mMenuItemVoidArray[i-1];
-
-    if(nsnull != item)
-    {
-      if (NS_OK == item->QueryInterface(nsIMenuItem::GetIID(), (void**)&menuitem)) {
-        // we do this twice because we have to do it once for QueryInterface,
-        // then we want to get rid of it.
-        // g_print("remove nsMenuItem\n");
-        NS_RELEASE(menuitem);
-        NS_RELEASE(item);
-        menuitem = nsnull;
-      } else if (NS_OK == item->QueryInterface(nsIMenu::GetIID(), (void**)&menu)) {
-        // g_print("remove nsMenu\n");
-        NS_RELEASE(menu);
-        NS_RELEASE(item);
-        menu = nsnull;
-      }
-      // mMenuItemVoidArray.RemoveElementAt(i-1);
-    }
-  }
-  mMenuItemVoidArray.Clear();
-#else
-  for (int i = mMenuItemVoidArray.Count(); i > 0; i--) {
-    if(nsnull != mMenuItemVoidArray[i-1]) {
-      nsIMenuItem * menuitem = nsnull;
-      ((nsISupports*)mMenuItemVoidArray[i-1])->QueryInterface(nsIMenuItem::GetIID(),
-                                                              (void**)&menuitem);
-      if(menuitem) {
-        void *gtkmenuitem = nsnull;
-        menuitem->GetNativeData(gtkmenuitem);
-        if (gtkmenuitem) {
-          //          gtk_widget_ref(GTK_WIDGET(gtkmenuitem));
-          //gtk_widget_destroy(GTK_WIDGET(gtkmenuitem));
-           gtk_container_remove (GTK_CONTAINER (mMenu), GTK_WIDGET(gtkmenuitem));
-        }
- 
-      } else {
- 
-        nsIMenu * menu= nsnull;
-        ((nsISupports*)mMenuItemVoidArray[i-1])->QueryInterface(nsIMenu::GetIID(),
-                                                                (void**)&menu);
-        if(menu)
-          {
-            void * gtkmenu = nsnull;
-            menu->GetNativeData(&gtkmenu);
- 
-            if(gtkmenu){
-              //g_print("gtkmenu removed");
- 
-              //gtk_menu_item_remove_submenu (GTK_MENU_ITEM (item));
-            }
-          }
- 
-      }
-    }
-  }
-#endif
-//g_print("end RemoveAll\n");
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenu::GetNativeData(void ** aData)
-{
-  *aData = (void *)mMenu;
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenu::SetNativeData(void * aData)
-{
-  return NS_OK;
-}
-
-GtkWidget *nsMenu::GetNativeParent()
-{
-  void * voidData; 
-  if (nsnull != mMenuParent) {
-    mMenuParent->GetNativeData(&voidData);
-  } else if (nsnull != mMenuBarParent) {
-    mMenuBarParent->GetNativeData(voidData);
-  } else {
-    return nsnull;
-  }
-  return GTK_WIDGET(voidData);
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenu::AddMenuListener(nsIMenuListener * aMenuListener)
-{
-  mListener = aMenuListener;
-  NS_ADDREF(mListener);
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenu::RemoveMenuListener(nsIMenuListener * aMenuListener)
-{
-  if (aMenuListener == mListener) {
-    NS_IF_RELEASE(mListener);
-  }
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-// nsIMenuListener interface
-//-------------------------------------------------------------------------
-nsEventStatus nsMenu::MenuItemSelected(const nsMenuEvent & aMenuEvent)
-{
-  if (nsnull != mListener) {
-    mListener->MenuSelected(aMenuEvent);
-  }
-  return nsEventStatus_eIgnore;
-}
-
-nsEventStatus nsMenu::MenuSelected(const nsMenuEvent & aMenuEvent)
-{
-  if (nsnull != mListener) {
-    mListener->MenuSelected(aMenuEvent);
-  }
-  return nsEventStatus_eIgnore;
-}
-
-//-------------------------------------------------------------------------
-nsEventStatus nsMenu::MenuDeselected(const nsMenuEvent & aMenuEvent)
-{
-  if (nsnull != mListener) {
-    mListener->MenuDeselected(aMenuEvent);
-  }
-  return nsEventStatus_eIgnore;
-}
-
-//-------------------------------------------------------------------------
-nsEventStatus nsMenu::MenuConstruct(const nsMenuEvent & aMenuEvent,
-                                    nsIWidget         * aParentWindow, 
-                                    void              * menuNode,
-                                    void              * aWebShell)
-{
-  //g_print("nsMenu::MenuConstruct called \n");
-  if(menuNode){
-    SetDOMNode((nsIDOMNode*)menuNode);
-  }
-  
-  if(!aWebShell){
-    aWebShell = mWebShell;
-  }
-
-  // First open the menu.
-  nsCOMPtr<nsIDOMElement> domElement = do_QueryInterface(mDOMNode);
-  if (domElement)
-    domElement->SetAttribute("open", "true");
-
-   /// Now get the kids. Retrieve our menupopup child.
-  nsCOMPtr<nsIDOMNode> menuPopupNode;
-  mDOMNode->GetFirstChild(getter_AddRefs(menuPopupNode));
-  while (menuPopupNode) {
-    nsCOMPtr<nsIDOMElement> menuPopupElement(do_QueryInterface(menuPopupNode));
-    if (menuPopupElement) {
-      nsString menuPopupNodeType;
-      menuPopupElement->GetNodeName(menuPopupNodeType);
-      if (menuPopupNodeType.Equals("menupopup"))
-        break;
-    }
-    nsCOMPtr<nsIDOMNode> oldMenuPopupNode(menuPopupNode);
-    oldMenuPopupNode->GetNextSibling(getter_AddRefs(menuPopupNode));
-  }
-
-  if (!menuPopupNode)
-    return nsEventStatus_eIgnore;
-
-  nsCOMPtr<nsIDOMNode> menuitemNode;
-  menuPopupNode->GetFirstChild(getter_AddRefs(menuitemNode));
-
-    unsigned short menuIndex = 0;
-
-    while (menuitemNode) {
-      nsCOMPtr<nsIDOMElement> menuitemElement(do_QueryInterface(menuitemNode));
-      if (menuitemElement) {
-        nsString menuitemNodeType;
-        nsString menuitemName;
-        menuitemElement->GetNodeName(menuitemNodeType);
-        if (menuitemNodeType.Equals("menuitem")) {
-          // LoadMenuItem
-          LoadMenuItem(this,
-                       menuitemElement,
-                       menuitemNode,
-                       menuIndex,
-                       (nsIWebShell*)aWebShell);
-        } else if (menuitemNodeType.Equals("menuseparator")) {
-          AddSeparator();
-        } else if (menuitemNodeType.Equals("menu")) {
-          // Load a submenu
-          LoadSubMenu(this, menuitemElement, menuitemNode);
-        }
-      }
-      
-      ++menuIndex;
-      
-      nsCOMPtr<nsIDOMNode> oldmenuitemNode(menuitemNode);
-      oldmenuitemNode->GetNextSibling(getter_AddRefs(menuitemNode));
-    } // end menu item innner loop
-  return nsEventStatus_eIgnore;
-}
-
-//-------------------------------------------------------------------------
-nsEventStatus nsMenu::MenuDestruct(const nsMenuEvent & aMenuEvent)
-{
-  // Close the node.
-  nsCOMPtr<nsIDOMElement> domElement = do_QueryInterface(mDOMNode);
-  if (domElement)
-    domElement->RemoveAttribute("open");
-
-  //g_print("nsMenu::MenuDestruct called \n");
-  mConstructCalled = PR_FALSE;
-  RemoveAll();
-  return nsEventStatus_eIgnore;
-}
-
-//-------------------------------------------------------------------------
-/**
-* Set DOMNode
-*
-*/
-NS_METHOD nsMenu::SetDOMNode(nsIDOMNode * aMenuNode)
-{
-  mDOMNode = aMenuNode;
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-/**
-* Set DOMElement
-*
-*/
-NS_METHOD nsMenu::SetDOMElement(nsIDOMElement * aMenuElement)
-{
-  mDOMElement = aMenuElement;
-  return NS_OK;
-}
-    
-//-------------------------------------------------------------------------
-/**
-* Set WebShell
-*
-*/
-NS_METHOD nsMenu::SetWebShell(nsIWebShell * aWebShell)
-{
-  mWebShell = aWebShell;
-  return NS_OK;
-}
-
-//----------------------------------------
-void nsMenu::LoadMenuItem(nsIMenu *       pParentMenu,
-                          nsIDOMElement * menuitemElement,
-                          nsIDOMNode *    menuitemNode,
-                          unsigned short  menuitemIndex,
-                          nsIWebShell *   aWebShell)
-{
-  static const char* NS_STRING_TRUE = "true";
-  nsString disabled;
-  nsString menuitemName;
-  nsString menuitemCmd;
-
-  menuitemElement->GetAttribute(nsAutoString("disabled"), disabled);
-  menuitemElement->GetAttribute(nsAutoString("value"), menuitemName);
-  menuitemElement->GetAttribute(nsAutoString("cmd"), menuitemCmd);
-      
-  // Create nsMenuItem
-  nsIMenuItem * pnsMenuItem = nsnull;
-  nsresult rv = nsComponentManager::CreateInstance(kMenuItemCID,
-                                                   nsnull, 
-                                                   nsIMenuItem::GetIID(), 
-                                                   (void**)&pnsMenuItem);
-  if (NS_OK == rv) {
-    pnsMenuItem->Create(pParentMenu, menuitemName, PR_FALSE);
-                     
-    nsISupports * supports = nsnull;
-    pnsMenuItem->QueryInterface(kISupportsIID, (void**) &supports);
-    pParentMenu->AddItem(supports); // Parent should now own menu item
-    NS_RELEASE(supports);
-            
-    if(disabled == NS_STRING_TRUE ) {
-      pnsMenuItem->SetEnabled(PR_FALSE);
-    }
-  
-    // Create MenuDelegate - this is the intermediator inbetween 
-    // the DOM node and the nsIMenuItem
-    // The nsWebShellWindow wacthes for Document changes and then notifies the 
-    // the appropriate nsMenuDelegate object
-    nsCOMPtr<nsIDOMElement> domElement(do_QueryInterface(menuitemNode));
-    if (!domElement) {
-      //return NS_ERROR_FAILURE;
-		return;
-    }
-    
-    nsAutoString cmdAtom("oncommand");
-    nsString cmdName;
-
-    domElement->GetAttribute(cmdAtom, cmdName);
-
-    pnsMenuItem->SetCommand(cmdName);
-   // DO NOT use passed in webshell because of messed up windows dynamic loading
-   // code. 
-    pnsMenuItem->SetWebShell(mWebShell);
-    pnsMenuItem->SetDOMElement(domElement);
-
-    NS_RELEASE(pnsMenuItem);
-    
-  } 
-  return;
-}
-
-//----------------------------------------
-void nsMenu::LoadSubMenu(nsIMenu *       pParentMenu,
-                         nsIDOMElement * menuElement,
-                         nsIDOMNode *    menuNode)
-{
-  nsString menuName;
-  menuElement->GetAttribute(nsAutoString("value"), menuName);
-  //printf("Creating Menu [%s] \n", menuName.ToNewCString()); // this leaks
-
-  // Create nsMenu
-  nsIMenu * pnsMenu = nsnull;
-  nsresult rv = nsComponentManager::CreateInstance(kMenuCID,
-                                                   nsnull,
-                                                   nsIMenu::GetIID(),
-                                                   (void**)&pnsMenu);
-  if (NS_OK == rv) {
-    // Call Create
-    nsISupports * supports = nsnull;
-    pParentMenu->QueryInterface(kISupportsIID, (void**) &supports);
-    pnsMenu->Create(supports, menuName);
-    NS_RELEASE(supports); // Balance QI
-
-    // Set nsMenu Name
-    pnsMenu->SetLabel(menuName); 
-
-    supports = nsnull;
-    pnsMenu->QueryInterface(kISupportsIID, (void**) &supports);
-    pParentMenu->AddItem(supports); // parent takes ownership
-    NS_RELEASE(supports);
-
-    pnsMenu->SetWebShell(mWebShell);
-    pnsMenu->SetDOMNode(menuNode);
-
-    /*
-    // Begin menuitem inner loop
-    unsigned short menuIndex = 0;
-
-    nsCOMPtr<nsIDOMNode> menuitemNode;
-    menuNode->GetFirstChild(getter_AddRefs(menuitemNode));
-    while (menuitemNode) {
-      nsCOMPtr<nsIDOMElement> menuitemElement(do_QueryInterface(menuitemNode));
-      if (menuitemElement) {
-        nsString menuitemNodeType;
-        menuitemElement->GetNodeName(menuitemNodeType);
-
-#ifdef DEBUG_saari
-        printf("Type [%s] %d\n", menuitemNodeType.ToNewCString(), menuitemNodeType.Equals("menuseparator"));
-#endif
-
-        if (menuitemNodeType.Equals("menuitem")) {
-          // Load a menuitem
-          LoadMenuItem(pnsMenu, menuitemElement, menuitemNode, menuIndex, mWebShell);
-        } else if (menuitemNodeType.Equals("menuseparator")) {
-          pnsMenu->AddSeparator();
-        } else if (menuitemNodeType.Equals("menu")) {
-          // Add a submenu
-          LoadSubMenu(pnsMenu, menuitemElement, menuitemNode);
-        }
-      }
-	  ++menuIndex;
-      nsCOMPtr<nsIDOMNode> oldmenuitemNode(menuitemNode);
-      oldmenuitemNode->GetNextSibling(getter_AddRefs(menuitemNode));
-    } // end menu item innner loop
-    */
-  }     
-}

mozilla/widget/src/gtk/nsMenu.h

@@ -1,120 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsMenu_h__
-#define nsMenu_h__
-
-#include "nsIMenu.h"
-#include "nsIMenuListener.h"
-#include "nsVoidArray.h"
-
-class nsIDOMElement;
-class nsIDOMNode;
-class nsIMenuBar;
-class nsIWebShell;
-
-/**
- * Native GTK+ Menu wrapper
- */
-
-class nsMenu : public nsIMenu, public nsIMenuListener
-{
-
-public:
-  nsMenu();
-  virtual ~nsMenu();
-
-  NS_DECL_ISUPPORTS
-  
-  // nsIMenuListener methods
-  nsEventStatus MenuItemSelected(const nsMenuEvent & aMenuEvent);
-  nsEventStatus MenuSelected(const nsMenuEvent & aMenuEvent); 
-  nsEventStatus MenuDeselected(const nsMenuEvent & aMenuEvent); 
-  nsEventStatus MenuConstruct(
-    const nsMenuEvent & aMenuEvent,
-    nsIWidget         * aParentWindow, 
-    void              * menuNode,
-	void              * aWebShell);
-  nsEventStatus MenuDestruct(const nsMenuEvent & aMenuEvent); 
-  
-  NS_IMETHOD Create(nsISupports * aParent, const nsString &aLabel);
-
-  // nsIMenu Methods
-  NS_IMETHOD GetParent(nsISupports *&aParent);
-  NS_IMETHOD GetLabel(nsString &aText);
-  NS_IMETHOD SetLabel(const nsString &aText);
-  NS_IMETHOD GetAccessKey(nsString &aText);
-  NS_IMETHOD SetAccessKey(const nsString &aText);
-  NS_IMETHOD AddItem(nsISupports * aItem);
-  NS_IMETHOD AddMenuItem(nsIMenuItem * aMenuItem);
-  NS_IMETHOD AddMenu(nsIMenu * aMenu);
-  NS_IMETHOD AddSeparator();
-  NS_IMETHOD GetItemCount(PRUint32 &aCount);
-  NS_IMETHOD GetItemAt(const PRUint32 aPos, nsISupports *& aMenuItem);
-  NS_IMETHOD InsertItemAt(const PRUint32 aPos, nsISupports * aMenuItem);
-  NS_IMETHOD RemoveItem(const PRUint32 aPos);
-  NS_IMETHOD RemoveAll();
-  NS_IMETHOD GetNativeData(void** aData);
-  NS_IMETHOD SetNativeData(void* aData);
-  NS_IMETHOD AddMenuListener(nsIMenuListener * aMenuListener);
-  NS_IMETHOD RemoveMenuListener(nsIMenuListener * aMenuListener);
-  NS_IMETHOD SetEnabled(PRBool aIsEnabled);
-  NS_IMETHOD GetEnabled(PRBool* aIsEnabled);
-  NS_IMETHOD IsHelpMenu(PRBool* aIsHelp);
-  
-  NS_IMETHOD SetDOMNode(nsIDOMNode * aMenuNode);
-  NS_IMETHOD SetDOMElement(nsIDOMElement * aMenuElement);
-  NS_IMETHOD SetWebShell(nsIWebShell * aWebShell);
-  
-protected:
-  void LoadMenuItem(
-    nsIMenu       * pParentMenu,
-    nsIDOMElement * menuitemElement,
-    nsIDOMNode    * menuitemNode,
-    unsigned short  menuitemIndex,
-    nsIWebShell   * aWebShell);
-  
-  void LoadSubMenu(
-    nsIMenu       * pParentMenu,
-    nsIDOMElement * menuElement,
-    nsIDOMNode    * menuNode);
-    
-  GtkWidget  *GetNativeParent();
-
-  nsString   mLabel;
-  nsString   mAccessKey;
-  PRUint32   mNumMenuItems;
-  GtkWidget  *mMenu;
-  
-  nsVoidArray mMenuItemVoidArray;
-
-  nsIMenu    *mMenuParent;
-  nsIMenuBar *mMenuBarParent;
-  nsIMenuListener * mListener;
-  
-  PRBool mConstructCalled;
-  nsIDOMNode    * mDOMNode;
-  nsIWebShell   * mWebShell;
-  nsIDOMElement * mDOMElement;
-};
-
-#endif // nsMenu_h__

mozilla/widget/src/gtk/nsMenuBar.cpp

@@ -1,354 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include <gtk/gtk.h>
-
-#include "nsMenuBar.h"
-#include "nsMenuItem.h"
-#include "nsIComponentManager.h"
-#include "nsIDOMNode.h"
-#include "nsIMenu.h"
-#include "nsIWebShell.h"
-#include "nsIWidget.h"
-
-#include "nsString.h"
-
-#include "nsGtkEventHandler.h"
-
-#include "nsCOMPtr.h"
-#include "nsWidgetsCID.h"
-
-static NS_DEFINE_CID(kMenuBarCID, NS_MENUBAR_CID);
-static NS_DEFINE_CID(kMenuCID, NS_MENU_CID);
-
-static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
-
-nsresult nsMenuBar::QueryInterface(REFNSIID aIID, void** aInstancePtr)
-{
-  if (NULL == aInstancePtr) {
-    return NS_ERROR_NULL_POINTER;
-  }
-
-  *aInstancePtr = NULL;
-
-  if (aIID.Equals(nsIMenuBar::GetIID())) {
-    *aInstancePtr = (void*) ((nsIMenuBar*) this);
-    NS_ADDREF_THIS();
-    return NS_OK;
-  }
-
-  if (aIID.Equals(kISupportsIID)) {
-    *aInstancePtr = (void*) ((nsISupports*)(nsIMenuBar*) this);
-    NS_ADDREF_THIS();
-    return NS_OK;
-  }
-
-  if (aIID.Equals(nsIMenuListener::GetIID())) {
-    *aInstancePtr = (void*) ((nsIMenuListener*)this);
-    NS_ADDREF_THIS();
-    return NS_OK;
-  }
-
-  return NS_NOINTERFACE;
-}
-
-NS_IMPL_ADDREF(nsMenuBar)
-NS_IMPL_RELEASE(nsMenuBar)
-
-//-------------------------------------------------------------------------
-//
-// nsMenuBar constructor
-//
-//-------------------------------------------------------------------------
-nsMenuBar::nsMenuBar() : nsIMenuBar(), nsIMenuListener()
-{
-  NS_INIT_REFCNT();
-  mNumMenus = 0;
-  mMenuBar  = nsnull;
-  mParent   = nsnull;
-  mIsMenuBarAdded = PR_FALSE;
-  mWebShell = nsnull;
-  mDOMNode  = nsnull;
-}
-
-//-------------------------------------------------------------------------
-//
-// nsMenuBar destructor
-//
-//-------------------------------------------------------------------------
-nsMenuBar::~nsMenuBar()
-{
-  // Release the menus
-  RemoveAll();
-}
-
-//-------------------------------------------------------------------------
-//
-// Create the proper widget
-//
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuBar::Create(nsIWidget *aParent)
-{
-  SetParent(aParent);
-  mMenuBar = gtk_menu_bar_new();
-  
-  gtk_widget_show(mMenuBar);
-  mParent->SetMenuBar(this);
-  
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuBar::GetParent(nsIWidget *&aParent)
-{
-  aParent = mParent;
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuBar::SetParent(nsIWidget *aParent)
-{
-  mParent = aParent;
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuBar::AddMenu(nsIMenu * aMenu)
-{
-  nsString Label;
-  GtkWidget *widget, *nmenu;
-  void *voidData;
-
-  nsISupports * supports = nsnull;
-  aMenu->QueryInterface(kISupportsIID, (void**)&supports);
-  if (supports) {
-    mMenusVoidArray.AppendElement(aMenu);
-    mNumMenus++;
-  }
-  
-  aMenu->GetLabel(Label);
-
-  // get access key
-  nsString accessKey = " ";
-  aMenu->GetAccessKey(accessKey);
-  if(accessKey != " ")
-  {
-    // munge acess key into name
-    PRInt32 offset = Label.Find(accessKey);
-    if(offset != -1)
-      Label.Insert("_", offset);
-  }
-
-  char *foo = Label.ToNewCString();
-  g_print("%s\n", foo);
-  nsCRT::free(foo);
-
-  widget = nsMenuItem::CreateLocalized(Label);
-  gtk_widget_show(widget);
-  gtk_menu_bar_append (GTK_MENU_BAR (mMenuBar), widget);
-
-  aMenu->GetNativeData(&voidData);
-  nmenu = GTK_WIDGET(voidData);
-
-  gtk_menu_item_set_submenu (GTK_MENU_ITEM (widget), nmenu);
-
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuBar::GetMenuCount(PRUint32 &aCount)
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuBar::GetMenuAt(const PRUint32 aCount, nsIMenu *& aMenu)
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuBar::InsertMenuAt(const PRUint32 aCount, nsIMenu *& aMenu)
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuBar::RemoveMenu(const PRUint32 aCount)
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuBar::RemoveAll()
-{
-  for (int i = mMenusVoidArray.Count(); i > 0; i--) {
-    if(nsnull != mMenusVoidArray[i-1]) {
-      nsIMenu * menu = nsnull;
-      ((nsISupports*)mMenusVoidArray[i-1])->QueryInterface(nsIMenu::GetIID(), (void**)&menu);
-      if(menu) {
-        //void * gtkmenu= nsnull;
-        //menu->GetNativeData(&gtkmenu);
-        //if(gtkmenu){
-        //  gtk_container_remove (GTK_CONTAINER (mMenuBar), GTK_WIDGET(gtkmenu) );
-        //}
-        NS_RELEASE(menu);
-	
-        g_print("menu release \n");
-        int num =((nsISupports*)mMenusVoidArray[i-1])->Release();
-        while(num) {
-          g_print("menu release again!\n");
-          num = ((nsISupports*)mMenusVoidArray[i-1])->Release();
-        }
-      }
-    }
-  }
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuBar::GetNativeData(void *& aData)
-{
-  aData = (void *)mMenuBar;
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuBar::SetNativeData(void * aData)
-{
-  // Temporary hack for MacOS. Will go away when nsMenuBar handles it's own
-  // construction
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuBar::Paint()
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-// nsMenuListener interface
-//
-//-------------------------------------------------------------------------
-nsEventStatus nsMenuBar::MenuItemSelected(const nsMenuEvent & aMenuEvent)
-{
-  return nsEventStatus_eIgnore;
-}
-
-nsEventStatus nsMenuBar::MenuSelected(const nsMenuEvent & aMenuEvent)
-{
-  return nsEventStatus_eIgnore;
-}
-
-nsEventStatus nsMenuBar::MenuDeselected(const nsMenuEvent & aMenuEvent)
-{
-  return nsEventStatus_eIgnore;
-}
-
-nsEventStatus nsMenuBar::MenuConstruct(
-    const nsMenuEvent & aMenuEvent,
-    nsIWidget         * aParentWindow, 
-    void              * menubarNode,
-    void              * aWebShell)
-{
-  mWebShell = (nsIWebShell*) aWebShell;
-  mDOMNode  = (nsIDOMNode*)menubarNode;
-  
-  nsIMenuBar * pnsMenuBar = nsnull;
-  nsresult rv = nsComponentManager::CreateInstance(kMenuBarCID,
-                                                   nsnull,
-                                                   nsIMenuBar::GetIID(),
-                                                   (void**)&pnsMenuBar);
-  if (NS_OK == rv) {
-    if (nsnull != pnsMenuBar) {
-      pnsMenuBar->Create(aParentWindow);
-
-      // set pnsMenuBar as a nsMenuListener on aParentWindow
-      nsCOMPtr<nsIMenuListener> menuListener;
-      pnsMenuBar->QueryInterface(nsIMenuListener::GetIID(), getter_AddRefs(menuListener));
-      aParentWindow->AddMenuListener(menuListener);
-
-      nsCOMPtr<nsIDOMNode> menuNode;
-      ((nsIDOMNode*)menubarNode)->GetFirstChild(getter_AddRefs(menuNode));
-      while (menuNode) {
-        nsCOMPtr<nsIDOMElement> menuElement(do_QueryInterface(menuNode));
-        if (menuElement) {
-          nsString menuNodeType;
-          nsString menuName;
-          nsString menuAccessKey = " ";
-          menuElement->GetNodeName(menuNodeType);
-          if (menuNodeType.Equals("menu")) {
-            menuElement->GetAttribute(nsAutoString("value"), menuName);
-            menuElement->GetAttribute(nsAutoString("accesskey"), menuAccessKey);
-            // Don't create the menu yet, just add in the top level names
-
-            // Create nsMenu
-            nsIMenu * pnsMenu = nsnull;
-            rv = nsComponentManager::CreateInstance(kMenuCID, nsnull, nsIMenu::GetIID(), (void**)&pnsMenu);
-            if (NS_OK == rv) {
-              // Call Create
-              nsISupports * supports = nsnull;
-              pnsMenuBar->QueryInterface(kISupportsIID, (void**) &supports);
-              pnsMenu->Create(supports, menuName);
-              NS_RELEASE(supports);
-
-              pnsMenu->SetLabel(menuName);
-              pnsMenu->SetAccessKey(menuAccessKey);
-              pnsMenu->SetDOMNode(menuNode);
-              pnsMenu->SetDOMElement(menuElement);
-              pnsMenu->SetWebShell(mWebShell);
-
-              // Make nsMenu a child of nsMenuBar
-              // nsMenuBar takes ownership of the nsMenu
-              pnsMenuBar->AddMenu(pnsMenu); 
-
-              // Release the menu now that the menubar owns it
-              NS_RELEASE(pnsMenu);
-            }
-          } 
-
-        }
-        nsCOMPtr<nsIDOMNode> oldmenuNode(menuNode);  
-        oldmenuNode->GetNextSibling(getter_AddRefs(menuNode));
-      } // end while (nsnull != menuNode)
-
-      // Give the aParentWindow this nsMenuBar to hold onto.
-      // The parent window should take ownership at this point
-      aParentWindow->SetMenuBar(pnsMenuBar);
-
-      // HACK: force a paint for now
-      pnsMenuBar->Paint();
-
-      NS_RELEASE(pnsMenuBar);
-    } // end if ( nsnull != pnsMenuBar )
-  }
-
-  return nsEventStatus_eIgnore;
-  return nsEventStatus_eIgnore;
-}
-
-nsEventStatus nsMenuBar::MenuDestruct(const nsMenuEvent & aMenuEvent)
-{
-  return nsEventStatus_eIgnore;
-}

mozilla/widget/src/gtk/nsMenuBar.h

@@ -1,85 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsMenuBar_h__
-#define nsMenuBar_h__
-
-#include "nsIMenuBar.h"
-#include "nsIMenuListener.h"
-#include "nsVoidArray.h"
-
-class nsIDOMNode;
-class nsIWebShell;
-class nsIWidget;
-
-/**
- * Native GTK+ MenuBar wrapper
- */
-
-class nsMenuBar : public nsIMenuBar, public nsIMenuListener
-{
-
-public:
-  nsMenuBar();
-  virtual ~nsMenuBar();
-
-  // nsIMenuListener interface
-  nsEventStatus MenuItemSelected(const nsMenuEvent & aMenuEvent);
-  nsEventStatus MenuSelected(const nsMenuEvent & aMenuEvent);
-  nsEventStatus MenuDeselected(const nsMenuEvent & aMenuEvent);
-  nsEventStatus MenuConstruct(
-    const nsMenuEvent & aMenuEvent,
-    nsIWidget         * aParentWindow, 
-    void              * menuNode,
-	void              * aWebShell);
-  nsEventStatus MenuDestruct(const nsMenuEvent & aMenuEvent);
-  
-  NS_DECL_ISUPPORTS
-
-  
-  NS_IMETHOD Create(nsIWidget * aParent);
-
-  // nsIMenuBar Methods
-  NS_IMETHOD GetParent(nsIWidget *&aParent);
-  NS_IMETHOD SetParent(nsIWidget * aParent);
-  NS_IMETHOD AddMenu(nsIMenu * aMenu);
-  NS_IMETHOD GetMenuCount(PRUint32 &aCount);
-  NS_IMETHOD GetMenuAt(const PRUint32 aCount, nsIMenu *& aMenu);
-  NS_IMETHOD InsertMenuAt(const PRUint32 aCount, nsIMenu *& aMenu);
-  NS_IMETHOD RemoveMenu(const PRUint32 aCount);
-  NS_IMETHOD RemoveAll();
-  NS_IMETHOD GetNativeData(void*& aData);
-  NS_IMETHOD Paint();
-  NS_IMETHOD SetNativeData(void* aData);
-protected:
-  GtkWidget * mMenuBar;
-  nsIWidget * mParent;
-  PRBool      mIsMenuBarAdded;
-  
-  nsIWebShell * mWebShell;
-  nsIDOMNode  * mDOMNode;
-  
-  nsVoidArray mMenusVoidArray;
-  PRUint32    mNumMenus;
-};
-
-#endif // nsMenuBar_h__

mozilla/widget/src/gtk/nsMenuItem.cpp

@@ -1,539 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include <gtk/gtk.h>
-
-#include "nsMenuItem.h"
-#include "nsIMenu.h"
-#include "nsIMenuBar.h"
-#include "nsIWidget.h"
-
-#include "nsGtkEventHandler.h"
-
-#include "nsIPopUpMenu.h"
-
-#include "nsCOMPtr.h"
-#include "nsIContent.h"
-#include "nsIContentViewer.h"
-#include "nsIDOMElement.h"
-#include "nsIDocumentViewer.h"
-#include "nsIPresContext.h"
-#include "nsIWebShell.h"
-#include "nsICharsetConverterManager.h"
-#include "nsIPlatformCharset.h"
-#include "nsIServiceManager.h"
-
-static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
-
-nsresult nsMenuItem::QueryInterface(REFNSIID aIID, void** aInstancePtr)
-{
-  if (NULL == aInstancePtr) {
-    return NS_ERROR_NULL_POINTER;
-  }
-
-  *aInstancePtr = NULL;
-
-  if (aIID.Equals(nsIMenuItem::GetIID())) {
-    *aInstancePtr = (void*)(nsIMenuItem*)this;
-    NS_ADDREF_THIS();
-    return NS_OK;
-  }
-  if (aIID.Equals(kISupportsIID)) {
-    *aInstancePtr = (void*)(nsISupports*)(nsIMenuItem*)this;
-    NS_ADDREF_THIS();
-    return NS_OK;
-  }
-  if (aIID.Equals(nsIMenuListener::GetIID())) {
-    *aInstancePtr = (void*)(nsIMenuListener*)this;
-    NS_ADDREF_THIS();
-    return NS_OK;
-  }
-  return NS_NOINTERFACE;
-}
-
-NS_IMPL_ADDREF(nsMenuItem)
-NS_IMPL_RELEASE(nsMenuItem)
-
-
-//-------------------------------------------------------------------------
-//
-// nsMenuItem constructor
-//
-//-------------------------------------------------------------------------
-nsMenuItem::nsMenuItem() : nsIMenuItem()
-{
-  NS_INIT_REFCNT();
-  mMenuItem    = nsnull;
-  mMenuParent  = nsnull;
-  mPopUpParent = nsnull;
-  mTarget      = nsnull;
-  mXULCommandListener = nsnull;
-  mIsSeparator = PR_FALSE;
-  mWebShell    = nsnull;
-  mDOMElement  = nsnull;
-  mIsSubMenu   = PR_FALSE;
-}
-
-//-------------------------------------------------------------------------
-//
-// nsMenuItem destructor
-//
-//-------------------------------------------------------------------------
-nsMenuItem::~nsMenuItem()
-{
-  //g_print("nsMenuItem::~nsMenuItem called\n");
-  //NS_IF_RELEASE(mTarget);
-  gtk_widget_destroy(mMenuItem);
-  mMenuItem = nsnull;
-  //g_print("end nsMenuItem::~nsMenuItem\n");
-}
-
-//-------------------------------------------------------------------------
-GtkWidget *nsMenuItem::GetNativeParent()
-{
-  void * voidData;
-  if (nsnull != mMenuParent) {
-    mMenuParent->GetNativeData(&voidData);
-  } else if (nsnull != mPopUpParent) {
-    mPopUpParent->GetNativeData(voidData);
-  } else {
-    return nsnull;
-  }
-  return GTK_WIDGET(voidData);
-}
-
-
-//-------------------------------------------------------------------------
-nsIWidget * nsMenuItem::GetMenuBarParent(nsISupports * aParent)
-{
-  nsIWidget    * widget  = nsnull; // MenuBar's Parent
-  nsIMenu      * menu    = nsnull;
-  nsIMenuBar   * menuBar = nsnull;
-  nsIPopUpMenu * popup   = nsnull;
-  nsISupports  * parent  = aParent;
-  
-  while(1) {
-    if (NS_OK == parent->QueryInterface(nsIMenu::GetIID(),(void**)&menu)) {
-      NS_RELEASE(parent);
-      if (NS_OK != menu->GetParent(parent)) {
-        NS_RELEASE(menu);
-        return nsnull;
-      }
-      NS_RELEASE(menu);
-
-    } else if (NS_OK == parent->QueryInterface(nsIPopUpMenu::GetIID(),(void**)&popup)) {
-      if (NS_OK != popup->GetParent(widget)) {
-        widget =  nsnull;
-      } 
-      NS_RELEASE(popup);
-      NS_RELEASE(parent);
-      return widget;
-
-    } else if (NS_OK == parent->QueryInterface(nsIMenuBar::GetIID(),(void**)&menuBar)) {
-      if (NS_OK != menuBar->GetParent(widget)) {
-        widget =  nsnull;
-      } 
-      NS_RELEASE(menuBar);
-      NS_RELEASE(parent);
-      return widget;
-    } else {
-      NS_RELEASE(parent);
-      return nsnull;
-    }
-  }
-  return nsnull;
-}
-
-GtkWidget*
-nsMenuItem::CreateLocalized(const nsString& aLabel)
-{
-  nsresult result;
-  static nsIUnicodeEncoder* converter = nsnull;
-  static int isLatin1 = 0;
-  static int initialized = 0;
-  if (!initialized) {
-    initialized = 1;
-    result = NS_ERROR_FAILURE;
-    NS_WITH_SERVICE(nsIPlatformCharset, platform, NS_PLATFORMCHARSET_PROGID,
-      &result);
-    if (platform && NS_SUCCEEDED(result)) {
-      nsAutoString charset("");
-      result = platform->GetCharset(kPlatformCharsetSel_Menu, charset);
-      if (NS_SUCCEEDED(result) && (charset.Length() > 0)) {
-        if (!charset.Compare("iso-8859-1", PR_TRUE)) {
-	  isLatin1 = 1;
-	}
-	NS_WITH_SERVICE(nsICharsetConverterManager, manager,
-	  NS_CHARSETCONVERTERMANAGER_PROGID, &result);
-	if (manager && NS_SUCCEEDED(result)) {
-	  result = manager->GetUnicodeEncoder(&charset, &converter);
-	  if (NS_FAILED(result) && converter) {
-	    NS_RELEASE(converter);
-	    converter = nsnull;
-	  }
-	  else if (converter) {
-	    result = converter->SetOutputErrorBehavior(
-	      nsIUnicodeEncoder::kOnError_Replace, nsnull, '?');
-	  }
-	}
-      }
-    }
-  }
-
-  GtkWidget* menuItem = nsnull;
-
-  if (converter) {
-    char labelStr[128];
-    labelStr[0] = 0;
-    PRInt32 srcLen = aLabel.Length() + 1;
-    PRInt32 destLen = sizeof(labelStr);
-    result = converter->Convert(aLabel.GetUnicode(), &srcLen, labelStr,
-      &destLen);
-    if (labelStr[0] && NS_SUCCEEDED(result)) {
-      menuItem = gtk_menu_item_new_with_label(labelStr);
-      if (menuItem && (!isLatin1)) {
-        GtkWidget* label = GTK_BIN(menuItem)->child;
-        gtk_widget_ensure_style(label);
-        GtkStyle* style = gtk_style_copy(label->style);
-        gdk_font_unref(style->font);
-        style->font = gdk_fontset_load("*");
-        gtk_widget_set_style(label, style);
-        gtk_style_unref(style);
-      }
-    }
-  }
-  else {
-    char labelStr[128];
-    aLabel.ToCString(labelStr, sizeof(labelStr));
-    menuItem = gtk_menu_item_new_with_label(labelStr);
-  }
-
-  return menuItem;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuItem::Create(nsISupports *aParent, 
-                             const nsString &aLabel, 
-                             PRBool aIsSeparator)
-                            
-{
-  if (nsnull == aParent) {
-    return NS_ERROR_FAILURE;
-  }
-
-  if(aParent) {
-    nsIMenu * menu;
-    aParent->QueryInterface(nsIMenu::GetIID(), (void**) &menu);
-    mMenuParent = menu;
-    NS_RELEASE(menu);
-  }
-
-  nsIWidget   *widget = nsnull; // MenuBar's Parent
-  nsISupports *sups;
-  if (NS_OK == aParent->QueryInterface(kISupportsIID,(void**)&sups)) {
-    widget = GetMenuBarParent(sups);
-    // GetMenuBarParent will call release for us
-    // NS_RELEASE(sups);
-    mTarget = widget;
-  }
-
-  mIsSeparator = aIsSeparator;
-  mLabel = aLabel;
-
-  // create the native menu item
-
-  if(mIsSeparator) {
-    mMenuItem = gtk_menu_item_new();
-  } else {
-    mMenuItem = CreateLocalized(aLabel);
-  }
-  
-  gtk_widget_show(mMenuItem);
- 
-  gtk_signal_connect(GTK_OBJECT(mMenuItem), "activate",
-                     GTK_SIGNAL_FUNC(menu_item_activate_handler),
-                     this);
-
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuItem::GetLabel(nsString &aText)
-{
-  aText = mLabel;
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuItem::SetLabel(nsString &aText)
-{
-  mLabel = aText;
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuItem::SetEnabled(PRBool aIsEnabled)
-{
-  gtk_widget_set_sensitive(GTK_WIDGET(mMenuItem), aIsEnabled);
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuItem::GetEnabled(PRBool *aIsEnabled)
-{
-  *aIsEnabled = GTK_WIDGET_IS_SENSITIVE(mMenuItem);
-
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuItem::SetChecked(PRBool aIsEnabled)
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuItem::GetChecked(PRBool *aIsEnabled)
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuItem::SetCheckboxType(PRBool aIsCheckbox)
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuItem::GetCheckboxType(PRBool *aIsCheckbox)
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuItem::GetCommand(PRUint32 & aCommand)
-{
-  aCommand = mCommand;
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuItem::GetTarget(nsIWidget *& aTarget)
-{
-  aTarget = mTarget;
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuItem::GetNativeData(void *& aData)
-{
-  aData = (void *)mMenuItem;
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuItem::AddMenuListener(nsIMenuListener * aMenuListener)
-{
- 
-  NS_IF_RELEASE(mXULCommandListener);
-  NS_IF_ADDREF(aMenuListener);
-  mXULCommandListener = aMenuListener;
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuItem::RemoveMenuListener(nsIMenuListener * aMenuListener)
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuItem::IsSeparator(PRBool & aIsSep)
-{
-  aIsSep = mIsSeparator;
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-// nsIMenuListener interface
-//-------------------------------------------------------------------------
-nsEventStatus nsMenuItem::MenuItemSelected(const nsMenuEvent & aMenuEvent)
-{
-  if(!mIsSeparator) {
-    //g_print("nsMenuItem::MenuItemSelected\n");
-    DoCommand();
-  }else{
-    //g_print("nsMenuItem::MenuItemSelected is separator\n");
-  }
-  return nsEventStatus_eIgnore;
-}
-//-------------------------------------------------------------------------
-nsEventStatus nsMenuItem::MenuSelected(const nsMenuEvent & aMenuEvent)
-{
-  if(mXULCommandListener)
-    return mXULCommandListener->MenuSelected(aMenuEvent);
-
-  //g_print("nsMenuItem::MenuSelected\n");
-  return nsEventStatus_eIgnore;
-}
-//-------------------------------------------------------------------------
-nsEventStatus nsMenuItem::MenuDeselected(const nsMenuEvent &aMenuEvent)
-{
-  //g_print("nsMenuItem::MenuDeselected\n");
-  return nsEventStatus_eIgnore;
-}
-//-------------------------------------------------------------------------
-nsEventStatus nsMenuItem::MenuConstruct(const nsMenuEvent &aMenuEvent,
-                                        nsIWidget *aParentWindow, 
-                                        void *menuNode,
-                                        void *aWebShell)
-{
-  //g_print("nsMenuItem::MenuConstruct\n");
-  return nsEventStatus_eIgnore;
-}
-//-------------------------------------------------------------------------
-nsEventStatus nsMenuItem::MenuDestruct(const nsMenuEvent &aMenuEvent)
-{
-  //g_print("nsMenuItem::MenuDestruct\n");
-  return nsEventStatus_eIgnore;
-}
-
-//-------------------------------------------------------------------------
-/**
- * Sets the JavaScript Command to be invoked when a "gui" event
- * occurs on a source widget
- * @param aStrCmd the JS command to be cached for later execution
- * @return NS_OK 
- */
-NS_METHOD nsMenuItem::SetCommand(const nsString &aStrCmd)
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-/**
- * Executes the "cached" JavaScript Command 
- * @return NS_OK if the command was executed properly, otherwise an error code
- */
-NS_METHOD nsMenuItem::DoCommand()
-{
-  nsresult rv = NS_ERROR_FAILURE;
- 
-  if(!mWebShell || !mDOMElement)
-    return rv;
-    
-  nsCOMPtr<nsIContentViewer> contentViewer;
-  NS_ENSURE_SUCCESS(mWebShell->GetContentViewer(getter_AddRefs(contentViewer)),
-   NS_ERROR_FAILURE);
-
-  nsCOMPtr<nsIDocumentViewer> docViewer;
-  docViewer = do_QueryInterface(contentViewer);
-  if (!docViewer) {
-    NS_ERROR("Document viewer interface not supported by the content viewer.");
-    //g_print("Document viewer interface not supported by the content viewer.");
-    return rv;
-  }
-
-  nsCOMPtr<nsIPresContext> presContext;
-  if (NS_FAILED(rv = docViewer->GetPresContext(*getter_AddRefs(presContext)))) {
-    NS_ERROR("Unable to retrieve the doc viewer's presentation context.");
-    //g_print("Unable to retrieve the doc viewer's presentation context.");
-    return rv;
-  }
-
-  nsEventStatus status = nsEventStatus_eIgnore;
-  nsMouseEvent event;
-  event.eventStructType = NS_MOUSE_EVENT;
-  event.message = NS_MENU_ACTION;
-
-  nsCOMPtr<nsIContent> contentNode;
-  contentNode = do_QueryInterface(mDOMElement);
-  if (!contentNode) {
-    NS_ERROR("DOM Node doesn't support the nsIContent interface required to handle DOM events.");
-    //g_print("DOM Node doesn't support the nsIContent interface required to handle DOM events.");
-    return rv;
-  }
-
-  rv = contentNode->HandleDOMEvent(*presContext, &event, nsnull, NS_EVENT_FLAG_INIT, status);
-  //g_print("HandleDOMEvent called");
-  return rv;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuItem::SetDOMNode(nsIDOMNode * aDOMNode)
-{
-  return NS_OK;
-}
-    
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuItem::GetDOMNode(nsIDOMNode ** aDOMNode)
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuItem::SetDOMElement(nsIDOMElement * aDOMElement)
-{
-  mDOMElement = aDOMElement;
-  return NS_OK;
-}
-    
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuItem::GetDOMElement(nsIDOMElement ** aDOMElement)
-{
-  return NS_OK;
-}
-    
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuItem::SetWebShell(nsIWebShell * aWebShell)
-{
-  mWebShell = aWebShell;
-  return NS_OK;
-}
-
-//----------------------------------------------------------------------
-NS_IMETHODIMP nsMenuItem::SetShortcutChar(const nsString &aText)
-{
-  mKeyEquivalent = aText;
-  return NS_OK;
-}
-
-//----------------------------------------------------------------------
-NS_IMETHODIMP nsMenuItem::GetShortcutChar(nsString &aText)
-{
-  aText = mKeyEquivalent;
-  return NS_OK;
-}
-
-//----------------------------------------------------------------------
-NS_IMETHODIMP nsMenuItem::SetModifiers(PRUint8 aModifiers)
-{
-  mModifiers = aModifiers;
-  return NS_OK;
-}
-
-//----------------------------------------------------------------------
-NS_IMETHODIMP nsMenuItem::GetModifiers(PRUint8 * aModifiers)
-{
-  *aModifiers = mModifiers; 
-  return NS_OK;
-}

mozilla/widget/src/gtk/nsMenuItem.h

@@ -1,116 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsMenuItem_h__
-#define nsMenuItem_h__
-
-#include "nsIMenuItem.h"
-#include "nsString.h"
-#include "nsIMenuListener.h"
-
-class nsIDOMNode;
-class nsIDOMElement;
-class nsIMenu;
-class nsIPopUpMenu;
-class nsIWebShell;
-class nsIWidget;
-
-/**
- * Native GTK+ MenuItem wrapper
- */
-
-class nsMenuItem : public nsIMenuItem, public nsIMenuListener
-{
-
-public:
-  nsMenuItem();
-  virtual ~nsMenuItem();
-
-  // nsISupports
-  NS_DECL_ISUPPORTS
-
-  // nsIMenuItem Methods
-  NS_IMETHOD Create(nsISupports    *aParent, 
-                    const nsString &aLabel,  
-                    PRBool          aIsSeparator);
-  NS_IMETHOD GetLabel(nsString &aText);
-  NS_IMETHOD SetLabel(nsString &aText);
-  NS_IMETHOD SetEnabled(PRBool aIsEnabled);
-  NS_IMETHOD GetEnabled(PRBool *aIsEnabled);
-  NS_IMETHOD SetChecked(PRBool aIsEnabled);
-  NS_IMETHOD GetChecked(PRBool *aIsEnabled);
-  NS_IMETHOD SetCheckboxType(PRBool aIsCheckbox);
-  NS_IMETHOD GetCheckboxType(PRBool *aIsCheckbox);
-  NS_IMETHOD GetCommand(PRUint32 & aCommand);
-  NS_IMETHOD GetTarget(nsIWidget *& aTarget);
-  NS_IMETHOD GetNativeData(void*& aData);
-  NS_IMETHOD AddMenuListener(nsIMenuListener * aMenuListener);
-  NS_IMETHOD RemoveMenuListener(nsIMenuListener * aMenuListener);
-  NS_IMETHOD IsSeparator(PRBool & aIsSep);
-
-  NS_IMETHOD SetCommand(const nsString & aStrCmd);
-  NS_IMETHOD DoCommand();
-  NS_IMETHOD SetDOMNode(nsIDOMNode * aDOMNode);
-  NS_IMETHOD GetDOMNode(nsIDOMNode ** aDOMNode);
-  NS_IMETHOD SetDOMElement(nsIDOMElement * aDOMElement);
-  NS_IMETHOD GetDOMElement(nsIDOMElement ** aDOMElement);
-  NS_IMETHOD SetWebShell(nsIWebShell * aWebShell);
-  
-  NS_IMETHOD SetShortcutChar(const nsString &aText);
-  NS_IMETHOD GetShortcutChar(nsString &aText);
-  NS_IMETHOD SetModifiers(PRUint8 aModifiers);
-  NS_IMETHOD GetModifiers(PRUint8 * aModifiers);
-  
-  // nsIMenuListener interface
-  nsEventStatus MenuItemSelected(const nsMenuEvent & aMenuEvent);
-  nsEventStatus MenuSelected(const nsMenuEvent & aMenuEvent);
-  nsEventStatus MenuDeselected(const nsMenuEvent & aMenuEvent);
-  nsEventStatus MenuConstruct(const nsMenuEvent & aMenuEvent,
-                              nsIWidget         * aParentWindow, 
-                              void              * menuNode,
-                              void              * aWebShell);
-  nsEventStatus MenuDestruct(const nsMenuEvent & aMenuEvent);
-
-  static GtkWidget* CreateLocalized(const nsString& aLabel);
- 
-protected:
-  nsIWidget    *GetMenuBarParent(nsISupports * aParentSupports);
-  GtkWidget    *GetNativeParent();
-
-  nsIMenuListener	*mXULCommandListener;
-  nsString     mLabel;
-  nsString     mKeyEquivalent;
-  PRUint8      mModifiers;
-  PRUint32     mCommand;
-  nsIMenu      *mMenuParent;
-  nsIPopUpMenu *mPopUpParent;
-  nsIWidget    *mTarget;
-
-  GtkWidget    *mMenuItem; // native cascade widget
-  PRBool        mIsSeparator;
-  PRBool        mIsSubMenu;
-
-  nsIWebShell   * mWebShell;
-  nsIDOMElement * mDOMElement;
-};
-
-#endif // nsMenuItem_h__

mozilla/widget/src/gtk/nsPopUpMenu.cpp

@@ -1,214 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-#include "nsPopUpMenu.h"
-#include "nsIMenu.h"
-#include "nsIWidget.h"
-
-#include "nsString.h"
-#include "nsFileSpec.h" // XXX: For nsAutoCString
-
-NS_IMPL_ISUPPORTS(nsPopUpMenu, nsIPopUpMenu::GetIID())
-
-//-------------------------------------------------------------------------
-//
-// nsPopUpMenu constructor
-//
-//-------------------------------------------------------------------------
-nsPopUpMenu::nsPopUpMenu() : nsIPopUpMenu()
-{
-  NS_INIT_REFCNT();
-  mNumMenuItems = 0;
-  mParent       = nsnull;
-  mMenu         = nsnull;
-}
-
-//-------------------------------------------------------------------------
-//
-// nsPopUpMenu destructor
-//
-//-------------------------------------------------------------------------
-nsPopUpMenu::~nsPopUpMenu()
-{
-  NS_IF_RELEASE(mParent);
-}
-
-
-//-------------------------------------------------------------------------
-//
-// Create the proper widget
-//
-//-------------------------------------------------------------------------
-NS_METHOD nsPopUpMenu::Create(nsIWidget *aParent)
-{
-
-  mParent = aParent;
-  NS_ADDREF(mParent);
-
-  mMenu = gtk_menu_new();
-  return NS_OK;
-}
-
-
-//-------------------------------------------------------------------------
-NS_METHOD nsPopUpMenu::AddItem(const nsString &aText)
-{
-  GtkWidget *widget;
-
-  widget = gtk_menu_item_new_with_label ((const char*)nsAutoCString(mLabel));
-  gtk_widget_show(widget);
-  gtk_menu_shell_append (GTK_MENU_SHELL (mMenu), widget);
-
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsPopUpMenu::AddItem(nsIMenuItem * aMenuItem)
-{
-  GtkWidget *widget;
-  void *voidData;
-  
-  aMenuItem->GetNativeData(voidData);
-  widget = GTK_WIDGET(voidData);
-
-  gtk_menu_shell_append (GTK_MENU_SHELL (mMenu), widget);
-
-  // XXX add aMenuItem to internal data structor list
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsPopUpMenu::AddMenu(nsIMenu * aMenu)
-{
-  nsString Label;
-  GtkWidget *item=NULL, *parentmenu=NULL, *newmenu=NULL;
-  void *voidData=NULL;
-  
-  aMenu->GetLabel(Label);
-
-  GetNativeData(voidData);
-  parentmenu = GTK_WIDGET(voidData);
-
-  item = gtk_menu_item_new_with_label ((const char*)nsAutoCString(Label));
-  gtk_widget_show(item);
-  gtk_menu_shell_append (GTK_MENU_SHELL (parentmenu), item);
-
-  voidData = NULL;
-
-  aMenu->GetNativeData(&voidData);
-  newmenu = GTK_WIDGET(voidData);
-
-  gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), newmenu);
-
-  // XXX add aMenu to internal data structor list
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsPopUpMenu::AddSeparator() 
-{
-  GtkWidget *widget;
-  widget = gtk_menu_item_new ();
-  gtk_widget_show(widget);
-  gtk_menu_shell_append (GTK_MENU_SHELL (mMenu), widget);
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsPopUpMenu::GetItemCount(PRUint32 &aCount)
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsPopUpMenu::GetItemAt(const PRUint32 aCount, nsIMenuItem *& aMenuItem)
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsPopUpMenu::InsertItemAt(const PRUint32 aCount, nsIMenuItem *& aMenuItem)
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsPopUpMenu::InsertItemAt(const PRUint32 aCount, const nsString & aMenuItemName)
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsPopUpMenu::InsertSeparator(const PRUint32 aCount)
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsPopUpMenu::RemoveItem(const PRUint32 aCount)
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsPopUpMenu::RemoveAll()
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-void nsPopUpMenu::GetXY(GtkMenu *menu, gint *x, gint *y, gpointer user_data)
-{
-  *x = ((nsPopUpMenu *)(user_data))->mX;
-  *y = ((nsPopUpMenu *)(user_data))->mY;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsPopUpMenu::ShowMenu(PRInt32 aX, PRInt32 aY)
-{
-  mX = aX;
-  mY = aY;
-
-  gtk_menu_popup (GTK_MENU(mMenu),
-		  NULL,
-		  NULL,
-                  GetXY,
-		  this,
-		  0,
-		  GDK_CURRENT_TIME);
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsPopUpMenu::GetNativeData(void *& aData)
-{
-  aData = (void *)mMenu;
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsPopUpMenu::GetParent(nsIWidget *& aParent)
-{
-  aParent = mParent;
-  return NS_OK;
-}
-
-

mozilla/widget/src/gtk/nsPopUpMenu.h

@@ -1,77 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsPopUpMenu_h__
-#define nsPopUpMenu_h__
-
-#include "nsIPopUpMenu.h"
-
-#include <gtk/gtk.h>
-
-class nsIWidget;
-
-/**
- * Native GTK+ PopUp wrapper
- */
-
-class nsPopUpMenu : public nsIPopUpMenu
-{
-
-public:
-  nsPopUpMenu();
-  virtual ~nsPopUpMenu();
-
-  NS_DECL_ISUPPORTS
-  
-  NS_IMETHOD Create(nsIWidget * aParent);
-
-  // nsIPopUpMenu Methods
-  NS_IMETHOD AddItem(const nsString &aText);
-  NS_IMETHOD AddItem(nsIMenuItem * aMenuItem);
-  NS_IMETHOD AddMenu(nsIMenu * aMenu);
-  NS_IMETHOD AddSeparator();
-  NS_IMETHOD GetItemCount(PRUint32 &aCount);
-  NS_IMETHOD GetItemAt(const PRUint32 aCount, nsIMenuItem *& aMenuItem);
-  NS_IMETHOD InsertItemAt(const PRUint32 aCount, nsIMenuItem *& aMenuItem);
-  NS_IMETHOD InsertItemAt(const PRUint32 aCount, const nsString & aMenuItemName);
-  NS_IMETHOD InsertSeparator(const PRUint32 aCount);
-  NS_IMETHOD RemoveItem(const PRUint32 aCount);
-  NS_IMETHOD RemoveAll();
-  static void GetXY(GtkMenu *menu, gint *x, gint *y, gpointer user_data);
-  NS_IMETHOD ShowMenu(PRInt32 aX, PRInt32 aY);
-  NS_IMETHOD GetNativeData(void*& aData);
-  NS_IMETHOD GetParent(nsIWidget*& aParent);
-
-protected:
-
-  nsString   mLabel;
-
-  PRUint32   mNumMenuItems;
-  nsIWidget  *mParent;
-  GtkWidget  *mMenu;
-
-  gint       mX;
-  gint       mY;
-};
-
-#endif // nsPopUpMenu_h__
-

mozilla/widget/src/gtk/nsRadioButton.cpp

@@ -1,240 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include <gtk/gtk.h>
-
-#include "nsRadioButton.h"
-#include "nsString.h"
-
-#include "nsGtkEventHandler.h"
-
-NS_IMPL_ADDREF_INHERITED(nsRadioButton, nsWidget)
-NS_IMPL_RELEASE_INHERITED(nsRadioButton, nsWidget)
-
-//-------------------------------------------------------------------------
-//
-// nsRadioButton constructor
-//
-//-------------------------------------------------------------------------
-nsRadioButton::nsRadioButton() : nsWidget(), nsIRadioButton()
-{
-  NS_INIT_REFCNT();
-  mLabel = nsnull;
-  mRadioButton = nsnull;
-}
-
-
-//-------------------------------------------------------------------------
-//
-// nsRadioButton destructor
-//
-//-------------------------------------------------------------------------
-nsRadioButton::~nsRadioButton()
-{
-#if 0
-  if (mLabel)
-    gtk_widget_destroy(mLabel);
-#endif
-}
-
-//-------------------------------------------------------------------------
-//
-// Query interface implementation
-//
-//-------------------------------------------------------------------------
-nsresult nsRadioButton::QueryInterface(const nsIID& aIID, void** aInstancePtr)
-{
-  nsresult result = nsWidget::QueryInterface(aIID, aInstancePtr);
-
-  if (result == NS_NOINTERFACE && aIID.Equals(nsIRadioButton::GetIID())) {
-      *aInstancePtr = (void*) ((nsIRadioButton*)this);
-      AddRef();
-      result = NS_OK;
-  }
-  return result;
-}
-
-
-//-------------------------------------------------------------------------
-//
-// Create the native RadioButton widget
-//
-//-------------------------------------------------------------------------
-NS_METHOD  nsRadioButton::CreateNative(GtkObject *parentWindow)
-{
-  mWidget = gtk_event_box_new();
-  mRadioButton = gtk_radio_button_new(nsnull);
-
-  gtk_container_add(GTK_CONTAINER(mWidget), mRadioButton);
-
-  gtk_widget_show(mRadioButton);
-
-  gtk_widget_set_name(mWidget, "nsRadioButton");
-
-  gtk_radio_button_set_group(GTK_RADIO_BUTTON(mRadioButton), nsnull);
-
-  gtk_signal_connect(GTK_OBJECT(mRadioButton),
-                     "destroy",
-                     GTK_SIGNAL_FUNC(DestroySignal),
-                     this);
-
-  return NS_OK;
-}
-
-void
-nsRadioButton::OnDestroySignal(GtkWidget* aGtkWidget)
-{
-  if (aGtkWidget == mLabel) {
-    mLabel = nsnull;
-  }
-  else if (aGtkWidget == mRadioButton) {
-    mRadioButton = nsnull;
-  }
-  else {
-    nsWidget::OnDestroySignal(aGtkWidget);
-  }
-}
-
-void nsRadioButton::InitCallbacks(char * aName)
-{
-  InstallButtonPressSignal(mRadioButton);
-  InstallButtonReleaseSignal(mRadioButton);
-
-  InstallEnterNotifySignal(mWidget);
-  InstallLeaveNotifySignal(mWidget);
-
-  // These are needed so that the events will go to us and not our parent.
-  AddToEventMask(mWidget,
-                 GDK_BUTTON_PRESS_MASK |
-                 GDK_BUTTON_RELEASE_MASK |
-                 GDK_ENTER_NOTIFY_MASK |
-                 GDK_EXPOSURE_MASK |
-                 GDK_FOCUS_CHANGE_MASK |
-                 GDK_KEY_PRESS_MASK |
-                 GDK_KEY_RELEASE_MASK |
-                 GDK_LEAVE_NOTIFY_MASK |
-                 GDK_POINTER_MOTION_MASK);
-}
-
-//-------------------------------------------------------------------------
-//
-// Set this button label
-//
-//-------------------------------------------------------------------------
-NS_METHOD nsRadioButton::SetState(const PRBool aState)
-{
-  if (mWidget) {
-    GtkToggleButton * item = GTK_TOGGLE_BUTTON(mRadioButton);
-    item->active = (gboolean) aState;
-    gtk_widget_queue_draw(GTK_WIDGET(item));
-  }
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-// Set this button state
-//-------------------------------------------------------------------------
-NS_METHOD nsRadioButton::GetState(PRBool& aState)
-{
-  if (mWidget) {
-    aState = (PRBool) GTK_TOGGLE_BUTTON(mRadioButton)->active;
-  }
-  else {
-    aState = PR_TRUE;
-  }
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-// Set this button label
-//
-//-------------------------------------------------------------------------
-NS_METHOD nsRadioButton::SetLabel(const nsString& aText)
-{
-  if (mWidget) {
-    NS_ALLOC_STR_BUF(label, aText, 256);
-    g_print("nsRadioButton::SetLabel(%s)\n",label);
-    if (mLabel) {
-      gtk_label_set(GTK_LABEL(mLabel), label);
-    } else {
-      mLabel = gtk_label_new(label);
-      gtk_misc_set_alignment (GTK_MISC (mLabel), 0.0, 0.5);
-      gtk_container_add(GTK_CONTAINER(mRadioButton), mLabel);
-      gtk_widget_show(mLabel); /* XXX */
-      gtk_signal_connect(GTK_OBJECT(mLabel),
-                         "destroy",
-                         GTK_SIGNAL_FUNC(DestroySignal),
-                         this);
-    }
-    NS_FREE_STR_BUF(label);
-  }
-  return NS_OK;
-}
-
-
-//-------------------------------------------------------------------------
-//
-// Get this button label
-//
-//-------------------------------------------------------------------------
-NS_METHOD nsRadioButton::GetLabel(nsString& aBuffer)
-{
-  aBuffer.Truncate();
-  if (mWidget) {
-    if (mLabel) {
-      char* text;
-      gtk_label_get(GTK_LABEL(mLabel), &text);
-      aBuffer.Append(text);
-    }
-  }
-  return NS_OK;
-}
-
-//////////////////////////////////////////////////////////////////////
-// SetBackgroundColor for RadioButton
-/*virtual*/
-void nsRadioButton::SetBackgroundColorNative(GdkColor *aColorNor,
-                                        GdkColor *aColorBri,
-                                        GdkColor *aColorDark)
-{
-  // use same style copy as SetFont
-  GtkStyle *style = gtk_style_copy(GTK_WIDGET (g_list_nth_data(gtk_container_children(GTK_CONTAINER (mWidget)),0))->style);
-  
-  style->bg[GTK_STATE_NORMAL]=*aColorNor;
-  
-  // Mouse over button
-  style->bg[GTK_STATE_PRELIGHT]=*aColorBri;
-
-  // Button is down
-  style->bg[GTK_STATE_ACTIVE]=*aColorDark;
-
-  // other states too? (GTK_STATE_ACTIVE, GTK_STATE_PRELIGHT,
-  //               GTK_STATE_SELECTED, GTK_STATE_INSENSITIVE)
-  gtk_widget_set_style(GTK_WIDGET (g_list_nth_data(gtk_container_children(GTK_CONTAINER (mWidget)),0)), style);
-  // set style for eventbox too
-  gtk_widget_set_style(mWidget, style);
-
-  gtk_style_unref(style);
-}
-

mozilla/widget/src/gtk/nsRadioButton.h

@@ -1,75 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsRadioButton_h__
-#define nsRadioButton_h__
-
-#include "nsWidget.h"
-#include "nsIRadioButton.h"
-
-/**
- * Native GTK+ Radiobutton wrapper
- */
-class nsRadioButton : public nsWidget,
-                      public nsIRadioButton
-{
-
-public:
-  nsRadioButton();
-  virtual                 ~nsRadioButton();
-
-  // nsISupports
-  NS_IMETHOD_(nsrefcnt) AddRef();
-  NS_IMETHOD_(nsrefcnt) Release();
-  NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr);
-
-  // nsIRadioButton part
-  NS_IMETHOD              SetLabel(const nsString& aText);
-  NS_IMETHOD              GetLabel(nsString& aBuffer);
-  NS_IMETHOD              SetState(const PRBool aState);
-  NS_IMETHOD              GetState(PRBool& aState);
-
-
-  virtual PRBool OnMove(PRInt32 aX, PRInt32 aY) { return PR_FALSE; }
-  virtual PRBool OnPaint(nsPaintEvent & aEvent) { return PR_FALSE; }
-  virtual PRBool OnResize(nsRect &aRect) { return PR_FALSE; }
-
-  // These are needed to Override the auto check behavior
-  void Armed();
-  void DisArmed();
-
-protected:
-  NS_IMETHOD  CreateNative(GtkObject *parentWindow);
-  virtual void InitCallbacks(char * aName = nsnull);
-  virtual void OnDestroySignal(GtkWidget* aGtkWidget);
-
-  // Sets background for checkbutton
-  virtual void SetBackgroundColorNative(GdkColor *aColorNor,
-                                        GdkColor *aColorBri,
-                                        GdkColor *aColorDark);
-
-  GtkWidget *mLabel;
-  GtkWidget *mRadioButton;
-
-};
-
-#endif // nsRadioButton_h__

mozilla/widget/src/gtk/nsScrollbar.cpp

@@ -1,455 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include <gtk/gtk.h>
-
-#include "nsScrollbar.h"
-#include "nsGUIEvent.h"
-
-#include "nsGtkEventHandler.h"
-
-NS_IMPL_ADDREF_INHERITED(nsScrollbar, nsWidget)
-NS_IMPL_RELEASE_INHERITED(nsScrollbar, nsWidget)
-NS_IMPL_QUERY_INTERFACE2(nsScrollbar, nsIScrollbar, nsIWidget)
-
-//-------------------------------------------------------------------------
-//
-// nsScrollbar constructor
-//
-//-------------------------------------------------------------------------
-nsScrollbar::nsScrollbar (PRBool aIsVertical):nsWidget (), nsIScrollbar ()
-{
-  NS_INIT_REFCNT ();
-
-  mOrientation = (aIsVertical) ?
-    GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL;
-}
-
-//-------------------------------------------------------------------------
-//
-// nsScrollbar destructor
-//
-//-------------------------------------------------------------------------
-nsScrollbar::~nsScrollbar ()
-{
-}
-
-//-------------------------------------------------------------------------
-//
-// Create the native scrollbar widget
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsScrollbar::CreateNative (GtkObject * parentWindow)
-{
-  // Create scrollbar, random default values
-  mAdjustment = GTK_ADJUSTMENT (gtk_adjustment_new (0, 0, 100, 1, 25, 25));
-  
-#ifdef USE_SUPERWIN
-
-  if (!GDK_IS_SUPERWIN(parentWindow)) {
-    g_print("Damn, brother.  That's not a superwin.\n");
-    return NS_ERROR_FAILURE;
-  }
-  
-  GdkSuperWin *superwin = GDK_SUPERWIN(parentWindow);
-
-  mMozBox = gtk_mozbox_new(superwin->bin_window);
-
-#endif /* USE_SUPERWIN */
-
-  switch (mOrientation)
-  {
-    case GTK_ORIENTATION_HORIZONTAL:
-      mWidget = gtk_hscrollbar_new (mAdjustment);
-      break;
-    case GTK_ORIENTATION_VERTICAL:
-      mWidget = gtk_vscrollbar_new (mAdjustment);
-      break;
-  }
-
-#ifdef USE_SUPERWIN
-
-  // make sure that we put the scrollbar into the mozbox
-
-  gtk_container_add(GTK_CONTAINER(mMozBox), mWidget);
-
-#endif /* USE_SUPERWIN */
-
-  gtk_widget_set_name (mWidget, "nsScrollbar");
-
-  gtk_signal_connect (GTK_OBJECT (mAdjustment),
-                      "value_changed",
-                      GTK_SIGNAL_FUNC (handle_scrollbar_value_changed),
-                      this);
-  gtk_signal_connect (GTK_OBJECT (mAdjustment),
-                      "destroy",
-                      GTK_SIGNAL_FUNC (DestroySignal),
-                      this);
-
-  return NS_OK;
-}
-
-void
-nsScrollbar::OnDestroySignal(GtkWidget* aGtkWidget)
-{
-  if ((void*)aGtkWidget == (void*)mAdjustment) {
-    mAdjustment = nsnull;
-  }
-  else {
-    nsWidget::OnDestroySignal(aGtkWidget);
-  }
-}
-
-//-------------------------------------------------------------------------
-//
-// Define the range settings
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsScrollbar::SetMaxRange (PRUint32 aEndRange)
-{
-  if (mAdjustment) {
-    GTK_ADJUSTMENT (mAdjustment)->upper = (float) aEndRange;
-    gtk_signal_emit_by_name (GTK_OBJECT (mAdjustment), "changed");
-  }
-  return NS_OK;
-}
-
-
-//-------------------------------------------------------------------------
-//
-// Return the range settings
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsScrollbar::GetMaxRange (PRUint32 & aMaxRange)
-{
-  if (mAdjustment)
-    aMaxRange = (PRUint32) GTK_ADJUSTMENT (mAdjustment)->upper;
-  else
-    aMaxRange = 0;
-
-  return NS_OK;
-}
-
-
-//-------------------------------------------------------------------------
-//
-// Set the thumb position
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsScrollbar::SetPosition (PRUint32 aPos)
-{
-//   if (mAdjustment)
-//     gtk_adjustment_set_value (GTK_ADJUSTMENT (mAdjustment), (float) aPos);
-
-  if (mAdjustment && mWidget)
-  {
-    //
-    // The following bit of code borrowed from gtkrange.c,
-    // gtk_range_adjustment_value_changed():
-    //
-    // Ok, so, like, the problem is that the view manager expects
-    // SetPosition() to simply do that - set the position of the 
-    // scroll bar.  Nothing else!
-    //
-    // Unfortunately, calling gtk_adjustment_set_value() causes
-    // the adjustment object (mAdjustment) to emit a 
-    // "value_changed" signal which in turn causes the
-    // scrollbar widget (mWidget) to scroll to the given position.
-    //
-    // The net result of this is that the content is scrolled
-    // twice, once by the view manager and once by the 
-    // scrollbar - and things get messed up from then onwards.
-    //
-    // The following bit of code does the equivalent of 
-    // gtk_adjustment_set_value(), except no signal is emitted.
-    //
-    GtkRange * range = GTK_RANGE(mWidget);
-    GtkAdjustment * adjustment = GTK_ADJUSTMENT(mAdjustment);
-      
-    adjustment->value = (float) aPos;
-      
-    if (range->old_value != adjustment->value)
-    {
-      gtk_range_slider_update (range);
-      gtk_range_clear_background (range);
-      
-      range->old_value = adjustment->value;
-    }
-  }
-
-  return NS_OK;
-}
-
-
-//-------------------------------------------------------------------------
-//
-// Get the current thumb position.
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsScrollbar::GetPosition (PRUint32 & aPos)
-{
-  if (mAdjustment)
-    aPos = (PRUint32) GTK_ADJUSTMENT (mAdjustment)->value;
-  else
-    aPos = 0;
-
-  return NS_OK;
-}
-
-
-//-------------------------------------------------------------------------
-//
-// Set the thumb size
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsScrollbar::SetThumbSize (PRUint32 aSize)
-{
-  if (aSize > 0)
-    {
-      if (mAdjustment) {
-        GTK_ADJUSTMENT (mAdjustment)->page_increment = (float) aSize;
-        GTK_ADJUSTMENT (mAdjustment)->page_size = (float) aSize;
-        gtk_signal_emit_by_name (GTK_OBJECT (mAdjustment), "changed");
-      }
-    }
-  return NS_OK;
-}
-
-
-//-------------------------------------------------------------------------
-//
-// Get the thumb size
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsScrollbar::GetThumbSize (PRUint32 & aThumbSize)
-{
-  if (mAdjustment)
-    aThumbSize = (PRUint32) GTK_ADJUSTMENT (mAdjustment)->page_size;
-  else
-    aThumbSize = 0;
-
-  return NS_OK;
-}
-
-
-//-------------------------------------------------------------------------
-//
-// Set the line increment for this scrollbar
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsScrollbar::SetLineIncrement (PRUint32 aLineIncrement)
-{
-  if (aLineIncrement > 0)
-    {
-      if (mAdjustment) {
-        GTK_ADJUSTMENT (mAdjustment)->step_increment = (float) aLineIncrement;
-        gtk_signal_emit_by_name (GTK_OBJECT (mAdjustment), "changed");
-      }
-    }
-  return NS_OK;
-}
-
-
-//-------------------------------------------------------------------------
-//
-// Get the line increment for this scrollbar
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsScrollbar::GetLineIncrement (PRUint32 & aLineInc)
-{
-  if (mAdjustment) {
-    aLineInc = (PRUint32) GTK_ADJUSTMENT (mAdjustment)->step_increment;
-  }
-  else
-    aLineInc = 0;
-
-  return NS_OK;
-}
-
-
-//-------------------------------------------------------------------------
-//
-// Set all scrolling parameters
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsScrollbar::SetParameters (PRUint32 aMaxRange, PRUint32 aThumbSize,
-	       PRUint32 aPosition, PRUint32 aLineIncrement)
-{
-  if (mAdjustment) {
-    int thumbSize = (((int) aThumbSize) > 0 ? aThumbSize : 1);
-    int maxRange = (((int) aMaxRange) > 0 ? aMaxRange : 10);
-    int mLineIncrement = (((int) aLineIncrement) > 0 ? aLineIncrement : 1);
-
-    int maxPos = maxRange - thumbSize;
-    int pos = ((int) aPosition) > maxPos ? maxPos - 1 : ((int) aPosition);
-
-    GTK_ADJUSTMENT (mAdjustment)->lower = 0;
-    GTK_ADJUSTMENT (mAdjustment)->upper = maxRange;
-    GTK_ADJUSTMENT (mAdjustment)->page_size = thumbSize;
-    GTK_ADJUSTMENT (mAdjustment)->page_increment = thumbSize;
-    GTK_ADJUSTMENT (mAdjustment)->step_increment = mLineIncrement;
-    // this will emit the changed signal for us
-    gtk_adjustment_set_value (GTK_ADJUSTMENT (mAdjustment), pos);
-  }
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-int nsScrollbar::AdjustScrollBarPosition (int aPosition)
-{
-  return 0;			/* XXX */
-}
-
-//-------------------------------------------------------------------------
-//
-// Deal with scrollbar messages (actually implemented only in nsScrollbar)
-//
-//-------------------------------------------------------------------------
-PRBool nsScrollbar::OnScroll (nsScrollbarEvent & aEvent, PRUint32 cPos)
-{
-  PRBool result = PR_TRUE;
-  float newPosition;
-
-  switch (aEvent.message)
-    {
-
-      // scroll one line right or down
-    case NS_SCROLLBAR_LINE_NEXT:
-      {
-        newPosition = GTK_ADJUSTMENT (mAdjustment)->value;
-        // newPosition += mLineIncrement;
-        newPosition += 10;
-        PRUint32 thumbSize;
-        PRUint32 maxRange;
-        GetThumbSize (thumbSize);
-        GetMaxRange (maxRange);
-        PRUint32 max = maxRange - thumbSize;
-        if (newPosition > (int) max)
-          newPosition = (int) max;
-
-        // if an event callback is registered, give it the chance
-        // to change the increment
-        if (mEventCallback)
-          {
-            aEvent.position = (PRUint32) newPosition;
-            result = ConvertStatus ((*mEventCallback) (&aEvent));
-            newPosition = aEvent.position;
-          }
-        break;
-      }
-
-
-      // scroll one line left or up
-    case NS_SCROLLBAR_LINE_PREV:
-      {
-        newPosition = GTK_ADJUSTMENT (mAdjustment)->value;
-
-        // newPosition -= mLineIncrement;
-        newPosition -= 10;
-        if (newPosition < 0)
-          newPosition = 0;
-
-        // if an event callback is registered, give it the chance
-        // to change the decrement
-        if (mEventCallback)
-          {
-            aEvent.position = (PRUint32) newPosition;
-            aEvent.widget = (nsWidget *) this;
-            result = ConvertStatus ((*mEventCallback) (&aEvent));
-            newPosition = aEvent.position;
-          }
-        break;
-      }
-
-      // Scrolls one page right or down
-    case NS_SCROLLBAR_PAGE_NEXT:
-      {
-        newPosition = GTK_ADJUSTMENT (mAdjustment)->value;
-        PRUint32 thumbSize;
-        GetThumbSize (thumbSize);
-        PRUint32 maxRange;
-        GetThumbSize (thumbSize);
-        GetMaxRange (maxRange);
-        PRUint32 max = maxRange - thumbSize;
-        if (newPosition > (int) max)
-          newPosition = (int) max;
-
-        // if an event callback is registered, give it the chance
-        // to change the increment
-        if (mEventCallback)
-          {
-            aEvent.position = (PRUint32) newPosition;
-            result = ConvertStatus ((*mEventCallback) (&aEvent));
-            newPosition = aEvent.position;
-          }
-        break;
-      }
-
-      // Scrolls one page left or up.
-    case NS_SCROLLBAR_PAGE_PREV:
-      {
-        newPosition = GTK_ADJUSTMENT (mAdjustment)->value;
-        if (newPosition < 0)
-          newPosition = 0;
-
-        // if an event callback is registered, give it the chance
-        // to change the increment
-        if (mEventCallback)
-          {
-            aEvent.position = (PRUint32) newPosition;
-            result = ConvertStatus ((*mEventCallback) (&aEvent));
-            newPosition = aEvent.position;
-          }
-        break;
-      }
-
-
-      // Scrolls to the absolute position. The current position is specified by
-      // the cPos parameter.
-    case NS_SCROLLBAR_POS:
-      {
-        newPosition = cPos;
-
-        // if an event callback is registered, give it the chance
-        // to change the increment
-        if (mEventCallback)
-          {
-            aEvent.position = (PRUint32) newPosition;
-            result = ConvertStatus ((*mEventCallback) (&aEvent));
-            newPosition = aEvent.position;
-          }
-        break;
-      }
-    }
-  /*
-     GTK_ADJUSTMENT(mAdjustment)->value = newPosition;
-     gtk_signal_emit_by_name(GTK_OBJECT(mAdjustment), "value_changed");
-   */
-  /*
-     if (mEventCallback) {
-     aEvent.position = cPos;
-     result = ConvertStatus((*mEventCallback)(&aEvent));
-     newPosition = aEvent.position;
-     }
-   */
-  return result;
-}

mozilla/widget/src/gtk/nsScrollbar.h

@@ -1,66 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsScrollbar_h__
-#define nsScrollbar_h__
-
-#include "nsWidget.h"
-#include "nsIScrollbar.h"
-
-/**
- * Native GTK+ scrollbar wrapper.
- */
-class nsScrollbar : public nsWidget,
-                    public nsIScrollbar
-{
-
-public:
-  nsScrollbar(PRBool aIsVertical);
-  virtual                 ~nsScrollbar();
-
-  NS_DECL_ISUPPORTS_INHERITED
-
-  // nsIScrollBar implementation
-  NS_IMETHOD SetMaxRange(PRUint32 aEndRange);
-  NS_IMETHOD GetMaxRange(PRUint32& aMaxRange);
-  NS_IMETHOD SetPosition(PRUint32 aPos);
-  NS_IMETHOD GetPosition(PRUint32& aPos);
-  NS_IMETHOD SetThumbSize(PRUint32 aSize);
-  NS_IMETHOD GetThumbSize(PRUint32& aSize);
-  NS_IMETHOD SetLineIncrement(PRUint32 aSize);
-  NS_IMETHOD GetLineIncrement(PRUint32& aSize);
-  NS_IMETHOD SetParameters(PRUint32 aMaxRange, PRUint32 aThumbSize,
-                           PRUint32 aPosition, PRUint32 aLineIncrement);
-  virtual PRBool OnScroll (nsScrollbarEvent & aEvent, PRUint32 cPos);
-
-protected:
-  NS_IMETHOD CreateNative(GtkObject *parentWindow);
-  virtual void OnDestroySignal(GtkWidget* aGtkWidget);
-
-private:
-  int             mOrientation;
-  GtkAdjustment   *mAdjustment;
-
-  int AdjustScrollBarPosition(int aPosition);
-};
-
-#endif /* nsScrollbar_h__ */

mozilla/widget/src/gtk/nsSound.cpp

@@ -1,125 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-
-#include "nscore.h"
-#include "nsIAllocator.h"
-#include "plstr.h"
-#include "stdio.h"
-
-#include "prlink.h"
-
-#include "nsSound.h"
-
-#include <unistd.h>
-
-#include <gtk/gtk.h>
-/* used with esd_open_sound */
-//static int esdref = -1;
-static PRLibrary *lib = nsnull;
-
-//typedef int (PR_CALLBACK *EsdOpenSoundType)(const char *host);
-//typedef int (PR_CALLBACK *EsdCloseType)(int);
-
-/* used to play the sounds from the find symbol call */
-typedef int (PR_CALLBACK *EsdPlayFileType)(const char *, const char *, int);
-
-NS_IMPL_ISUPPORTS1(nsSound, nsISound);
-
-////////////////////////////////////////////////////////////////////////
-nsSound::nsSound()
-{
-  NS_INIT_REFCNT();
-
-  /* we don't need to do esd_open_sound if we are only going to play files
-     but we will if we want to do things like streams, etc
-  */
-  //  EsdOpenSoundType EsdOpenSound;
-
-  lib = PR_LoadLibrary("libesd.so");
-
-  /*
-    if (!lib)
-    return;
-    EsdOpenSound = (EsdOpenSoundType) PR_FindSymbol(lib, "esd_open_sound");
-    esdref = (*EsdOpenSound)("localhost");
-  */
-}
-
-nsSound::~nsSound()
-{
-  /* see above comment */
-  /*
-    if (esdref != -1)
-    {
-    EsdCloseType EsdClose = (EsdCloseType) PR_FindSymbol(lib, "esd_close");
-    (*EsdClose)(esdref);
-    esdref = -1;
-    }
-  */
-}
-
-nsresult NS_NewSound(nsISound** aSound)
-{
-  NS_PRECONDITION(aSound != nsnull, "null ptr");
-  if (! aSound)
-    return NS_ERROR_NULL_POINTER;
-  
-  *aSound = new nsSound();
-  if (! *aSound)
-    return NS_ERROR_OUT_OF_MEMORY;
-  
-  NS_ADDREF(*aSound);
-  return NS_OK;
-}
-
-
-NS_METHOD nsSound::Init(void)
-{
-  return NS_OK;
-}
-
-
-NS_METHOD nsSound::Beep()
-{
-	::gdk_beep();
-
-  return NS_OK;
-}
-
-NS_METHOD nsSound::Play(nsIFileSpec *filespec)
-{
-  if (lib)
-  {
-    char *filename;
-    filespec->GetNativePath(&filename);
-
-    g_print("there are some issues with playing sound right now, but this should work\n");
-    EsdPlayFileType EsdPlayFile = (EsdPlayFileType) PR_FindSymbol(lib, "esd_play_file");
-    (*EsdPlayFile)("mozilla", filename, 1);
-
-    nsCRT::free(filename);
-
-    return NS_OK;
-  }
-  return NS_OK;
-}

mozilla/widget/src/gtk/nsSound.h

@@ -1,41 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef __nsSound_h__
-#define __nsSound_h__
-
-#include "nsISound.h"
-
-#include <gtk/gtk.h>
-
-class nsSound : public nsISound {
- public: 
-
-  nsSound();
-  virtual ~nsSound();
-
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSISOUND
-
-};
-
-#endif /* __nsSound_h__ */

mozilla/widget/src/gtk/nsTextAreaWidget.cpp

@@ -1,97 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include <gtk/gtk.h>
-
-#include "nsTextAreaWidget.h"
-#include "nsString.h"
-
-NS_IMPL_ADDREF_INHERITED(nsTextAreaWidget, nsWidget)
-NS_IMPL_RELEASE_INHERITED(nsTextAreaWidget, nsWidget)
-NS_IMPL_QUERY_INTERFACE2(nsTextAreaWidget, nsITextAreaWidget, nsIWidget)
-
-//-------------------------------------------------------------------------
-//
-// nsTextAreaWidget constructor
-//
-//-------------------------------------------------------------------------
-nsTextAreaWidget::nsTextAreaWidget()
-{
-  mBackground = NS_RGB(124, 124, 124);
-}
-
-//-------------------------------------------------------------------------
-//
-// nsTextAreaWidget destructor
-//
-//-------------------------------------------------------------------------
-nsTextAreaWidget::~nsTextAreaWidget()
-{
-  gtk_widget_destroy(mTextWidget);
-  mTextWidget = nsnull;
-}
-
-//-------------------------------------------------------------------------
-//
-// Create the native Text widget
-//
-//-------------------------------------------------------------------------
-NS_METHOD nsTextAreaWidget::CreateNative(GtkObject *parentWindow)
-{
-  PRBool oldIsReadOnly;
-  mWidget = gtk_scrolled_window_new(nsnull, nsnull);
-  gtk_container_set_border_width(GTK_CONTAINER(mWidget), 0);
-  gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(mWidget),
-                                 GTK_POLICY_NEVER,
-                                 GTK_POLICY_ALWAYS);
-  
-  mTextWidget = gtk_text_new(nsnull, nsnull);
-  gtk_text_set_word_wrap(GTK_TEXT(mTextWidget), PR_TRUE);
-  gtk_widget_set_name(mTextWidget, "nsTextAreaWidget");
-  gtk_widget_show(mTextWidget);
-  SetPassword(mIsPassword);
-  SetReadOnly(mIsReadOnly, oldIsReadOnly);
-
-  gtk_container_add(GTK_CONTAINER(mWidget), mTextWidget);
-
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-// set font for textarea
-//
-//-------------------------------------------------------------------------
-/* virtual */
-void nsTextAreaWidget::SetFontNative(GdkFont *aFont)
-{
-  GtkStyle *style = gtk_style_copy(GTK_WIDGET (g_list_nth_data(gtk_container_children(GTK_CONTAINER (mWidget)),0))->style);
-  // gtk_style_copy ups the ref count of the font
-  gdk_font_unref (style->font);
-  
-  style->font = aFont;
-  gdk_font_ref(style->font);
-  
-  gtk_widget_set_style(GTK_WIDGET (g_list_nth_data(gtk_container_children(GTK_CONTAINER (mWidget)),0)), style);
-  
-  gtk_style_unref(style);
-}

mozilla/widget/src/gtk/nsTextAreaWidget.h

@@ -1,49 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsTextAreaWidget_h__
-#define nsTextAreaWidget_h__
-
-#include "nsTextHelper.h"
-#include "nsITextAreaWidget.h"
-
-/**
- * Native GTK+ multi-line edit control wrapper.
- */
-
-class nsTextAreaWidget : public nsTextHelper
-{
-
-public:
-  nsTextAreaWidget();
-  virtual ~nsTextAreaWidget();
-
-  NS_DECL_ISUPPORTS_INHERITED
-
-  virtual void SetFontNative(GdkFont *aFont);
-
-protected:
-  NS_METHOD CreateNative(GtkObject *parentWindow);
-};
-
-
-#endif // nsTextAreaWidget_h__

mozilla/widget/src/gtk/nsTextHelper.cpp

@@ -1,216 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include <gtk/gtk.h>
-
-#include "nsTextHelper.h"
-#include "nsTextWidget.h"
-#include "nsString.h"
-
-NS_IMPL_ADDREF_INHERITED(nsTextHelper, nsWidget)
-NS_IMPL_RELEASE_INHERITED(nsTextHelper, nsWidget)
-
-//-------------------------------------------------------------------------
-//
-// nsTextHelper constructor
-//
-//-------------------------------------------------------------------------
-
-nsTextHelper::nsTextHelper() : nsWidget(), nsITextAreaWidget(), nsITextWidget()
-{
-  mIsReadOnly = PR_FALSE;
-  mIsPassword = PR_FALSE;
-}
-
-//-------------------------------------------------------------------------
-//
-// nsTextHelper destructor
-//
-//-------------------------------------------------------------------------
-nsTextHelper::~nsTextHelper()
-{
-}
-
-//-------------------------------------------------------------------------
-//
-// Set initial parameters
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsTextHelper::PreCreateWidget(nsWidgetInitData *aInitData)
-{
-  if (nsnull != aInitData) {
-    nsTextWidgetInitData* data = (nsTextWidgetInitData *) aInitData;
-    mIsPassword = data->mIsPassword;
-    mIsReadOnly = data->mIsReadOnly;
-  }
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsTextHelper::SetMaxTextLength(PRUint32 aChars)
-{
-  // This is a normal entry only thing, not a text box
-  gtk_entry_set_max_length(GTK_ENTRY(mTextWidget), (int)aChars);
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_IMETHODIMP  nsTextHelper::GetText(nsString& aTextBuffer, PRUint32 aBufferSize, PRUint32& aActualSize)
-{
-  char *str = nsnull;
-  if (GTK_IS_ENTRY(mTextWidget))
-    {
-      str = gtk_entry_get_text(GTK_ENTRY(mTextWidget));
-    }
-  else if (GTK_IS_TEXT(mTextWidget))
-    {
-      str = gtk_editable_get_chars (GTK_EDITABLE (mTextWidget), 0,
-                                    gtk_text_get_length (GTK_TEXT (mTextWidget)));
-    }
-  aTextBuffer.SetLength(0);
-  aTextBuffer.Append(str);
-  PRUint32 len = (PRUint32)strlen(str);
-  aActualSize = len;
-
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_IMETHODIMP  nsTextHelper::SetText(const nsString& aText, PRUint32& aActualSize)
-{
-  if (GTK_IS_ENTRY(mTextWidget)) {
-    gtk_entry_set_text(GTK_ENTRY(mTextWidget),
-                       (const gchar *)nsAutoCString(aText));
-  } else if (GTK_IS_TEXT(mTextWidget)) {
-    gtk_editable_delete_text(GTK_EDITABLE(mTextWidget), 0,
-                             gtk_text_get_length(GTK_TEXT (mTextWidget)));
-    gtk_text_insert(GTK_TEXT(mTextWidget),
-                    nsnull, nsnull, nsnull,
-                    (const char *)nsAutoCString(aText),
-                    aText.Length());
-  }
-
-  aActualSize = aText.Length();
-
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_IMETHODIMP  nsTextHelper::InsertText(const nsString &aText,
-                                    PRUint32 aStartPos,
-                                    PRUint32 aEndPos,
-                                    PRUint32& aActualSize)
-{
-  gtk_editable_insert_text(GTK_EDITABLE(mTextWidget),
-                           (const gchar *)nsAutoCString(aText),
-                           (gint)aText.Length(), (gint*)&aStartPos);
-
-  aActualSize = aText.Length();
-
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_IMETHODIMP  nsTextHelper::RemoveText()
-{
-  if (GTK_IS_ENTRY(mTextWidget)) {
-    gtk_entry_set_text(GTK_ENTRY(mTextWidget), "");
-  } else if (GTK_IS_TEXT(mTextWidget)) {
-    gtk_editable_delete_text(GTK_EDITABLE(mTextWidget), 0,
-                             gtk_text_get_length(GTK_TEXT (mTextWidget)));
-  }
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_IMETHODIMP  nsTextHelper::SetPassword(PRBool aIsPassword)
-{
-  mIsPassword = aIsPassword?PR_FALSE:PR_TRUE;
-  if (GTK_IS_ENTRY(mTextWidget)) {
-    gtk_entry_set_visibility(GTK_ENTRY(mTextWidget), mIsPassword);
-  }
-  // this won't work for gtk_texts
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_IMETHODIMP  nsTextHelper::SetReadOnly(PRBool aReadOnlyFlag, PRBool& aOldReadOnlyFlag)
-{
-  NS_ASSERTION(nsnull != mTextWidget,
-               "SetReadOnly - Widget is NULL, Create may not have been called!");
-  aOldReadOnlyFlag = mIsReadOnly;
-  mIsReadOnly = aReadOnlyFlag?PR_FALSE:PR_TRUE;
-  gtk_editable_set_editable(GTK_EDITABLE(mTextWidget), mIsReadOnly);
-  return NS_OK;
-}
-
-
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsTextHelper::SelectAll()
-{
-  nsString text;
-  PRUint32 actualSize = 0;
-  PRUint32 numChars = GetText(text, 0, actualSize);
-  SetSelection(0, numChars);
-  return NS_OK;
-}
-
-
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsTextHelper::SetSelection(PRUint32 aStartSel, PRUint32 aEndSel)
-{
-  gtk_editable_select_region(GTK_EDITABLE(mTextWidget), aStartSel, aEndSel);
-  return NS_OK;
-}
-
-
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsTextHelper::GetSelection(PRUint32 *aStartSel, PRUint32 *aEndSel)
-{
-#if 0
-  XmTextPosition left;
-  XmTextPosition right;
-
-  if (XmTextGetSelectionPosition(mTextWidget, &left, &right)) {
-    *aStartSel = (PRUint32)left;
-    *aEndSel   = (PRUint32)right;
-  } else {
-    printf("nsTextHelper::GetSelection Error getting positions\n");
-    return NS_ERROR_FAILURE;
-  }
-#endif
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_IMETHODIMP  nsTextHelper::SetCaretPosition(PRUint32 aPosition)
-{
-  gtk_editable_set_position(GTK_EDITABLE(mTextWidget), aPosition);
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_IMETHODIMP  nsTextHelper::GetCaretPosition(PRUint32& aPosition)
-{
-  aPosition = (PRUint32)GTK_EDITABLE(mTextWidget)->current_pos;
-  return NS_OK;
-}

mozilla/widget/src/gtk/nsTextHelper.h

@@ -1,66 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-#ifndef nsTextHelper_h__
-#define nsTextHelper_h__
-
-#include "nsITextWidget.h"
-#include "nsITextAreaWidget.h"
-#include "nsWidget.h"
-
-/**
- * Base class for nsTextAreaWidget and nsTextWidget
- */
-class nsTextHelper : public nsWidget,
-                     public nsITextAreaWidget,
-                     public nsITextWidget
-{
-
-public:
-    nsTextHelper();
-    virtual ~nsTextHelper();
-
-    // nsISupports
-    NS_IMETHOD_(nsrefcnt) AddRef();
-    NS_IMETHOD_(nsrefcnt) Release();
-
-    NS_IMETHOD        SelectAll();
-    NS_IMETHOD        PreCreateWidget(nsWidgetInitData *aInitData);
-    NS_IMETHOD        SetMaxTextLength(PRUint32 aChars);
-    NS_IMETHOD        GetText(nsString& aTextBuffer, PRUint32 aBufferSize, PRUint32& aActualSize);
-    NS_IMETHOD        SetText(const nsString &aText, PRUint32& aActualSize);
-    NS_IMETHOD        InsertText(const nsString &aText, PRUint32 aStartPos, PRUint32 aEndPos, PRUint32& aActualSize);
-    NS_IMETHOD        RemoveText();
-    NS_IMETHOD        SetPassword(PRBool aIsPassword);
-    NS_IMETHOD        SetReadOnly(PRBool aNewReadOnlyFlag, PRBool& aOldReadOnlyFlag);
-    NS_IMETHOD        SetSelection(PRUint32 aStartSel, PRUint32 aEndSel);
-    NS_IMETHOD        GetSelection(PRUint32 *aStartSel, PRUint32 *aEndSel);
-    NS_IMETHOD        SetCaretPosition(PRUint32 aPosition);
-    NS_IMETHOD        GetCaretPosition(PRUint32& aPosition);
-
-protected:
-    GtkWidget *mTextWidget;
-    PRBool  mIsPassword;
-    PRBool  mIsReadOnly;
-
-};
-
-#endif // nsTextHelper_h__

mozilla/widget/src/gtk/nsTextWidget.cpp

@@ -1,130 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include <gtk/gtk.h>
-
-#include "nsTextWidget.h"
-#include "nsString.h"
-#include "nsGtkEventHandler.h"
-
-extern int mIsPasswordCallBacksInstalled;
-
-
-NS_IMPL_ADDREF_INHERITED(nsTextWidget, nsWidget)
-NS_IMPL_RELEASE_INHERITED(nsTextWidget, nsWidget)
-NS_IMPL_QUERY_INTERFACE2(nsTextWidget, nsITextWidget, nsIWidget)
-
-
-//-------------------------------------------------------------------------
-//
-// nsTextWidget constructor
-//
-//-------------------------------------------------------------------------
-nsTextWidget::nsTextWidget() : nsTextHelper()
-{
-}
-
-//-------------------------------------------------------------------------
-//
-// nsTextWidget destructor
-//
-//-------------------------------------------------------------------------
-nsTextWidget::~nsTextWidget()
-{
-  // avoid freeing this twice in other destructors
-  mTextWidget = nsnull;
-}
-
-//-------------------------------------------------------------------------
-//
-// Create the native Entry widget
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsTextWidget::CreateNative(GtkObject *parentWindow)
-{
-  PRBool oldIsReadOnly;
-  mWidget = gtk_entry_new();
-
-#ifdef USE_SUPERWIN
-
-  if (!GDK_IS_SUPERWIN(parentWindow)) {
-    g_print("Damn, brother.  That's not a superwin.\n");
-    return NS_ERROR_FAILURE;
-  }
-  
-  GdkSuperWin *superwin = GDK_SUPERWIN(parentWindow);
-
-  mMozBox = gtk_mozbox_new(superwin->bin_window);
-
-#endif /* USE_SUPERWIN */
-
-  // used by nsTextHelper because nsTextArea needs a scrolled_window
-  mTextWidget = mWidget;
-
-  gtk_widget_set_name(mWidget, "nsTextWidget");
-
-  /*
-   * GTK's text widget does XIM for us, so we don't want to use the default key handler
-   * which does XIM, so we connect to a non-XIM key event for the text widget
-   */
-  gtk_signal_connect_after(GTK_OBJECT(mWidget),
-                     "key_press_event",
-                     GTK_SIGNAL_FUNC(handle_key_press_event_for_text),
-                     this);
-  gtk_signal_connect(GTK_OBJECT(mWidget),
-                     "key_release_event",
-                     GTK_SIGNAL_FUNC(handle_key_release_event_for_text),
-                     this);
-  SetPassword(mIsPassword);
-  SetReadOnly(mIsReadOnly, oldIsReadOnly);
-  gtk_widget_show(mWidget);
-
-  // These are needed so that the events will go to us and not our parent.
-  AddToEventMask(mWidget,
-                 GDK_BUTTON_PRESS_MASK |
-                 GDK_BUTTON_RELEASE_MASK |
-                 GDK_ENTER_NOTIFY_MASK |
-                 GDK_EXPOSURE_MASK |
-                 GDK_FOCUS_CHANGE_MASK |
-                 GDK_KEY_PRESS_MASK |
-                 GDK_KEY_RELEASE_MASK |
-                 GDK_LEAVE_NOTIFY_MASK |
-                 GDK_POINTER_MOTION_MASK);
-
-#ifdef USE_SUPERWIN
-
-  // make sure that we put the scrollbar into the mozbox
-
-  gtk_container_add(GTK_CONTAINER(mMozBox), mWidget);
-
-#endif /* USE_SUPERWIN */
-
-  return NS_OK;
-}
-
-PRBool nsTextWidget::OnKey(nsKeyEvent &aEvent)
-{
-  if (mEventCallback) {
-    return DispatchWindowEvent(&aEvent);
-  }
-  return PR_FALSE;
-}

mozilla/widget/src/gtk/nsTextWidget.h

@@ -1,48 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsTextWidget_h__
-#define nsTextWidget_h__
-
-#include "nsTextHelper.h"
-
-#include "nsITextWidget.h"
-
-/**
- * Native GTK+ single line edit control wrapper.
- */
-
-class nsTextWidget : public nsTextHelper
-{
-
-public:
-  nsTextWidget();
-  virtual ~nsTextWidget();
-
-  NS_DECL_ISUPPORTS_INHERITED
-
-  PRBool   OnKey(nsKeyEvent &aEvent);
-protected:
-  NS_IMETHOD CreateNative(GtkObject *parentWindow);
-};
-
-#endif // nsTextWidget_h__

mozilla/widget/src/gtk/nsToolkit.cpp

@@ -1,144 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nscore.h"  // needed for 'nsnull'
-#include "nsToolkit.h"
-
-//
-// Static thread local storage index of the Toolkit 
-// object associated with a given thread...
-//
-static PRUintn gToolkitTLSIndex = 0;
-
-//-------------------------------------------------------------------------
-//
-// constructor
-//
-//-------------------------------------------------------------------------
-nsToolkit::nsToolkit()
-{
-  NS_INIT_REFCNT();
-  mSharedGC = nsnull;
-}
-
-//-------------------------------------------------------------------------
-//
-// destructor
-//
-//-------------------------------------------------------------------------
-nsToolkit::~nsToolkit()
-{
-  if (mSharedGC)
-    gdk_gc_unref(mSharedGC);
-
-    // Remove the TLS reference to the toolkit...
-    PR_SetThreadPrivate(gToolkitTLSIndex, nsnull);
-}
-
-//-------------------------------------------------------------------------
-//
-// nsISupports implementation macro
-//
-//-------------------------------------------------------------------------
-
-NS_IMPL_ISUPPORTS1(nsToolkit, nsIToolkit)
-
-void nsToolkit::CreateSharedGC(void)
-{
-  GdkPixmap *pixmap;
-
-  if (mSharedGC)
-    return;
-
-  pixmap = ::gdk_pixmap_new (NULL, 1, 1, gdk_rgb_get_visual()->depth);
-  mSharedGC = ::gdk_gc_new (pixmap);
-  gdk_pixmap_unref (pixmap);
-  mSharedGC = gdk_gc_ref(mSharedGC);
-}
-
-GdkGC *nsToolkit::GetSharedGC(void)
-{
-  return gdk_gc_ref(mSharedGC);
-}
-
-//-------------------------------------------------------------------------
-//
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsToolkit::Init(PRThread *aThread)
-{
-  CreateSharedGC();
-
-  return NS_OK;
-}
-
-
-//-------------------------------------------------------------------------
-//
-// Return the nsIToolkit for the current thread.  If a toolkit does not
-// yet exist, then one will be created...
-//
-//-------------------------------------------------------------------------
-NS_METHOD NS_GetCurrentToolkit(nsIToolkit* *aResult)
-{
-  nsIToolkit* toolkit = nsnull;
-  nsresult rv = NS_OK;
-  PRStatus status;
-
-  // Create the TLS index the first time through...
-  if (0 == gToolkitTLSIndex) {
-    status = PR_NewThreadPrivateIndex(&gToolkitTLSIndex, NULL);
-    if (PR_FAILURE == status) {
-      rv = NS_ERROR_FAILURE;
-    }
-  }
-
-  if (NS_SUCCEEDED(rv)) {
-    toolkit = (nsIToolkit*)PR_GetThreadPrivate(gToolkitTLSIndex);
-
-    //
-    // Create a new toolkit for this thread...
-    //
-    if (!toolkit) {
-      toolkit = new nsToolkit();
-
-      if (!toolkit) {
-        rv = NS_ERROR_OUT_OF_MEMORY;
-      } else {
-        NS_ADDREF(toolkit);
-        toolkit->Init(PR_GetCurrentThread());
-        //
-        // The reference stored in the TLS is weak.  It is removed in the
-        // nsToolkit destructor...
-        //
-        PR_SetThreadPrivate(gToolkitTLSIndex, (void*)toolkit);
-      }
-    } else {
-      NS_ADDREF(toolkit);
-    }
-    *aResult = toolkit;
-  }
-
-  return rv;
-}
-
-

mozilla/widget/src/gtk/nsToolkit.h

@@ -1,55 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef TOOLKIT_H      
-#define TOOLKIT_H
-
-#include "nsIToolkit.h"
-#include <gtk/gtk.h>
-
-/**
- * Wrapper around the thread running the message pump.
- * The toolkit abstraction is necessary because the message pump must
- * execute within the same thread that created the widget under Win32.
- */ 
-
-class nsToolkit : public nsIToolkit
-{
-
-public:
-  nsToolkit();
-  virtual ~nsToolkit();
-  
-  NS_DECL_ISUPPORTS
-
-  NS_IMETHOD    Init(PRThread *aThread);
-
-  void          CreateSharedGC(void);
-  GdkGC         *GetSharedGC(void);
-  
-private:
-  GdkGC         *mSharedGC;
-};
-
-
-
-#endif  // TOOLKIT_H

mozilla/widget/src/gtk/nsWidget.h

@@ -1,410 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsWidget_h__
-#define nsWidget_h__
-
-#include "nsBaseWidget.h"
-#include "nsIRegion.h"
-
-
-// XXX: This must go away when nsAutoCString moves out of nsFileSpec.h
-#include "nsFileSpec.h" // for nsAutoCString()
-
-class nsILookAndFeel;
-class nsIAppShell;
-class nsIToolkit;
-
-#include <gtk/gtk.h>
-
-#include <gdk/gdkprivate.h>
-
-#include "gtkmozbox.h"
-
-#define USE_SUPERWIN
-
-#define NSRECT_TO_GDKRECT(ns,gdk) \
-  PR_BEGIN_MACRO \
-  gdk.x = ns.x; \
-  gdk.y = ns.y; \
-  gdk.width = ns.width; \
-  gdk.height = ns.height; \
-  PR_END_MACRO
-
-#define NSCOLOR_TO_GDKCOLOR(n,g) \
-  PR_BEGIN_MACRO \
-  g.red = 256 * NS_GET_R(n); \
-  g.green = 256 * NS_GET_G(n); \
-  g.blue = 256 * NS_GET_B(n); \
-  PR_END_MACRO
-
-#define NS_TO_GDK_RGB(ns) (ns & 0xff) << 16 | (ns & 0xff00) | ((ns >> 16) & 0xff)
-
-
-/**
- * Base of all GTK+ native widgets.
- */
-
-class nsWidget : public nsBaseWidget
-{
-public:
-  nsWidget();
-  virtual ~nsWidget();
-
-  NS_IMETHOD            Create(nsIWidget *aParent,
-                               const nsRect &aRect,
-                               EVENT_CALLBACK aHandleEventFunction,
-                               nsIDeviceContext *aContext,
-                               nsIAppShell *aAppShell = nsnull,
-                               nsIToolkit *aToolkit = nsnull,
-                               nsWidgetInitData *aInitData = nsnull);
-  NS_IMETHOD            Create(nsNativeWidget aParent,
-                               const nsRect &aRect,
-                               EVENT_CALLBACK aHandleEventFunction,
-                               nsIDeviceContext *aContext,
-                               nsIAppShell *aAppShell = nsnull,
-                               nsIToolkit *aToolkit = nsnull,
-                               nsWidgetInitData *aInitData = nsnull);
-
-  NS_IMETHOD Destroy(void);
-  nsIWidget* GetParent(void);
-
-  NS_IMETHOD SetModal(PRBool aModal);
-  NS_IMETHOD Show(PRBool state);
-  NS_IMETHOD CaptureRollupEvents(nsIRollupListener *aListener, PRBool aDoCapture, PRBool aConsumeRollupEvent);
-  NS_IMETHOD IsVisible(PRBool &aState);
-
-  NS_IMETHOD Move(PRInt32 aX, PRInt32 aY);
-  NS_IMETHOD Resize(PRInt32 aWidth, PRInt32 aHeight, PRBool aRepaint);
-  NS_IMETHOD Resize(PRInt32 aX, PRInt32 aY, PRInt32 aWidth,
-                    PRInt32 aHeight, PRBool aRepaint);
-
-  NS_IMETHOD Enable(PRBool aState);
-  NS_IMETHOD SetFocus(void);
-
-  PRBool OnResize(nsSizeEvent event);
-  virtual PRBool OnResize(nsRect &aRect);
-  virtual PRBool OnMove(PRInt32 aX, PRInt32 aY);
-
-  nsIFontMetrics *GetFont(void);
-  NS_IMETHOD SetFont(const nsFont &aFont);
-
-  NS_IMETHOD SetBackgroundColor(const nscolor &aColor);
-
-  NS_IMETHOD SetCursor(nsCursor aCursor);
-
-  NS_IMETHOD SetColorMap(nsColorMap *aColorMap);
-
-  void* GetNativeData(PRUint32 aDataType);
-
-  NS_IMETHOD GetAbsoluteBounds(nsRect &aRect);
-  NS_IMETHOD WidgetToScreen(const nsRect &aOldRect, nsRect &aNewRect);
-  NS_IMETHOD ScreenToWidget(const nsRect &aOldRect, nsRect &aNewRect);
-
-  NS_IMETHOD BeginResizingChildren(void);
-  NS_IMETHOD EndResizingChildren(void);
-
-  NS_IMETHOD GetPreferredSize(PRInt32& aWidth, PRInt32& aHeight);
-  NS_IMETHOD SetPreferredSize(PRInt32 aWidth, PRInt32 aHeight);
-
-  // Use this to set the name of a widget for normal widgets.. not the same as the nsWindow version
-  NS_IMETHOD SetTitle(const nsString& aTitle);
-
-
-  virtual void ConvertToDeviceCoordinates(nscoord &aX, nscoord &aY);
-
-  // the following are nsWindow specific, and just stubbed here
-  NS_IMETHOD Scroll(PRInt32 aDx, PRInt32 aDy, nsRect *aClipRect) { return NS_ERROR_FAILURE; }
-  NS_IMETHOD SetMenuBar(nsIMenuBar *aMenuBar) { return NS_ERROR_FAILURE; }
-  NS_IMETHOD ShowMenuBar(PRBool aShow) { return NS_ERROR_FAILURE; }
-  // *could* be done on a widget, but that would be silly wouldn't it?
-  NS_IMETHOD CaptureMouse(PRBool aCapture) { return NS_ERROR_FAILURE; }
-
-
-  NS_IMETHOD Invalidate(PRBool aIsSynchronous);
-  NS_IMETHOD Invalidate(const nsRect &aRect, PRBool aIsSynchronous);
-  NS_IMETHOD InvalidateRegion(const nsIRegion *aRegion, PRBool aIsSynchronous);
-  NS_IMETHOD Update(void);
-  NS_IMETHOD DispatchEvent(nsGUIEvent* event, nsEventStatus & aStatus);
-
-  void InitEvent(nsGUIEvent& event, PRUint32 aEventType, nsPoint* aPoint = nsnull);
-    
-  // Utility functions
-
-  void       HandleEvent(GdkEvent *event);
-  PRBool     ConvertStatus(nsEventStatus aStatus);
-  PRBool     DispatchMouseEvent(nsMouseEvent& aEvent);
-  PRBool     DispatchStandardEvent(PRUint32 aMsg);
-  PRBool     DispatchFocus(nsGUIEvent &aEvent);
-
-  // are we a "top level" widget?
-  PRBool     mIsToplevel;
-
-#ifdef DEBUG
-  void IndentByDepth(FILE* out);
-#endif
-
-  // Return the Gdk window used for rendering
-  virtual GdkWindow * GetRenderWindow(GtkObject * aGtkWidget);
-
-protected:
-
-  virtual void InitCallbacks(char * aName = nsnull);
-  virtual void OnDestroy();
-
-  NS_IMETHOD CreateNative(GtkObject *parentWindow) { return NS_OK; }
-
-  nsresult CreateWidget(nsIWidget *aParent,
-                        const nsRect &aRect,
-                        EVENT_CALLBACK aHandleEventFunction,
-                        nsIDeviceContext *aContext,
-                        nsIAppShell *aAppShell,
-                        nsIToolkit *aToolkit,
-                        nsWidgetInitData *aInitData,
-                        nsNativeWidget aNativeParent = nsnull);
-
-
-  PRBool DispatchWindowEvent(nsGUIEvent* event);
-
-  // Return the Gdk window whose background should change
-  virtual GdkWindow *GetWindowForSetBackground();
-
-  // Sets font for widgets
-  virtual void SetFontNative(GdkFont *aFont);
-  // Sets backround for widgets
-  virtual void SetBackgroundColorNative(GdkColor *aColorNor,
-                                        GdkColor *aColorBri,
-                                        GdkColor *aColorDark);
-
-  //////////////////////////////////////////////////////////////////
-  //
-  // GTK signal installers
-  //
-  //////////////////////////////////////////////////////////////////
-  void InstallMotionNotifySignal(GtkWidget * aWidget);
-
-  void InstallDragMotionSignal(GtkWidget * aWidget);
-  void InstallDragLeaveSignal(GtkWidget * aWidget);
-  void InstallDragBeginSignal(GtkWidget * aWidget);
-  void InstallDragDropSignal(GtkWidget * aWidget);
-
-  void InstallEnterNotifySignal(GtkWidget * aWidget);
-
-  void InstallLeaveNotifySignal(GtkWidget * aWidget);
-
-  void InstallButtonPressSignal(GtkWidget * aWidget);
-
-  void InstallButtonReleaseSignal(GtkWidget * aWidget);
-
-  virtual
-  void InstallFocusInSignal(GtkWidget * aWidget);
-
-  virtual
-  void InstallFocusOutSignal(GtkWidget * aWidget);
-
-  void InstallRealizeSignal(GtkWidget * aWidget);
-
-  void AddToEventMask(GtkWidget * aWidget,
-                      gint        aEventMask);
-
-  //////////////////////////////////////////////////////////////////
-  //
-  // OnSomething handlers
-  //
-  //////////////////////////////////////////////////////////////////
-  virtual void OnMotionNotifySignal(GdkEventMotion * aGdkMotionEvent);
-  virtual void OnDragMotionSignal(GdkDragContext *aGdkDragContext,
-                                  gint            x,
-                                  gint            y,
-                                  guint           time);
-/* OnDragEnterSignal is not a real signal.. it is only called from OnDragMotionSignal */
-  virtual void OnDragEnterSignal(GdkDragContext *aGdkDragContext,
-                                 gint            x,
-                                 gint            y,
-                                 guint           time);
-  virtual void OnDragLeaveSignal(GdkDragContext   *context,
-                                 guint             time);
-  virtual void OnDragBeginSignal(GdkDragContext *aGdkDragContext);
-  virtual void OnDragDropSignal(GdkDragContext *aGdkDragContext,
-                                gint            x,
-                                gint            y,
-                                guint           time);
-  virtual void OnEnterNotifySignal(GdkEventCrossing * aGdkCrossingEvent);
-  virtual void OnLeaveNotifySignal(GdkEventCrossing * aGdkCrossingEvent);
-  virtual void OnButtonPressSignal(GdkEventButton * aGdkButtonEvent);
-  virtual void OnButtonReleaseSignal(GdkEventButton * aGdkButtonEvent);
-  virtual void OnFocusInSignal(GdkEventFocus * aGdkFocusEvent);
-  virtual void OnFocusOutSignal(GdkEventFocus * aGdkFocusEvent);
-  virtual void OnRealize(GtkWidget *aWidget);
-
-  virtual void OnDestroySignal(GtkWidget* aGtkWidget);
-
-  // Static method used to trampoline to OnDestroySignal
-  static gint  DestroySignal(GtkWidget *      aGtkWidget,
-                             nsWidget*        aWidget);
-
-  static void  SuppressModality(PRBool aSuppress);
-
-
-public:
-  PRBool          mIMEEnable;
-  PRUnichar*      mIMECompositionUniString;
-  PRInt32         mIMECompositionUniStringSize;
-  void            SetXICSpotLocation(nsPoint aPoint);
-
-
-
-protected:
-
-  //////////////////////////////////////////////////////////////////
-  //
-  // GTK widget signals
-  //
-  //////////////////////////////////////////////////////////////////
-
-  static gint MotionNotifySignal(GtkWidget *       aWidget,
-                                 GdkEventMotion *  aGdkMotionEvent,
-                                 gpointer          aData);
-
-  static gint DragMotionSignal(GtkWidget *       aWidget,
-                               GdkDragContext   *context,
-                               gint             x,
-                               gint             y,
-                               guint            time,
-                               void             *data);
-
-  static void DragLeaveSignal(GtkWidget *      aWidget,
-                              GdkDragContext   *aDragContext,
-                              guint            time,
-                              void             *aData);
-
-  static gint DragBeginSignal(GtkWidget *       aWidget,
-                              GdkDragContext   *context,
-                              gint             x,
-                              gint             y,
-                              guint            time,
-                              void             *data);
-
-  static gint DragDropSignal(GtkWidget *      aWidget,
-                             GdkDragContext   *context,
-                             gint             x,
-                             gint             y,
-                             guint            time,
-                             void             *data);
-
-
-
-  static gint EnterNotifySignal(GtkWidget *        aWidget, 
-                                GdkEventCrossing * aGdkCrossingEvent, 
-                                gpointer           aData);
-  
-  static gint LeaveNotifySignal(GtkWidget *        aWidget, 
-                                GdkEventCrossing * aGdkCrossingEvent, 
-                                gpointer           aData);
-
-  static gint ButtonPressSignal(GtkWidget *      aWidget, 
-                                GdkEventButton * aGdkButtonEvent, 
-                                gpointer         aData);
-
-  static gint ButtonReleaseSignal(GtkWidget *      aWidget, 
-                                  GdkEventButton * aGdkButtonEvent, 
-                                  gpointer         aData);
-
-  static gint RealizeSignal(GtkWidget *      aWidget, 
-                            gpointer         aData);
-
-
-  static gint FocusInSignal(GtkWidget *      aWidget, 
-                            GdkEventFocus *  aGdkFocusEvent, 
-                            gpointer         aData);
-
-  static gint FocusOutSignal(GtkWidget *      aWidget, 
-                             GdkEventFocus *  aGdkFocusEvent, 
-                             gpointer         aData);
-
-protected:
-
-  //////////////////////////////////////////////////////////////////
-  //
-  // GTK event support methods
-  //
-  //////////////////////////////////////////////////////////////////
-  void InstallSignal(GtkWidget *   aWidget,
-                     gchar *       aSignalName,
-                     GtkSignalFunc aSignalFunction);
-  
-  PRBool DropEvent(GtkWidget * aWidget, 
-                   GdkWindow * aEventWindow);
-  
-  void InitMouseEvent(GdkEventButton * aGdkButtonEvent,
-                      nsMouseEvent &   anEvent,
-                      PRUint32         aEventType);
-
-#ifdef DEBUG
-  nsCAutoString  debug_GetName(GtkObject * aGtkWidget);
-  nsCAutoString  debug_GetName(GtkWidget * aGtkWidget);
-  PRInt32       debug_GetRenderXID(GtkObject * aGtkWidget);
-  PRInt32       debug_GetRenderXID(GtkWidget * aGtkWidget);
-#endif
-
-  guint32 mGrabTime;
-  GtkWidget *mWidget;
-  // our mozbox for those native widgets
-  GtkWidget *mMozBox;
-
-  nsIWidget *mParent;
-
-  // This is the composite update area (union of all the calls to
-  // Invalidate)
-  nsIRegion *mUpdateArea;
-
-  PRBool mShown;
-
-  PRUint32 mPreferredWidth, mPreferredHeight;
-  PRBool       mListenForResizes;
-
-  GdkICPrivate *mIC;
-  GdkICPrivate *GetXIC();
-  void SetXIC(GdkICPrivate *aIC);
-  void GetXYFromPosition(unsigned long *aX, unsigned long *aY);
-
-  // this is the rollup listener variables
-  static nsIRollupListener *gRollupListener;
-  static nsIWidget         *gRollupWidget;
-  static PRBool             gRollupConsumeRollupEvent;
-
-private:
-  PRBool mIsDragDest;
-  static nsILookAndFeel *sLookAndFeel;
-  static PRUint32 sWidgetCount;
-
-  //
-  // Keep track of the last widget being "dragged"
-  //
-  static nsWidget *sButtonMotionTarget;
-  static gint sButtonMotionRootX;
-  static gint sButtonMotionRootY;
-  static gint sButtonMotionWidgetX;
-  static gint sButtonMotionWidgetY;
-};
-
-#endif /* nsWidget_h__ */

mozilla/widget/src/gtk/nsWidgetFactory.cpp

@@ -1,274 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsIFactory.h"
-#include "nsISupports.h"
-#include "nsIButton.h"
-#include "nsITextWidget.h"
-#include "nsWidgetsCID.h"
-
-#include "nsToolkit.h"
-#include "nsWindow.h"
-#include "nsAppShell.h"
-#include "nsButton.h"
-#include "nsScrollbar.h"
-#include "nsCheckButton.h"
-#include "nsRadioButton.h"
-#include "nsTextWidget.h"
-#include "nsTextAreaWidget.h"
-#include "nsFileWidget.h"
-#include "nsFileSpecWithUIImpl.h"
-#include "nsListBox.h"
-#include "nsComboBox.h"
-#include "nsLookAndFeel.h"
-#include "nsLabel.h"
-#ifdef LOSER
-#include "nsMenuBar.h"
-#include "nsMenu.h"
-#include "nsMenuItem.h"
-#include "nsPopUpMenu.h"
-#include "nsContextMenu.h"
-#endif
-#include "nsFontRetrieverService.h"
-
-// Drag & Drop, Clipboard
-#include "nsClipboard.h"
-#include "nsTransferable.h"
-#include "nsXIFFormatConverter.h"
-#include "nsDragService.h"
-
-#include "nsSound.h"
-
-static NS_DEFINE_IID(kCWindow,        NS_WINDOW_CID);
-static NS_DEFINE_IID(kCChild,         NS_CHILD_CID);
-static NS_DEFINE_IID(kCButton,        NS_BUTTON_CID);
-static NS_DEFINE_IID(kCCheckButton,   NS_CHECKBUTTON_CID);
-static NS_DEFINE_IID(kCCombobox,      NS_COMBOBOX_CID);
-static NS_DEFINE_IID(kCFileOpen,      NS_FILEWIDGET_CID);
-static NS_DEFINE_IID(kCListbox,       NS_LISTBOX_CID);
-static NS_DEFINE_IID(kCRadioButton,   NS_RADIOBUTTON_CID);
-static NS_DEFINE_IID(kCHorzScrollbar, NS_HORZSCROLLBAR_CID);
-static NS_DEFINE_IID(kCVertScrollbar, NS_VERTSCROLLBAR_CID);
-static NS_DEFINE_IID(kCTextArea,      NS_TEXTAREA_CID);
-static NS_DEFINE_IID(kCTextField,     NS_TEXTFIELD_CID);
-static NS_DEFINE_IID(kCAppShell,      NS_APPSHELL_CID);
-static NS_DEFINE_IID(kCToolkit,       NS_TOOLKIT_CID);
-static NS_DEFINE_IID(kCLookAndFeel,   NS_LOOKANDFEEL_CID);
-static NS_DEFINE_IID(kCLabel,         NS_LABEL_CID);
-#if 0
-static NS_DEFINE_IID(kCMenuBar,       NS_MENUBAR_CID);
-static NS_DEFINE_IID(kCMenu,          NS_MENU_CID);
-static NS_DEFINE_IID(kCMenuItem,      NS_MENUITEM_CID);
-static NS_DEFINE_IID(kCPopUpMenu,     NS_POPUPMENU_CID);
-static NS_DEFINE_IID(kCContextMenu,   NS_CONTEXTMENU_CID);
-#endif
-static NS_DEFINE_IID(kCFontRetrieverService,    NS_FONTRETRIEVERSERVICE_CID);
-
-// Drag & Drop, Clipboard
-static NS_DEFINE_IID(kCDataObj,       NS_DATAOBJ_CID);
-static NS_DEFINE_IID(kCClipboard,     NS_CLIPBOARD_CID);
-static NS_DEFINE_IID(kCTransferable,  NS_TRANSFERABLE_CID);
-static NS_DEFINE_IID(kCDataFlavor,    NS_DATAFLAVOR_CID);
-static NS_DEFINE_IID(kCXIFFormatConverter,  NS_XIFFORMATCONVERTER_CID);
-static NS_DEFINE_IID(kCDragService,   NS_DRAGSERVICE_CID);
-
-static NS_DEFINE_IID(kISupportsIID,   NS_ISUPPORTS_IID);
-static NS_DEFINE_IID(kIFactoryIID,    NS_IFACTORY_IID);
-
-// Sound services (just Beep for now)
-static NS_DEFINE_CID(kCSound,   NS_SOUND_CID);
-static NS_DEFINE_CID(kCFileSpecWithUI,   NS_FILESPECWITHUI_CID);
-
-
-class nsWidgetFactory : public nsIFactory
-{   
-public:   
-
-    NS_DECL_ISUPPORTS
-
-    NS_DECL_NSIFACTORY
-
-    nsWidgetFactory(const nsCID &aClass);   
-    virtual ~nsWidgetFactory();   
-private:
-  nsCID mClassID;
-
-};   
-
-
-
-nsWidgetFactory::nsWidgetFactory(const nsCID &aClass)   
-{   
-    NS_INIT_ISUPPORTS();
-    mClassID = aClass;
-}   
-
-nsWidgetFactory::~nsWidgetFactory()   
-{   
-}   
-
-NS_IMPL_ISUPPORTS(nsWidgetFactory, NS_GET_IID(nsIFactory))
-
-nsresult nsWidgetFactory::CreateInstance(nsISupports *aOuter,  
-                                          const nsIID &aIID,  
-                                          void **aResult)  
-{  
-    if (aResult == NULL) {  
-        return NS_ERROR_NULL_POINTER;  
-    }  
-
-    *aResult = NULL;  
-
-    if (nsnull != aOuter)
-      return NS_ERROR_NO_AGGREGATION;
-  
-    nsISupports *inst = nsnull;
-    if (mClassID.Equals(kCWindow)) {
-      inst = (nsISupports *)new nsWindow();
-    }
-    else if (mClassID.Equals(kCChild)) {
-      inst = (nsISupports *)new ChildWindow();
-    }
-    else if (mClassID.Equals(kCButton)) {
-      inst = (nsISupports*)(nsWidget *)new nsButton();
-    }
-    else if (mClassID.Equals(kCCheckButton)) {
-        inst = (nsISupports*)(nsWidget *)new nsCheckButton();
-    }
-    else if (mClassID.Equals(kCCombobox)) {
-        inst = (nsISupports*)(nsWidget *)new nsComboBox();
-    }
-    else if (mClassID.Equals(kCRadioButton)) {
-        inst = (nsISupports*)(nsWidget *)new nsRadioButton();
-    }
-    else if (mClassID.Equals(kCFileOpen)) {
-        inst = (nsISupports*)new nsFileWidget();
-    }
-    else if (mClassID.Equals(kCListbox)) {
-        inst = (nsISupports*)(nsWidget *)new nsListBox();
-    }
-    else if (mClassID.Equals(kCHorzScrollbar)) {
-        inst = (nsISupports*)(nsWidget *)new nsScrollbar(PR_FALSE);
-    }
-    else if (mClassID.Equals(kCVertScrollbar)) {
-        inst = (nsISupports*)(nsWidget *)new nsScrollbar(PR_TRUE);
-    }
-    else if (mClassID.Equals(kCTextArea)) {
-        inst = (nsISupports*)(nsWidget *)new nsTextAreaWidget();
-    }
-    else if (mClassID.Equals(kCTextField)) {
-        inst = (nsISupports*)(nsWidget *)new nsTextWidget();
-    }
-    else if (mClassID.Equals(kCAppShell)) {
-        inst = (nsISupports*)new nsAppShell();
-    }
-    else if (mClassID.Equals(kCToolkit)) {
-        inst = (nsISupports*)(nsWidget *)new nsToolkit();
-    }
-    else if (mClassID.Equals(kCLookAndFeel)) {
-        inst = (nsISupports*)(nsWidget *)new nsLookAndFeel();
-    }
-    else if (mClassID.Equals(kCLabel)) {
-        inst = (nsISupports*)(nsWidget *)new nsLabel();
-    }
-#if 0
-    else if (mClassID.Equals(kCMenuBar)) {
-        inst = (nsISupports*)(nsIMenuBar *)new nsMenuBar();
-    }
-    else if (mClassID.Equals(kCMenu)) {
-        inst = (nsISupports*)(nsIMenu *)new nsMenu();
-    }
-    else if (mClassID.Equals(kCMenuItem)) {
-        inst = (nsISupports*)(nsIMenuItem *)new nsMenuItem();
-    }
-    else if (mClassID.Equals(kCPopUpMenu)) {
-        inst = (nsISupports*)new nsPopUpMenu();
-    }
-    /*
-    else if (mClassID.Equals(kCContextMenu)) {
-        inst = (nsISupports*)(nsIContextMenu*)new nsContextMenu();
-    }
-    */
-#endif
-    else if (mClassID.Equals(kCSound)) {
-    	nsISound* aSound = nsnull;
-    	NS_NewSound(&aSound);
-        inst = (nsISupports*) aSound;
-    }
-    else if (mClassID.Equals(kCTransferable)) {
-        inst = (nsISupports*)new nsTransferable();
-    }
-    else if (mClassID.Equals(kCClipboard)) {
-        inst = (nsISupports*)new nsClipboard();
-    }
-    else if (mClassID.Equals(kCXIFFormatConverter))
-        inst = (nsISupports*)new nsXIFFormatConverter();
-    else if (mClassID.Equals(kCFontRetrieverService))
-        inst = (nsISupports*)(nsIFontRetrieverService *) new nsFontRetrieverService();
-    else if (mClassID.Equals(kCDragService))
-        inst = (nsISupports*) (nsIDragService *) new nsDragService();
-    else if (mClassID.Equals(kCFileSpecWithUI))
-    	inst = (nsISupports*) (nsIFileSpecWithUI *) new nsFileSpecWithUIImpl;
-    else {
-        printf("nsWidgetFactory::CreateInstance(), unhandled class.\n");
-    }
-  
-    if (inst == NULL) {  
-        return NS_ERROR_OUT_OF_MEMORY;  
-    }  
-
-    NS_ADDREF(inst);
-    nsresult res = inst->QueryInterface(aIID, aResult);
-    NS_RELEASE(inst);
-
-    return res;
-
-}  
-
-nsresult nsWidgetFactory::LockFactory(PRBool aLock)  
-{  
-    // Not implemented in simplest case.  
-    return NS_OK;
-}  
-
-// return the proper factory to the caller
-extern "C" NS_WIDGET nsresult 
-NSGetFactory(nsISupports* serviceMgr,
-             const nsCID &aClass,
-             const char *aClassName,
-             const char *aProgID,
-             nsIFactory **aFactory)
-{
-    if (nsnull == aFactory) {
-        return NS_ERROR_NULL_POINTER;
-    }
-
-    *aFactory = new nsWidgetFactory(aClass);
-
-    if (nsnull == aFactory) {
-        return NS_ERROR_OUT_OF_MEMORY;
-    }
-
-    return (*aFactory)->QueryInterface(kIFactoryIID, (void**)aFactory);
-}
-
-

mozilla/widget/src/gtk/nsWindow.h

@@ -1,211 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-#ifndef nsWindow_h__
-#define nsWindow_h__
-
-
-
-#include "nsISupports.h"
-
-#include "nsWidget.h"
-
-#include "nsString.h"
-
-#include "gtkmozarea.h"
-#include "gdksuperwin.h"
-
-class nsFont;
-class nsIAppShell;
-
-/**
- * Native GTK++ window wrapper.
- */
-
-class nsWindow : public nsWidget
-{
-
-public:
-      // nsIWidget interface
-
-  nsWindow();
-  virtual ~nsWindow();
-
-  NS_IMETHOD           WidgetToScreen(const nsRect &aOldRect, nsRect &aNewRect);
-
-  NS_IMETHOD           PreCreateWidget(nsWidgetInitData *aWidgetInitData);
-
-  virtual void*        GetNativeData(PRUint32 aDataType);
-
-  NS_IMETHOD           Scroll(PRInt32 aDx, PRInt32 aDy, nsRect *aClipRect);
-  NS_IMETHOD           ScrollRect(nsRect &aSrcRect, PRInt32 aDx, PRInt32 aDy);
-
-  NS_IMETHOD           SetTitle(const nsString& aTitle);
-  NS_IMETHOD           Show(PRBool aShow);
-  NS_IMETHOD           CaptureMouse(PRBool aCapture);
-
-  NS_IMETHOD           Move(PRInt32 aX, PRInt32 aY);
-
-  NS_IMETHOD           Resize(PRInt32 aWidth, PRInt32 aHeight, PRBool aRepaint);
-  NS_IMETHOD           Resize(PRInt32 aX, PRInt32 aY, PRInt32 aWidth,
-                              PRInt32 aHeight, PRBool aRepaint);
-
-  NS_IMETHOD           BeginResizingChildren(void);
-  NS_IMETHOD           EndResizingChildren(void);
-  NS_IMETHOD           Destroy(void);
-
-#ifdef USE_SUPERWIN
-  NS_IMETHOD           GetAbsoluteBounds(nsRect &aRect);
-  NS_IMETHOD           CaptureRollupEvents(nsIRollupListener * aListener,
-                                           PRBool aDoCapture,
-                                           PRBool aConsumeRollupEvent);
-  NS_IMETHOD           Invalidate(PRBool aIsSynchronous);
-  NS_IMETHOD           Invalidate(const nsRect &aRect, PRBool aIsSynchronous);
-  NS_IMETHOD           SetBackgroundColor(const nscolor &aColor);
-  NS_IMETHOD           SetCursor(nsCursor aCursor);
-  NS_IMETHOD           SetFocus(void);
-  void                 QueueDraw();
-  void                 UnqueueDraw();
-  void                 DoPaint(PRInt32 x, PRInt32 y, PRInt32 width, PRInt32 height,
-                               nsIRegion *aClipRegion);
-  static gboolean      UpdateIdle (gpointer data);
-  NS_IMETHOD           Update(void);
-  virtual void         OnFocusInSignal(GdkEventFocus * aGdkFocusEvent);
-  virtual void         OnFocusOutSignal(GdkEventFocus * aGdkFocusEvent);
-  virtual void         InstallFocusInSignal(GtkWidget * aWidget);
-  virtual void         InstallFocusOutSignal(GtkWidget * aWidget);
-#endif /* USE_SUPERWIN */
-
-  gint                 ConvertBorderStyles(nsBorderStyle bs);
-
-  // Add an XATOM property to this window.
-  void                 StoreProperty(char *property, unsigned char *data);
-
-  virtual PRBool IsChild() const;
-
-  void SetIsDestroying(PRBool val) {
-    mIsDestroyingWindow = val;
-  }
-
-  PRBool IsDestroying() const {
-    return mIsDestroyingWindow;
-  }
-
-  // Utility methods
-  virtual  PRBool OnExpose(nsPaintEvent &event);
-  virtual  PRBool OnDraw(nsPaintEvent &event);
-
-  PRBool   OnKey(nsKeyEvent &aEvent);
-  virtual  PRBool OnScroll(nsScrollbarEvent & aEvent, PRUint32 cPos);
-  // in nsWidget now
-  //    virtual  PRBool OnResize(nsSizeEvent &aEvent);
-  
-  static void SuperWinFilter(GdkSuperWin *superwin, XEvent *event, gpointer p);
-  
-  void HandleXlibExposeEvent(XEvent *event);
-  void HandleXlibConfigureNotifyEvent(XEvent *event);
-  void HandleXlibButtonEvent(XButtonEvent *aButtonEvent);
-  void HandleXlibMotionNotifyEvent(XMotionEvent *aMotionEvent);
-  void HandleXlibCrossingEvent(XCrossingEvent * aCrossingEvent);
- 
-  // Return the GtkMozArea that is the nearest parent of this widget
-  GtkWidget *GetMozArea();
-
-  // Return the Gdk window used for rendering
-  virtual GdkWindow * GetRenderWindow(GtkObject * aGtkWidget);
-  //  XXX Chris - fix these
-  //  virtual void OnButtonPressSignal(GdkEventButton * aGdkButtonEvent);
-
-protected:
-
-  //////////////////////////////////////////////////////////////////////
-  //
-  // Draw signal
-  // 
-  //////////////////////////////////////////////////////////////////////
-  void InitDrawEvent(GdkRectangle * aArea,
-                     nsPaintEvent & aPaintEvent,
-                     PRUint32       aEventType);
-
-  void UninitDrawEvent(GdkRectangle * area,
-                       nsPaintEvent & aPaintEvent,
-                       PRUint32       aEventType);
-  
-  static gint DrawSignal(GtkWidget *    aWidget,
-                         GdkRectangle * aArea,
-                         gpointer       aData);
-
-  virtual gint OnDrawSignal(GdkRectangle * aArea);
-  virtual void OnRealize(GtkWidget *aWidget);
-
-  virtual void OnDestroySignal(GtkWidget* aGtkWidget);
-
-  //////////////////////////////////////////////////////////////////////
-
-  virtual void InitCallbacks(char * aName = nsnull);
-  NS_IMETHOD CreateNative(GtkObject *parentWidget);
-
-  nsIFontMetrics *mFontMetrics;
-  PRBool      mVisible;
-  PRBool      mDisplayed;
-  PRBool      mIsDestroyingWindow;
-  PRBool      mIsTooSmall;
-
-  // XXX Temporary, should not be caching the font
-  nsFont *    mFont;
-
-  // Resize event management
-  nsRect mResizeRect;
-  int    mResized;
-  PRBool mLowerLeft;
-
-  GtkWidget *mShell;  /* used for toplevel windows */
-  GdkSuperWin *mSuperWin;
-  GtkWidget   *mMozArea;
-  GtkWidget   *mMozAreaClosestParent;
-
-  nsIMenuBar *mMenuBar;
-private:
-  nsresult     SetIcon(GdkPixmap *window_pixmap, 
-                       GdkBitmap *window_mask);
-  nsresult     SetIcon();
-  PRBool       mIsUpdating;
-  // this is the current GdkSuperWin with the focus
-  static nsWindow  *focusWindow;
-  // when this is PR_TRUE we will block focus
-  // events to prevent recursion
-  PRBool       mBlockFocusEvents;
-};
-
-//
-// A child window is a window with different style
-//
-class ChildWindow : public nsWindow {
-public:
-  ChildWindow();
-  ~ChildWindow();
-  virtual PRBool IsChild() const;
-#ifndef USE_SUPERWIN
-  NS_IMETHOD Destroy(void);
-#endif
-};
-
-#endif // Window_h__