}
-void BufferView::redraw()
+void BufferView::repaint()
{
- pimpl_->redraw();
+ pimpl_->repaint();
}
void buffer(Buffer * b);
///
void resize();
- ///
- void redraw();
+ /**
+ * Repaint the pixmap. Used for when we don't want
+ * to go through the full update() logic, just a simple
+ * repaint of the whole screen.
+ */
+ void repaint();
///
bool fitCursor();
///
if (buffer_) {
lyxerr[Debug::INFO] << "Buffer addr: " << buffer_ << endl;
buffer_->addUser(bv_);
+
// If we don't have a text object for this, we make one
if (bv_->text == 0) {
resizeCurrentBuffer();
- } else {
- updateScreen();
- updateScrollbar();
}
+
+ // FIXME: needed when ?
bv_->text->first_y = screen().topCursorVisible(bv_->text->cursor, bv_->text->first_y);
- owner_->updateMenubar();
- owner_->updateToolbar();
+
// Similarly, buffer-dependent dialogs should be updated or
// hidden. This should go here because some dialogs (eg ToC)
// require bv_->text.
owner_->getDialogs()->updateBufferDependent(true);
- redraw();
} else {
lyxerr[Debug::INFO] << " No Buffer!" << endl;
- owner_->updateMenubar();
- owner_->updateToolbar();
owner_->getDialogs()->hideBufferDependent();
- updateScrollbar();
- workarea().redraw();
// Also remove all remaining text's from the testcache.
// (there should not be any!) (if there is any it is a
textcache.show(lyxerr, "buffer delete all");
textcache.clear();
}
- // should update layoutchoice even if we don't have a buffer.
+
+ repaint();
+ updateScrollbar();
+ owner_->updateMenubar();
+ owner_->updateToolbar();
owner_->updateLayoutChoice();
-
owner_->updateWindowTitle();
}
-void BufferView::Pimpl::redraw()
-{
- lyxerr[Debug::INFO] << "BufferView::redraw()" << endl;
- workarea().redraw();
-}
-
-
bool BufferView::Pimpl::fitCursor()
{
bool ret;
bv_->text->first_y = screen().topCursorVisible(bv_->text->cursor, bv_->text->first_y);
- // this will scroll the screen such that the cursor becomes visible
- updateScrollbar();
- redraw();
-
setState();
owner_->allowInput();
}
-void BufferView::Pimpl::updateScreen()
+void BufferView::Pimpl::repaint()
{
// Regenerate the screen.
screen().redraw(bv_->text, bv_);
// update from work area
work_area_width = workarea().workWidth();
work_area_height = workarea().workHeight();
+
if (buffer_ != 0) {
if (widthChange) {
// The visible LyXView need a resize
// to the start of the document on vertical
// resize
fitCursor();
-
- // The main window size has changed, repaint most stuff
- redraw();
} else {
screen().redraw(bv_->text, bv_);
}
screen().draw(bv_->text, bv_, 0);
}
update(bv_->text, BufferView::SELECT|BufferView::FITCUR);
- redraw();
}
LyXScreen & screen() const;
///
void buffer(Buffer *);
- ///
- void redraw();
/// Return true if the cursor was fitted.
bool fitCursor();
///
void update();
//
void update(LyXText *, BufferView::UpdateCodes);
- /// Update pixmap of screen
- void updateScreen();
+ /**
+ * Repaint pixmap. Used for when we've made a visible
+ * change but don't need the full update() logic
+ */
+ void repaint();
///
void workAreaResize();
///
+2002-06-21 John Levon <moz@compsoc.man.ac.uk>
+
+ * buffer.C:
+ * converter.C:
+ * exporter.C:
+ * lyxfunc.C:
+ * BufferView.h:
+ * BufferView.C: use repaint()
+
+ * BufferView_pimpl.h:
+ * BufferView_pimpl.C: s/updateScreen()/repaint()/
+ as it's a clearer description. Remove superfluous
+ redraws.
+
2002-06-21 John Levon <moz@compsoc.man.ac.uk>
* text.C: fix bug 488. Not ideal, but getting
// if we removed error insets before we ran chktex or if we inserted
// error insets after we ran chktex, this must be run:
if (removedErrorInsets || res) {
- users->redraw();
+#warning repaint needed here, or do you mean update() ?
+ users->repaint();
users->fitCursor();
}
users->owner()->allowInput();
void Buffer::redraw()
{
- users->redraw();
+#warning repaint needed here, or do you mean update() ?
+ users->repaint();
users->fitCursor();
}
if ((result & LaTeX::ERRORS)) {
// Insert all errors as errors boxes
bv->insertErrors(terr);
- bv->redraw();
+#warning repaint() or update() or nothing ?
+ bv->repaint();
bv->fitCursor();
}
bv->owner()->allowInput();
if ((result & LaTeX::ERRORS)) {
// Insert all errors as errors boxes
bv->insertErrors(terr);
- bv->redraw();
+#warning repaint() or update() or nothing ?
+ bv->repaint();
bv->fitCursor();
}
}
if (bv) {
// Remove all error insets
if (bv->removeAutoInsets()) {
- bv->redraw();
+#warning repaint() or update() or nothing ?
+ bv->repaint();
bv->fitCursor();
}
}
+2002-06-21 John Levon <moz@compsoc.man.ac.uk>
+
+ * WorkArea.h: remove redraw()
+
2002-06-20 John Levon <moz@compsoc.man.ac.uk>
* guiapi.h:
/// return the height of the work area in pixels
virtual int workHeight() const = 0;
- /// FIXME: GUII
- virtual void redraw() const = 0;
-
/**
* Update the scrollbar.
* @param height the total document height in pixels
+2002-06-21 John Levon <moz@compsoc.man.ac.uk>
+
+ * ControlBibtex.C:
+ * ControlBibitem.C: use repaint()
+
2002-06-21 John Levon <moz@compsoc.man.ac.uk>
* ControlTexinfo.C: do the same for Texinfo
// We need to do a redraw because the maximum
// InsetBibKey width could have changed
- lv_.view()->redraw();
+#warning please check you mean repaint() not update(),
+#warning and whether the repaint() is needed at all
+ lv_.view()->repaint();
lv_.view()->fitCursor();
}
// We need to do a redraw because the maximum
// InsetBibKey width could have changed
- lv_.view()->redraw();
+#warning are you sure you need this repaint() ?
+ lv_.view()->repaint();
lv_.view()->fitCursor();
}
int y1, int y2, int yo, int xo,
bool internal)
{
+ lyxerr[Debug::GUI] << "screen: drawFromTo " << y1 << "-" << y2 << endl;
+
int y_text = text->first_y + y1;
// get the first needed row
virtual bool forceClear() const { return force_clear_; }
protected:
- /// copies specified area of pixmap to screen
- virtual void expose(int x, int y, int exp_width, int exp_height) = 0;
+ /// cause the display of the given area of the work area
+ virtual void expose(int x, int y, int w, int h) = 0;
/// get the work area
virtual WorkArea & workarea() const = 0;
virtual int workHeight() const { return work_area->h; }
///
virtual void redraw() const {
- fl_redraw_object(work_area);
- fl_redraw_object(scrollbar);
+ //fl_redraw_object(work_area);
+ //fl_redraw_object(scrollbar);
}
///
Window getWin() const { return work_area->form->window; }
#include "insets/insettext.h"
#include "ColorHandler.h"
#include "language.h"
+#include "debug.h"
using std::max;
using std::min;
}
-void XScreen::expose(int x, int y, int exp_width, int exp_height)
+void XScreen::expose(int x, int y, int w, int h)
{
- // FIXME: here we should definitely NOT do this.
- // we need to generate an expose event for the workarea
- // and then copy from the pixmap to the screen. This
- // is the Sane Way (tm)
+ lyxerr[Debug::GUI] << "expose " << w << "x" << h
+ << "+" << x << "+" << y << endl;
XCopyArea(fl_get_display(),
owner_.getPixmap(),
owner_.getWin(),
gc_copy,
- x, y,
- exp_width, exp_height,
+ x, y, w, h,
x + owner_.xpos(),
y + owner_.ypos());
}
virtual WorkArea & workarea() const { return owner_; }
/// Copies specified area of pixmap to screen
- virtual void expose(int x, int y, int exp_width, int exp_height);
+ virtual void expose(int x, int y, int w, int h);
private:
/// our owning widget
case LFUN_REMOVEERRORS:
if (owner->view()->removeAutoInsets()) {
- owner->view()->redraw();
+#warning repaint() or update() or nothing ?
+ owner->view()->repaint();
owner->view()->fitCursor();
}
break;
gc.changeDisplay(true);
}
- owner->view()->redraw();
+ owner->view()->repaint();
break;
}
+2002-06-21 John Levon <moz@compsoc.man.ac.uk>
+
+ * formula.C: use repaint()
+
2002-06-16 André Pönitz <poenitz@gmx.net>
* math_factory.C:
hull()->numbered(row, true);
}
+#warning FIXME: please check you really mean repaint() ... is it needed,
+#warning and if so, should it be update() instead ?
if (!new_label.empty() && bv->ChangeRefsIfUnique(old_label, new_label))
- bv->redraw();
+ bv->repaint();
hull()->label(row, new_label);
projects / features.git / commitdiff