On 04/12/01 Martin Sevior wrote:
> Hi Joaquin,
> Rather than try to produce a patch of this I just bundled up
> all your work into a abi-js.tar.gz tarball. You can download it from
The problem with that is that the tarball contains unrelated changes
that you or Joaquin were working on and I don't have time to clean
them up from my patch: I'll leave that to you or whoever knows this stuff
better. The point is that the perl support requires some tens of
lines of code, but the patch is bigger and messy because of the
unrelated stuff.
So, to get perl scripting to work, you'll need to apply the patch and
untar the tarball in abi/src to produce bindings/perl. Go
to src/bindings/perl and type:
$ perl Makefile.PL
$ make
$ make install
build abiword with the ABI_OPT_JS=1 option and write a script
with something like this in it:
# open an empty document
$frame = abi::XAP_Frame::openFile(undef);
$view = $frame->getCurrentView;
$view->insertData("Hello world!\n");
$view->setCharFormat("font-weight" => "bold");
$view->insertData("Yadda yadda!\n");
and then run abiword with the --script scriptfile option.
This has been tested with the vanilla Unix build, I spent some time
with the gnome build, but the build setup of abiword is so broken
and I have better things to do than fix it or flame about it:-)
The script can do anuthing, even use the perl Gtk module to create
additional user interface dialogs etc. etc.
When you run it abiword opens an additional dummy window, maybe
that should be disable when running a script, since it's annoying.
The things I did involved fixing the perl module, making it use
a more OO interface and fixing other perl embedding issues in Joaquin's
code. There are still some unfixed things (s_perlEvalFile), but I
guess Joaquin can figure out now how things work, I also added
a couple of methods to the view perl bindings (the most useful
setCharFormat) and deleted an assert that broke with the latest
spell-checking update: I guess you know if there is a better fix.
There are a couple of things that should still be done:
1) pass the defines and options used to build abiword also to the
perl module and integrate it in the build process.
2) once it's stabilized, link statically to the module (otherwise it
may have problems on weird platforms: it's ok right now as long as you
use something like Linux or Solaris).
3) add more methods: you know better than me what methods you need more,
just take the ones in abi.xs as examples. If you need advice on how
to implemented specific things in the perl binding, feel free to ask me.
4) add the code that lets add to the toolbars and menus hooks to run
perl code (you just got a powerful macro system)
Hope this helps.
lupus
--
-----------------------------------------------------------------
[EMAIL PROTECTED] debian/rules
[EMAIL PROTECTED] Monkeys do it better
Index: src/af/util/unix/ut_unixTimer.cpp
===================================================================
RCS file: /cvsroot/abi/src/af/util/unix/ut_unixTimer.cpp,v
retrieving revision 1.17
diff -u -r1.17 ut_unixTimer.cpp
--- src/af/util/unix/ut_unixTimer.cpp 2001/03/27 08:35:45 1.17
+++ src/af/util/unix/ut_unixTimer.cpp 2001/04/12 13:22:57
@@ -80,7 +80,7 @@
if (getIdentifier() == 0)
setIdentifier(m_iGtkTimerId);
-// UT_DEBUGMSG(("ut_unixTimer.cpp: timer [%d] (with id [%d] set\n",
getIdentifier(), m_iGtkTimerId));
+ // UT_DEBUGMSG(("ut_unixTimer.cpp: timer [%d] (with id [%d] set\n",
+getIdentifier(), m_iGtkTimerId));
m_iMilliseconds = iMilliseconds;
Index: src/af/util/unix/ut_unixTimer.h
===================================================================
RCS file: /cvsroot/abi/src/af/util/unix/ut_unixTimer.h,v
retrieving revision 1.10
diff -u -r1.10 ut_unixTimer.h
--- src/af/util/unix/ut_unixTimer.h 2001/03/19 00:51:07 1.10
+++ src/af/util/unix/ut_unixTimer.h 2001/04/12 13:22:57
@@ -34,7 +34,7 @@
virtual void stop(void);
virtual void start(void);
-protected:
+private:
UT_sint32 m_iMilliseconds;
UT_uint32 m_iGtkTimerId;
};
Index: src/af/util/win/ut_Win32Timer.h
===================================================================
RCS file: /cvsroot/abi/src/af/util/win/ut_Win32Timer.h,v
retrieving revision 1.10
diff -u -r1.10 ut_Win32Timer.h
--- src/af/util/win/ut_Win32Timer.h 2001/02/06 22:54:10 1.10
+++ src/af/util/win/ut_Win32Timer.h 2001/04/12 13:22:57
@@ -34,7 +34,7 @@
virtual void stop(void);
virtual void start(void);
-protected:
+private:
UT_sint32 m_iMilliseconds;
bool m_bStarted;
HWND m_hWnd;
Index: src/af/util/xp/ut_timer.cpp
===================================================================
RCS file: /cvsroot/abi/src/af/util/xp/ut_timer.cpp,v
retrieving revision 1.8
diff -u -r1.8 ut_timer.cpp
--- src/af/util/xp/ut_timer.cpp 2001/03/17 01:31:42 1.8
+++ src/af/util/xp/ut_timer.cpp 2001/04/12 13:22:58
@@ -82,9 +82,7 @@
UT_ASSERT(pTimer);
if (pTimer->getIdentifier() == iIdentifier)
- {
return pTimer;
- }
}
return NULL;
Index: src/af/util/xp/ut_timer.h
===================================================================
RCS file: /cvsroot/abi/src/af/util/xp/ut_timer.h,v
retrieving revision 1.10
diff -u -r1.10 ut_timer.h
--- src/af/util/xp/ut_timer.h 2001/03/19 00:51:08 1.10
+++ src/af/util/xp/ut_timer.h 2001/04/12 13:22:58
@@ -16,9 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
-
-
#ifndef UT_TIMER_H
#define UT_TIMER_H
@@ -54,6 +52,7 @@
UT_uint32 getIdentifier();
static UT_Timer* findTimer(UT_uint32 iIdentifier);
+// static bool deleteTimer(UT_uint32 iIdentifier); TODO
/*
Note that the static_constructor is actually implemented in
@@ -65,6 +64,7 @@
protected:
UT_Timer(); // should only be called from static_constructor()
+private:
void* m_pInstanceData;
UT_TimerCallback m_pCallback;
UT_uint32 m_iIdentifier;
Index: src/config/abi_defs.mk
===================================================================
RCS file: /cvsroot/abi/src/config/abi_defs.mk,v
retrieving revision 1.143
diff -u -r1.143 abi_defs.mk
--- src/config/abi_defs.mk 2001/03/29 10:31:29 1.143
+++ src/config/abi_defs.mk 2001/04/12 13:22:58
@@ -658,6 +658,15 @@
ABI_OPTIONS+=Pspell:Off
endif
+# Perl scripting support
+ifdef ABI_OPT_JS
+EXTRA_LIBS += $(shell perl -MExtUtils::Embed -e ldopts)
+ABI_OPTIONS+=Scripting:On
+CFLAGS += -DABI_OPT_JS $(shell perl -MExtUtils::Embed -e ccopts) -Ubool
+else
+ABI_OPTIONS+=Scripting:Off
+endif
+
# conditionally enable stl-based implementations of our
# UT_XXX classes. We may need to link against certain
# libraries, but we don't on linux. Add these as necessary.
Index: src/hello/ap/unix/ap_UnixApp.cpp
===================================================================
RCS file: /cvsroot/abi/src/hello/ap/unix/ap_UnixApp.cpp,v
retrieving revision 1.6
diff -u -r1.6 ap_UnixApp.cpp
--- src/hello/ap/unix/ap_UnixApp.cpp 2001/02/06 22:54:29 1.6
+++ src/hello/ap/unix/ap_UnixApp.cpp 2001/04/12 13:22:59
@@ -18,7 +18,8 @@
*/
#ifdef ABI_OPT_JS
-#include <js.h>
+#include <EXTERN.h>
+#include <perl.h>
#endif /* ABI_OPT_JS */
#include <stdio.h>
@@ -41,7 +42,12 @@
#define DELETEP(p) do { if (p) delete(p); (p)=NULL; } while (0)
+PerlInterpreter *AP_UnixApp::m_pPerlInstance = 0;
+
static bool s_createDirectoryIfNecessary(const char * szDir);
+#ifdef ABI_OPT_JS
+static void s_perlEvalFile(PerlInterpreter *my_perl, const char *filename);
+#endif
AP_UnixApp::AP_UnixApp(XAP_Args* pArgs, const char* szAppName)
: XAP_UnixApp(pArgs, szAppName)
@@ -49,33 +55,50 @@
m_pStringSet = NULL;
}
-AP_UnixApp::~AP_UnixApp(void)
+AP_UnixApp::~AP_UnixApp()
{
DELETEP(m_pStringSet);
+#ifdef ABI_OPT_JS
+ if (m_pPerlInstance != 0)
+ {
+ perl_destruct(m_pPerlInstance);
+ perl_free(m_pPerlInstance);
+ }
+#endif
}
static bool s_createDirectoryIfNecessary(const char * szDir)
{
- struct stat statbuf;
-
- if (stat(szDir,&statbuf) == 0)
- // if it exists
- {
- if (S_ISDIR(statbuf.st_mode))
- // and is a directory
- return true;
+ struct stat statbuf;
- UT_DEBUGMSG(("Pathname [%s] is not a directory.\n",szDir));
- return false;
- }
-
- if (mkdir(szDir,0700) == 0)
- return true;
-
+ if (stat(szDir,&statbuf) == 0)
+ // if it exists
+ {
+ if (S_ISDIR(statbuf.st_mode))
+ // and is a directory
+ return true;
+
+ UT_DEBUGMSG(("Pathname [%s] is not a directory.\n",szDir));
+ return false;
+ }
+
+ if (mkdir(szDir,0700) == 0)
+ return true;
+
+
+ UT_DEBUGMSG(("Could not create Directory [%s].\n",szDir));
+ return false;
+}
- UT_DEBUGMSG(("Could not create Directory [%s].\n",szDir));
- return false;
+#ifdef ABI_OPT_JS
+static void s_perlEvalFile(PerlInterpreter *my_perl, const char *filename)
+{
+ char *argv[] = { "", filename };
+ int argc = 2;
+ perl_parse(my_perl, NULL, argc, argv, (char **)NULL);
+ perl_run(my_perl);
}
+#endif
bool AP_UnixApp::initialize(void)
{
@@ -174,7 +197,8 @@
i++;
#ifdef ABI_OPT_JS
- js_eval_file(pMyUnixApp->getInterp(), argv[i]);
+ s_perlEvalFile(pMyUnixApp->getPerlInterp(), argv[i]);
+// js_eval_file(pMyUnixApp->getInterp(), argv[i]);
#endif /* ABI_OPT_JS */
}
else
@@ -214,3 +238,15 @@
const char **pszFormatFound){}
void AP_UnixApp::cacheCurrentSelection(AV_View *){}
+#ifdef ABI_OPT_JS
+PerlInterpreter *AP_UnixApp::getPerlInterp()
+{
+ if (m_pPerlInstance == 0)
+ {
+ m_pPerlInstance = perl_alloc();
+ perl_construct(m_pPerlInstance);
+ }
+
+ return m_pPerlInstance;
+}
+#endif
Index: src/hello/ap/unix/ap_UnixApp.h
===================================================================
RCS file: /cvsroot/abi/src/hello/ap/unix/ap_UnixApp.h,v
retrieving revision 1.4
diff -u -r1.4 ap_UnixApp.h
--- src/hello/ap/unix/ap_UnixApp.h 2001/02/06 22:54:29 1.4
+++ src/hello/ap/unix/ap_UnixApp.h 2001/04/12 13:22:59
@@ -25,6 +25,9 @@
#include "ap_UnixPrefs.h"
class XAP_StringSet;
+#ifdef ABI_OPT_JS
+class PerlInterpreter;
+#endif
class AP_UnixApp : public XAP_UnixApp
{
@@ -49,13 +52,17 @@
void ** ppData, UT_uint32 * pLen,
const char **pszFormatFound);
virtual void cacheCurrentSelection(AV_View
*);
-
-
+#ifdef ABI_OPT_JS
+ PerlInterpreter * getPerlInterp();
+#endif
static int main(const char* szAppName, int argc, char**
argv);
- protected:
+protected:
XAP_StringSet* m_pStringSet;
+
+private:
+ static PerlInterpreter * m_pPerlInstance;
};
#endif // AP_UNIXAPP_H
Index: src/text/fmt/xp/fl_BlockLayout.cpp
===================================================================
RCS file: /cvsroot/abi/src/text/fmt/xp/fl_BlockLayout.cpp,v
retrieving revision 1.284
diff -u -r1.284 fl_BlockLayout.cpp
--- src/text/fmt/xp/fl_BlockLayout.cpp 2001/04/12 03:10:44 1.284
+++ src/text/fmt/xp/fl_BlockLayout.cpp 2001/04/12 13:23:01
@@ -122,7 +122,7 @@
SpellCheckWord (const UT_UCSChar * word, UT_uint32 len)
{
SpellChecker * checker = SpellManager::instance()->lastDictionary();
- UT_ASSERT(checker);
+ if(!checker) return true;
if (checker->checkWord (word, len) == SpellChecker::LOOKUP_SUCCEEDED)
return true;
return false;
Index: src/wp/ap/unix/ap_UnixApp.cpp
===================================================================
RCS file: /cvsroot/abi/src/wp/ap/unix/ap_UnixApp.cpp,v
retrieving revision 1.87
diff -u -r1.87 ap_UnixApp.cpp
--- src/wp/ap/unix/ap_UnixApp.cpp 2001/04/11 22:28:16 1.87
+++ src/wp/ap/unix/ap_UnixApp.cpp 2001/04/12 13:23:02
@@ -29,6 +29,11 @@
#include <sys/stat.h>
#include <signal.h>
+#ifdef ABI_OPT_JS
+#include <EXTERN.h>
+#include <perl.h>
+#endif
+
#include "ut_debugmsg.h"
#include "ut_string.h"
#include "ut_misc.h"
@@ -79,6 +84,10 @@
/*****************************************************************/
+#ifdef ABI_OPT_JS
+PerlInterpreter *AP_UnixApp::m_pPerlInstance = 0;
+#endif
+
/*!
Construct an AP_UnixApp.
/param pArgs Arguments from command line
@@ -103,12 +112,19 @@
Destructor for AP_UnixApp's. Cleans up spellcheck, clipboard, and
StringSet.
*/
-AP_UnixApp::~AP_UnixApp(void)
+AP_UnixApp::~AP_UnixApp()
{
delete SpellManager::instance();
DELETEP(m_pStringSet);
DELETEP(m_pClipboard);
+#ifdef ABI_OPT_JS
+ if (m_pPerlInstance != 0)
+ {
+ perl_destruct(m_pPerlInstance);
+ perl_free(m_pPerlInstance);
+ }
+#endif
}
/*!
@@ -126,21 +142,62 @@
if (stat(szDir,&statbuf) == 0)
// if it exists
{
- if (S_ISDIR(statbuf.st_mode))
// and is a directory
- return true;
+ if (S_ISDIR(statbuf.st_mode))
+ // and is a directory
+ return true;
- UT_DEBUGMSG(("Pathname [%s] is not a directory.\n",szDir));
- return false;
+ UT_DEBUGMSG(("Pathname [%s] is not a directory.\n",szDir));
+ return false;
}
if (mkdir(szDir,0700) == 0)
- return true;
+ return true;
UT_DEBUGMSG(("Could not create Directory [%s].\n",szDir));
return false;
}
+#ifdef ABI_OPT_JS
+void AP_UnixApp::perlEvalFile(const char* filename)
+{
+ char * code = g_strdup_printf("do \"%s\"", filename);
+ getPerlInterp();
+ perl_eval_pv(code, TRUE);
+ g_free(code);
+}
+
+#ifdef __cplusplus
+# define EXTERN_C extern "C"
+#else
+# define EXTERN_C extern
+#endif
+
+EXTERN_C void boot_DynaLoader (CV* cv);
+EXTERN_C void boot_abi (CV* cv);
+
+static void
+xs_init () {
+ char *file = __FILE__;
+ newXS("DynaLoader::boot_DynaLoader", boot_DynaLoader, file);
+ /* we want to link to the module code, but until it's stable
+ it's better to have it dynamically loaded...
+ newXS("abi::boot_abi", boot_abi, file);*/
+}
+
+PerlInterpreter *AP_UnixApp::getPerlInterp()
+{
+ if (m_pPerlInstance == 0)
+ {
+ char *argv[] = { "", "-Mabi", "-e", "0" };
+ m_pPerlInstance = perl_alloc();
+ perl_construct(m_pPerlInstance);
+ perl_parse(m_pPerlInstance, xs_init, 4, argv, (char **)NULL);
+ }
+
+ return m_pPerlInstance;
+}
+#endif
+
/*!
Initailize the application. This involves preferences, keybindings,
toolbars, graphics, spelling and everything else.
@@ -179,7 +236,7 @@
UT_ASSERT(m_pToolbarActionSet);
if (! XAP_UNIXBASEAPP::initialize())
- return false;
+ return false;
//////////////////////////////////////////////////////////////////
// initializes the spell checker.
@@ -194,50 +251,50 @@
//////////////////////////////////////////////////////////////////
{
- // assume we will be using the builtin set (either as the main
- // set or as the fallback set).
+ // assume we will be using the builtin set (either as the main
+ // set or as the fallback set).
- AP_BuiltinStringSet * pBuiltinStringSet = new
AP_BuiltinStringSet(this,(XML_Char*)AP_PREF_DEFAULT_StringSet);
- UT_ASSERT(pBuiltinStringSet);
- m_pStringSet = pBuiltinStringSet;
+ AP_BuiltinStringSet * pBuiltinStringSet = new
+AP_BuiltinStringSet(this,(XML_Char*)AP_PREF_DEFAULT_StringSet);
+ UT_ASSERT(pBuiltinStringSet);
+ m_pStringSet = pBuiltinStringSet;
- // see if we should load an alternative set from the disk
+ // see if we should load an alternative set from the disk
- const char * szDirectory = NULL;
- const char * szStringSet = NULL;
+ const char * szDirectory = NULL;
+ const char * szStringSet = NULL;
- if ( (getPrefsValue(AP_PREF_KEY_StringSet,
- (const XML_Char**)&szStringSet))
- && (szStringSet)
- && (*szStringSet)
- && (strcmp(szStringSet,AP_PREF_DEFAULT_StringSet) != 0))
- {
- getPrefsValueDirectory(true,
- (const XML_Char*)AP_PREF_KEY_StringSetDirectory,
- (const XML_Char**)&szDirectory);
- UT_ASSERT((szDirectory) && (*szDirectory));
-
- UT_String szPathname = szDirectory;
- if (szDirectory[szPathname.size()-1]!='/')
- szPathname += "/";
- szPathname += szStringSet;
- szPathname += ".strings";
+ if ( (getPrefsValue(AP_PREF_KEY_StringSet,
+ (const
+XML_Char**)&szStringSet))
+ && (szStringSet)
+ && (*szStringSet)
+ && (strcmp(szStringSet,AP_PREF_DEFAULT_StringSet) != 0))
+ {
+ getPrefsValueDirectory(true,
+ (const
+XML_Char*)AP_PREF_KEY_StringSetDirectory,
+ (const
+XML_Char**)&szDirectory);
+ UT_ASSERT((szDirectory) && (*szDirectory));
+
+ UT_String szPathname = szDirectory;
+ if (szDirectory[szPathname.size()-1]!='/')
+ szPathname += "/";
+ szPathname += szStringSet;
+ szPathname += ".strings";
- AP_DiskStringSet * pDiskStringSet = new AP_DiskStringSet(this);
- UT_ASSERT(pDiskStringSet);
+ AP_DiskStringSet * pDiskStringSet = new AP_DiskStringSet(this);
+ UT_ASSERT(pDiskStringSet);
- if (pDiskStringSet->loadStringsFromDisk(szPathname.c_str()))
- {
- pDiskStringSet->setFallbackStringSet(m_pStringSet);
- m_pStringSet = pDiskStringSet;
- UT_DEBUGMSG(("Using StringSet [%s]\n",szPathname.c_str()));
- }
- else
- {
- DELETEP(pDiskStringSet);
- UT_DEBUGMSG(("Unable to load StringSet [%s] -- using builtin strings
instead.\n",szPathname.c_str()));
- }
- }
+ if (pDiskStringSet->loadStringsFromDisk(szPathname.c_str()))
+ {
+ pDiskStringSet->setFallbackStringSet(m_pStringSet);
+ m_pStringSet = pDiskStringSet;
+ UT_DEBUGMSG(("Using StringSet
+[%s]\n",szPathname.c_str()));
+ }
+ else
+ {
+ DELETEP(pDiskStringSet);
+ UT_DEBUGMSG(("Unable to load StringSet [%s] -- using
+builtin strings instead.\n",szPathname.c_str()));
+ }
+ }
}
// Now we have the strings loaded we can populate the field names correctly
@@ -245,14 +302,14 @@
for (i = 0; fp_FieldTypes[i].m_Type != FPFIELDTYPE_END; i++)
{
- (&fp_FieldTypes[i])->m_Desc =
m_pStringSet->getValue(fp_FieldTypes[i].m_DescId);
- UT_DEBUGMSG(("Setting field type desc for type %d, desc=%s\n",
fp_FieldTypes[i].m_Type, fp_FieldTypes[i].m_Desc));
+ (&fp_FieldTypes[i])->m_Desc =
+m_pStringSet->getValue(fp_FieldTypes[i].m_DescId);
+ UT_DEBUGMSG(("Setting field type desc for type %d, desc=%s\n",
+fp_FieldTypes[i].m_Type, fp_FieldTypes[i].m_Desc));
}
for (i = 0; fp_FieldFmts[i].m_Tag != NULL; i++)
{
- (&fp_FieldFmts[i])->m_Desc = m_pStringSet->getValue(fp_FieldFmts[i].m_DescId);
- UT_DEBUGMSG(("Setting field desc for field %s, desc=%s\n",
fp_FieldFmts[i].m_Tag, fp_FieldFmts[i].m_Desc));
+ (&fp_FieldFmts[i])->m_Desc =
+m_pStringSet->getValue(fp_FieldFmts[i].m_DescId);
+ UT_DEBUGMSG(("Setting field desc for field %s, desc=%s\n",
+fp_FieldFmts[i].m_Tag, fp_FieldFmts[i].m_Desc));
}
//////////////////////////////////////////////////////////////////
@@ -269,7 +326,7 @@
AP_UnixFrame * pUnixFrame = new AP_UnixFrame(this);
if (pUnixFrame)
- pUnixFrame->initialize();
+ pUnixFrame->initialize();
return pUnixFrame;
}
@@ -285,7 +342,7 @@
bool AP_UnixApp::shutdown(void)
{
if (m_prefs->getAutoSavePrefs())
- m_prefs->savePrefsFile();
+ m_prefs->savePrefsFile();
return true;
}
@@ -304,19 +361,19 @@
\todo support meaningful return values.
*/
bool AP_UnixApp::getPrefsValueDirectory(bool bAppSpecific,
- const XML_Char * szKey, const XML_Char **
pszValue) const
+ const
+XML_Char * szKey, const XML_Char ** pszValue) const
{
if (!m_prefs)
- return false;
+ return false;
const XML_Char * psz = NULL;
if (!m_prefs->getPrefsValue(szKey,&psz))
- return false;
+ return false;
if (*psz == '/')
{
- *pszValue = psz;
- return true;
+ *pszValue = psz;
+ return true;
}
const XML_Char * dir = ((bAppSpecific) ? getAbiSuiteAppDir() :
getAbiSuiteLibDir());
@@ -377,9 +434,9 @@
IE_Exp_RTF * pExpRtf = new IE_Exp_RTF(pDocRange->m_pDoc);
if (pExpRtf)
{
- pExpRtf->copyToBuffer(pDocRange,&bufRTF);
- DELETEP(pExpRtf);
- UT_DEBUGMSG(("CopyToClipboard: copying %d bytes in RTF
format.\n",bufRTF.getLength()));
+ pExpRtf->copyToBuffer(pDocRange,&bufRTF);
+ DELETEP(pExpRtf);
+ UT_DEBUGMSG(("CopyToClipboard: copying %d bytes in RTF
+format.\n",bufRTF.getLength()));
}
// create raw 8bit text buffer to put on the clipboard
@@ -387,9 +444,9 @@
IE_Exp_Text * pExpText = new IE_Exp_Text(pDocRange->m_pDoc);
if (pExpText)
{
- pExpText->copyToBuffer(pDocRange,&bufTEXT);
- DELETEP(pExpText);
- UT_DEBUGMSG(("CopyToClipboard: copying %d bytes in TEXTPLAIN
format.\n",bufTEXT.getLength()));
+ pExpText->copyToBuffer(pDocRange,&bufTEXT);
+ DELETEP(pExpText);
+ UT_DEBUGMSG(("CopyToClipboard: copying %d bytes in TEXTPLAIN
+format.\n",bufTEXT.getLength()));
}
// NOTE: this clearData() will actually release our ownership of
@@ -400,9 +457,9 @@
// m_pClipboard->clearData(true,false);
if (bufRTF.getLength() > 0)
- m_pClipboard->addData(AP_CLIPBOARD_RTF,(UT_Byte
*)bufRTF.getPointer(0),bufRTF.getLength());
+ m_pClipboard->addData(AP_CLIPBOARD_RTF,(UT_Byte
+*)bufRTF.getPointer(0),bufRTF.getLength());
if (bufTEXT.getLength() > 0)
- m_pClipboard->addData(AP_CLIPBOARD_TEXTPLAIN_8BIT,(UT_Byte
*)bufTEXT.getPointer(0),bufTEXT.getLength());
+ m_pClipboard->addData(AP_CLIPBOARD_TEXTPLAIN_8BIT,(UT_Byte
+*)bufTEXT.getPointer(0),bufTEXT.getLength());
return;
}
@@ -414,9 +471,9 @@
doesn't - hvv.
*/
static const char * aszFormatsAccepted[] = { AP_CLIPBOARD_RTF,
- AP_CLIPBOARD_STRING,
- AP_CLIPBOARD_TEXTPLAIN_8BIT,
- 0 /* must be last */ };
+
+ AP_CLIPBOARD_STRING,
+
+ AP_CLIPBOARD_TEXTPLAIN_8BIT,
+
+ 0 /* must be last */ };
/*!
paste from the system clipboard using the best-for-us format
@@ -433,8 +490,8 @@
void AP_UnixApp::pasteFromClipboard(PD_DocumentRange * pDocRange, bool bUseClipboard)
{
XAP_UnixClipboard::T_AllowGet tFrom = ((bUseClipboard)
- ? XAP_UnixClipboard::TAG_ClipboardOnly
- : XAP_UnixClipboard::TAG_PrimaryOnly);
+ ?
+XAP_UnixClipboard::TAG_ClipboardOnly
+ :
+XAP_UnixClipboard::TAG_PrimaryOnly);
const char * szFormatFound = NULL;
unsigned char * pData = NULL;
@@ -443,33 +500,33 @@
bool bFoundOne =
m_pClipboard->getData(tFrom,aszFormatsAccepted,(void**)&pData,&iLen,&szFormatFound);
if (!bFoundOne)
{
- UT_DEBUGMSG(("PasteFromClipboard: did not find anything to paste.\n"));
- return;
+ UT_DEBUGMSG(("PasteFromClipboard: did not find anything to paste.\n"));
+ return;
}
if (strcmp(szFormatFound,AP_CLIPBOARD_RTF) == 0)
{
- iLen = MyMin(iLen,strlen((const char *)pData));
- UT_DEBUGMSG(("PasteFromClipboard: pasting %d bytes in format
[%s].\n",iLen,szFormatFound));
+ iLen = MyMin(iLen,strlen((const char *)pData));
+ UT_DEBUGMSG(("PasteFromClipboard: pasting %d bytes in format
+[%s].\n",iLen,szFormatFound));
- IE_Imp_RTF * pImpRTF = new IE_Imp_RTF(pDocRange->m_pDoc);
- pImpRTF->pasteFromBuffer(pDocRange,pData,iLen);
- DELETEP(pImpRTF);
+ IE_Imp_RTF * pImpRTF = new IE_Imp_RTF(pDocRange->m_pDoc);
+ pImpRTF->pasteFromBuffer(pDocRange,pData,iLen);
+ DELETEP(pImpRTF);
- return;
+ return;
}
if ( (strcmp(szFormatFound,AP_CLIPBOARD_TEXTPLAIN_8BIT) == 0)
- || (strcmp(szFormatFound,AP_CLIPBOARD_STRING) == 0))
+ || (strcmp(szFormatFound,AP_CLIPBOARD_STRING) == 0))
{
- iLen = MyMin(iLen,strlen((const char *)pData));
- UT_DEBUGMSG(("PasteFromClipboard: pasting %d bytes in format
[%s].\n",iLen,szFormatFound));
+ iLen = MyMin(iLen,strlen((const char *)pData));
+ UT_DEBUGMSG(("PasteFromClipboard: pasting %d bytes in format
+[%s].\n",iLen,szFormatFound));
- IE_Imp_Text * pImpText = new IE_Imp_Text(pDocRange->m_pDoc);
- pImpText->pasteFromBuffer(pDocRange,pData,iLen);
- DELETEP(pImpText);
+ IE_Imp_Text * pImpText = new IE_Imp_Text(pDocRange->m_pDoc);
+ pImpText->pasteFromBuffer(pDocRange,pData,iLen);
+ DELETEP(pImpText);
- return;
+ return;
}
return;
@@ -496,7 +553,7 @@
// first, try to see if we can paste from the clipboard
bool bFoundOne =
m_pClipboard->getData(tFrom,aszFormatsAccepted,(void**)&pData,&iLen,&szFormatFound);
if (bFoundOne)
- return true;
+ return true;
// didn't work, try out the primary selection
tFrom = XAP_UnixClipboard::TAG_PrimaryOnly;
@@ -528,18 +585,18 @@
{
if (m_bSelectionInFlux)
- return;
+ return;
m_bSelectionInFlux = true;
bool bSelectionStateInThisView = ( ! pView->isSelectionEmpty() );
if (m_pViewSelection && m_pFrameSelection && m_bHasSelection && (pView !=
m_pViewSelection))
{
- // one window has a selection currently and another window just
- // asserted one. we force clear the old one to enforce the X11
- // style.
+ // one window has a selection currently and another window just
+ // asserted one. we force clear the old one to enforce the X11
+ // style.
- ((FV_View *)m_pViewSelection)->cmdUnselectSelection();
+ ((FV_View *)m_pViewSelection)->cmdUnselectSelection();
}
// now fill in all of our variables for this window
@@ -554,22 +611,22 @@
if (bSelectionStateInThisView)
{
- m_bHasSelection = bSelectionStateInThisView;
- m_pClipboard->assertSelection();
+ m_bHasSelection = bSelectionStateInThisView;
+ m_pClipboard->assertSelection();
}
else if (pView == m_cacheSelectionView)
{
- // if we are going to use the cache, we do not
- // clear m_bHasSelection now. rather, we defer
- // this and the server notification until afterwards.
+ // if we are going to use the cache, we do not
+ // clear m_bHasSelection now. rather, we defer
+ // this and the server notification until afterwards.
- UT_ASSERT(m_bHasSelection);
- m_cacheDeferClear = true;
+ UT_ASSERT(m_bHasSelection);
+ m_cacheDeferClear = true;
}
else
{
- m_bHasSelection = bSelectionStateInThisView;
- m_pClipboard->clearData(false,true);
+ m_bHasSelection = bSelectionStateInThisView;
+ m_pClipboard->clearData(false,true);
}
UT_DEBUGMSG(("here we go whooooo\n"));
@@ -608,9 +665,9 @@
if (m_pFrameSelection && (pFrame==m_pFrameSelection))
{
- m_pClipboard->clearData(false,true);
- m_pFrameSelection = NULL;
- m_pViewSelection = NULL;
+ m_pClipboard->clearData(false,true);
+ m_pFrameSelection = NULL;
+ m_pViewSelection = NULL;
}
return XAP_App::forgetFrame(pFrame);
@@ -634,15 +691,15 @@
void AP_UnixApp::clearSelection(void)
{
if (m_bSelectionInFlux)
- return;
+ return;
m_bSelectionInFlux = true;
if (m_pViewSelection && m_pFrameSelection && m_bHasSelection)
{
- UT_DEBUGMSG(("crash2\n"));
- FV_View *pView = static_cast<FV_View *>(m_pViewSelection);
- pView->cmdUnselectSelection();
- m_bHasSelection = false;
+ UT_DEBUGMSG(("crash2\n"));
+ FV_View *pView = static_cast<FV_View *>(m_pViewSelection);
+ pView->cmdUnselectSelection();
+ m_bHasSelection = false;
}
m_bSelectionInFlux = false;
@@ -653,33 +710,33 @@
{
if (pView)
{
- // remember a temporary copy of the extent of the current
- // selection in the given view. this is intended for the
- // X11 middle mouse trick -- where we need to warp to a
- // new location and paste the current selection (not the
- // clipboard) and the act of warping clears the selection.
-
- // TODO if we ever support multiple view types, we'll have to
- // TODO change this.
- FV_View * pFVView = static_cast<FV_View *>(pView);
- pFVView->getDocumentRangeOfCurrentSelection(&m_cacheDocumentRangeOfSelection);
-
- m_cacheSelectionView = pView;
- UT_DEBUGMSG(("Clipboard::cacheCurrentSelection: [view %p][range %d %d]\n",
- pFVView,
- m_cacheDocumentRangeOfSelection.m_pos1,
- m_cacheDocumentRangeOfSelection.m_pos2));
- m_cacheDeferClear = false;
+ // remember a temporary copy of the extent of the current
+ // selection in the given view. this is intended for the
+ // X11 middle mouse trick -- where we need to warp to a
+ // new location and paste the current selection (not the
+ // clipboard) and the act of warping clears the selection.
+
+ // TODO if we ever support multiple view types, we'll have to
+ // TODO change this.
+ FV_View * pFVView = static_cast<FV_View *>(pView);
+
+pFVView->getDocumentRangeOfCurrentSelection(&m_cacheDocumentRangeOfSelection);
+
+ m_cacheSelectionView = pView;
+ UT_DEBUGMSG(("Clipboard::cacheCurrentSelection: [view %p][range %d
+%d]\n",
+ pFVView,
+ m_cacheDocumentRangeOfSelection.m_pos1,
+ m_cacheDocumentRangeOfSelection.m_pos2));
+ m_cacheDeferClear = false;
}
else
{
- if (m_cacheDeferClear)
- {
- m_cacheDeferClear = false;
- m_bHasSelection = false;
- m_pClipboard->clearData(false,true);
- }
- m_cacheSelectionView = NULL;
+ if (m_cacheDeferClear)
+ {
+ m_cacheDeferClear = false;
+ m_bHasSelection = false;
+ m_pClipboard->clearData(false,true);
+ }
+ m_cacheSelectionView = NULL;
}
return;
@@ -697,8 +754,8 @@
\return True if successful, false otherwise.
*/
bool AP_UnixApp::getCurrentSelection(const char** formatList,
- void ** ppData, UT_uint32 * pLen,
- const char **pszFormatFound)
+ void **
+ppData, UT_uint32 * pLen,
+ const char
+**pszFormatFound)
{
int j;
@@ -707,55 +764,55 @@
*pszFormatFound = NULL;
if (!m_pViewSelection || !m_pFrameSelection || !m_bHasSelection)
- return false; // can't do it, give up.
+ return false; // can't do it, give up.
PD_DocumentRange dr;
if (m_cacheSelectionView == m_pViewSelection)
{
- dr = m_cacheDocumentRangeOfSelection;
- UT_DEBUGMSG(("Clipboard::getCurrentSelection: *using cached values* [range %d
%d]\n",dr.m_pos1,dr.m_pos2));
+ dr = m_cacheDocumentRangeOfSelection;
+ UT_DEBUGMSG(("Clipboard::getCurrentSelection: *using cached values*
+[range %d %d]\n",dr.m_pos1,dr.m_pos2));
}
else
{
- // TODO if we ever support multiple view types, we'll have to
- // TODO change this.
- FV_View * pFVView = static_cast<FV_View *>(m_pViewSelection);
+ // TODO if we ever support multiple view types, we'll have to
+ // TODO change this.
+ FV_View * pFVView = static_cast<FV_View *>(m_pViewSelection);
- pFVView->getDocumentRangeOfCurrentSelection(&dr);
- UT_DEBUGMSG(("Clipboard::getCurrentSelection: [view %p][range %d
%d]\n",pFVView,dr.m_pos1,dr.m_pos2));
+ pFVView->getDocumentRangeOfCurrentSelection(&dr);
+ UT_DEBUGMSG(("Clipboard::getCurrentSelection: [view %p][range %d
+%d]\n",pFVView,dr.m_pos1,dr.m_pos2));
}
m_selectionByteBuf.truncate(0);
for (j=0; (formatList[j]); j++)
{
- UT_DEBUGMSG(("Clipboard::getCurrentSelection: considering format
[%s]\n",formatList[j]));
+ UT_DEBUGMSG(("Clipboard::getCurrentSelection: considering format
+[%s]\n",formatList[j]));
- if (strcmp(formatList[j],AP_CLIPBOARD_RTF) == 0)
- {
- IE_Exp_RTF * pExpRtf = new IE_Exp_RTF(dr.m_pDoc);
- if (!pExpRtf)
- return false; // give up on memory errors
-
- pExpRtf->copyToBuffer(&dr,&m_selectionByteBuf);
- DELETEP(pExpRtf);
- goto ReturnThisBuffer;
- }
+ if (strcmp(formatList[j],AP_CLIPBOARD_RTF) == 0)
+ {
+ IE_Exp_RTF * pExpRtf = new IE_Exp_RTF(dr.m_pDoc);
+ if (!pExpRtf)
+ return false; // give up on memory errors
+
+ pExpRtf->copyToBuffer(&dr,&m_selectionByteBuf);
+ DELETEP(pExpRtf);
+ goto ReturnThisBuffer;
+ }
- if ( (strcmp(formatList[j],AP_CLIPBOARD_TEXTPLAIN_8BIT) == 0)
- || (strcmp(formatList[j],AP_CLIPBOARD_STRING) == 0))
- {
- IE_Exp_Text * pExpText = new IE_Exp_Text(dr.m_pDoc);
- if (!pExpText)
- return false;
-
- pExpText->copyToBuffer(&dr,&m_selectionByteBuf);
- DELETEP(pExpText);
- goto ReturnThisBuffer;
- }
+ if ( (strcmp(formatList[j],AP_CLIPBOARD_TEXTPLAIN_8BIT) == 0)
+ || (strcmp(formatList[j],AP_CLIPBOARD_STRING) == 0))
+ {
+ IE_Exp_Text * pExpText = new IE_Exp_Text(dr.m_pDoc);
+ if (!pExpText)
+ return false;
+
+ pExpText->copyToBuffer(&dr,&m_selectionByteBuf);
+ DELETEP(pExpText);
+ goto ReturnThisBuffer;
+ }
- // TODO add other formats as necessary
+ // TODO add other formats as necessary
}
UT_DEBUGMSG(("Clipboard::getCurrentSelection: cannot create anything in one of
requested formats.\n"));
@@ -763,7 +820,7 @@
ReturnThisBuffer:
UT_DEBUGMSG(("Clipboard::getCurrentSelection: copying %d bytes in format [%s].\n",
- m_selectionByteBuf.getLength(),formatList[j]));
+ m_selectionByteBuf.getLength(),formatList[j]));
*ppData = (void *)m_selectionByteBuf.getPointer(0);
*pLen = m_selectionByteBuf.getLength();
*pszFormatFound = formatList[j];
@@ -791,11 +848,11 @@
{
if (wSplash)
{
- gtk_timeout_remove(death_timeout_handler);
- gtk_widget_destroy(wSplash);
- wSplash = NULL;
- DELETEP(pUnixGraphics);
- DELETEP(pSplashImage);
+ gtk_timeout_remove(death_timeout_handler);
+ gtk_widget_destroy(wSplash);
+ wSplash = NULL;
+ DELETEP(pUnixGraphics);
+ DELETEP(pSplashImage);
}
return TRUE;
}
@@ -817,19 +874,19 @@
return TRUE, not FALSE.
*/
static gint s_drawingarea_expose(GtkWidget * /* widget */,
- GdkEventExpose * /* pExposeEvent */)
+ GdkEventExpose * /*
+pExposeEvent */)
{
if (pUnixGraphics && pSplashImage)
{
- pUnixGraphics->drawImage(pSplashImage, 0, 0);
+ pUnixGraphics->drawImage(pSplashImage, 0, 0);
- // on the first full paint of the image, start a 2 second timer
- if (!firstExpose)
- {
- firstExpose = true;
- // kill the window after splashTimeoutValue ms
- death_timeout_handler = gtk_timeout_add(splashTimeoutValue, s_hideSplash,
NULL);
- }
+ // on the first full paint of the image, start a 2 second timer
+ if (!firstExpose)
+ {
+ firstExpose = true;
+ // kill the window after splashTimeoutValue ms
+ death_timeout_handler = gtk_timeout_add(splashTimeoutValue,
+s_hideSplash, NULL);
+ }
}
return FALSE;
@@ -892,16 +949,16 @@
char * buf;
if (strlen(szDirectory) + strlen(szFile) + 2 >= PATH_MAX)
- buf = NULL;
+ buf = NULL;
else
{
- buf = (char *)malloc(strlen(szDirectory) + strlen(szFile) + 2);
- memset(buf,0,sizeof(buf));
- strcpy(buf,szDirectory);
- int len = strlen(buf);
- if ( (len == 0) || (buf[len-1] != '/') )
- strcat(buf,"/");
- strcat(buf,szFile);
+ buf = (char *)malloc(strlen(szDirectory) + strlen(szFile) + 2);
+ memset(buf,0,sizeof(buf));
+ strcpy(buf,szDirectory);
+ int len = strlen(buf);
+ if ( (len == 0) || (buf[len-1] != '/') )
+ strcat(buf,"/");
+ strcat(buf,szFile);
}
#endif
@@ -914,61 +971,61 @@
pBB = new UT_ByteBuf();
if (
#ifdef DEBUG
- (pBB->insertFromFile(0, buf)) ||
+ (pBB->insertFromFile(0, buf)) ||
#endif
- (pBB->ins(0, g_pngSplash, g_pngSplash_sizeof))
- )
+ (pBB->ins(0, g_pngSplash, g_pngSplash_sizeof))
+ )
{
- // get splash size
- UT_sint32 iSplashWidth;
- UT_sint32 iSplashHeight;
- {
- bool pngReturnVal = UT_PNG_getDimensions(pBB, iSplashWidth, iSplashHeight);
- if(!pngReturnVal)
- {
+ // get splash size
+ UT_sint32 iSplashWidth;
+ UT_sint32 iSplashHeight;
+ {
+ bool pngReturnVal = UT_PNG_getDimensions(pBB, iSplashWidth,
+iSplashHeight);
+ if(!pngReturnVal)
+ {
// uh oh
- UT_DEBUGMSG(("That image caused an error in the PNG library."));
- return NULL;
- }
- }
- // create a centered window the size of our image
- wSplash = gtk_window_new(GTK_WINDOW_POPUP);
- gtk_window_set_default_size (GTK_WINDOW (wSplash),
- iSplashWidth, iSplashHeight);
- gtk_window_set_policy(GTK_WINDOW(wSplash), FALSE, FALSE, FALSE);
-
- // create a frame to add depth
- GtkWidget * frame = gtk_frame_new(NULL);
- gtk_container_add(GTK_CONTAINER(wSplash), frame);
- gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_OUT);
- gtk_widget_show(frame);
-
- // create a drawing area
- GtkWidget * da = gtk_drawing_area_new ();
- gtk_widget_set_events(da, GDK_ALL_EVENTS_MASK);
- gtk_drawing_area_size(GTK_DRAWING_AREA (da), iSplashWidth, iSplashHeight);
- gtk_signal_connect(GTK_OBJECT(da), "expose_event",
- GTK_SIGNAL_FUNC(s_drawingarea_expose), NULL);
- gtk_signal_connect(GTK_OBJECT(da), "button_press_event",
- GTK_SIGNAL_FUNC(s_button_event), NULL);
- gtk_container_add(GTK_CONTAINER(frame), da);
- gtk_widget_show(da);
+ UT_DEBUGMSG(("That image caused an error in the PNG
+library."));
+ return NULL;
+ }
+ }
+ // create a centered window the size of our image
+ wSplash = gtk_window_new(GTK_WINDOW_POPUP);
+ gtk_window_set_default_size (GTK_WINDOW (wSplash),
+ iSplashWidth,
+iSplashHeight);
+ gtk_window_set_policy(GTK_WINDOW(wSplash), FALSE, FALSE, FALSE);
+
+ // create a frame to add depth
+ GtkWidget * frame = gtk_frame_new(NULL);
+ gtk_container_add(GTK_CONTAINER(wSplash), frame);
+ gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_OUT);
+ gtk_widget_show(frame);
+
+ // create a drawing area
+ GtkWidget * da = gtk_drawing_area_new ();
+ gtk_widget_set_events(da, GDK_ALL_EVENTS_MASK);
+ gtk_drawing_area_size(GTK_DRAWING_AREA (da), iSplashWidth,
+iSplashHeight);
+ gtk_signal_connect(GTK_OBJECT(da), "expose_event",
+
+GTK_SIGNAL_FUNC(s_drawingarea_expose), NULL);
+ gtk_signal_connect(GTK_OBJECT(da), "button_press_event",
+ GTK_SIGNAL_FUNC(s_button_event),
+NULL);
+ gtk_container_add(GTK_CONTAINER(frame), da);
+ gtk_widget_show(da);
- // now bring the window up front & center
- gtk_window_set_position(GTK_WINDOW(wSplash), WIN_POS);
+ // now bring the window up front & center
+ gtk_window_set_position(GTK_WINDOW(wSplash), WIN_POS);
- // create the window so we can attach a GC to it
- gtk_widget_show(wSplash);
+ // create the window so we can attach a GC to it
+ gtk_widget_show(wSplash);
- // create image context
- pUnixGraphics = new GR_UnixGraphics(da->window, NULL, m_pApp);
- pSplashImage = pUnixGraphics->createNewImage("splash", pBB, iSplashWidth,
iSplashHeight);
+ // create image context
+ pUnixGraphics = new GR_UnixGraphics(da->window, NULL, m_pApp);
+ pSplashImage = pUnixGraphics->createNewImage("splash", pBB,
+iSplashWidth, iSplashHeight);
- // another for luck (to bring it up forward and paint)
- gtk_widget_show(wSplash);
+ // another for luck (to bring it up forward and paint)
+ gtk_widget_show(wSplash);
- // trigger an expose event to get us started
- s_drawingarea_expose(da, NULL);
+ // trigger an expose event to get us started
+ s_drawingarea_expose(da, NULL);
}
DELETEP(pBB);
@@ -1004,37 +1061,37 @@
bool bHelp = false;
for (int k = 1; k < Args.m_argc; k++)
- if (*Args.m_argv[k] == '-')
- {
- // Do a quick and dirty find for "-to"
- if ((strcmp(Args.m_argv[k],"-to") == 0)
- || (strcmp(Args.m_argv[k],"--to") == 0))
- bTo = true;
+ if (*Args.m_argv[k] == '-')
+ {
+ // Do a quick and dirty find for "-to"
+ if ((strcmp(Args.m_argv[k],"-to") == 0)
+ || (strcmp(Args.m_argv[k],"--to") == 0))
+ bTo = true;
// Do a quick and dirty find for "-show"
- else if ((strcmp(Args.m_argv[k],"-show") == 0)
- || (strcmp(Args.m_argv[k],"--show") == 0))
- bShow = true;
+ else if ((strcmp(Args.m_argv[k],"-show") == 0)
+ || (strcmp(Args.m_argv[k],"--show") == 0))
+ bShow = true;
// Do a quick and dirty find for "-nosplash"
- else if ((strcmp(Args.m_argv[k],"-nosplash") == 0)
- || (strcmp(Args.m_argv[k],"--nosplash") == 0))
- bNoSplash = true;
+ else if ((strcmp(Args.m_argv[k],"-nosplash") == 0)
+ || (strcmp(Args.m_argv[k],"--nosplash") == 0))
+ bNoSplash = true;
// Do a quick and dirty find for "-help",
// "--help" or "-h"
- else if (strncmp(Args.m_argv[k],"-h",2) == 0 ||
- strncmp(Args.m_argv[k],"--h",3) == 0)
- bHelp = true;
- }
+ else if (strncmp(Args.m_argv[k],"-h",2) == 0 ||
+ strncmp(Args.m_argv[k],"--h",3) == 0)
+ bHelp = true;
+ }
if((bTo && !bShow) || bHelp)
{
- bShowSplash = false;
- bShowApp = false;
+ bShowSplash = false;
+ bShowApp = false;
}
else if (bNoSplash)
- bShowSplash = false;
+ bShowSplash = false;
// HACK : these calls to gtk reside properly in XAP_UNIXBASEAPP::initialize(),
// HACK : but need to be here to throw the splash screen as
@@ -1042,22 +1099,22 @@
if (bShowSplash || bShowApp)
{
- gtk_set_locale();
- gtk_init(&Args.m_argc,&Args.m_argv);
+ gtk_set_locale();
+ gtk_init(&Args.m_argc,&Args.m_argv);
}
if (bShowSplash)
- _showSplash(2000);
+ _showSplash(2000);
AP_UnixApp * pMyUnixApp = new AP_UnixApp(&Args, szAppName);
if(bHelp)
{
- /* there's no need to stay around any longer than
- neccessary. */
- pMyUnixApp->_printUsage();
- delete pMyUnixApp;
- return 0;
+ /* there's no need to stay around any longer than
+ neccessary. */
+ pMyUnixApp->_printUsage();
+ delete pMyUnixApp;
+ return 0;
}
// Setup signal handlers, primarily for segfault
@@ -1123,7 +1180,7 @@
\return False if an unknow command line option was used, true
otherwise.
*/
-bool AP_UnixApp::parseCommandLine(void)
+bool AP_UnixApp::parseCommandLine()
{
int nFirstArg = 1;
@@ -1135,213 +1192,219 @@
for (k=nFirstArg; (k<m_pArgs->m_argc); k++)
{
- if (*m_pArgs->m_argv[k] == '-')
- {
-
+ if (*m_pArgs->m_argv[k] == '-')
+ {
#if 0
- // This code is currently unused.
- // We don't load libraries, and we don't
- // have scripts
-
- if ((strcmp(m_pArgs->m_argv[k],"-script") == 0)
- || (strcmp(m_pArgs->m_argv[k],"--script") == 0))
- {
- // [-script scriptname]
- k++;
- }
- else if ((strcmp(m_pArgs->m_argv[k],"-lib") == 0)
- || (strcmp(m_pArgs->m_argv[k],"--lib") == 0))
- {
- // [-lib <AbiSuiteLibDirectory>]
- // we've already processed this when we initialized the App class
- k++;
- }
+ // This code is currently unused.
+ // We don't load libraries
+ if ((strcmp(m_pArgs->m_argv[k],"-lib") == 0)
+ || (strcmp(m_pArgs->m_argv[k],"--lib") == 0))
+ {
+ // [-lib <AbiSuiteLibDirectory>]
+ // we've already processed this when we initialized
+the App class
+ k++;
+ }
#endif
- if ((strcmp(m_pArgs->m_argv[k],"-dumpstrings") == 0)
- || (strcmp(m_pArgs->m_argv[k],"--dumpstrings") == 0))
- {
- // [-dumpstrings]
+ if ((strcmp(m_pArgs->m_argv[k],"-dumpstrings") == 0)
+ || (strcmp(m_pArgs->m_argv[k],"--dumpstrings") == 0))
+ {
+ // [-dumpstrings]
#ifdef DEBUG
- // dump the string table in english as a template for
translators.
- // see abi/docs/AbiSource_Localization.abw for details.
- AP_BuiltinStringSet * pBuiltinStringSet = new
AP_BuiltinStringSet(this,(XML_Char*)AP_PREF_DEFAULT_StringSet);
- pBuiltinStringSet->dumpBuiltinSet("en-US.strings");
- delete pBuiltinStringSet;
+ // dump the string table in english as a template for
+translators.
+ // see abi/docs/AbiSource_Localization.abw for details.
+ AP_BuiltinStringSet * pBuiltinStringSet = new
+AP_BuiltinStringSet(this,(XML_Char*)AP_PREF_DEFAULT_StringSet);
+ pBuiltinStringSet->dumpBuiltinSet("en-US.strings");
+ delete pBuiltinStringSet;
#endif
- }
- else if ((strcmp(m_pArgs->m_argv[k],"-nosplash") == 0)
- || (strcmp(m_pArgs->m_argv[k],"--nosplash") == 0))
- {
- // we've alrady processed this before we initialized the App class
- }
- else if ((strcmp(m_pArgs->m_argv[k],"-geometry") == 0)
- || (strcmp(m_pArgs->m_argv[k],"--geometry") == 0))
- {
- // [-geometry <X geometry string>]
- // let us at the next argument
- k++;
+ }
+ else if ((strcmp(m_pArgs->m_argv[k],"-nosplash") == 0)
+ || (strcmp(m_pArgs->m_argv[k],"--nosplash")
+== 0))
+ {
+ // we've alrady processed this before we initialized
+the App class
+ }
+ else if ((strcmp(m_pArgs->m_argv[k],"-geometry") == 0)
+ || (strcmp(m_pArgs->m_argv[k],"--geometry")
+== 0))
+ {
+ // [-geometry <X geometry string>]
+ // let us at the next argument
+ k++;
- // TODO : does X have a dummy geometry value reserved for this?
- gint dummy = 1 << ((sizeof(gint) * 8) - 1);
- gint x = dummy;
- gint y = dummy;
- guint width = 0;
- guint height = 0;
+ // TODO : does X have a dummy geometry value reserved
+for this?
+ gint dummy = 1 << ((sizeof(gint) * 8) - 1);
+ gint x = dummy;
+ gint y = dummy;
+ guint width = 0;
+ guint height = 0;
- XParseGeometry(m_pArgs->m_argv[k], &x, &y, &width, &height);
+ XParseGeometry(m_pArgs->m_argv[k], &x, &y, &width,
+&height);
- // use both by default
- XAP_UNIXBASEAPP::windowGeometryFlags f =
(XAP_UNIXBASEAPP::windowGeometryFlags)
- (XAP_UNIXBASEAPP::GEOMETRY_FLAG_SIZE
- | XAP_UNIXBASEAPP::GEOMETRY_FLAG_POS);
+ // use both by default
+ XAP_UNIXBASEAPP::windowGeometryFlags f =
+(XAP_UNIXBASEAPP::windowGeometryFlags)
+ (XAP_UNIXBASEAPP::GEOMETRY_FLAG_SIZE
+ | XAP_UNIXBASEAPP::GEOMETRY_FLAG_POS);
- // if pos (x and y) weren't provided just use size
- if (x == dummy || y == dummy)
- f = XAP_UNIXBASEAPP::GEOMETRY_FLAG_SIZE;
+ // if pos (x and y) weren't provided just use size
+ if (x == dummy || y == dummy)
+ f = XAP_UNIXBASEAPP::GEOMETRY_FLAG_SIZE;
- // if size (width and height) weren't provided just use pos
- if (width == 0 || height == 0)
- f = XAP_UNIXBASEAPP::GEOMETRY_FLAG_POS;
+ // if size (width and height) weren't provided just
+use pos
+ if (width == 0 || height == 0)
+ f = XAP_UNIXBASEAPP::GEOMETRY_FLAG_POS;
- // set the xap-level geometry for future frame use
- setGeometry(x, y, width, height, f);
- }
- else if ((strcmp (m_pArgs->m_argv[k],"-to") == 0)
- || (strcmp (m_pArgs->m_argv[k],"--to") == 0))
- {
- k++;
- to = m_pArgs->m_argv[k];
- }
- else if ((strcmp (m_pArgs->m_argv[k], "-show") == 0)
- || (strcmp (m_pArgs->m_argv[k], "--show") == 0))
- {
- show = true;
- }
- else if ((strcmp (m_pArgs->m_argv[k], "-verbose") == 0)
- || (strcmp (m_pArgs->m_argv[k], "--verbose") == 0))
- {
- k++;
- if(k<m_pArgs->m_argc)
- {
- /* if we don't check we segfault
- when there aren't any numbers
- after --verbose
- */
- verbose = atoi (m_pArgs->m_argv[k]);
+ // set the xap-level geometry for future frame use
+ setGeometry(x, y, width, height, f);
+ }
+ else if ((strcmp (m_pArgs->m_argv[k],"-to") == 0)
+ || (strcmp (m_pArgs->m_argv[k],"--to") == 0))
+ {
+ k++;
+ to = m_pArgs->m_argv[k];
+ }
+ else if ((strcmp (m_pArgs->m_argv[k], "-show") == 0)
+ || (strcmp (m_pArgs->m_argv[k], "--show") ==
+0))
+ {
+ show = true;
+ }
+ else if ((strcmp (m_pArgs->m_argv[k], "-verbose") == 0)
+ || (strcmp (m_pArgs->m_argv[k], "--verbose")
+== 0))
+ {
+ k++;
+ if(k<m_pArgs->m_argc)
+ {
+ /* if we don't check we segfault
+ when there aren't any numbers
+ after --verbose
+ */
+ verbose = atoi (m_pArgs->m_argv[k]);
- }
- }
- else
- {
- UT_DEBUGMSG(("Unknown command line option [%s]\n",m_pArgs->m_argv[k]));
+ }
+ }
+#ifdef ABI_OPT_JS
+ else if ((strcmp(m_pArgs->m_argv[k],"-script") == 0)
+ || (strcmp(m_pArgs->m_argv[k],"--script") == 0))
+ {
+ k++;
+ // [-script]
+ if(k<m_pArgs->m_argc)
+ {
+ perlEvalFile(m_pArgs->m_argv[k]);
+
+ } else {
+ UT_DEBUGMSG(("No script file to execute in
+--script option\n"));
+ }
+ }
+#endif
+ else
+ {
+ UT_DEBUGMSG(("Unknown command line option
+[%s]\n",m_pArgs->m_argv[k]));
// TODO don't know if it has a following argument or
not -- assume not
- _printUsage();
- return false;
- }
- }
- else
- {
- // [filename]
- if (to)
- {
- AP_Convert * conv = new AP_Convert(getApp());
- conv->setVerbose(verbose);
- conv->convertTo(m_pArgs->m_argv[k], to);
- delete conv;
- }
- else
- {
- AP_UnixFrame * pFirstUnixFrame = new AP_UnixFrame(this);
- pFirstUnixFrame->initialize();
-
- // try to read the document from disk, or create a new one
- // with the given name
- UT_Error error = pFirstUnixFrame->loadDocument(m_pArgs->m_argv[k],
IEFT_Unknown, true);
- if (!error)
- {
- kWindowsOpened++;
+ _printUsage();
+ return false;
+ }
}
else
{
- // TODO: warn user that we couldn't open that file
+ // [filename]
+ if (to)
+ {
+ AP_Convert * conv = new AP_Convert(getApp());
+ conv->setVerbose(verbose);
+ conv->convertTo(m_pArgs->m_argv[k], to);
+ delete conv;
+ }
+ else
+ {
+ AP_UnixFrame * pFirstUnixFrame = new
+AP_UnixFrame(this);
+ pFirstUnixFrame->initialize();
+
+ // try to read the document from disk, or create a new
+one
+ // with the given name
+ UT_Error error =
+pFirstUnixFrame->loadDocument(m_pArgs->m_argv[k], IEFT_Unknown, true);
+ if (!error)
+ {
+ kWindowsOpened++;
+ }
+ else
+ {
+ // TODO: warn user that we couldn't open that
+file
#if 1
- // TODO we crash if we just delete this without putting something
- // TODO in it, so let's go ahead and open an untitled document
- // TODO for now. this would cause us to get 2 untitled documents
- // TODO if the user gave us 2 bogus pathnames....
- kWindowsOpened++;
- pFirstUnixFrame->loadDocument(NULL, IEFT_Unknown);
+ // TODO we crash if we just delete this
+without putting something
+ // TODO in it, so let's go ahead and open an
+untitled document
+ // TODO for now. this would cause us to get 2
+untitled documents
+ // TODO if the user gave us 2 bogus
+pathnames....
+ kWindowsOpened++;
+ pFirstUnixFrame->loadDocument(NULL,
+IEFT_Unknown);
- pFirstUnixFrame->raise();
+ pFirstUnixFrame->raise();
- XAP_DialogFactory * pDialogFactory
- = (XAP_DialogFactory *)(pFirstUnixFrame->getDialogFactory());
+ XAP_DialogFactory * pDialogFactory
+ = (XAP_DialogFactory
+*)(pFirstUnixFrame->getDialogFactory());
- XAP_Dialog_MessageBox * pDialog
- = (XAP_Dialog_MessageBox
*)(pDialogFactory->requestDialog(XAP_DIALOG_ID_MESSAGE_BOX));
- UT_ASSERT(pDialog);
+ XAP_Dialog_MessageBox * pDialog
+ = (XAP_Dialog_MessageBox
+*)(pDialogFactory->requestDialog(XAP_DIALOG_ID_MESSAGE_BOX));
+ UT_ASSERT(pDialog);
- const XAP_StringSet * pSS =
pFirstUnixFrame->getApp()->getStringSet();
+ const XAP_StringSet * pSS =
+pFirstUnixFrame->getApp()->getStringSet();
- switch (error)
- {
- case -301:
-
pDialog->setMessage((char*)pSS->getValue(AP_STRING_ID_MSG_IE_FileNotFound),m_pArgs->m_argv[k]);
- break;
+ switch (error)
+ {
+ case -301:
+
+pDialog->setMessage((char*)pSS->getValue(AP_STRING_ID_MSG_IE_FileNotFound),m_pArgs->m_argv[k]);
+ break;
- case -302:
-
pDialog->setMessage((char*)pSS->getValue(AP_STRING_ID_MSG_IE_NoMemory),m_pArgs->m_argv[k]);
- break;
+ case -302:
+
+pDialog->setMessage((char*)pSS->getValue(AP_STRING_ID_MSG_IE_NoMemory),m_pArgs->m_argv[k]);
+ break;
- case -303:
-
pDialog->setMessage((char*)pSS->getValue(AP_STRING_ID_MSG_IE_UnknownType),m_pArgs->m_argv[k]);
- break;
+ case -303:
+
+pDialog->setMessage((char*)pSS->getValue(AP_STRING_ID_MSG_IE_UnknownType),m_pArgs->m_argv[k]);
+ break;
- case -304:
-
pDialog->setMessage((char*)pSS->getValue(AP_STRING_ID_MSG_IE_BogusDocument),m_pArgs->m_argv[k]);
- break;
+ case -304:
+
+pDialog->setMessage((char*)pSS->getValue(AP_STRING_ID_MSG_IE_BogusDocument),m_pArgs->m_argv[k]);
+ break;
- case -305:
-
pDialog->setMessage((char*)pSS->getValue(AP_STRING_ID_MSG_IE_CouldNotOpen),m_pArgs->m_argv[k]);
- break;
+ case -305:
+
+pDialog->setMessage((char*)pSS->getValue(AP_STRING_ID_MSG_IE_CouldNotOpen),m_pArgs->m_argv[k]);
+ break;
- case -306:
-
pDialog->setMessage((char*)pSS->getValue(AP_STRING_ID_MSG_IE_CouldNotWrite),m_pArgs->m_argv[k]);
- break;
+ case -306:
+
+pDialog->setMessage((char*)pSS->getValue(AP_STRING_ID_MSG_IE_CouldNotWrite),m_pArgs->m_argv[k]);
+ break;
- case -307:
-
pDialog->setMessage((char*)pSS->getValue(AP_STRING_ID_MSG_IE_FakeType),m_pArgs->m_argv[k]);
- break;
+ case -307:
+
+pDialog->setMessage((char*)pSS->getValue(AP_STRING_ID_MSG_IE_FakeType),m_pArgs->m_argv[k]);
+ break;
- case -311:
-
pDialog->setMessage((char*)pSS->getValue(AP_STRING_ID_MSG_IE_UnsupportedType),m_pArgs->m_argv[k]);
- break;
+ case -311:
+
+pDialog->setMessage((char*)pSS->getValue(AP_STRING_ID_MSG_IE_UnsupportedType),m_pArgs->m_argv[k]);
+ break;
- default:
-
pDialog->setMessage((char*)pSS->getValue(AP_STRING_ID_MSG_ImportError),m_pArgs->m_argv[k]);
- }
- pDialog->setButtons(XAP_Dialog_MessageBox::b_O);
- pDialog->setDefaultAnswer(XAP_Dialog_MessageBox::a_OK);
+ default:
+
+pDialog->setMessage((char*)pSS->getValue(AP_STRING_ID_MSG_ImportError),m_pArgs->m_argv[k]);
+ }
+
+pDialog->setButtons(XAP_Dialog_MessageBox::b_O);
+
+pDialog->setDefaultAnswer(XAP_Dialog_MessageBox::a_OK);
- pDialog->runModal(pFirstUnixFrame);
+ pDialog->runModal(pFirstUnixFrame);
- //XAP_Dialog_MessageBox::tAnswer ans = pDialog->getAnswer();
+ //XAP_Dialog_MessageBox::tAnswer ans =
+pDialog->getAnswer();
- pDialogFactory->releaseDialog(pDialog);
+ pDialogFactory->releaseDialog(pDialog);
#else
- delete pFirstUnixFrame;
+ delete pFirstUnixFrame;
#endif
+ }
+ }
}
- }
- }
}
// command-line conversion may not open any windows at all
if (to && !show)
- return true;
+ return true;
if (kWindowsOpened == 0)
{
@@ -1359,6 +1422,9 @@
be global so that we can pass a function pointer to it to C code
that handles signals.
\todo Could this be a static member function?
+ JCA: No, but it can be extern "C" { static void signalWrapper(int) }
+ JCA: (well, there is a way to use a static member function and to remain
+ JCA: correct, but it's a bit cumbersome.)
*/
void signalWrapper(int sig_num)
{
@@ -1384,9 +1450,9 @@
s_signal_count = s_signal_count + 1;
if(s_signal_count > 1)
{
- UT_DEBUGMSG(("Segfault during filesave - no file saved \n"));
- fflush(stdout);
- abort();
+ UT_DEBUGMSG(("Segfault during filesave - no file saved \n"));
+ fflush(stdout);
+ abort();
}
UT_DEBUGMSG(("Oh no - we just segfaulted!\n"));
@@ -1394,9 +1460,9 @@
UT_uint32 i = 0;
for(;i<m_vecFrames.getItemCount();i++)
{
- AP_UnixFrame * curFrame = (AP_UnixFrame*) m_vecFrames[i];
- UT_ASSERT(curFrame);
- curFrame->backup();
+ AP_UnixFrame * curFrame = (AP_UnixFrame*) m_vecFrames[i];
+ UT_ASSERT(curFrame);
+ curFrame->backup();
}
fflush(stdout);
Index: src/wp/ap/unix/ap_UnixApp.h
===================================================================
RCS file: /cvsroot/abi/src/wp/ap/unix/ap_UnixApp.h,v
retrieving revision 1.24
diff -u -r1.24 ap_UnixApp.h
--- src/wp/ap/unix/ap_UnixApp.h 2001/03/05 05:28:04 1.24
+++ src/wp/ap/unix/ap_UnixApp.h 2001/04/12 13:23:02
@@ -40,6 +40,11 @@
#define XAP_UNIXBASEAPP XAP_UnixApp
#endif
+#ifdef ABI_OPT_JS
+#include <EXTERN.h>
+#include <perl.h>
+#endif
+
class XAP_StringSet;
class AV_View;
@@ -47,7 +52,7 @@
{
public:
AP_UnixApp(XAP_Args * pArgs, const char * szAppName);
- virtual ~AP_UnixApp(void);
+ virtual ~AP_UnixApp();
virtual bool initialize(void);
virtual XAP_Frame * newFrame(void);
@@ -74,7 +79,7 @@
/*!
Gets the View Selection
- /return The View currently selected.
+ \return The View currently selected.
*/
inline virtual AV_View * getViewSelection(void)
{ return m_pViewSelection; }
@@ -87,6 +92,10 @@
static int main (const char * szAppName, int argc, char ** argv);
void catchSignals(int sig_num);
+#ifdef ABI_OPT_JS
+ void
+ perlEvalFile(const char * filename);
+ PerlInterpreter *
+ getPerlInterp();
+#endif
protected:
@@ -103,6 +112,11 @@
XAP_Frame * m_pFrameSelection;
UT_ByteBuf m_selectionByteBuf;
PD_DocumentRange m_cacheDocumentRangeOfSelection;
+
+private: // JCA: Why in the hell we have so many (any) protected variable?
+#ifdef ABI_OPT_JS
+ static PerlInterpreter *m_pPerlInstance;
+#endif
};
// HACK What follows is an ugly hack. It is neccessitated by the
Index: src/wp/ap/unix/gnome/ap_UnixGnomeApp.cpp
===================================================================
RCS file: /cvsroot/abi/src/wp/ap/unix/gnome/ap_UnixGnomeApp.cpp,v
retrieving revision 1.18
diff -u -r1.18 ap_UnixGnomeApp.cpp
--- src/wp/ap/unix/gnome/ap_UnixGnomeApp.cpp 2001/04/10 04:50:49 1.18
+++ src/wp/ap/unix/gnome/ap_UnixGnomeApp.cpp 2001/04/12 13:23:03
@@ -22,8 +22,9 @@
*****************************************************************/
#ifdef ABI_OPT_JS
-#include <js.h>
-#endif /* ABI_OPT_JS */
+#include <EXTERN.h>
+#include <perl.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
abi-perl.tgz
