X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fscreen.C;h=5ef3ad3aac364591c23dbe1fe1c0feed5030697c;hb=664eb7ff45dbb4fabc22ec0b56798031a82335b1;hp=efb13aafa787fc89db1dd3decbddc123cd539117;hpb=12e7bf34f41339bba4b3504a68407c5c09c0d9a7;p=lyx.git diff --git a/src/screen.C b/src/screen.C index efb13aafa7..5ef3ad3aac 100644 --- a/src/screen.C +++ b/src/screen.C @@ -23,33 +23,37 @@ #include "WorkArea.h" #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) { - first = 0; - // the cursor isnt yet visible cursor_visible = false; cursor_pixmap = 0; @@ -63,20 +67,33 @@ LyXScreen::LyXScreen(WorkArea & o) //, LyXText * text_ptr) } -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, @@ -87,25 +104,33 @@ void LyXScreen::expose(int x, int y, int exp_width, int exp_height) } -void LyXScreen::DrawFromTo(LyXText * text, int y1, int y2) +void LyXScreen::DrawFromTo(LyXText * text, BufferView * bv, + int y1, int y2, int y_offset, int x_offset) { - long y_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 - 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, 0, row, y + 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) { + if ((y < y2) && text->bv_owner) { owner.getPainter().fillRectangle(0, y, owner.workWidth(), y2 - y, @@ -114,84 +139,92 @@ void LyXScreen::DrawFromTo(LyXText * text, int y1, int y2) } -void LyXScreen::DrawOneRow(LyXText * text, Row * row, long y_text) +void LyXScreen::DrawOneRow(LyXText * text, BufferView * bv, Row * row, + int y_text, int y_offset, int x_offset) { - long y = y_text - first; - - 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(owner.height()))) { // ok there is something visible - text->GetVisibleRow(owner.owner(), y, 0, row, y + 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 = first; - first = y; + 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 (first < old_first) { - DrawFromTo(text, 0, old_first - first); - XCopyArea (fl_display, + if (text->first < old_first) { + DrawFromTo(text, bv, 0, old_first - text->first); + XCopyArea (fl_get_display(), owner.getWin(), owner.getWin(), gc_copy, 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(text, - owner.height() + old_first - first, + DrawFromTo(text, bv, + owner.height() + old_first - text->first, owner.height()); - XCopyArea (fl_display, + XCopyArea (fl_get_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(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->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); @@ -200,50 +233,52 @@ void LyXScreen::ShowCursor(LyXText const * text) /* 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 = first; + int newtop = text->first; - if (y + desc - first >= owner.height()) + if (y + desc - text->first >= static_cast(owner.height())) newtop = y - 3 * owner.height() / 4; // the scroll region must be so big!! - else if (y - asc < long(first) - && first > 0) { + else if (y - asc < static_cast(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(first)) { - Draw(text, newtop); - first = newtop; + if (newtop != static_cast(text->first)) { + Draw(text, bv, newtop); + text->first = newtop; return true; } return false; } -void LyXScreen::ShowManualCursor(long x, long y, int asc, int desc, - Cursor_Shape shape) +void LyXScreen::ShowManualCursor(LyXText const * text, int x, int y, + int asc, int desc, Cursor_Shape shape) { - unsigned long y1 = max(y - first - asc, 0UL); - typedef unsigned long ulong; + // Update the cursor color. + setCursorColor(); - unsigned long y2 = min(y - 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(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; @@ -259,12 +294,12 @@ void LyXScreen::ShowManualCursor(long x, long y, int asc, int desc, } 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, @@ -273,20 +308,20 @@ void LyXScreen::ShowManualCursor(long x, long y, int asc, int desc, 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(), @@ -305,7 +340,7 @@ void LyXScreen::HideCursor() if (!cursor_visible) return; if (cursor_pixmap){ - XCopyArea (fl_display, + XCopyArea (fl_get_display(), cursor_pixmap, owner.getWin(), gc_copy, @@ -318,24 +353,24 @@ void LyXScreen::HideCursor() } -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 = first; + int newtop = text->first; if (text->cursor.y() - text->cursor.row()->baseline() + text->cursor.row()->height() - - first >= owner.height()) { + - text->first >= owner.height()) { if (text->cursor.row()->height() < owner.height() && text->cursor.row()->height() > owner.height() / 4) newtop = text->cursor.y() @@ -344,18 +379,19 @@ unsigned long LyXScreen::TopCursorVisible(LyXText const * text) 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() < first - && first > 0) { + } else if (static_cast((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(first)); + newtop = min(newtop, int(text->first)); } } - newtop = max(newtop, 0L); + newtop = max(newtop, 0); return newtop; } @@ -363,40 +399,41 @@ unsigned long LyXScreen::TopCursorVisible(LyXText const * text) /* 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 != 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) +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(first), 0L); - - DrawFromTo(text, y, owner.height()); + 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 - first, + 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; @@ -404,46 +441,55 @@ void LyXScreen::Update(LyXText * text) } -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(), first), - first + owner.height()); - long top = min(max(text->sel_start_cursor.y() - - text->sel_start_cursor.row()->baseline(), first), - first + owner.height()); + int const bottom = min( + max(static_cast(text->sel_end_cursor.y() + - text->sel_end_cursor.row()->baseline() + + text->sel_end_cursor.row()->height()), + text->first), + static_cast(text->first + owner.height())); + int const top = min( + max(static_cast(text->sel_start_cursor.y() - + text->sel_start_cursor.row()->baseline()), + text->first), + static_cast(text->first + owner.height())); if (kill_selection) text->selection = 0; - DrawFromTo(text, top - first, bottom - first); - expose(0, top - first, + DrawFromTo(text, bv, 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(LyXText * text) +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), first), first + owner.height()); - top = min(max(ulong(top), first), first + owner.height()); - - DrawFromTo(text, top - first, bottom - first); - expose(0, top - first, owner.workWidth(), - bottom - first - (top - first)); + int const bottom = min(max(bottom_tmp, text->first), + static_cast(text->first + owner.height())); + int const top = min(max(top_tmp, text->first), + static_cast(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)); }