* LyX, The Document Processor
*
* Copyright 1995 Matthias Ettrich
- * Copyright 1995-1999 The LyX Team.
+ * Copyright 1995-2000 The LyX Team.
*
* ====================================================== */
#include "layout_forms.h"
#include "intl.h"
#include "lyxrc.h"
-#include "lyxscreen.h"
#include "support/filetools.h" // OnlyFilename()
#include "layout.h"
#include "lyxtext.h"
extern void AutoSave();
extern char updatetimer;
extern void QuitLyX();
-int current_layout = 0;
+LyXTextClass::size_type current_layout = 0;
// This is very temporary
BufferView * current_view;
LyXView * view = static_cast<LyXView*>(ob->u_vdata);
if (!view->view()->available())
return;
- if (!view->view()->getScreen() || !updatetimer)
+ if (!updatetimer)
return;
- view->view()->getScreen()->HideCursor();
+ view->view()->hideCursor();
view->view()->update(-2);
/* This update can happen, even when the work area has lost
/// Reset autosave timer
void LyXView::resetAutosaveTimer()
{
- if (lyxrc->autosave)
- fl_set_timer(_form_main->timer_autosave, lyxrc->autosave);
+ if (lyxrc.autosave)
+ fl_set_timer(_form_main->timer_autosave, lyxrc.autosave);
}
// TOOLBAR
//
- toolbar = new Toolbar(lyxrc->toolbar, this, air, 30 + air + bw);
+ toolbar = new Toolbar(this, air, 30 + air + bw);
// Setup the toolbar
toolbar->set(true);
UpdateDocumentClassChoice();
// Start autosave timer
- if (lyxrc->autosave)
- fl_set_timer(_form_main->timer_autosave, lyxrc->autosave);
+ if (lyxrc.autosave)
+ fl_set_timer(_form_main->timer_autosave, lyxrc.autosave);
// Install the raw callback for keyboard events
fl_register_raw_callback(_form,
KeyPressMask,
C_LyXView_KeyPressMask_raw_callback);
- intl->InitKeyMapper(lyxrc->use_kbmap);
+ intl->InitKeyMapper(lyxrc.use_kbmap);
}
// we need to do this.
toolbar->combox->Redraw();
- char layout = bufferview->text->cursor.par->GetLayout();
+ LyXTextClass::size_type layout = bufferview->text->cursor.par->GetLayout();
if (layout != current_layout){
toolbar->combox->select(layout + 1);
LyXView * view = static_cast<LyXView*>(fl->u_vdata);
int retval = 0; // 0 means XForms should have a look at this event
-#define USE_XSYNC 1
-#ifdef USE_XSYNC
XKeyEvent * xke = static_cast<XKeyEvent*>(xev);
static Time last_time_pressed = 0;
static Time last_time_released = 0;
static unsigned int last_key_released = 0;
static unsigned int last_state_pressed = 0;
static unsigned int last_state_released = 0;
-#endif
+
// funny. Even though the raw_callback is registered with KeyPressMask,
// also KeyRelease-events are passed through:-(
// [It seems that XForms puts them in pairs... (JMarc)]
if (static_cast<XEvent*>(xev)->type == KeyPress
-#ifdef NEW_WA
&& view->bufferview->focus()
&& view->bufferview->active())
-#else
- && view->bufferview->getWorkArea()->focus
- && view->bufferview->getWorkArea()->active)
-#endif
{
-#ifdef USE_XSYNC
last_time_pressed = xke->time;
last_key_pressed = xke->keycode;
last_state_pressed = xke->state;
-#endif
retval = view->getLyXFunc()
->processKeyEvent(static_cast<XEvent*>(xev));
}
-#ifdef USE_XSYNC
else if (static_cast<XEvent*>(xev)->type == KeyRelease
-#ifdef NEW_WA
&& view->bufferview->focus()
&& view->bufferview->active())
-#else
- && view->bufferview->getWorkArea()->focus
- && view->bufferview->getWorkArea()->active)
-#endif
{
last_time_released = xke->time;
last_key_released = xke->keycode;
// purging of XEvents can cause any harm...after some testing
// I can see no problems, but I'd like other reports too.
}
-#endif
return retval;
}