#include "Painter.h"
#include "WorkArea.h"
#include "buffer.h"
+#include "BufferView.h"
#include "font.h"
#include "insets/insettext.h"
#include "ColorHandler.h"
+#include "language.h"
using std::max;
using std::min;
-static
+namespace {
+
GC createGC()
{
XGCValues val;
| GCLineWidth | GCLineStyle , &val);
}
+} // namespace anon
+
// Constructor
LyXScreen::LyXScreen(WorkArea & o)
}
+LyXScreen::~LyXScreen()
+{
+ XFreeGC(fl_get_display(), gc_copy);
+}
+
+
void LyXScreen::setCursorColor()
{
- if (!lyxColorHandler) return;
+ if (!lyxColorHandler.get()) return;
GC gc = lyxColorHandler->getGCForeground(LColor::cursor);
}
-void LyXScreen::Redraw(LyXText * text, BufferView * bv)
+void LyXScreen::redraw(LyXText * text, BufferView * bv)
{
- DrawFromTo(text, bv, 0, owner.height());
+ drawFromTo(text, bv, 0, owner.height(), 0, 0, text == bv->text);
expose(0, 0, owner.workWidth(), owner.height());
if (cursor_visible) {
cursor_visible = false;
- ShowCursor(text, bv);
+ bv->showCursor();
}
}
}
-void LyXScreen::DrawFromTo(LyXText * text, BufferView * bv,
- int y1, int y2, int y_offset, int x_offset)
+void LyXScreen::drawFromTo(LyXText * text, BufferView * bv,
+ int y1, int y2, int y_offset, int x_offset,
+ bool internal)
{
int y_text = text->first + y1;
// get the first needed row
- Row * row = text->GetRowNearY(y_text);
+ Row * row = text->getRowNearY(y_text);
// y_text is now the real beginning of the row
int y = y_text - text->first;
// y1 is now the real beginning of row on the screen
while (row != 0 && y < y2) {
- LyXText::text_status st = bv->text->status;
- do {
- bv->text->status = st;
- text->GetVisibleRow(bv, y + y_offset,
- x_offset, row, y + text->first);
- } while (bv->text->status == LyXText::CHANGED_IN_DRAW);
- bv->text->status = st;
+ LyXText::text_status st = text->status();
+ text->getVisibleRow(bv, y + y_offset,
+ x_offset, row, y + text->first);
+ internal = internal && (st != LyXText::CHANGED_IN_DRAW);
+ while(internal && text->status() == LyXText::CHANGED_IN_DRAW) {
+ if (text->fullRebreak(bv)) {
+ st = LyXText::NEED_MORE_REFRESH;
+ text->setCursor(bv, text->cursor.par(), text->cursor.pos());
+ }
+ text->status(bv, st);
+ text->getVisibleRow(bv, y + y_offset,
+ x_offset, row, y + text->first);
+ }
y += row->height();
row = row->next();
}
}
-void LyXScreen::DrawOneRow(LyXText * text, BufferView * bv, Row * row,
+void LyXScreen::drawOneRow(LyXText * text, BufferView * bv, Row * row,
int y_text, int y_offset, int x_offset)
{
int const y = y_text - text->first + y_offset;
if (((y + row->height()) > 0) &&
((y - row->height()) <= static_cast<int>(owner.height()))) {
// ok there is something visible
- LyXText::text_status st = bv->text->status;
+#if 0
+ LyXText::text_status st = bv->text->status();
do {
- bv->text->status = st;
- text->GetVisibleRow(bv, y, x_offset, row,
+ bv->text->status(bv, st);
+ text->getVisibleRow(bv, y, x_offset, row,
y + text->first);
- } while (bv->text->status == LyXText::CHANGED_IN_DRAW);
- bv->text->status = st;
+ } while (!text->inset_owner &&
+ text->status() == LyXText::CHANGED_IN_DRAW);
+ bv->text->status(bv, st);
+#else
+ text->getVisibleRow(bv, y, x_offset, row, y + text->first);
+#endif
}
force_clear = false;
}
/* draws the screen, starting with textposition y. uses as much already
-* printed pixels as possible */
-void LyXScreen::Draw(LyXText * text, BufferView * bv, unsigned int y)
+ * printed pixels as possible */
+void LyXScreen::draw(LyXText * text, BufferView * bv, unsigned int y)
{
- if (cursor_visible) HideCursor();
+ if (cursor_visible) hideCursor();
int const old_first = text->first;
+ bool internal = (text == bv->text);
text->first = y;
// is any optimiziation possible?
if ((y - old_first) < owner.height()
- && (old_first - y) < owner.height()) {
+ && (old_first - y) < owner.height())
+ {
if (text->first < old_first) {
- DrawFromTo(text, bv, 0, old_first - text->first);
+ drawFromTo(text, bv, 0, old_first - text->first, 0, 0, internal);
XCopyArea (fl_get_display(),
owner.getWin(),
owner.getWin(),
owner.workWidth(),
old_first - text->first);
} else {
- DrawFromTo(text, bv,
- owner.height() + old_first - text->first,
- owner.height());
+ drawFromTo(text, bv,
+ owner.height() + old_first - text->first,
+ owner.height(), 0, 0, internal);
XCopyArea (fl_get_display(),
owner.getWin(),
owner.getWin(),
}
} else {
// make a dumb new-draw
- DrawFromTo(text, bv, 0, owner.height());
+ drawFromTo(text, bv, 0, owner.height(), 0, 0, internal);
expose(0, 0, owner.workWidth(), owner.height());
}
}
-void LyXScreen::ShowCursor(LyXText const * text, BufferView const * bv)
+void LyXScreen::showCursor(LyXText const * text, BufferView const * bv)
{
if (!cursor_visible) {
Cursor_Shape shape = BAR_SHAPE;
!= bv->buffer()->params.language->RightToLeft())
shape = (text->real_current_font.isVisibleRightToLeft())
? REVERSED_L_SHAPE : L_SHAPE;
- ShowManualCursor(text, text->cursor.x(), text->cursor.y(),
+ showManualCursor(text, text->cursor.x(), text->cursor.y(),
lyxfont::maxAscent(text->real_current_font),
lyxfont::maxDescent(text->real_current_font),
shape);
/* returns true if first has changed, otherwise false */
-bool LyXScreen::FitManualCursor(LyXText * text, BufferView * bv,
+bool LyXScreen::fitManualCursor(LyXText * text, BufferView * bv,
int /*x*/, int y, int asc, int desc)
{
int newtop = text->first;
newtop = max(newtop, 0); // can newtop ever be < 0? (Lgb)
if (newtop != static_cast<int>(text->first)) {
- Draw(text, bv, newtop);
+ draw(text, bv, newtop);
text->first = newtop;
return true;
}
}
-void LyXScreen::ShowManualCursor(LyXText const * text, int x, int y,
+void LyXScreen::showManualCursor(LyXText const * text, int x, int y,
int asc, int desc, Cursor_Shape shape)
{
// Update the cursor color.
}
-void LyXScreen::HideCursor()
+void LyXScreen::hideCursor()
{
if (!cursor_visible) return;
}
-void LyXScreen::CursorToggle(LyXText const * text, BufferView const * bv)
+void LyXScreen::cursorToggle(BufferView * bv) const
{
if (cursor_visible)
- HideCursor();
+ bv->hideCursor();
else
- ShowCursor(text, bv);
+ bv->showCursor();
}
/* returns a new top so that the cursor is visible */
-unsigned int LyXScreen::TopCursorVisible(LyXText const * text)
+unsigned int LyXScreen::topCursorVisible(LyXText const * text)
{
int newtop = text->first;
/* scrolls the screen so that the cursor is visible, if necessary.
* returns true if a change was made, otherwise false */
-bool LyXScreen::FitCursor(LyXText * text, BufferView * bv)
+bool LyXScreen::fitCursor(LyXText * text, BufferView * bv)
{
// Is a change necessary?
- int const newtop = TopCursorVisible(text);
+ int const newtop = topCursorVisible(text);
bool const result = (newtop != text->first);
if (result)
- Draw(text, bv, newtop);
+ draw(text, bv, newtop);
return result;
}
-void LyXScreen::Update(LyXText * text, BufferView * bv,
- int y_offset, int x_offset)
+void LyXScreen::update(LyXText * text, BufferView * bv,
+ int y_offset, int x_offset)
{
- switch (text->status) {
+ switch (text->status()) {
case LyXText::NEED_MORE_REFRESH:
{
int const y = max(int(text->refresh_y - text->first), 0);
- DrawFromTo(text, bv, y, owner.height(), y_offset, x_offset);
+ drawFromTo(text, bv, y, owner.height(), y_offset, x_offset);
text->refresh_y = 0;
- text->status = LyXText::UNCHANGED;
+ // otherwise this is called ONLY from BufferView_pimpl(update)
+ // or we should see to set this flag accordingly
+ if (text != bv->text)
+ text->status(bv, LyXText::UNCHANGED);
expose(0, y, owner.workWidth(), owner.height() - y);
}
break;
case LyXText::NEED_VERY_LITTLE_REFRESH:
{
// ok I will update the current cursor row
- DrawOneRow(text, bv, text->refresh_row, text->refresh_y,
+ drawOneRow(text, bv, text->refresh_row, text->refresh_y,
y_offset, x_offset);
- text->status = LyXText::UNCHANGED;
- expose(0, text->refresh_y - text->first + y_offset,
- owner.workWidth(), text->refresh_row->height());
+ // this because if we had a major update the refresh_row could
+ // have been set to 0!
+ if (text->refresh_row) {
+ // otherwise this is called ONLY from BufferView_pimpl(update)
+ // or we should see to set this flag accordingly
+ if (text != bv->text)
+ text->status(bv, LyXText::UNCHANGED);
+ expose(0, text->refresh_y - text->first + y_offset,
+ owner.workWidth(), text->refresh_row->height());
+ }
}
break;
case LyXText::CHANGED_IN_DRAW: // just to remove the warning
}
-void LyXScreen::ToggleSelection(LyXText * text, BufferView * bv,
+void LyXScreen::toggleSelection(LyXText * text, BufferView * bv,
bool kill_selection,
int y_offset, int x_offset)
{
// only if there is a selection
- if (!text->selection) return;
+ if (!text->selection.set()) return;
int const bottom = min(
- max(static_cast<int>(text->sel_end_cursor.y()
- - text->sel_end_cursor.row()->baseline()
- + text->sel_end_cursor.row()->height()),
+ max(static_cast<int>(text->selection.end.y()
+ - text->selection.end.row()->baseline()
+ + text->selection.end.row()->height()),
text->first),
static_cast<int>(text->first + owner.height()));
int const top = min(
- max(static_cast<int>(text->sel_start_cursor.y() -
- text->sel_start_cursor.row()->baseline()),
+ max(static_cast<int>(text->selection.start.y() -
+ text->selection.start.row()->baseline()),
text->first),
static_cast<int>(text->first + owner.height()));
if (kill_selection)
- text->selection = 0;
- DrawFromTo(text, bv, top - text->first, bottom - text->first,
+ text->selection.set(false);
+ drawFromTo(text, bv, top - text->first, bottom - text->first,
y_offset, x_offset);
expose(0, top - text->first,
owner.workWidth(),
}
-void LyXScreen::ToggleToggle(LyXText * text, BufferView * bv,
+void LyXScreen::toggleToggle(LyXText * text, BufferView * bv,
int y_offset, int x_offset)
{
if (text->toggle_cursor.par() == text->toggle_end_cursor.par()
int const top = min(max(top_tmp, text->first),
static_cast<int>(text->first + owner.height()));
- DrawFromTo(text, bv, top - text->first, bottom - text->first, y_offset,
+ drawFromTo(text, bv, top - text->first, bottom - text->first, y_offset,
x_offset);
expose(0, top - text->first, owner.workWidth(),
bottom - text->first - (top - text->first));
projects / lyx.git / blobdiff