#include "lyxrow.h"
#include "Painter.h"
#include "WorkArea.h"
-#include "bufferparams.h"
+#include "buffer.h"
#include "font.h"
+#include "insets/insettext.h"
using std::max;
using std::min;
// Constructor
-LyXScreen::LyXScreen(WorkArea & o, LyXText * text_ptr)
- : owner(o), text(text_ptr)
+LyXScreen::LyXScreen(WorkArea & o) //, LyXText * text_ptr)
+ : owner(o), force_clear(true) //, text(text_ptr)
{
- first = 0;
-
- /* the cursor isnt yet visible */
+ // the cursor isnt yet visible
cursor_visible = false;
- screen_refresh_y = -1;
-
cursor_pixmap = 0;
cursor_pixmap_x = 0;
cursor_pixmap_y = 0;
}
-void LyXScreen::Redraw()
+void LyXScreen::Redraw(LyXText * text)
{
- DrawFromTo(0, owner.height());
- screen_refresh_y = -1;
+ DrawFromTo(text, 0, owner.height());
expose(0, 0, owner.workWidth(), owner.height());
if (cursor_visible) {
cursor_visible = false;
- ShowCursor();
+ ShowCursor(text);
}
}
}
-void LyXScreen::DrawFromTo(int y1, int y2)
+void LyXScreen::DrawFromTo(LyXText * text, int y1, int y2, int y_offset, int x_offset)
{
- long y_text = first + y1;
+ long y_text = text->first + y1;
- /* get the first needed row */
+ // get the first needed row
Row * row = text->GetRowNearY(y_text);
- /* y_text is now the real beginning of the row */
+ // y_text is now the real beginning of the row
- long y = y_text - first;
- /* y1 is now the real beginning of row on the screen */
+ long y = y_text - text->first;
+ // y1 is now the real beginning of row on the screen
while (row != 0 && y < y2) {
- text->GetVisibleRow(y, row, y + first);
- y += row->height;
- row = row->next;
+ LyXText::text_status st = text->status;
+ do {
+ text->status = st;
+ text->GetVisibleRow(owner.owner(), y+y_offset,
+ x_offset, row, y + text->first);
+ } while (text->status == LyXText::CHANGED_IN_DRAW);
+ text->status = st;
+ y += row->height();
+ row = row->next();
}
-
- /* maybe we have to clear the screen at the bottom */
- if (y < y2) {
+ force_clear = false;
+
+ // maybe we have to clear the screen at the bottom
+ if ((y < y2) && text->bv_owner) {
owner.getPainter().fillRectangle(0, y,
owner.workWidth(),
y2 - y,
}
-void LyXScreen::DrawOneRow(Row * row, long & y_text)
+void LyXScreen::DrawOneRow(LyXText * text, Row * row, long y_text,
+ int y_offset, int x_offset)
{
- long y = y_text - first;
+ long y = y_text - text->first + y_offset;
- if (y + row->height > 0 && y - row->height <= owner.height()) {
- /* ok there is something visible */
- text->GetVisibleRow(y, row, y + first);
+ if (y + row->height() > 0
+ && y - row->height() <= long(owner.height())) {
+ // ok there is something visible
+ LyXText::text_status st = text->status;
+ do {
+ text->status = st;
+ text->GetVisibleRow(owner.owner(), y, x_offset, row,
+ y + text->first);
+ } while (text->status == LyXText::CHANGED_IN_DRAW);
+ text->status = st;
}
- y_text += row->height;
+ force_clear = false;
}
/* draws the screen, starting with textposition y. uses as much already
* printed pixels as possible */
-void LyXScreen::Draw(long y)
+void LyXScreen::Draw(LyXText * text, unsigned long y)
{
if (cursor_visible) HideCursor();
- if (y < 0) y = 0;
- long old_first = first;
- first = y;
+ unsigned long old_first = text->first;
+ text->first = y;
- /* is any optimiziation possible? */
+ // is any optimiziation possible?
if ((y - old_first) < owner.height()
&& (old_first - y) < owner.height()) {
- if (first < old_first) {
- DrawFromTo(0, old_first - first);
+ if (text->first < old_first) {
+ DrawFromTo(text, 0, old_first - text->first);
XCopyArea (fl_display,
owner.getWin(),
owner.getWin(),
owner.xpos(),
owner.ypos(),
owner.workWidth(),
- owner.height() - old_first + first,
+ owner.height() - old_first + text->first,
owner.xpos(),
- owner.ypos() + old_first - first
+ owner.ypos() + old_first - text->first
);
// expose the area drawn
expose(0, 0,
owner.workWidth(),
- old_first - first);
+ old_first - text->first);
} else {
- DrawFromTo(
- owner.height() + old_first - first,
+ DrawFromTo(text,
+ owner.height() + old_first - text->first,
owner.height());
XCopyArea (fl_display,
owner.getWin(),
owner.getWin(),
gc_copy,
owner.xpos(),
- owner.ypos() + first - old_first,
+ owner.ypos() + text->first - old_first,
owner.workWidth(),
- owner.height() + old_first - first,
+ owner.height() + old_first - text->first,
owner.xpos(),
owner.ypos());
// expose the area drawn
- expose(0, owner.height() + old_first - first,
- owner.workWidth(), first - old_first);
+ expose(0, owner.height() + old_first - text->first,
+ owner.workWidth(), text->first - old_first);
}
} else {
- /* make a dumb new-draw */
- DrawFromTo(0, owner.height());
+ // make a dumb new-draw
+ DrawFromTo(text, 0, owner.height());
expose(0, 0, owner.workWidth(), owner.height());
}
}
-void LyXScreen::ShowCursor()
+void LyXScreen::ShowCursor(LyXText const * text)
{
if (!cursor_visible) {
Cursor_Shape shape = BAR_SHAPE;
if (text->real_current_font.language() !=
- text->parameters->language_info
+ owner.owner()->buffer()->params.language_info
|| text->real_current_font.isVisibleRightToLeft()
- != text->parameters->language_info->RightToLeft)
+ != owner.owner()->buffer()->params.language_info->RightToLeft())
shape = (text->real_current_font.isVisibleRightToLeft())
? REVERSED_L_SHAPE : L_SHAPE;
- ShowManualCursor(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 1 if first has changed, otherwise 0 */
-int LyXScreen::FitManualCursor(long /*x*/, long y, int asc, int desc)
+/* returns true if first has changed, otherwise false */
+bool LyXScreen::FitManualCursor(LyXText * text,
+ long /*x*/, long y, int asc, int desc)
{
- long newtop = first;
+ long newtop = text->first;
- if (y + desc - first >= owner.height())
- newtop = y - 3 * owner.height() / 4; /* the scroll region must be so big!! */
- else if (y - asc < first
- && first > 0) {
+ if (y + desc - text->first >= owner.height())
+ newtop = y - 3 * owner.height() / 4; // the scroll region must be so big!!
+ else if (y - asc < long(text->first)
+ && text->first > 0) {
newtop = y - owner.height() / 4;
}
- if (newtop < 0)
- newtop = 0;
+
+ newtop = max(newtop, 0L); // can newtop ever be < 0? (Lgb)
- if (newtop != first){
- Draw(newtop);
- first = newtop;
- return 1;
+ if (newtop != long(text->first)) {
+ Draw(text, newtop);
+ text->first = newtop;
+ return true;
}
- return 0;
+ return false;
}
-void LyXScreen::ShowManualCursor(long x, long y, int asc, int desc,
- Cursor_Shape shape)
+void LyXScreen::ShowManualCursor(LyXText const * text, long x, long y,
+ int asc, int desc, Cursor_Shape shape)
{
- long y1 = max(y - first - asc, 0L);
- long y2 = min(y - first + desc, long(owner.height()));
+ unsigned long y1 = max(y - text->first - asc, 0UL);
+ typedef unsigned long ulong;
+
+ unsigned long y2 = min(y - text->first + desc, ulong(owner.height()));
// Secure against very strange situations
- if (y2 < y1) y2 = y1;
-
+ y2 = max(y2, y1);
+
if (cursor_pixmap){
XFreePixmap(fl_display, cursor_pixmap);
cursor_pixmap = 0;
}
- if (y2 > 0 && y1 <
- owner.height()) {
+ if (y2 > 0 && y1 < owner.height()) {
cursor_pixmap_h = y2 - y1 + 1;
cursor_pixmap_y = y1;
}
-void LyXScreen::CursorToggle()
+void LyXScreen::CursorToggle(LyXText const * text)
{
if (cursor_visible)
HideCursor();
else
- ShowCursor();
+ ShowCursor(text);
}
/* returns a new top so that the cursor is visible */
-long LyXScreen::TopCursorVisible()
+unsigned long LyXScreen::TopCursorVisible(LyXText const * text)
{
- long newtop = first;
-
- if (text->cursor.y
- - text->cursor.row->baseline
- + text->cursor.row->height
- - first >= owner.height()) {
- if (text->cursor.row->height < owner.height()
- && text->cursor.row->height > owner.height() / 4)
- newtop = text->cursor.y
- + text->cursor.row->height
- - text->cursor.row->baseline - owner.height();
+ long newtop = text->first;
+
+ if (text->cursor.y()
+ - text->cursor.row()->baseline()
+ + text->cursor.row()->height()
+ - text->first >= owner.height()) {
+ if (text->cursor.row()->height() < owner.height()
+ && text->cursor.row()->height() > owner.height() / 4)
+ newtop = text->cursor.y()
+ + text->cursor.row()->height()
+ - text->cursor.row()->baseline() - owner.height();
else
- newtop = text->cursor.y
+ newtop = text->cursor.y()
- 3 * owner.height() / 4; /* the scroll region must be so big!! */
- } else if (text->cursor.y - text->cursor.row->baseline < first
- && first > 0) {
- if (text->cursor.row->height < owner.height()
- && text->cursor.row->height > owner.height() / 4)
- newtop = text->cursor.y - text->cursor.row->baseline;
+ } else if (text->cursor.y() - text->cursor.row()->baseline() < text->first
+ && text->first > 0) {
+ if (text->cursor.row()->height() < owner.height()
+ && text->cursor.row()->height() > owner.height() / 4)
+ newtop = text->cursor.y() - text->cursor.row()->baseline();
else {
- newtop = text->cursor.y - owner.height() / 4;
- if (newtop > first)
- newtop = first;
+ newtop = text->cursor.y() - owner.height() / 4;
+ newtop = min(newtop, long(text->first));
}
}
- if (newtop < 0)
- newtop = 0;
-
+
+ newtop = max(newtop, 0L);
+
return newtop;
}
/* scrolls the screen so that the cursor is visible, if necessary.
-* returns 1 if a change was made, otherwise 0 */
-int LyXScreen::FitCursor()
+* returns true if a change was made, otherwise false */
+bool LyXScreen::FitCursor(LyXText * text)
{
- /* is a change necessary */
- long newtop = TopCursorVisible();
- int result = (newtop != first);
+ // Is a change necessary?
+ unsigned long newtop = TopCursorVisible(text);
+ bool result = (newtop != text->first);
if (result)
- Draw(newtop);
+ Draw(text, newtop);
return result;
}
-void LyXScreen::Update()
+void LyXScreen::Update(LyXText * text, int y_offset, int x_offset)
{
- if (text->status == LyXText::NEED_MORE_REFRESH
- || screen_refresh_y > -1 ) {
- long y = 0;
- if (screen_refresh_y > -1
- && screen_refresh_y < text->refresh_y)
- y = screen_refresh_y;
+ switch(text->status) {
+ case LyXText::NEED_MORE_REFRESH:
+ {
+ long y = max(text->refresh_y - long(text->first), 0L);
+ int height;
+ if (text->inset_owner)
+ height = text->inset_owner->ascent(owner.owner(),
+ text->real_current_font)
+ + text->inset_owner->descent(owner.owner(),
+ text->real_current_font);
else
- y = text->refresh_y;
-
- if (y < first) y = first;
-
- DrawFromTo(y - first, owner.height());
+ height = owner.height();
+ DrawFromTo(text, y, owner.height(), y_offset, x_offset);
text->refresh_y = 0;
text->status = LyXText::UNCHANGED;
- screen_refresh_y = -1;
- expose(0, y - first,
- owner.workWidth(), owner.height() - (y - first));
- } else if (text->status == LyXText::NEED_VERY_LITTLE_REFRESH) {
- /* ok I will update the current cursor row */
- long y = text->refresh_y;
- DrawOneRow(text->refresh_row, y);
- text->status = LyXText::UNCHANGED;
- expose(0, text->refresh_y - first,
- owner.workWidth(), text->refresh_row->height);
+ expose(0, y,
+ owner.workWidth(), owner.height() - y);
}
-}
-
-
-void LyXScreen::SmallUpdate()
-{
- if (text->status == LyXText::NEED_MORE_REFRESH) {
- /* ok I will update till the current cursor row */
- Row * row = text->refresh_row;
- long y = text->refresh_y;
- long y2 = y;
-
- if (y > text->cursor.y) {
- Update();
- return;
- }
-
- while (row
- && row != text->cursor.row
- && y < first + owner.height()) {
- DrawOneRow(row, y);
- row = row->next;
- }
-
- DrawOneRow(row, y);
- screen_refresh_y = y;
- screen_refresh_row = row->next;
+ break;
+ case LyXText::NEED_VERY_LITTLE_REFRESH:
+ {
+ // ok I will update the current cursor row
+ DrawOneRow(text, text->refresh_row, text->refresh_y,
+ y_offset, x_offset);
text->status = LyXText::UNCHANGED;
- // Is the right regin exposed?
- expose(0, y2 - first,
- owner.workWidth(), y - y2);
- } else if (text->status == LyXText::NEED_VERY_LITTLE_REFRESH) {
- /* ok I will update the current cursor row */
- long y = text->refresh_y;
- DrawOneRow(text->refresh_row, y);
- text->status = LyXText::UNCHANGED;
- expose(0, text->refresh_y - first,
- owner.workWidth(), text->refresh_row->height);
+ 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
+ case LyXText::UNCHANGED:
+ // Nothing needs done
+ break;
}
}
-void LyXScreen::ToggleSelection(bool kill_selection)
+void LyXScreen::ToggleSelection(LyXText * text, bool kill_selection,
+ int y_offset, int x_offset)
{
- /* only if there is a selection */
+ // only if there is a selection
if (!text->selection) return;
- long top = text->sel_start_cursor.y
- - text->sel_start_cursor.row->baseline;
- long bottom = text->sel_end_cursor.y
- - text->sel_end_cursor.row->baseline
- + text->sel_end_cursor.row->height;
-
- if (top < first)
- top = max(top, first);
- if (bottom < first)
- bottom = max(bottom, first);
-
- if (bottom > first + owner.height())
- bottom = first + owner.height();
- if (top > first + owner.height())
- top = first + owner.height();
+ long bottom = min(max(text->sel_end_cursor.y()
+ - text->sel_end_cursor.row()->baseline()
+ + text->sel_end_cursor.row()->height(), text->first),
+ text->first + owner.height());
+ long top = min(max(text->sel_start_cursor.y()
+ - text->sel_start_cursor.row()->baseline(), text->first),
+ text->first + owner.height());
if (kill_selection)
text->selection = 0;
- DrawFromTo(top - first, bottom - first);
- expose(0, top - first,
+ DrawFromTo(text, top - text->first, bottom - text->first,
+ y_offset, x_offset);
+ expose(0, top - text->first,
owner.workWidth(),
- bottom - first - (top - first));
+ bottom - text->first - (top - text->first));
}
-void LyXScreen::ToggleToggle()
+void LyXScreen::ToggleToggle(LyXText * text, int y_offset, int x_offset)
{
- if (text->toggle_cursor.par == text->toggle_end_cursor.par
- && text->toggle_cursor.pos == text->toggle_end_cursor.pos)
+ if (text->toggle_cursor.par() == text->toggle_end_cursor.par()
+ && text->toggle_cursor.pos() == text->toggle_end_cursor.pos())
return;
- long top = text->toggle_cursor.y
- - text->toggle_cursor.row->baseline;
- long bottom = text->toggle_end_cursor.y
- - text->toggle_end_cursor.row->baseline
- + text->toggle_end_cursor.row->height;
-
- if (top - first < 0)
- top = first;
- if (bottom - first < 0)
- bottom = first;
+ long top = text->toggle_cursor.y()
+ - text->toggle_cursor.row()->baseline();
+ long bottom = text->toggle_end_cursor.y()
+ - text->toggle_end_cursor.row()->baseline()
+ + text->toggle_end_cursor.row()->height();
- if (bottom - first > owner.height())
- bottom = first + owner.height();
- if (top - first > owner.height())
- top = first + owner.height();
+ typedef unsigned long ulong;
- DrawFromTo(top - first, bottom - first);
- expose(0, top - first, owner.workWidth(),
- bottom - first - (top - first));
+ bottom = min(max(ulong(bottom), text->first), text->first + owner.height());
+ top = min(max(ulong(top), text->first), text->first + owner.height());
+
+ DrawFromTo(text, 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