diff options
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/.gitignore | 7 | ||||
| -rw-r--r-- | plugin/Main.c | 7 | ||||
| -rw-r--r-- | plugin/PProcess.c | 4 | ||||
| -rw-r--r-- | plugin/common/.gitignore | 2 | ||||
| -rw-r--r-- | plugin/common/npunix.c | 22 | ||||
| -rw-r--r-- | plugin/include/.gitignore | 2 | ||||
| -rw-r--r-- | plugin/include/jri_md.h | 4 | ||||
| -rw-r--r-- | plugin/include/npupp.h | 1 |
8 files changed, 21 insertions, 28 deletions
diff --git a/plugin/.gitignore b/plugin/.gitignore deleted file mode 100644 index 2059c63..0000000 --- a/plugin/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -.deps -.libs -Makefile -Makefile.in -*.la -*.lo -libxrx.1 diff --git a/plugin/Main.c b/plugin/Main.c index 1810b43..bd9255b 100644 --- a/plugin/Main.c +++ b/plugin/Main.c @@ -161,7 +161,7 @@ NPP_GetValue( } jref -NPP_GetJavaClass() +NPP_GetJavaClass(void) { return NULL; } @@ -289,6 +289,7 @@ NPP_NewStream(NPP instance, * still called but can safely be ignored using this strategy. */ +static int32 STREAMBUFSIZE = 0X0FFFFFFF; /* If we are reading from a file in NPAsFile * mode so we can take any size stream in our * write call (since we ignore it) */ @@ -368,7 +369,7 @@ NPP_Write(NPP instance, NPStream *stream, int32 offset, int32 len, void *buf) return len; /* The number of bytes accepted */ } -void +static void StartApplication(PluginInstance* This) { #ifndef NO_STARTING_STATE @@ -384,7 +385,7 @@ StartApplication(PluginInstance* This) This->parse_reply = 1; /* we want to print out the answer */ } -void +static void StartCB(Widget widget, XtPointer client_data, XtPointer call_data) { PluginInstance* This = (PluginInstance*) client_data; diff --git a/plugin/PProcess.c b/plugin/PProcess.c index fb9b532..642e94f 100644 --- a/plugin/PProcess.c +++ b/plugin/PProcess.c @@ -83,6 +83,8 @@ GetWindowGeometry( *border_width = wattr.border_width; *cmap = wattr.colormap; } + else + *cmap = NotUseful; if (sizehints) { XGetWMNormalHints (dpy, win, sizehints, &mask); @@ -337,7 +339,7 @@ ResetWMColormap(PluginInstance* This, Window win) /*********************************************************************** * Event Handler to reparent client window under plugin window ***********************************************************************/ -/* static */ void +static void SubstructureRedirectHandler ( Widget widget, XtPointer client_data, diff --git a/plugin/common/.gitignore b/plugin/common/.gitignore deleted file mode 100644 index 282522d..0000000 --- a/plugin/common/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/plugin/common/npunix.c b/plugin/common/npunix.c index bedd861..d2b5338 100644 --- a/plugin/common/npunix.c +++ b/plugin/common/npunix.c @@ -147,7 +147,7 @@ void NPN_ReloadPlugins(NPBool reloadPages) CallNPN_ReloadPluginsProc(gNetscapeFuncs.reloadplugins, reloadPages); } -JRIEnv* NPN_GetJavaEnv() +JRIEnv* NPN_GetJavaEnv(void) { return CallNPN_GetJavaEnvProc(gNetscapeFuncs.getJavaEnv); } @@ -170,7 +170,7 @@ jref NPN_GetJavaPeer(NPP instance) * ***********************************************************************/ -NPError +static NPError Private_New(NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc, char* argn[], char* argv[], NPSavedData* saved) { @@ -180,14 +180,14 @@ Private_New(NPMIMEType pluginType, NPP instance, uint16 mode, return ret; } -NPError +static NPError Private_Destroy(NPP instance, NPSavedData** save) { PLUGINDEBUGSTR("Destroy"); return NPP_Destroy(instance, save); } -NPError +static NPError Private_SetWindow(NPP instance, NPWindow* window) { NPError err; @@ -196,7 +196,7 @@ Private_SetWindow(NPP instance, NPWindow* window) return err; } -NPError +static NPError Private_NewStream(NPP instance, NPMIMEType type, NPStream* stream, NPBool seekable, uint16* stype) { @@ -206,7 +206,7 @@ Private_NewStream(NPP instance, NPMIMEType type, NPStream* stream, return err; } -int32 +static int32 Private_WriteReady(NPP instance, NPStream* stream) { unsigned int result; @@ -215,7 +215,7 @@ Private_WriteReady(NPP instance, NPStream* stream) return result; } -int32 +static int32 Private_Write(NPP instance, NPStream* stream, int32 offset, int32 len, void* buffer) { @@ -225,7 +225,7 @@ Private_Write(NPP instance, NPStream* stream, int32 offset, int32 len, return result; } -void +static void Private_StreamAsFile(NPP instance, NPStream* stream, const char* fname) { PLUGINDEBUGSTR("StreamAsFile"); @@ -233,7 +233,7 @@ Private_StreamAsFile(NPP instance, NPStream* stream, const char* fname) } -NPError +static NPError Private_DestroyStream(NPP instance, NPStream* stream, NPError reason) { NPError err; @@ -243,14 +243,14 @@ Private_DestroyStream(NPP instance, NPStream* stream, NPError reason) } -void +static void Private_Print(NPP instance, NPPrint* platformPrint) { PLUGINDEBUGSTR("Print"); NPP_Print(instance, platformPrint); } -JRIGlobalRef +static JRIGlobalRef Private_GetJavaClass(void) { jref clazz = NPP_GetJavaClass(); diff --git a/plugin/include/.gitignore b/plugin/include/.gitignore deleted file mode 100644 index 282522d..0000000 --- a/plugin/include/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/plugin/include/jri_md.h b/plugin/include/jri_md.h index e708b6d..4e682e0 100644 --- a/plugin/include/jri_md.h +++ b/plugin/include/jri_md.h @@ -69,11 +69,11 @@ extern "C" { #elif defined(macintosh) || defined(Macintosh) || defined(THINK_C) # if defined(__MWERKS__) /* Metrowerks */ # if !__option(enumsalwaysint) -# error You need to define 'Enums Always Int' for your project. +# error You need to define "Enums Always Int" for your project. # endif # if defined(GENERATING68K) && !GENERATINGCFM # if !__option(fourbyteints) -# error You need to define 'Struct Alignment: 68k' for your project. +# error You need to define "Struct Alignment: 68k" for your project. # endif # endif /* !GENERATINGCFM */ # elif defined(__SC__) /* Symantec */ diff --git a/plugin/include/npupp.h b/plugin/include/npupp.h index dfd4974..f183840 100644 --- a/plugin/include/npupp.h +++ b/plugin/include/npupp.h @@ -984,6 +984,7 @@ extern "C" { /* plugin meta member functions */ char* NP_GetMIMEDescription(void); +NPError NP_GetValue(void *future, NPPVariable variable, void *value); NPError NP_Initialize(NPNetscapeFuncs*, NPPluginFuncs*); NPError NP_Shutdown(void); |