+/* This file is part of
+ * ======================================================
+ *
+ * LyX, The Document Processor
+ *
+ * Copyright 1995 Matthias Ettrich
+ * Copyright 1995-2000 The LyX Team.
+ *
+ * ====================================================== */
+
#include <config.h>
+#ifdef __GNUG__
+#pragma implementation
+#endif
+
#include "bufferview_funcs.h"
#include "LyXView.h"
#include "BufferView.h"
extern FD_form_paragraph * fd_form_paragraph;
extern FD_form_character * fd_form_character;
-
-static
-void SetXtermCursor(Window win)
-{
- static Cursor cursor;
- static bool cursor_undefined = true;
- if (cursor_undefined){
- cursor = XCreateFontCursor(fl_display, XC_xterm);
- XFlush(fl_display);
- cursor_undefined = false;
- }
- XDefineCursor(fl_display, win, cursor);
- XFlush(fl_display);
-}
-
-
+#ifndef NEW_INSETS
void Foot(BufferView * bv)
{
if (!bv->available())
bv->owner()->getMiniBuffer()
->Set(_("Inserting Footnote..."));
bv->hideCursor();
- bv->update(-2);
- bv->text->InsertFootnoteEnvironment(LyXParagraph::FOOTNOTE);
- bv->update(1);
+ bv->update(BufferView::SELECT|BufferView::FITCUR);
+ bv->text->InsertFootnoteEnvironment(bv, LyXParagraph::FOOTNOTE);
+ bv->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
}
+#endif
void Emph(BufferView * bv)
}
+#ifndef NEW_INSETS
void Margin(BufferView * bv)
{
if (bv->available()) {
bv->owner()->getMiniBuffer()->Set(_("Inserting margin note..."));
bv->hideCursor();
- bv->update(-2);
- bv->text->InsertFootnoteEnvironment(LyXParagraph::MARGIN);
- bv->update(1);
+ bv->update(BufferView::SELECT|BufferView::FITCUR);
+ bv->text->InsertFootnoteEnvironment(bv, LyXParagraph::MARGIN);
+ bv->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
}
}
+#endif
void Lang(BufferView * bv, string const & l)
}
+#ifndef NEW_INSETS
void Melt(BufferView * bv)
{
if (!bv->available()) return;
bv->owner()->getMiniBuffer()->Set(_("Melt"));
bv->hideCursor();
bv->beforeChange();
- bv->update(-2);
- bv->text->MeltFootnoteEnvironment();
- bv->update(1);
+ bv->update(BufferView::SELECT|BufferView::FITCUR);
+ bv->text->MeltFootnoteEnvironment(bv);
+ bv->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
}
+#endif
void Tex(BufferView * bv)
if (!bv->available()) return;
bv->hideCursor();
- bv->update(-2);
+ bv->update(BufferView::SELECT|BufferView::FITCUR);
if (decInc >= 0)
- bv->text->IncDepth();
+ bv->text->IncDepth(bv);
else
- bv->text->DecDepth();
- bv->update(1);
+ bv->text->DecDepth(bv);
+ bv->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
bv->owner()->getMiniBuffer()
->Set(_("Changed environment depth"
" (in possible range, maybe not)"));
void Free(BufferView * bv)
{
- ToggleAndShow(bv, UserFreeFont());
+ ToggleAndShow(bv, UserFreeFont(bv->buffer()->params));
}
XUndefineCursor(fl_display,
fd_form_character->form_character->window);
- // What to do about this? (Lgb)
- if (bv->belowMouse())
- SetXtermCursor(bv->owner()->getForm()->window);
-
XFlush(fl_display);
fl_activate_all_forms();
}
}
-/* -------> Returns the current font and depth by printing a message. In the
- * future perhaps we could try to implement a callback to the button-bar.
- * That is, `light' the bold button when the font is currently bold, etc.
- */
+// Returns the current font and depth as a message.
string CurrentState(BufferView * bv)
{
string state;
if (bv->available()) {
// I think we should only show changes from the default
// font. (Asger)
+ LyXText *text = 0;
+
+ if (bv->the_locking_inset)
+ text = bv->the_locking_inset->getLyXText(bv);
+ if (!text)
+ text = bv->text;
+
Buffer * buffer = bv->buffer();
- LyXFont font = bv->text->real_current_font;
- LyXFont defaultfont = textclasslist.TextClass(buffer->
- params.textclass).defaultfont();
+ LyXFont font = text->real_current_font;
+ LyXFont const & defaultfont =
+ textclasslist
+ .TextClass(buffer->params.textclass)
+ .defaultfont();
font.reduce(defaultfont);
- state = _("Font: ") + font.stateText();
+ state = _("Font: ") + font.stateText(&buffer->params);
// The paragraph depth
- int depth = bv->text->GetDepth();
+ int depth = text->GetDepth();
if (depth > 0)
state += string(_(", Depth: ")) + tostr(depth);
// The paragraph spacing, but only if different from
// buffer spacing.
- if (!bv->text->cursor.par->spacing.isDefault()) {
+ if (!text->cursor.par()->spacing.isDefault()) {
Spacing::Space cur_space =
- bv->text->cursor.par->spacing.getSpace();
+ text->cursor.par()->spacing.getSpace();
state += _(", Spacing: ");
switch (cur_space) {
case Spacing::Single:
break;
case Spacing::Other:
state += _("Other (");
- state += tostr(bv->text->cursor.par->spacing.getValue());
+ state += tostr(text->cursor.par()->spacing.getValue());
state += ")";
break;
case Spacing::Default:
}
-// candidate for move to BufferView
/* -------> Does the actual toggle job of the XxxCB() calls above.
* Also shows the current font state.
*/
{
if (bv->available()) {
bv->hideCursor();
- bv->update(-2);
+ bv->update(BufferView::SELECT|BufferView::FITCUR);
if (bv->the_locking_inset)
bv->the_locking_inset->SetFont(bv, font, toggleall);
else
- bv->text->ToggleFree(font, toggleall);
- bv->update(1);
+ bv->text->ToggleFree(bv, font, toggleall);
+ bv->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+
+ if (font.language() != ignore_language ||
+ font.latex() != LyXFont::IGNORE) {
+ LyXText * text = bv->text;
+ LyXCursor & cursor = text->cursor;
+ text->ComputeBidiTables(bv->buffer(), cursor.row());
+ if (cursor.boundary() !=
+ text->IsBoundary(bv->buffer(), cursor.par(), cursor.pos(),
+ text->real_current_font) )
+ text->SetCursor(bv, cursor.par(), cursor.pos(),
+ false, !cursor.boundary());
+ }
}
}