#include "buffer.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;
- val.foreground = BlackPixel(fl_display,
- DefaultScreen(fl_display));
+ val.foreground = BlackPixel(fl_get_display(),
+ DefaultScreen(fl_get_display()));
- val.function=GXcopy;
+ val.function = GXcopy;
val.graphics_exposures = false;
val.line_style = LineSolid;
val.line_width = 0;
- return XCreateGC(fl_display, RootWindow(fl_display, 0),
+ return XCreateGC(fl_get_display(), RootWindow(fl_get_display(), 0),
GCForeground | GCFunction | GCGraphicsExposures
| GCLineWidth | GCLineStyle , &val);
}
+} // namespace anon
+
// Constructor
-LyXScreen::LyXScreen(WorkArea & o) //, LyXText * text_ptr)
- : owner(o) //, text(text_ptr)
+LyXScreen::LyXScreen(WorkArea & o)
+ : owner(o), force_clear(true)
{
// the cursor isnt yet visible
cursor_visible = false;
}
-void LyXScreen::Redraw(LyXText * text)
+void LyXScreen::setCursorColor()
+{
+ if (!lyxColorHandler.get()) return;
+
+ GC gc = lyxColorHandler->getGCForeground(LColor::cursor);
+
+ XGCValues val;
+ XGetGCValues(fl_get_display(),
+ gc, GCForeground, &val);
+ XChangeGC(fl_get_display(), gc_copy, GCForeground, &val);
+}
+
+
+void LyXScreen::Redraw(LyXText * text, BufferView * bv)
{
- DrawFromTo(text, 0, owner.height());
+ DrawFromTo(text, bv, 0, owner.height());
expose(0, 0, owner.workWidth(), owner.height());
if (cursor_visible) {
cursor_visible = false;
- ShowCursor(text);
+ ShowCursor(text, bv);
}
}
void LyXScreen::expose(int x, int y, int exp_width, int exp_height)
{
- XCopyArea(fl_display,
+ XCopyArea(fl_get_display(),
owner.getPixmap(),
owner.getWin(),
gc_copy,
}
-void LyXScreen::DrawFromTo(LyXText * text, 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)
{
- long y_text = text->first + y1;
+ int y_text = text->first + y1;
// get the first needed row
Row * row = text->GetRowNearY(y_text);
// y_text is now the real beginning of the row
- long y = y_text - text->first;
+ int y = y_text - text->first;
// y1 is now the real beginning of row on the screen
while (row != 0 && y < y2) {
- text->GetVisibleRow(owner.owner(), y+y_offset, x_offset, row, y + text->first);
+ 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;
y += row->height();
row = row->next();
}
-
+ force_clear = false;
+
// maybe we have to clear the screen at the bottom
if ((y < y2) && text->bv_owner) {
owner.getPainter().fillRectangle(0, y,
}
-void LyXScreen::DrawOneRow(LyXText * text, Row * row, long y_text,
- int y_offset, int x_offset)
+void LyXScreen::DrawOneRow(LyXText * text, BufferView * bv, Row * row,
+ int y_text, int y_offset, int x_offset)
{
- long y = y_text - text->first + y_offset;
-
- if (y + row->height() > 0
- && y - row->height() <= long(owner.height())) {
+ 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
- text->GetVisibleRow(owner.owner(), y, x_offset, row, y + text->first);
+ LyXText::text_status st = bv->text->status;
+ do {
+ bv->text->status = st;
+ text->GetVisibleRow(bv, y, x_offset, row,
+ y + text->first);
+ } while (bv->text->status == LyXText::CHANGED_IN_DRAW);
+ bv->text->status = st;
}
+ force_clear = false;
}
/* draws the screen, starting with textposition y. uses as much already
* printed pixels as possible */
-void LyXScreen::Draw(LyXText * text, unsigned long y)
+void LyXScreen::Draw(LyXText * text, BufferView * bv, unsigned int y)
{
if (cursor_visible) HideCursor();
- unsigned long old_first = text->first;
+ int const old_first = text->first;
text->first = y;
// is any optimiziation possible?
if ((y - old_first) < owner.height()
&& (old_first - y) < owner.height()) {
if (text->first < old_first) {
- DrawFromTo(text, 0, old_first - text->first);
- XCopyArea (fl_display,
+ DrawFromTo(text, bv, 0, old_first - text->first);
+ XCopyArea (fl_get_display(),
owner.getWin(),
owner.getWin(),
gc_copy,
owner.workWidth(),
old_first - text->first);
} else {
- DrawFromTo(text,
+ DrawFromTo(text, bv,
owner.height() + old_first - text->first,
owner.height());
- XCopyArea (fl_display,
+ XCopyArea (fl_get_display(),
owner.getWin(),
owner.getWin(),
gc_copy,
}
} else {
// make a dumb new-draw
- DrawFromTo(text, 0, owner.height());
+ DrawFromTo(text, bv, 0, owner.height());
expose(0, 0, owner.workWidth(), owner.height());
}
}
-void LyXScreen::ShowCursor(LyXText const * text)
+void LyXScreen::ShowCursor(LyXText const * text, BufferView const * bv)
{
if (!cursor_visible) {
Cursor_Shape shape = BAR_SHAPE;
if (text->real_current_font.language() !=
- owner.owner()->buffer()->params.language_info
+ bv->buffer()->params.language
|| text->real_current_font.isVisibleRightToLeft()
- != owner.owner()->buffer()->params.language_info->RightToLeft())
+ != bv->buffer()->params.language->RightToLeft())
shape = (text->real_current_font.isVisibleRightToLeft())
? REVERSED_L_SHAPE : L_SHAPE;
ShowManualCursor(text, text->cursor.x(), text->cursor.y(),
/* returns true if first has changed, otherwise false */
-bool LyXScreen::FitManualCursor(LyXText * text,
- long /*x*/, long y, int asc, int desc)
+bool LyXScreen::FitManualCursor(LyXText * text, BufferView * bv,
+ int /*x*/, int y, int asc, int desc)
{
- long newtop = text->first;
+ int newtop = text->first;
- if (y + desc - text->first >= owner.height())
+ if (y + desc - text->first >= static_cast<int>(owner.height()))
newtop = y - 3 * owner.height() / 4; // the scroll region must be so big!!
- else if (y - asc < long(text->first)
+ else if (y - asc < static_cast<int>(text->first)
&& text->first > 0) {
newtop = y - owner.height() / 4;
}
- newtop = max(newtop, 0L); // can newtop ever be < 0? (Lgb)
+ newtop = max(newtop, 0); // can newtop ever be < 0? (Lgb)
- if (newtop != long(text->first)) {
- Draw(text, newtop);
+ if (newtop != static_cast<int>(text->first)) {
+ Draw(text, bv, newtop);
text->first = newtop;
return true;
}
}
-void LyXScreen::ShowManualCursor(LyXText const * text, long x, long y,
+void LyXScreen::ShowManualCursor(LyXText const * text, int x, int y,
int asc, int desc, Cursor_Shape shape)
{
- unsigned long y1 = max(y - text->first - asc, 0UL);
- typedef unsigned long ulong;
+ // Update the cursor color.
+ setCursorColor();
- unsigned long y2 = min(y - text->first + desc, ulong(owner.height()));
+ int const y1 = max(y - text->first - asc, 0);
+ int const y_tmp = min(y - text->first + desc,
+ static_cast<int>(owner.height()));
// Secure against very strange situations
- y2 = max(y2, y1);
+ int const y2 = max(y_tmp, y1);
if (cursor_pixmap){
- XFreePixmap(fl_display, cursor_pixmap);
+ XFreePixmap(fl_get_display(), cursor_pixmap);
cursor_pixmap = 0;
}
- if (y2 > 0 && y1 < owner.height()) {
+ if (y2 > 0 && y1 < int(owner.height())) {
cursor_pixmap_h = y2 - y1 + 1;
cursor_pixmap_y = y1;
- switch(shape) {
+ switch (shape) {
case BAR_SHAPE:
cursor_pixmap_w = 1;
cursor_pixmap_x = x;
}
cursor_pixmap =
- XCreatePixmap (fl_display,
+ XCreatePixmap (fl_get_display(),
fl_root,
cursor_pixmap_w,
cursor_pixmap_h,
fl_get_visual_depth());
- XCopyArea (fl_display,
+ XCopyArea (fl_get_display(),
owner.getWin(),
cursor_pixmap,
gc_copy,
cursor_pixmap_w,
cursor_pixmap_h,
0, 0);
- XDrawLine(fl_display,
+ XDrawLine(fl_get_display(),
owner.getWin(),
gc_copy,
x + owner.xpos(),
y1 + owner.ypos(),
x + owner.xpos(),
y2 + owner.ypos());
- switch(shape) {
+ switch (shape) {
case BAR_SHAPE:
break;
case L_SHAPE:
case REVERSED_L_SHAPE:
- int rectangle_h = (cursor_pixmap_h+10)/20;
- XFillRectangle(fl_display,
+ int const rectangle_h = (cursor_pixmap_h + 10) / 20;
+ XFillRectangle(fl_get_display(),
owner.getWin(),
gc_copy,
cursor_pixmap_x + owner.xpos(),
if (!cursor_visible) return;
if (cursor_pixmap){
- XCopyArea (fl_display,
+ XCopyArea (fl_get_display(),
cursor_pixmap,
owner.getWin(),
gc_copy,
}
-void LyXScreen::CursorToggle(LyXText const * text)
+void LyXScreen::CursorToggle(LyXText const * text, BufferView const * bv)
{
if (cursor_visible)
HideCursor();
else
- ShowCursor(text);
+ ShowCursor(text, bv);
}
/* returns a new top so that the cursor is visible */
-unsigned long LyXScreen::TopCursorVisible(LyXText const * text)
+unsigned int LyXScreen::TopCursorVisible(LyXText const * text)
{
- long newtop = text->first;
+ int newtop = text->first;
if (text->cursor.y()
- text->cursor.row()->baseline()
else
newtop = text->cursor.y()
- 3 * owner.height() / 4; /* the scroll region must be so big!! */
- } else if (text->cursor.y() - text->cursor.row()->baseline() < text->first
- && text->first > 0) {
+ } else if (static_cast<int>((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;
- newtop = min(newtop, long(text->first));
+ newtop = min(newtop, int(text->first));
}
}
- newtop = max(newtop, 0L);
+ newtop = max(newtop, 0);
return newtop;
}
/* 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)
+bool LyXScreen::FitCursor(LyXText * text, BufferView * bv)
{
// Is a change necessary?
- unsigned long newtop = TopCursorVisible(text);
- bool result = (newtop != text->first);
+ int const newtop = TopCursorVisible(text);
+ bool const result = (newtop != text->first);
if (result)
- Draw(text, newtop);
+ Draw(text, bv, newtop);
return result;
}
-void LyXScreen::Update(LyXText * text, 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:
{
- 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
- height = owner.height();
- DrawFromTo(text, y, owner.height(), y_offset, x_offset);
+ int const y = max(int(text->refresh_y - text->first), 0);
+ DrawFromTo(text, bv, y, owner.height(), y_offset, x_offset);
text->refresh_y = 0;
text->status = LyXText::UNCHANGED;
- expose(0, y,
- owner.workWidth(), owner.height() - y);
+ 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, 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());
}
break;
+ case LyXText::CHANGED_IN_DRAW: // just to remove the warning
case LyXText::UNCHANGED:
// Nothing needs done
break;
}
-void LyXScreen::ToggleSelection(LyXText * text, bool kill_selection)
+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;
- 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());
+ 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()),
+ 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()),
+ text->first),
+ static_cast<int>(text->first + owner.height()));
if (kill_selection)
text->selection = 0;
- DrawFromTo(text, top - text->first, bottom - text->first);
+ 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));
}
-void LyXScreen::ToggleToggle(LyXText * text, int y_offset, int x_offset)
+void LyXScreen::ToggleToggle(LyXText * text, BufferView * bv,
+ 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())
return;
- long top = text->toggle_cursor.y()
+ int const top_tmp = text->toggle_cursor.y()
- text->toggle_cursor.row()->baseline();
- long bottom = text->toggle_end_cursor.y()
+ int const bottom_tmp = text->toggle_end_cursor.y()
- text->toggle_end_cursor.row()->baseline()
+ text->toggle_end_cursor.row()->height();
- typedef unsigned long ulong;
-
- 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,
+ int const bottom = min(max(bottom_tmp, text->first),
+ static_cast<int>(text->first + owner.height()));
+ 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,
x_offset);
expose(0, top - text->first, owner.workWidth(),
bottom - text->first - (top - text->first));
projects / lyx.git / blobdiff