Jean-Marc Lasgouttes wrote:
> @@ -486,9 +469,9 @@ void GuiWorkArea::redraw(bool update_metrics)
>
> // update cursor position, because otherwise it has to wait until
> // the blinking interval is over
> - if (d->cursor_visible_) {
> - d->hideCursor();
> - d->showCursor();
> + if (d->caret_visible_) {
> + d->hideCaret();
> + d->showCaret();
> }
....
> // In order to avoid bad surprise in the middle of an operation,
> - // we better stop the blinking cursor...
> - // the cursor gets restarted in GuiView::restartCursor()
> - stopBlinkingCursor();
> + // we better stop the blinking caret...
> + // the cursor gets restarted in GuiView::restartCaret()
> + stopBlinkingCaret();
> guiApp->processKeySym(key, mod);
....
> @@ -548,7 +531,7 @@ void GuiWorkArea::Private::dispatch(FuncRequest const &
> cmd)
> // In order to avoid bad surprise in the middle of an operation, we
> better stop
> // the blinking cursor.
> if (notJustMovingTheMouse)
> - p->stopBlinkingCursor();
> + p->stopBlinkingCaret();
>
> buffer_view_->mouseEventDispatch(cmd);
>
....
> @@ -569,7 +552,7 @@ void GuiWorkArea::Private::dispatch(FuncRequest const &
> cmd)
> lyx_view_->clearMessage();
>
> // Show the cursor immediately after any operation
> - p->startBlinkingCursor();
> + p->startBlinkingCaret();
....
> //int cur_x = buffer_view_->getPos(cur).x_;
> // We may have decided to slide the cursor row so that cursor
> // is visible.
> - p.x_ -= buffer_view_->horizScrollOffset();
> + point.x_ -= buffer_view_->horizScrollOffset();
....
> @@ -1277,7 +1233,7 @@ void GuiWorkArea::inputMethodEvent(QInputMethodEvent *
> e)
> // get attributes of input method cursor.
> // cursor_pos : cursor position in preedit string.
> size_t cursor_pos = 0;
> - bool cursor_is_visible = false;
> + bool caret_is_visible = false;
> for (int i = 0; i != att.size(); ++i) {
> if (att.at(i).type == QInputMethodEvent::Cursor) {
> cursor_pos = att.at(i).start;
....
> /// hide the visible cursor, if it is visible
> - void hideCursor();
> + void hideCaret();
> /// show the cursor if it is not visible
> - void showCursor();
> + void showCaret();
....
> + /// is the cursor currently displayed
> + bool caret_visible_;
Not sure how much strict you wanted to be about cursor/caret
but there were bunch of "cursors" left in the patch... P
