+2000-11-02 Lars Gullik Bjønnes <larsbj@lyx.org>
+
+ * src/lyxlookup.C: include FORMS_H_LOCATION to get at FL_REVISION,
+ conditionalize build on xforms < 0.89
+
+ * src/lyx_gui.C (LyXGUI): only close lyxlookup if not xforms 0.89
+
+ * src/lyxfunc.C (getStatus): commenout LFUN_FAX
+
+ * src/LyXAction.C (init): comment out fax
+
+ * src/lyxrc.h: comment out the fax enums
+ comment out the fax variables
+
+ * src/commandtags.h: comment out LFUN_FAX
+
+ * src/lyxrc.C: disable fax variables.
+ (read): disable parsing of fax variables
+ (output): disable writing of fax variables
+ (getFeedback): now description for fax variables
+
+ * src/lyxfunc.C: comment out MenuFax
+ (Dispatch): disable LFUN_FAX
+
+ * src/lyx_cb.C (MenuFax): comment out
+
+ * src/WorkArea.C: add <cctype>
+ (work_area_handler): better key handling, should be ok now.
+ for accented chars + etc
+
+ * src/Makefile.am (lyx_SOURCES): remove lyx_sendfax.C
+ lyx_sendfax.h and lyx_sendfax_man.C
+
+ * src/LyXView.C: don't include lyxlookup.h when using xforms 0.89
+ (show): don't call InitLyXLookup when using xforms 0.89
+
2000-11-01 Lars Gullik Bjønnes <larsbj@lyx.org>
+ * src/trans.C (AddDeadkey): better fix, the other one could crash...
+
* src/support/filetools.C (GetFileContents): close to dummy change
2000-10-31 Lars Gullik Bjønnes <larsbj@lyx.org>
2.95.1) CXXFLAGS="-g $lyx_opt -fpermissive -fno-rtti -fno-exceptions";;
2.95.*) CXXFLAGS="-g $lyx_opt -fno-rtti -fno-exceptions";;
2.96*) CXXFLAGS="-g $lyx_opt -fno-rtti -fno-exceptions";;
- 2.97*) CXXFLAGS="-g $lyx_opt -fhonor-std";;
+ 2.97*) CXXFLAGS="-g $lyx_opt -fhonor-std -fno-builtin -ffunction-sectons -fdata-sections";;
*2.91.*) CXXFLAGS="-g $lyx_opt -fno-rtti -fno-exceptions";;
*) CXXFLAGS="-g $lyx_opt -fno-rtti -fno-exceptions";;
esac
src/lyx_gui.C
src/lyx_gui_misc.C
src/lyx_main.C
+src/lyxrc.C
src/lyx_sendfax.C
src/lyx_sendfax_main.C
src/LyXSendto.C
int Condition::signal() {return pthread_cond_signal(&cond_);}
int Condition::broadcast() {return pthread_cond_broadcast(&cond_);}
int Condition::wait(Mutex &m) {return pthread_cond_wait(&cond_,m);}
-int Condition::wait(Mutex &m,struct timespec* spec)
+int Condition::wait(Mutex &m, struct timespec* spec)
{return pthread_cond_timedwait(&cond_,m,spec);}
int Condition::destroy() {return pthread_cond_destroy(&cond_);}
// unlocks a mutex while waiting on a condition, then reaquires lock
// with a fixed maximum duration.
- int wait(Mutex &m,struct timespec* spec);
+ int wait(Mutex &m, struct timespec* spec);
};
{ LFUN_ENDBUFSEL, "buffer-end-select",
N_("Select to end of document"), ReadOnly },
{ LFUN_EXPORT, "buffer-export", N_("Export to"), ReadOnly },
+#if 0
{ LFUN_FAX, "buffer-fax", N_("Fax"), ReadOnly },
+#endif
#ifndef NEW_INSETS
{ LFUN_INSERTFOOTNOTE, "buffer-float-insert", "", Noop },
#endif
#include "LyXView.h"
#include "lyx_main.h"
+#if FL_REVISION < 89
#include "lyxlookup.h"
+#endif
#include "minibuffer.h"
#include "lyxfunc.h"
#include "debug.h"
{
fl_show_form(form_, place, border, title.c_str());
minibuffer->Init();
+#if FL_REVISION < 89
InitLyXLookup(fl_get_display(), form_->window);
+#endif
}
lyx_gui_misc.h \
lyx_main.C \
lyx_main.h \
- lyx_sendfax.C \
- lyx_sendfax.h \
- lyx_sendfax_main.C \
lyx_sty.C \
lyx_sty.h \
lyxcursor.C \
#include <config.h>
#include <cmath>
-
+#include <cctype>
#ifdef __GNUG__
#pragma implementation
#endif
else
break;
} else {
- ret_key = (keysym ? keysym : key);
+ // It seems that this was a bit optimistic...
+ // With this hacking things seems to be better (Lgb)
+ if (static_cast<unsigned char>(key) == key
+ && !iscntrl(key))
+ ret_key = key;
+ else
+ ret_key = (keysym ? keysym : key);
}
#endif
LFUN_DELETE_SKIP,
LFUN_MENUNEWTMPLT, // Asger 1997-02-02
LFUN_MENURELOAD, // Asger 1997-02-02
+#if 0
LFUN_FAX, // Asger 1997-02-10
+#endif
LFUN_RECONFIGURE, // 170 // Asger 1997-02-14
LFUN_CITATION_INSERT, // AAS 97-02-23
LFUN_INSERT_BIBTEX, // AAS 97-02-23
extern void DeleteSimpleCutBuffer(); /* for the cleanup when exiting */
+#if 0
extern bool send_fax(string const & fname, string const & sendcmd);
+#endif
+
extern void MenuSendto();
extern LyXServer * lyxserver;
return ret;
}
-
+#if 0
void MenuFax(Buffer * buffer)
{
// Generate postscript file
} else
send_fax(ps, lyxrc.fax_command);
}
+#endif
void QuitLyX()
#include "lyxrc.h"
#include "gettext.h"
#include "lyx_gui_misc.h"
+#if FL_REVISION < 89
#include "lyxlookup.h"
+#endif
#include "bufferlist.h"
#include "language.h"
#include "ColorHandler.h"
delete lyxserver;
lyxserver = 0;
delete lyxViews;
-
+#if FL_REVISION < 89
CloseLyXLookup();
+#endif
}
#endif
#include "version.h"
+#if 0
#include "lyxlookup.h"
+#endif
#include "kbmap.h"
#include "lyxfunc.h"
#include "bufferlist.h"
extern void MenuPrint(Buffer *);
extern void MenuSendto();
extern void QuitLyX();
+#if 0
extern void MenuFax(Buffer *);
+#endif
extern void show_symbols_form(LyXFunc *);
extern LyXAction lyxaction;
disable = !Exporter::IsExportable(buf, "dvi")
|| lyxrc.print_command == "none";
break;
+#if 0
case LFUN_FAX:
disable = !Exporter::IsExportable(buf, "ps")
|| lyxrc.fax_command == "none";
break;
+#endif
case LFUN_IMPORT:
disable = !Importer::IsImportable(argument);
break;
owner->getDialogs()->showPrint();
break;
+#if 0
case LFUN_FAX:
MenuFax(owner->buffer());
break;
-
+#endif
+
case LFUN_EXPORT:
Exporter::Export(owner->buffer(), argument, false);
break;
#ifdef HAVE_XOPENIM
// This part is the full blown Input Method manager for X11R5 and up.
// For the plain-and-old-X11R4 version, see later.
-
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/keysym.h>
+#include FORMS_H_LOCATION
+//#include <X11/Xlib.h>
+//#include <X11/Xutil.h>
+//#include <X11/keysym.h>
+#if FL_REVISION < 89
#ifdef HAVE_LOCALE_H
#include <locale.h>
#endif
}
#endif // HAVE_XOPENIM
+
+#endif
different input methods for different frames, but for now we can
keep it as it is. */
-#include <X11/Xlib.h>
+#include <config.h>
+#include FORMS_H_LOCATION
+#if FL_REVISION < 89
+//#include <X11/Xlib.h>
/// Initialize the compose key handling
extern void InitLyXLookup(Display *, Window ) ;
/// Call this when you destroy your window
extern void CloseLyXLookup();
+#endif
{ "\\document_path", LyXRC::RC_DOCUMENTPATH },
{ "\\escape_chars", LyXRC::RC_ESC_CHARS },
{ "\\exit_confirmation", LyXRC::RC_EXIT_CONFIRMATION },
+#if 0
{ "\\fax_command", LyXRC::RC_FAX_COMMAND },
{ "\\fax_program", LyXRC::RC_FAXPROGRAM },
+#endif
{ "\\font_encoding", LyXRC::RC_FONT_ENCODING },
{ "\\format", LyXRC::RC_FORMAT },
{ "\\input", LyXRC::RC_INPUT },
{ "\\num_lastfiles", LyXRC::RC_NUMLASTFILES },
{ "\\override_x_deadkeys", LyXRC::RC_OVERRIDE_X_DEADKEYS },
{ "\\personal_dictionary", LyXRC::RC_PERS_DICT },
+#if 0
{ "\\phone_book", LyXRC::RC_PHONEBOOK },
+#endif
{ "\\print_adapt_output", LyXRC::RC_PRINT_ADAPTOUTPUT },
{ "\\print_collcopies_flag", LyXRC::RC_PRINTCOLLCOPIESFLAG },
{ "\\print_command", LyXRC::RC_PRINT_COMMAND },
cursor_follows_scrollbar = lexrc.GetBool();
break;
+#if 0
case RC_FAX_COMMAND:
if (lexrc.next())
fax_command = lexrc.GetString();
phone_book = user_lyxdir + s;
}
break;
+#endif
case RC_ASCIIROFF_COMMAND:
if (lexrc.next())
ascii_roff_command = lexrc.GetString();
os << "\\backupdir_path \"" << backupdir_path << "\"\n";
}
+#if 0
os << "\n#\n"
<< "# FAX SECTION #######################################\n"
<< "#\n\n";
if (fax_program != system_lyxrc.fax_program) {
os << "\\fax_program \"" << fax_program << "\"\n";
}
-
+#endif
os << "\n#\n"
<< "# ASCII EXPORT SECTION ##############################\n"
<< "#\n\n";
case RC_KBMAP_SECONDARY:
str = N_("Use this to set the correct mapping file for your keyboard.\nYou'll need this if you for instance want to type German documents\non an American keyboard.");
break;
-
+
+#if 0
case RC_FAX_COMMAND:
break;
case RC_FAXPROGRAM:
break;
-
+#endif
case RC_ASCIIROFF_COMMAND:
str = N_("Use to define an external program to render tables in the ASCII output.\nE.g. \"groff -t -Tlatin1 $$FName\" where $$FName is the input file.\nIf \"none\" is specified, an internal routine is used.");
break;
RC_KBMAP,
RC_KBMAP_PRIMARY,
RC_KBMAP_SECONDARY,
+#if 0
RC_FAX_COMMAND,
RC_PHONEBOOK,
RC_FAXPROGRAM,
+#endif
RC_ASCIIROFF_COMMAND,
RC_ASCII_LINELEN,
RC_NUMLASTFILES,
string font_norm_menu;
///
unsigned int autosave;
+#if 0
///
string fax_command;
///
string phone_book;
///
string fax_program;
+#endif
///
string ascii_roff_command;
///
using std::vector;
using std::max;
+#if 0
+using std::strncmp;
+using std::strcmp;
+using std::abs;
+using std::isdigit;
+using std::isalpha;
+#endif
+
//extern char * mathed_label;
extern string mathed_label;
#include "matrix.xpm"
#include "equation.xpm"
+#if 0
+using std::free;
+#endif
+
static LyXFunc * lyxfunc = 0;
//static FD_panel* symb_form= 0;
using std::istream;
using std::endl;
+#if 0
+using std::isalpha;
+using std::isdigit;
+using std::isspace;
+#endif
+
enum {
FLAG_BRACE = 1, // A { needed
FLAG_BRACE_ARG = 2, // Next { is argument
"Footnote in a Footnote -- not supported"
<< endl;
}
-//#ifndef HAVE_OSTREAM
-// delete [] dummy.str();
-//#endif
}
switch (footnotekind) {
#include "lyxlib.h"
+#if 0
+using std::atoi;
+#endif
+
int lyx::atoi(string const & nstr)
{
return ::atoi(nstr.c_str());
using std::endl;
using std::ifstream;
+#if 0
+using std::getenv;
+using std::isalpha;
+using std::isalnum;
+using std::popen;
+#endif
+
extern string system_lyxdir;
extern string build_lyxdir;
extern string user_lyxdir;
string const GetEnv(string const & envname)
{
// f.ex. what about error checking?
- char const * const ch = ::getenv(envname.c_str());
+ char const * const ch = getenv(envname.c_str());
string const envstr = !ch ? "" : ch;
return envstr;
}
#include "LString.h"
+#if 0
+using std::vsnprintf;
+#endif
+
/* This output manipulator gives the option to use Old style format
specifications in ostreams. Note that this is done at the expense
of typesafety, so if possible this manipulator should be avoided.
va_list ap;
while (true) {
va_start(ap, fmtstr);
- int const r = ::vsnprintf(str, size, fmtstr, ap);
+ int const r = vsnprintf(str, size, fmtstr, ap);
va_end(ap);
if (r == -1) { // size is too small
delete [] str;
#else
string & temp =
keymap_[static_cast<unsigned char>(keys[i])];
- if (!temp.empty()) {
- temp[0] = 0;
- temp[1] = accent;
- } else {
- // But the question remains: "Should we be allowed
- // to change bindings, without unbinding first?"
- // Lgb
- lyxerr << "Hey... keymap_[xx] not empty." << endl;
- temp += char(0);
- temp += char(accent);
- }
+ if (!temp.empty())
+ temp.erase();
+
+ // But the question remains: "Should we be allowed
+ // to change bindings, without unbinding first?"
+ // Lgb
+ temp += char(0);
+ temp += char(accent);
#endif
}
kmod_list_[accent]->exception_list = 0;
projects / lyx.git / commitdiff