// -*- C++ -*-
/* This file is part of
- * ======================================================
+ * ======================================================
*
* LyX, The Document Processor
*
* Copyright 1995 Matthias Ettrich
* Copyright 1995-1999 The LyX Team.
*
- * ======================================================*/
+ * ====================================================== */
#include <config.h>
#include "lyxtext.h"
#include "lyx_cb.h"
#include "gettext.h"
+#include "layout.h"
extern BufferList bufferlist;
void sigchldhandler(pid_t pid, int *status);
extern void MenuPasteSelection(char at);
extern InsetUpdateStruct *InsetUpdateList;
extern void UpdateInsetUpdateList();
+extern void FreeUpdateTimer();
// This is _very_ temporary
-FL_OBJECT *figinset_canvas;
+FL_OBJECT * figinset_canvas;
BufferView::BufferView(LyXView *o, int xpos, int ypos,
int width, int height)
- : _owner(o)
+ : owner_(o)
{
- _buffer = 0;
-
+ buffer_ = 0;
+#ifdef MOVE_TEXT
+ text = 0;
+#endif
screen = 0;
work_area = 0;
figinset_canvas = 0;
create_view(xpos, ypos, width, height);
// Activate the timer for the cursor
fl_set_timer(timer_cursor, 0.4);
- fl_set_focus_object(_owner->getForm(), work_area);
+ fl_set_focus_object(owner_->getForm(), work_area);
work_area_focus = true;
lyx_focus = false;
- backstack = new BackStack(16);
}
BufferView::~BufferView()
{
- delete backstack;
-}
+#ifdef MOVE_TEXT
+ delete text;
+#endif
+}
-void BufferView::setBuffer(Buffer *b)
+void BufferView::buffer(Buffer *b)
{
- lyxerr.debug() << "Setting buffer in BufferView" << endl;
- if (_buffer) {
- _buffer->InsetSleep();
- _buffer->delUser(this);
+ lyxerr[Debug::INFO] << "Setting buffer in BufferView" << endl;
+ if (buffer_) {
+ buffer_->InsetSleep();
+ buffer_->delUser(this);
+ delete text;
+ text = 0;
}
// Set current buffer
- _buffer = b;
+ buffer_ = b;
if (bufferlist.getState() == BufferList::CLOSING) return;
screen = 0;
// If we are closing the buffer, use the first buffer as current
- if (!_buffer) {
- _buffer = bufferlist.first();
+ if (!buffer_) {
+ buffer_ = bufferlist.first();
}
- if (_buffer) {
- lyxerr.debug() << " Buffer addr: " << _buffer << endl;
- _buffer->addUser(this);
- _owner->getMenus()->showMenus();
+ if (buffer_) {
+ lyxerr[Debug::INFO] << " Buffer addr: " << buffer_ << endl;
+ buffer_->addUser(this);
+ owner_->getMenus()->showMenus();
// If we don't have a text object for this, we make one
- if (_buffer->text == 0)
+#ifdef MOVE_TEXT
+ if (text == 0)
+ resizeCurrentBuffer();
+ else {
+ updateScreen();
+ updateScrollbar();
+ }
+#else
+ if (buffer_->text == 0)
resizeCurrentBuffer();
else {
updateScreen();
updateScrollbar();
}
+#endif
screen->first = screen->TopCursorVisible();
redraw();
updateAllVisibleBufferRelatedPopups();
- _buffer->InsetWakeup();
+ buffer_->InsetWakeup();
} else {
- lyxerr.debug() << " No Buffer!" << endl;
- _owner->getMenus()->hideMenus();
- //workAreaExpose();
+ lyxerr[Debug::INFO] << " No Buffer!" << endl;
+ owner_->getMenus()->hideMenus();
updateScrollbar();
fl_redraw_object(work_area);
}
// should update layoutchoice even if we don't have a buffer.
- _owner->updateLayoutChoice();
- _owner->getMiniBuffer()->Init();
- _owner->updateWindowTitle();
+ owner_->updateLayoutChoice();
+ owner_->getMiniBuffer()->Init();
+ owner_->updateWindowTitle();
}
// Regenerate the screen.
if (screen)
delete screen;
+#ifdef MOVE_TEXT
screen = new LyXScreen(FL_ObjWin(work_area),
work_area->w,
work_area->h,
work_area->x,
work_area->y,
- _buffer->text);
+ text);
+#else
+ screen = new LyXScreen(FL_ObjWin(work_area),
+ work_area->w,
+ work_area->h,
+ work_area->x,
+ work_area->y,
+ buffer_->text);
+#endif
}
void BufferView::resize()
{
// This will resize the buffer. (Asger)
- if (_buffer)
+ if (buffer_)
resizeCurrentBuffer();
}
void BufferView::redraw()
{
- lyxerr.debug() << "BufferView::redraw()" << endl;
+ lyxerr[Debug::INFO] << "BufferView::redraw()" << endl;
lgb_hack = true;
fl_redraw_object(work_area);
fl_redraw_object(scrollbar);
* maximum must be the working area height. No scrolling will
* be possible */
- if (!_buffer) {
+ if (!buffer_) {
fl_set_slider_value(scrollbar, 0);
fl_set_slider_size(scrollbar, scrollbar->h);
return;
long cbth = 0;
long cbsf = 0;
- if (_buffer->text)
- cbth = _buffer->text->height;
+#ifdef MOVE_TEXT
+ if (text)
+ cbth = text->height;
+#else
+ if (buffer_->text)
+ cbth = buffer_->text->height;
+#endif
if (screen)
cbsf = screen->first;
long maximum_height = work_area->h * 3/4 + cbth;
long value = cbsf;
- /* set the scrollbar */
+ // set the scrollbar
double hfloat = work_area->h;
double maxfloat = maximum_height;
fl_set_slider_bounds(scrollbar, 0,
maximum_height - work_area->h);
#if FL_REVISION > 85
- double lineh = _buffer->text->DefaultHeight();
- fl_set_slider_increment(scrollbar,work_area->h-lineh,lineh);
+#ifdef MOVE_TEXT
+ double lineh = text->DefaultHeight();
+#else
+ double lineh = buffer_->text->DefaultHeight();
#endif
- if (maxfloat>0){
- if ((hfloat/maxfloat) * (float) height2 < 3)
+ fl_set_slider_increment(scrollbar, work_area->h-lineh, lineh);
+#endif
+ if (maxfloat > 0){
+ if ((hfloat / maxfloat) * float(height2) < 3)
fl_set_slider_size(scrollbar,
- 3/(float)height2);
+ 3 / float(height2));
else
fl_set_slider_size(scrollbar,
- hfloat/maxfloat);
+ hfloat / maxfloat);
} else
fl_set_slider_size(scrollbar, hfloat);
fl_set_slider_precision(scrollbar, 0);
void BufferView::redoCurrentBuffer()
{
- lyxerr.debug() << "BufferView::redoCurrentBuffer" << endl;
- if (_buffer && _buffer->text) {
+ lyxerr[Debug::INFO] << "BufferView::redoCurrentBuffer" << endl;
+#ifdef MOVE_TEXT
+ if (text) {
+ resize();
+ owner_->updateLayoutChoice();
+ }
+#else
+ if (buffer_ && buffer_->text) {
resize();
- _owner->updateLayoutChoice();
+ owner_->updateLayoutChoice();
}
+#endif
}
int BufferView::resizeCurrentBuffer()
{
- lyxerr.debug() << "resizeCurrentBuffer" << endl;
+ lyxerr[Debug::INFO] << "resizeCurrentBuffer" << endl;
- LyXParagraph *par = 0;
- LyXParagraph *selstartpar = 0;
- LyXParagraph *selendpar = 0;
+ LyXParagraph * par = 0;
+ LyXParagraph * selstartpar = 0;
+ LyXParagraph * selendpar = 0;
int pos = 0;
int selstartpos = 0;
int selendpos = 0;
ProhibitInput();
- _owner->getMiniBuffer()->Set(_("Formatting document..."));
-
- if (_buffer->text) {
- par = _buffer->text->cursor.par;
- pos = _buffer->text->cursor.pos;
- selstartpar = _buffer->text->sel_start_cursor.par;
- selstartpos = _buffer->text->sel_start_cursor.pos;
- selendpar = _buffer->text->sel_end_cursor.par;
- selendpos = _buffer->text->sel_end_cursor.pos;
- selection = _buffer->text->selection;
- mark_set = _buffer->text->mark_set;
- delete _buffer->text;
+ owner_->getMiniBuffer()->Set(_("Formatting document..."));
+
+#ifdef MOVE_TEXT
+ if (text) {
+ par = text->cursor.par;
+ pos = text->cursor.pos;
+ selstartpar = text->sel_start_cursor.par;
+ selstartpos = text->sel_start_cursor.pos;
+ selendpar = text->sel_end_cursor.par;
+ selendpos = text->sel_end_cursor.pos;
+ selection = text->selection;
+ mark_set = text->mark_set;
+ delete text;
+ }
+ text = new LyXText(work_area->w, buffer_);
+#else
+ if (buffer_->text) {
+ par = buffer_->text->cursor.par;
+ pos = buffer_->text->cursor.pos;
+ selstartpar = buffer_->text->sel_start_cursor.par;
+ selstartpos = buffer_->text->sel_start_cursor.pos;
+ selendpar = buffer_->text->sel_end_cursor.par;
+ selendpos = buffer_->text->sel_end_cursor.pos;
+ selection = buffer_->text->selection;
+ mark_set = buffer_->text->mark_set;
+ delete buffer_->text;
}
- _buffer->text = new LyXText(work_area->w, _buffer);
+ buffer_->text = new LyXText(work_area->w, buffer_);
+#endif
updateScreen();
-
+
+#ifdef MOVE_TEXT
if (par) {
- _buffer->text->selection = true;
+ text->selection = true;
/* at this point just
* to avoid the Delete-
* Empty-Paragraph
* Mechanism when
* setting the cursor */
- _buffer->text->mark_set = mark_set;
+ text->mark_set = mark_set;
if (selection) {
- _buffer->text->SetCursor(selstartpar, selstartpos);
- _buffer->text->sel_cursor = _buffer->text->cursor;
- _buffer->text->SetCursor(selendpar, selendpos);
- _buffer->text->SetSelection();
- _buffer->text->SetCursor(par, pos);
+ text->SetCursor(selstartpar, selstartpos);
+ text->sel_cursor = text->cursor;
+ text->SetCursor(selendpar, selendpos);
+ text->SetSelection();
+ text->SetCursor(par, pos);
} else {
- _buffer->text->SetCursor(par, pos);
- _buffer->text->sel_cursor = _buffer->text->cursor;
- _buffer->text->selection = false;
+ text->SetCursor(par, pos);
+ text->sel_cursor = text->cursor;
+ text->selection = false;
}
}
+#else
+ if (par) {
+ buffer_->text->selection = true;
+ /* at this point just
+ * to avoid the Delete-
+ * Empty-Paragraph
+ * Mechanism when
+ * setting the cursor */
+ buffer_->text->mark_set = mark_set;
+ if (selection) {
+ buffer_->text->SetCursor(selstartpar, selstartpos);
+ buffer_->text->sel_cursor = buffer_->text->cursor;
+ buffer_->text->SetCursor(selendpar, selendpos);
+ buffer_->text->SetSelection();
+ buffer_->text->SetCursor(par, pos);
+ } else {
+ buffer_->text->SetCursor(par, pos);
+ buffer_->text->sel_cursor = buffer_->text->cursor;
+ buffer_->text->selection = false;
+ }
+ }
+#endif
screen->first = screen->TopCursorVisible(); /* this will scroll the
* screen such that the
* cursor becomes
* visible */
updateScrollbar();
redraw();
- _owner->getMiniBuffer()->Init();
+ owner_->getMiniBuffer()->Init();
AllowInput();
// Now if the title form still exist kill it
- TimerCB(0,0);
+ TimerCB(0, 0);
return 0;
}
screen->HideCursor();
BeforeChange();
- _buffer->update(-2);
+#ifdef MOVE_TEXT
+ update(-2);
+#else
+ buffer_->update(-2);
+#endif
LyXCursor tmp;
-
- if (!_buffer->text->GotoNextError()) {
- if (_buffer->text->cursor.pos
- || _buffer->text->cursor.par !=
- _buffer->text->FirstParagraph()) {
- tmp = _buffer->text->cursor;
- _buffer->text->cursor.par =
- _buffer->text->FirstParagraph();
- _buffer->text->cursor.pos = 0;
- if (!_buffer->text->GotoNextError()) {
- _buffer->text->cursor = tmp;
- _owner->getMiniBuffer()->Set(_("No more errors"));
+
+#ifdef MOVE_TEXT
+ if (!text->GotoNextError()) {
+ if (text->cursor.pos
+ || text->cursor.par != text->FirstParagraph()) {
+ tmp = text->cursor;
+ text->cursor.par = text->FirstParagraph();
+ text->cursor.pos = 0;
+ if (!text->GotoNextError()) {
+ text->cursor = tmp;
+ owner_->getMiniBuffer()->Set(_("No more errors"));
+ LyXBell();
+ }
+ } else {
+ owner_->getMiniBuffer()->Set(_("No more errors"));
+ LyXBell();
+ }
+ }
+ update(0);
+ text->sel_cursor = text->cursor;
+#else
+ if (!buffer_->text->GotoNextError()) {
+ if (buffer_->text->cursor.pos
+ || buffer_->text->cursor.par !=
+ buffer_->text->FirstParagraph()) {
+ tmp = buffer_->text->cursor;
+ buffer_->text->cursor.par =
+ buffer_->text->FirstParagraph();
+ buffer_->text->cursor.pos = 0;
+ if (!buffer_->text->GotoNextError()) {
+ buffer_->text->cursor = tmp;
+ owner_->getMiniBuffer()->Set(_("No more errors"));
LyXBell();
}
} else {
- _owner->getMiniBuffer()->Set(_("No more errors"));
+ owner_->getMiniBuffer()->Set(_("No more errors"));
LyXBell();
}
}
- _buffer->update(0);
- _buffer->text->sel_cursor =
- _buffer->text->cursor;
+ buffer_->update(0);
+ buffer_->text->sel_cursor =
+ buffer_->text->cursor;
+#endif
+}
+
+
+// Just a bunch of C wrappers around static members of BufferView
+extern "C" void C_BufferView_UpCB(FL_OBJECT * ob, long buf) {
+ BufferView::UpCB(ob, buf);
+}
+
+extern "C" void C_BufferView_DownCB(FL_OBJECT * ob, long buf) {
+ BufferView::DownCB(ob, buf);
+}
+
+extern "C" void C_BufferView_ScrollCB(FL_OBJECT * ob, long buf) {
+ BufferView::ScrollCB(ob, buf);
+}
+
+extern "C" void C_BufferView_CursorToggleCB(FL_OBJECT * ob, long buf) {
+ BufferView::CursorToggleCB(ob, buf);
+}
+
+extern "C" int C_BufferView_work_area_handler(FL_OBJECT * ob, int event,
+ FL_Coord, FL_Coord,
+ int key, void * xev) {
+ return BufferView::work_area_handler(ob, event, 0, 0, key, xev);
}
void BufferView::create_view(int xpos, int ypos, int width, int height)
{
- FL_OBJECT *obj;
+ FL_OBJECT * obj;
const int bw = abs(fl_get_border_width());
// a hack for the figinsets (Matthias)
// This one first, then it will probably be invisible. (Lgb)
- ::figinset_canvas = figinset_canvas = obj =
+ ::figinset_canvas = figinset_canvas = obj =
fl_add_canvas(FL_NORMAL_CANVAS,
xpos + 1,
- ypos + 1,1,1,"");
- fl_set_object_boxtype(obj,FL_NO_BOX);
+ ypos + 1, 1, 1, "");
+ fl_set_object_boxtype(obj, FL_NO_BOX);
fl_set_object_resize(obj, FL_RESIZE_ALL);
fl_set_object_gravity(obj, NorthWestGravity, NorthWestGravity);
// a box
obj = fl_add_box(FL_BORDER_BOX, xpos, ypos,
width - 15,
- height,"");
+ height, "");
fl_set_object_resize(obj, FL_RESIZE_ALL);
fl_set_object_gravity(obj, NorthWestGravity, SouthEastGravity);
work_area = obj = fl_add_free(FL_INPUT_FREE,
xpos +bw, ypos+bw,
width-15-2*bw /* scrollbarwidth */,
- height-2*bw,"",
- work_area_handler);
+ height-2*bw, "",
+ C_BufferView_work_area_handler);
obj->wantkey = FL_KEY_TAB;
obj->u_vdata = this; /* This is how we pass the BufferView
to the work_area_handler. */
- fl_set_object_boxtype(obj,FL_DOWN_BOX);
+ fl_set_object_boxtype(obj, FL_DOWN_BOX);
fl_set_object_resize(obj, FL_RESIZE_ALL);
fl_set_object_gravity(obj, NorthWestGravity, SouthEastGravity);
button_up = obj = fl_add_pixmapbutton(FL_TOUCH_BUTTON,
width-15+4*bw,
ypos,
- 15,15,"");
- fl_set_object_boxtype(obj,FL_UP_BOX);
- fl_set_object_color(obj,FL_MCOL,FL_BLUE);
+ 15, 15, "");
+ fl_set_object_boxtype(obj, FL_UP_BOX);
+ fl_set_object_color(obj, FL_MCOL, FL_BLUE);
fl_set_object_resize(obj, FL_RESIZE_ALL);
- fl_set_object_gravity(obj,NorthEastGravity, NorthEastGravity);
- fl_set_object_callback(obj,UpCB,(long)this);
- fl_set_pixmapbutton_data(obj, up_xpm);
+ fl_set_object_gravity(obj, NorthEastGravity, NorthEastGravity);
+ fl_set_object_callback(obj, C_BufferView_UpCB, 0);
+ obj->u_vdata = this;
+ fl_set_pixmapbutton_data(obj, const_cast<char**>(up_xpm));
-#if FL_REVISION >85
+#if FL_REVISION > 85
// Remove the blue feedback rectangle
- fl_set_pixmapbutton_focus_outline(obj,0);
+ fl_set_pixmapbutton_focus_outline(obj, 0);
#endif
// the scrollbar slider
scrollbar = obj = fl_add_slider(FL_VERT_SLIDER,
width-15+4*bw,
ypos + 15,
- 15,height-30,"");
- fl_set_object_color(obj,FL_COL1,FL_MCOL);
+ 15, height-30, "");
+ fl_set_object_color(obj, FL_COL1, FL_MCOL);
fl_set_object_boxtype(obj, FL_UP_BOX);
fl_set_object_resize(obj, FL_RESIZE_ALL);
fl_set_object_gravity(obj, NorthEastGravity, SouthEastGravity);
- fl_set_object_callback(obj,ScrollCB,(long)this);
+ fl_set_object_callback(obj, C_BufferView_ScrollCB, 0);
+ obj->u_vdata = this;
// down - scrollbar button
#if FL_REVISION > 85
button_down = obj = fl_add_pixmapbutton(FL_TOUCH_BUTTON,
width-15+4*bw,
ypos + height-15,
- 15,15,"");
- fl_set_object_boxtype(obj,FL_UP_BOX);
- fl_set_object_color(obj,FL_MCOL,FL_BLUE);
+ 15, 15, "");
+ fl_set_object_boxtype(obj, FL_UP_BOX);
+ fl_set_object_color(obj, FL_MCOL, FL_BLUE);
fl_set_object_resize(obj, FL_RESIZE_ALL);
fl_set_object_gravity(obj, SouthEastGravity, SouthEastGravity);
- fl_set_object_callback(obj,DownCB,(long)this);
- fl_set_pixmapbutton_data(obj, down_xpm);
+ fl_set_object_callback(obj, C_BufferView_DownCB, 0);
+ obj->u_vdata = this;
+ fl_set_pixmapbutton_data(obj, const_cast<char**>(down_xpm));
fl_set_border_width(-bw);
#if FL_REVISION >85
// Remove the blue feedback rectangle
- fl_set_pixmapbutton_focus_outline(obj,0);
+ fl_set_pixmapbutton_focus_outline(obj, 0);
#endif
//
// timer_cursor
timer_cursor = obj = fl_add_timer(FL_HIDDEN_TIMER,
- 0,0,0,0,"Timer");
- fl_set_object_callback(obj,CursorToggleCB,0);
+ 0, 0, 0, 0, "Timer");
+ fl_set_object_callback(obj, C_BufferView_CursorToggleCB, 0);
obj->u_vdata = this;
}
// Callback for scrollbar up button
-void BufferView::UpCB(FL_OBJECT *ob, long buf)
+void BufferView::UpCB(FL_OBJECT * ob, long)
{
- BufferView *view = (BufferView*) buf;
+ BufferView * view = static_cast<BufferView*>(ob->u_vdata);
- if (view->_buffer == 0) return;
+ if (view->buffer_ == 0) return;
- const XEvent*ev2;
+ XEvent const * ev2;
static long time = 0;
ev2 = fl_last_event();
if (ev2->type == ButtonPress || ev2->type == ButtonRelease)
static
void waitForX()
{
+#if 0
static Window w = 0;
static Atom a = 0;
if (!a)
}
static XEvent ev;
XChangeProperty(fl_display, w, a, a, 8,
- PropModeAppend, (unsigned char *)"", 0);
+ PropModeAppend, reinterpret_cast<unsigned char*>(""), 0);
XWindowEvent(fl_display, w, PropertyChangeMask, &ev);
+#endif
+ XSync(fl_get_display(), 0);
}
// Callback for scrollbar slider
-void BufferView::ScrollCB(FL_OBJECT *ob, long buf)
+void BufferView::ScrollCB(FL_OBJECT * ob, long)
{
- BufferView *view = (BufferView*) buf;
+ BufferView * view = static_cast<BufferView*>(ob->u_vdata);
extern bool cursor_follows_scrollbar;
- if (view->_buffer == 0) return;
+ if (view->buffer_ == 0) return;
- view->current_scrollbar_value = (long)fl_get_slider_value(ob);
+ view->current_scrollbar_value = long(fl_get_slider_value(ob));
if (view->current_scrollbar_value < 0)
view->current_scrollbar_value = 0;
view->screen->Draw(view->current_scrollbar_value);
if (cursor_follows_scrollbar) {
- LyXText * vbt = view->_buffer->text;
+#ifdef MOVE_TEXT
+ LyXText * vbt = view->text;
+#else
+ LyXText * vbt = view->buffer_->text;
+#endif
int height = vbt->DefaultHeight();
if (vbt->cursor.y < view->screen->first + height) {
// Callback for scrollbar down button
-void BufferView::DownCB(FL_OBJECT *ob, long buf)
+void BufferView::DownCB(FL_OBJECT * ob, long)
{
- BufferView *view = (BufferView*) buf;
+ BufferView * view = static_cast<BufferView*>(ob->u_vdata);
- if (view->_buffer == 0) return;
+ if (view->buffer_ == 0) return;
- const XEvent*ev2;
+ XEvent const * ev2;
static long time = 0;
ev2 = fl_last_event();
if (ev2->type == ButtonPress || ev2->type == ButtonRelease)
int BufferView::ScrollUp(long time)
{
- if (_buffer == 0) return 0;
+ if (buffer_ == 0) return 0;
if (!screen)
return 0;
if (value == 0)
return 0;
+
+#ifdef MOVE_TEXT
+ float add_value = (text->DefaultHeight()
+ + float(time) * float(time) * 0.125);
- float add_value = (_buffer->text->DefaultHeight()
- + (float)(time) * (float)(time) * 0.125);
+ if (add_value > work_area->h)
+ add_value = float(work_area->h -
+ text->DefaultHeight());
+#else
+ float add_value = (buffer_->text->DefaultHeight()
+ + float(time) * float(time) * 0.125);
if (add_value > work_area->h)
- add_value = (float) (work_area->h -
- _buffer->text->DefaultHeight());
+ add_value = float(work_area->h -
+ buffer_->text->DefaultHeight());
+#endif
value -= add_value;
fl_set_slider_value(scrollbar, value);
- ScrollCB(scrollbar,(long)this);
+ ScrollCB(scrollbar, 0);
return 0;
}
int BufferView::ScrollDown(long time)
{
- if (_buffer == 0) return 0;
+ if (buffer_ == 0) return 0;
if (!screen)
return 0;
if (value == max)
return 0;
+
+#ifdef MOVE_TEXT
+ float add_value = (text->DefaultHeight()
+ + float(time) * float(time) * 0.125);
- float add_value = (_buffer->text->DefaultHeight()
- + (float)(time) * (float)(time) * 0.125);
+ if (add_value > work_area->h)
+ add_value = float(work_area->h -
+ text->DefaultHeight());
+#else
+ float add_value = (buffer_->text->DefaultHeight()
+ + float(time) * float(time) * 0.125);
if (add_value > work_area->h)
- add_value = (float) (work_area->h -
- _buffer->text->DefaultHeight());
+ add_value = float(work_area->h -
+ buffer_->text->DefaultHeight());
+#endif
value += add_value;
fl_set_slider_value(scrollbar, value);
- ScrollCB(scrollbar,(long)this);
+ ScrollCB(scrollbar, 0);
return 0;
}
void BufferView::ScrollUpOnePage(long /*time*/)
{
- if (_buffer == 0) return;
+ if (buffer_ == 0) return;
if (!screen)
return;
long y = screen->first;
if (!y) return;
-
- Row* row = _buffer->text->GetRowNearY(y);
+#ifdef MOVE_TEXT
+ Row * row = text->GetRowNearY(y);
+#else
+ Row * row = buffer_->text->GetRowNearY(y);
+#endif
y = y - work_area->h + row->height;
fl_set_slider_value(scrollbar, y);
- ScrollCB(scrollbar,(long)this);
+ ScrollCB(scrollbar, 0);
}
void BufferView::ScrollDownOnePage(long /*time*/)
{
- if (_buffer == 0) return;
+ if (buffer_ == 0) return;
if (!screen)
return;
double min, max;
fl_get_slider_bounds(scrollbar, &min, &max);
long y = screen->first;
+
+#ifdef MOVE_TEXT
+ if (y > text->height - work_area->h)
+ return;
- if (y > _buffer->text->height - work_area->h)
+ y += work_area->h;
+ text->GetRowNearY(y);
+#else
+ if (y > buffer_->text->height - work_area->h)
return;
y += work_area->h;
- _buffer->text->GetRowNearY(y);
-
+ buffer_->text->GetRowNearY(y);
+#endif
fl_set_slider_value(scrollbar, y);
- ScrollCB(scrollbar,(long)this);
+ ScrollCB(scrollbar, 0);
}
static int y_old = -1;
static long scrollbar_value_old = -1;
- XEvent* ev = (XEvent*) xev;
- BufferView *view = (BufferView*) ob->u_vdata;
+ XEvent * ev = static_cast<XEvent*>(xev);
+ BufferView * view = static_cast<BufferView*>(ob->u_vdata);
// If we don't have a view yet; return
if (!view || quitting) return 0;
view->workAreaExpose();
break;
case FL_PUSH:
- view->WorkAreaButtonPress(ob, 0,0,0,ev,0);
+ view->WorkAreaButtonPress(ob, 0, 0, 0, ev, 0);
break;
case FL_RELEASE:
- view->WorkAreaButtonRelease(ob, 0,0,0,ev,0);
+ view->WorkAreaButtonRelease(ob, 0, 0, 0, ev, 0);
break;
case FL_MOUSE:
if (ev->xmotion.x != x_old ||
x_old = ev->xmotion.x;
y_old = ev->xmotion.y;
scrollbar_value_old = view->current_scrollbar_value;
- view->WorkAreaMotionNotify(ob, 0,0,0,ev,0);
+ view->WorkAreaMotionNotify(ob, 0, 0, 0, ev, 0);
}
break;
// Done by the raw callback:
- // case FL_KEYBOARD: WorkAreaKeyPress(ob, 0,0,0,ev,0); break;
+ // case FL_KEYBOARD: WorkAreaKeyPress(ob, 0, 0, 0, ev, 0); break;
case FL_FOCUS:
- if (!view->_owner->getMiniBuffer()->shows_no_match)
- view->_owner->getMiniBuffer()->Init();
- view->_owner->getMiniBuffer()->shows_no_match = false;
+ if (!view->owner_->getMiniBuffer()->shows_no_match)
+ view->owner_->getMiniBuffer()->Init();
+ view->owner_->getMiniBuffer()->shows_no_match = false;
view->work_area_focus = true;
fl_set_timer(view->timer_cursor, 0.4);
break;
case FL_UNFOCUS:
- view->_owner->getMiniBuffer()->ExecCommand();
+ view->owner_->getMiniBuffer()->ExecCommand();
view->work_area_focus = false;
break;
case FL_ENTER:
- SetXtermCursor(view->_owner->getForm()->window);
+ SetXtermCursor(view->owner_->getForm()->window);
// reset the timer
view->lyx_focus = true;
fl_set_timer(view->timer_cursor, 0.4);
case FL_LEAVE:
if (!input_prohibited)
XUndefineCursor(fl_display,
- view->_owner->getForm()->window);
+ view->owner_->getForm()->window);
view->lyx_focus = false; // This is not an absolute truth
// but if it is not true, it will be changed within a blink
// of an eye. ... Not good enough... use regulare timeperiod
break;
case FL_DBLCLICK:
// select a word
- if (view->_buffer && !view->_buffer->the_locking_inset) {
+ if (view->buffer_ && !view->buffer_->the_locking_inset) {
if (view->screen && ev->xbutton.button == 1) {
view->screen->HideCursor();
- view->screen->ToggleSelection();
- view->_buffer->text->SelectWord();
+ view->screen->ToggleSelection();
+#ifdef MOVE_TEXT
+ view->text->SelectWord();
+#else
+ view->buffer_->text->SelectWord();
+#endif
view->screen->ToggleSelection(false);
/* This will fit the cursor on the screen
- * if necessary */
- view->_buffer->update(0);
+ * if necessary */
+#ifdef MOVE_TEXT
+ view->update(0);
+#else
+ view->buffer_->update(0);
+#endif
}
}
break;
case FL_TRPLCLICK:
// select a line
- if (view->_buffer && view->screen && ev->xbutton.button == 1) {
+ if (view->buffer_ && view->screen && ev->xbutton.button == 1) {
view->screen->HideCursor();
- view->screen->ToggleSelection();
- view->_buffer->text->CursorHome();
- view->_buffer->text->sel_cursor =
- view->_buffer->text->cursor;
- view->_buffer->text->CursorEnd();
- view->_buffer->text->SetSelection();
+ view->screen->ToggleSelection();
+#ifdef MOVE_TEXT
+ view->text->CursorHome();
+ view->text->sel_cursor = view->text->cursor;
+ view->text->CursorEnd();
+ view->text->SetSelection();
+#else
+ view->buffer_->text->CursorHome();
+ view->buffer_->text->sel_cursor =
+ view->buffer_->text->cursor;
+ view->buffer_->text->CursorEnd();
+ view->buffer_->text->SetSelection();
+#endif
view->screen->ToggleSelection(false);
/* This will fit the cursor on the screen
- * if necessary */
- view->_buffer->update(0);
+ * if necessary */
+#ifdef MOVE_TEXT
+ view->update(0);
+#else
+ view->buffer_->update(0);
+#endif
}
break;
case FL_OTHER:
view->WorkAreaSelectionNotify(ob,
- view->_owner->getForm()->window,
- 0,0,ev,0);
+ view->owner_->getForm()->window,
+ 0, 0, ev, 0);
break;
}
return 1;
XEvent *ev, void */*d*/)
{
- if (_buffer == 0) return 0;
+ if (buffer_ == 0) return 0;
if (!screen) return 0;
// Check for inset locking
- if (_buffer->the_locking_inset) {
- LyXCursor cursor = _buffer->text->cursor;
- _buffer->the_locking_inset->
+ if (buffer_->the_locking_inset) {
+#ifdef MOVE_TEXT
+ LyXCursor cursor = text->cursor;
+#else
+ LyXCursor cursor = buffer_->text->cursor;
+#endif
+ buffer_->the_locking_inset->
InsetMotionNotify(ev->xbutton.x - ob->x - cursor.x,
ev->xbutton.y - ob->y -
(cursor.y),
if (selection_possible) {
screen->HideCursor();
- _buffer->text->
+#ifdef MOVE_TEXT
+ text->SetCursorFromCoordinates(ev->xbutton.x - ob->x,
+ ev->xbutton.y - ob->y +
+ screen->first);
+
+ if (!text->selection)
+ update(-3); // Maybe an empty line was deleted
+
+ text->SetSelection();
+#else
+ buffer_->text->
SetCursorFromCoordinates(ev->xbutton.x - ob->x,
ev->xbutton.y - ob->y +
screen->first);
- if (!_buffer->text->selection)
- _buffer->update(-3); // Maybe an empty line was deleted
+ if (!buffer_->text->selection)
+ buffer_->update(-3); // Maybe an empty line was deleted
- _buffer->text->SetSelection();
+ buffer_->text->SetSelection();
+#endif
screen->ToggleToggle();
if (screen->FitCursor())
updateScrollbar();
}
-extern int bibitemMaxWidth(const class LyXFont &);
+extern int bibitemMaxWidth(LyXFont const &);
+#ifdef MOVE_TEXT
// Single-click on work area
int BufferView::WorkAreaButtonPress(FL_OBJECT *ob, Window,
int /*w*/, int /*h*/, XEvent *ev, void */*d*/)
last_click_x = -1;
last_click_y = -1;
- if (_buffer == 0) return 0;
+ if (buffer_ == 0) return 0;
if (!screen) return 0;
int const x = ev->xbutton.x - ob->x;
{
- if (_buffer->the_locking_inset) {
+ if (buffer_->the_locking_inset) {
// We are in inset locking mode
/* Check whether the inset was hit. If not reset mode,
otherwise give the event to the inset */
if (inset_hit != 0) {
- _buffer->the_locking_inset->
+ buffer_->the_locking_inset->
InsetButtonPress(inset_x, inset_y, button);
return 0;
} else {
- UnlockInset(_buffer->the_locking_inset);
+ UnlockInset(buffer_->the_locking_inset);
}
}
// Right button mouse click on a table
if (button == 3 &&
- (_buffer->text->cursor.par->table ||
- _buffer->text->MouseHitInTable(x, y+screen->first))) {
+ (text->cursor.par->table ||
+ text->MouseHitInTable(x, y + screen->first))) {
// Set the cursor to the press-position
- _buffer->text->SetCursorFromCoordinates(x, y + screen->first);
+ text->SetCursorFromCoordinates(x, y + screen->first);
bool doit = true;
// Only show the table popup if the hit is in the table, too
- if (!_buffer->text->HitInTable(_buffer->text->cursor.row, x))
+ if (!text->HitInTable(text->cursor.row, x))
doit = false;
// Hit above or below the table?
if (doit) {
- if (!_buffer->text->selection) {
+ if (!text->selection) {
screen->ToggleSelection();
- _buffer->text->ClearSelection();
- _buffer->text->FullRebreak();
+ text->ClearSelection();
+ text->FullRebreak();
screen->Update();
updateScrollbar();
}
// the right mouse. So this should be done more
// general in the future. Matthias.
selection_possible = false;
- _owner->getLyXFunc()->Dispatch(LFUN_LAYOUT_TABLE,
+ owner_->getLyXFunc()->Dispatch(LFUN_LAYOUT_TABLE,
"true");
return 0;
}
// Middle button press pastes if we have a selection
bool paste_internally = false;
- if (button == 2 // && !_buffer->the_locking_inset
- && _buffer->text->selection) {
- _owner->getLyXFunc()->Dispatch(LFUN_COPY);
+ if (button == 2 // && !buffer_->the_locking_inset
+ && text->selection) {
+ owner_->getLyXFunc()->Dispatch(LFUN_COPY);
paste_internally = true;
}
// Clear the selection
screen->ToggleSelection();
- _buffer->text->ClearSelection();
- _buffer->text->FullRebreak();
+ text->ClearSelection();
+ text->FullRebreak();
screen->Update();
updateScrollbar();
if (inset_hit != 0 && inset_hit->Editable() == 2) {
// Highly editable inset, like math
selection_possible = false;
- _owner->updateLayoutChoice();
- _owner->getMiniBuffer()->Set(inset_hit->EditMessage());
+ owner_->updateLayoutChoice();
+ owner_->getMiniBuffer()->Set(inset_hit->EditMessage());
inset_hit->Edit(inset_x, inset_y);
return 0;
}
return 0;
}
- _buffer->text->SetCursorFromCoordinates(x, y + screen_first);
- _buffer->text->FinishUndo();
- _buffer->text->sel_cursor = _buffer->text->cursor;
- _buffer->text->cursor.x_fix = _buffer->text->cursor.x;
+ text->SetCursorFromCoordinates(x, y + screen_first);
+ text->FinishUndo();
+ text->sel_cursor = text->cursor;
+ text->cursor.x_fix = text->cursor.x;
- _owner->updateLayoutChoice();
+ owner_->updateLayoutChoice();
if (screen->FitCursor()){
updateScrollbar();
selection_possible = false;
// Insert primary selection with middle mouse
// if there is a local selection in the current buffer, insert this
- if (button == 2) { // && !_buffer->the_locking_inset){
+ if (button == 2) { // && !buffer_->the_locking_inset){
if (paste_internally)
- _owner->getLyXFunc()->Dispatch(LFUN_PASTE);
+ owner_->getLyXFunc()->Dispatch(LFUN_PASTE);
else
- _owner->getLyXFunc()->Dispatch(LFUN_PASTESELECTION,
+ owner_->getLyXFunc()->Dispatch(LFUN_PASTESELECTION,
"paragraph");
selection_possible = false;
return 0;
return 0;
}
+#else
+// Single-click on work area
+int BufferView::WorkAreaButtonPress(FL_OBJECT *ob, Window,
+ int /*w*/, int /*h*/, XEvent *ev, void */*d*/)
+{
+ last_click_x = -1;
+ last_click_y = -1;
+
+ if (buffer_ == 0) return 0;
+ if (!screen) return 0;
+
+ int const x = ev->xbutton.x - ob->x;
+ int const y = ev->xbutton.y - ob->y;
+ // If we hit an inset, we have the inset coordinates in these
+ // and inset_hit points to the inset. If we do not hit an
+ // inset, inset_hit is 0, and inset_x == x, inset_y == y.
+ int inset_x = x;
+ int inset_y = y;
+ Inset * inset_hit = checkInsetHit(inset_x, inset_y);
+
+ // ok ok, this is a hack.
+ int button = ev->xbutton.button;
+ if (button == 4 || button == 5) goto wheel;
+
+ {
+
+ if (buffer_->the_locking_inset) {
+ // We are in inset locking mode
+
+ /* Check whether the inset was hit. If not reset mode,
+ otherwise give the event to the inset */
+ if (inset_hit != 0) {
+ buffer_->the_locking_inset->
+ InsetButtonPress(inset_x, inset_y, button);
+ return 0;
+ } else {
+ UnlockInset(buffer_->the_locking_inset);
+ }
+ }
+
+ selection_possible = true;
+ screen->HideCursor();
+
+ // Right button mouse click on a table
+ if (button == 3 &&
+ (buffer_->text->cursor.par->table ||
+ buffer_->text->MouseHitInTable(x, y+screen->first))) {
+ // Set the cursor to the press-position
+ buffer_->text->SetCursorFromCoordinates(x, y + screen->first);
+ bool doit = true;
+
+ // Only show the table popup if the hit is in the table, too
+ if (!buffer_->text->HitInTable(buffer_->text->cursor.row, x))
+ doit = false;
+
+ // Hit above or below the table?
+ if (doit) {
+ if (!buffer_->text->selection) {
+ screen->ToggleSelection();
+ buffer_->text->ClearSelection();
+ buffer_->text->FullRebreak();
+ screen->Update();
+ updateScrollbar();
+ }
+ // Popup table popup when on a table.
+ // This is obviously temporary, since we should be
+ // able to
+ // popup various context-sensitive-menus with the
+ // the right mouse. So this should be done more
+ // general in the future. Matthias.
+ selection_possible = false;
+ owner_->getLyXFunc()->Dispatch(LFUN_LAYOUT_TABLE,
+ "true");
+ return 0;
+ }
+ }
+
+ int screen_first = screen->first;
+
+ // Middle button press pastes if we have a selection
+ bool paste_internally = false;
+ if (button == 2 // && !buffer_->the_locking_inset
+ && buffer_->text->selection) {
+ owner_->getLyXFunc()->Dispatch(LFUN_COPY);
+ paste_internally = true;
+ }
+
+ // Clear the selection
+ screen->ToggleSelection();
+ buffer_->text->ClearSelection();
+ buffer_->text->FullRebreak();
+ screen->Update();
+ updateScrollbar();
+
+ // Single left click in math inset?
+ if (inset_hit != 0 && inset_hit->Editable() == 2) {
+ // Highly editable inset, like math
+ selection_possible = false;
+ owner_->updateLayoutChoice();
+ owner_->getMiniBuffer()->Set(inset_hit->EditMessage());
+ inset_hit->Edit(inset_x, inset_y);
+ return 0;
+ }
+ // Right click on a footnote flag opens float menu
+ if (button == 3) {
+ selection_possible = false;
+ return 0;
+ }
+
+ buffer_->text->SetCursorFromCoordinates(x, y + screen_first);
+ buffer_->text->FinishUndo();
+ buffer_->text->sel_cursor = buffer_->text->cursor;
+ buffer_->text->cursor.x_fix = buffer_->text->cursor.x;
+
+ owner_->updateLayoutChoice();
+ if (screen->FitCursor()){
+ updateScrollbar();
+ selection_possible = false;
+ }
+ // Insert primary selection with middle mouse
+ // if there is a local selection in the current buffer, insert this
+ if (button == 2) { // && !buffer_->the_locking_inset){
+ if (paste_internally)
+ owner_->getLyXFunc()->Dispatch(LFUN_PASTE);
+ else
+ owner_->getLyXFunc()->Dispatch(LFUN_PASTESELECTION,
+ "paragraph");
+ selection_possible = false;
+ return 0;
+ }
+ }
+ goto out;
+ wheel: {
+ // I am not quite sure if this is the correct place to put this,
+ // but it will not cause any harm.
+ // Patch from Mark Huang (markman@mit.edu) to make LyX recognise
+ // button 4 and 5. This enables LyX use use the scrollwhell on
+ // certain mice for something useful. (Lgb)
+ // Added wheel acceleration detection code. (Rvdk)
+ static Time lastTime = 0;
+ int diff = ev->xbutton.time - lastTime;
+ int scroll = int(1.0 + (4.0/(abs(diff)+1.0))*200.0);
+ switch (button) {
+ case 4:
+ ScrollUp(scroll);
+ break;
+ case 5:
+ ScrollDown(scroll);
+ break;
+ }
+ lastTime = ev->xbutton.time;
+ return 0;
+ }
+ out:
+ last_click_x = x;
+ last_click_y = y;
+
+ return 0;
+}
+#endif
+
+#ifdef MOVE_TEXT
+int BufferView::WorkAreaButtonRelease(FL_OBJECT * ob, Window ,
+ int /*w*/, int /*h*/, XEvent * ev, void * /*d*/)
+{
+ if (buffer_ == 0 || screen == 0) return 0;
+
+ int const x = ev->xbutton.x - ob->x;
+ int const y = ev->xbutton.y - ob->y;
+
+ // If we hit an inset, we have the inset coordinates in these
+ // and inset_hit points to the inset. If we do not hit an
+ // inset, inset_hit is 0, and inset_x == x, inset_y == y.
+ int inset_x = x;
+ int inset_y = y;
+ Inset * inset_hit = checkInsetHit(inset_x, inset_y);
+
+ if (buffer_->the_locking_inset) {
+ // We are in inset locking mode.
+
+ /* LyX does a kind of work-area grabbing for insets.
+ Only a ButtonPress Event outside the inset will
+ force a InsetUnlock. */
+ buffer_->the_locking_inset->
+ InsetButtonRelease(inset_x, inset_y,
+ ev->xbutton.button);
+ return 0;
+ }
+
+ selection_possible = false;
+ if (text->cursor.par->table) {
+ int cell = text->
+ NumberOfCell(text->cursor.par,
+ text->cursor.pos);
+ if (text->cursor.par->table->IsContRow(cell) &&
+ text->cursor.par->table->
+ CellHasContRow(text->cursor.par->table->
+ GetCellAbove(cell))<0) {
+ text->CursorUp();
+ }
+ }
+
+ if (ev->xbutton.button >= 2)
+ return 0;
+
+ // Make sure that the press was not far from the release
+ if ((abs(last_click_x - x) >= 5) ||
+ (abs(last_click_y - y) >= 5)) {
+ return 0;
+ }
+
+ // Did we hit an editable inset?
+ if (inset_hit != 0) {
+ // Inset like error, notes and figures
+ selection_possible = false;
+#ifdef WITH_WARNINGS
+#warning fix this proper in 0.13
+#endif
+ // Following a ref shouldn't issue
+ // a push on the undo-stack
+ // anylonger, now that we have
+ // keybindings for following
+ // references and returning from
+ // references. IMHO though, it
+ // should be the inset's own business
+ // to push or not push on the undo
+ // stack. They don't *have* to
+ // alter the document...
+ // (Joacim)
+ // ...or maybe the SetCursorParUndo()
+ // below isn't necessary at all anylonger?
+ if (inset_hit->LyxCode() == Inset::REF_CODE) {
+ text->SetCursorParUndo();
+ }
+
+ owner_->getMiniBuffer()->Set(inset_hit->EditMessage());
+ inset_hit->Edit(inset_x, inset_y);
+ return 0;
+ }
+
+ // check whether we want to open a float
+ if (text) {
+ bool hit = false;
+ char c = ' ';
+ if (text->cursor.pos <
+ text->cursor.par->Last()) {
+ c = text->cursor.par->
+ GetChar(text->cursor.pos);
+ }
+ if (c == LyXParagraph::META_FOOTNOTE
+ || c == LyXParagraph::META_MARGIN
+ || c == LyXParagraph::META_FIG
+ || c == LyXParagraph::META_TAB
+ || c == LyXParagraph::META_WIDE_FIG
+ || c == LyXParagraph::META_WIDE_TAB
+ || c == LyXParagraph::META_ALGORITHM){
+ hit = true;
+ } else if (text->cursor.pos - 1 >= 0) {
+ c = text->cursor.par->
+ GetChar(text->cursor.pos - 1);
+ if (c == LyXParagraph::META_FOOTNOTE
+ || c == LyXParagraph::META_MARGIN
+ || c == LyXParagraph::META_FIG
+ || c == LyXParagraph::META_TAB
+ || c == LyXParagraph::META_WIDE_FIG
+ || c == LyXParagraph::META_WIDE_TAB
+ || c == LyXParagraph::META_ALGORITHM){
+ // We are one step too far to the right
+ text->CursorLeft();
+ hit = true;
+ }
+ }
+ if (hit == true) {
+ ToggleFloat();
+ selection_possible = false;
+ return 0;
+ }
+ }
+
+ // Do we want to close a float? (click on the float-label)
+ if (text->cursor.row->par->footnoteflag ==
+ LyXParagraph::OPEN_FOOTNOTE
+ && text->cursor.pos == 0
+ && text->cursor.row->previous &&
+ text->cursor.row->previous->par->
+ footnoteflag != LyXParagraph::OPEN_FOOTNOTE){
+ LyXFont font (LyXFont::ALL_SANE);
+ font.setSize(LyXFont::SIZE_SMALL);
+
+ int box_x = 20; // LYX_PAPER_MARGIN;
+ box_x += font.textWidth("Mwide-figM", 10);
+
+ int screen_first = screen->first;
+
+ if (x < box_x
+ && y + screen_first > text->cursor.y -
+ text->cursor.row->baseline
+ && y + screen_first < text->cursor.y -
+ text->cursor.row->baseline
+ + font.maxAscent()*1.2 + font.maxDescent()*1.2) {
+ ToggleFloat();
+ selection_possible = false;
+ return 0;
+ }
+ }
+
+ // Maybe we want to edit a bibitem ale970302
+ if (text->cursor.par->bibkey && x < 20 +
+ bibitemMaxWidth(textclasslist.TextClass(buffer_->
+ params.textclass).defaultfont())) {
+ text->cursor.par->bibkey->Edit(0, 0);
+ }
+
+ return 0;
+}
+#else
int BufferView::WorkAreaButtonRelease(FL_OBJECT *ob, Window ,
int /*w*/, int /*h*/, XEvent *ev, void */*d*/)
{
- if (_buffer == 0 || screen == 0) return 0;
+ if (buffer_ == 0 || screen == 0) return 0;
int const x = ev->xbutton.x - ob->x;
int const y = ev->xbutton.y - ob->y;
int inset_y = y;
Inset * inset_hit = checkInsetHit(inset_x, inset_y);
- if (_buffer->the_locking_inset) {
+ if (buffer_->the_locking_inset) {
// We are in inset locking mode.
/* LyX does a kind of work-area grabbing for insets.
Only a ButtonPress Event outside the inset will
force a InsetUnlock. */
- _buffer->the_locking_inset->
+ buffer_->the_locking_inset->
InsetButtonRelease(inset_x, inset_y,
ev->xbutton.button);
return 0;
}
selection_possible = false;
- if (_buffer->text->cursor.par->table) {
- int cell = _buffer->text->
- NumberOfCell(_buffer->text->cursor.par,
- _buffer->text->cursor.pos);
- if (_buffer->text->cursor.par->table->IsContRow(cell) &&
- _buffer->text->cursor.par->table->
- CellHasContRow(_buffer->text->cursor.par->table->
+ if (buffer_->text->cursor.par->table) {
+ int cell = buffer_->text->
+ NumberOfCell(buffer_->text->cursor.par,
+ buffer_->text->cursor.pos);
+ if (buffer_->text->cursor.par->table->IsContRow(cell) &&
+ buffer_->text->cursor.par->table->
+ CellHasContRow(buffer_->text->cursor.par->table->
GetCellAbove(cell))<0) {
- _buffer->text->CursorUp();
+ buffer_->text->CursorUp();
}
}
// ...or maybe the SetCursorParUndo()
// below isn't necessary at all anylonger?
if (inset_hit->LyxCode() == Inset::REF_CODE) {
- _buffer->text->SetCursorParUndo();
+ buffer_->text->SetCursorParUndo();
}
- _owner->getMiniBuffer()->Set(inset_hit->EditMessage());
+ owner_->getMiniBuffer()->Set(inset_hit->EditMessage());
inset_hit->Edit(inset_x, inset_y);
return 0;
}
// check whether we want to open a float
- if (_buffer->text) {
+ if (buffer_->text) {
bool hit = false;
char c = ' ';
- if (_buffer->text->cursor.pos <
- _buffer->text->cursor.par->Last()) {
- c = _buffer->text->cursor.par->
- GetChar(_buffer->text->cursor.pos);
+ if (buffer_->text->cursor.pos <
+ buffer_->text->cursor.par->Last()) {
+ c = buffer_->text->cursor.par->
+ GetChar(buffer_->text->cursor.pos);
}
- if (c == LYX_META_FOOTNOTE || c == LYX_META_MARGIN
- || c == LYX_META_FIG || c == LYX_META_TAB
- || c == LYX_META_WIDE_FIG || c == LYX_META_WIDE_TAB
- || c == LYX_META_ALGORITHM){
+ if (c == LyXParagraph::META_FOOTNOTE
+ || c == LyXParagraph::META_MARGIN
+ || c == LyXParagraph::META_FIG
+ || c == LyXParagraph::META_TAB
+ || c == LyXParagraph::META_WIDE_FIG
+ || c == LyXParagraph::META_WIDE_TAB
+ || c == LyXParagraph::META_ALGORITHM){
hit = true;
- } else if (_buffer->text->cursor.pos - 1 >= 0) {
- c = _buffer->text->cursor.par->
- GetChar(_buffer->text->cursor.pos - 1);
- if (c == LYX_META_FOOTNOTE || c == LYX_META_MARGIN
- || c == LYX_META_FIG || c == LYX_META_TAB
- || c == LYX_META_WIDE_FIG
- || c == LYX_META_WIDE_TAB
- || c == LYX_META_ALGORITHM){
+ } else if (buffer_->text->cursor.pos - 1 >= 0) {
+ c = buffer_->text->cursor.par->
+ GetChar(buffer_->text->cursor.pos - 1);
+ if (c == LyXParagraph::META_FOOTNOTE
+ || c == LyXParagraph::META_MARGIN
+ || c == LyXParagraph::META_FIG
+ || c == LyXParagraph::META_TAB
+ || c == LyXParagraph::META_WIDE_FIG
+ || c == LyXParagraph::META_WIDE_TAB
+ || c == LyXParagraph::META_ALGORITHM){
// We are one step too far to the right
- _buffer->text->CursorLeft();
+ buffer_->text->CursorLeft();
hit = true;
}
}
}
// Do we want to close a float? (click on the float-label)
- if (_buffer->text->cursor.row->par->footnoteflag ==
+ if (buffer_->text->cursor.row->par->footnoteflag ==
LyXParagraph::OPEN_FOOTNOTE
- && _buffer->text->cursor.pos == 0
- && _buffer->text->cursor.row->previous &&
- _buffer->text->cursor.row->previous->par->
+ && buffer_->text->cursor.pos == 0
+ && buffer_->text->cursor.row->previous &&
+ buffer_->text->cursor.row->previous->par->
footnoteflag != LyXParagraph::OPEN_FOOTNOTE){
LyXFont font (LyXFont::ALL_SANE);
font.setSize(LyXFont::SIZE_SMALL);
int screen_first = screen->first;
if (x < box_x
- && y + screen_first > _buffer->text->cursor.y -
- _buffer->text->cursor.row->baseline
- && y + screen_first < _buffer->text->cursor.y -
- _buffer->text->cursor.row->baseline
+ && y + screen_first > buffer_->text->cursor.y -
+ buffer_->text->cursor.row->baseline
+ && y + screen_first < buffer_->text->cursor.y -
+ buffer_->text->cursor.row->baseline
+ font.maxAscent()*1.2 + font.maxDescent()*1.2) {
ToggleFloat();
selection_possible = false;
}
// Maybe we want to edit a bibitem ale970302
- if (_buffer->text->cursor.par->bibkey && x < 20 +
- bibitemMaxWidth(lyxstyle.TextClass(_buffer->
- params.textclass)->defaultfont)) {
- _buffer->text->cursor.par->bibkey->Edit(0, 0);
+ if (buffer_->text->cursor.par->bibkey && x < 20 +
+ bibitemMaxWidth(textclasslist.TextClass(buffer_->
+ params.textclass).defaultfont())) {
+ buffer_->text->cursor.par->bibkey->Edit(0, 0);
}
return 0;
}
-
+#endif
/*
* Returns an inset if inset was hit. 0 otherwise.
* If hit, the coordinates are changed relative to the inset.
* Otherwise coordinates are not changed, and false is returned.
*/
-Inset * BufferView::checkInsetHit(int &x, int &y)
+#ifdef MOVE_TEXT
+Inset * BufferView::checkInsetHit(int & x, int & y)
{
if (!getScreen())
return 0;
int y_tmp = y + getScreen()->first;
- LyXCursor cursor = _buffer->text->cursor;
+ LyXCursor cursor = text->cursor;
if (cursor.pos < cursor.par->Last()
- && cursor.par->GetChar(cursor.pos) == LYX_META_INSET
+ && cursor.par->GetChar(cursor.pos) == LyXParagraph::META_INSET
&& cursor.par->GetInset(cursor.pos)
&& cursor.par->GetInset(cursor.pos)->Editable()) {
// Check whether the inset really was hit
- Inset* tmpinset = cursor.par->GetInset(cursor.pos);
- LyXFont font = _buffer->text->GetFont(cursor.par, cursor.pos);
+ Inset * tmpinset = cursor.par->GetInset(cursor.pos);
+ LyXFont font = text->GetFont(cursor.par, cursor.pos);
if (x > cursor.x
&& x < cursor.x + tmpinset->Width(font)
&& y_tmp > cursor.y - tmpinset->Ascent(font)
return tmpinset;
}
} else if (cursor.pos - 1 >= 0
- && cursor.par->GetChar(cursor.pos - 1) == LYX_META_INSET
+ && cursor.par->GetChar(cursor.pos - 1) == LyXParagraph::META_INSET
&& cursor.par->GetInset(cursor.pos - 1)
&& cursor.par->GetInset(cursor.pos - 1)->Editable()) {
- _buffer->text->CursorLeft();
+ text->CursorLeft();
Inset * result = checkInsetHit(x, y);
if (result == 0) {
- _buffer->text->CursorRight();
+ text->CursorRight();
return 0;
} else {
return result;
}
return 0;
}
+#else
+Inset * BufferView::checkInsetHit(int & x, int & y)
+{
+ if (!getScreen())
+ return 0;
+
+ int y_tmp = y + getScreen()->first;
+
+ LyXCursor cursor = buffer_->text->cursor;
+ if (cursor.pos < cursor.par->Last()
+ && cursor.par->GetChar(cursor.pos) == LyXParagraph::META_INSET
+ && cursor.par->GetInset(cursor.pos)
+ && cursor.par->GetInset(cursor.pos)->Editable()) {
+ // Check whether the inset really was hit
+ Inset * tmpinset = cursor.par->GetInset(cursor.pos);
+ LyXFont font = buffer_->text->GetFont(cursor.par, cursor.pos);
+ if (x > cursor.x
+ && x < cursor.x + tmpinset->Width(font)
+ && y_tmp > cursor.y - tmpinset->Ascent(font)
+ && y_tmp < cursor.y + tmpinset->Descent(font)) {
+ x = x - cursor.x;
+ // The origin of an inset is on the baseline
+ y = y_tmp - (cursor.y);
+ return tmpinset;
+ }
+ } else if (cursor.pos - 1 >= 0
+ && cursor.par->GetChar(cursor.pos - 1) == LyXParagraph::META_INSET
+ && cursor.par->GetInset(cursor.pos - 1)
+ && cursor.par->GetInset(cursor.pos - 1)->Editable()) {
+ buffer_->text->CursorLeft();
+ Inset * result = checkInsetHit(x, y);
+ if (result == 0) {
+ buffer_->text->CursorRight();
+ return 0;
+ } else {
+ return result;
+ }
+ }
+ return 0;
+}
+#endif
int BufferView::workAreaExpose()
{
// update from work area
work_area_width = work_area->w;
work_area_height = work_area->h;
- if (_buffer != 0) {
+ if (buffer_ != 0) {
if (widthChange) {
// All buffers need a resize
bufferlist.resize();
// The main window size has changed, repaint most stuff
redraw();
// ...including the minibuffer
- _owner->getMiniBuffer()->Init();
+ owner_->getMiniBuffer()->Init();
} else if (screen) screen->Redraw();
} else {
// always make sure that the scrollbar is sane.
updateScrollbar();
- _owner->updateLayoutChoice();
+ owner_->updateLayoutChoice();
return 1;
}
// Callback for cursor timer
-void BufferView::CursorToggleCB(FL_OBJECT *ob, long)
+void BufferView::CursorToggleCB(FL_OBJECT * ob, long)
{
- BufferView *view = (BufferView*) ob->u_vdata;
+ BufferView *view = static_cast<BufferView*>(ob->u_vdata);
/* quite a nice place for asyncron Inset updating, isn't it? */
// actually no! This is run even if no buffer exist... so (Lgb)
- if (view && !view->_buffer) {
+ if (view && !view->buffer_) {
goto set_timer_and_return;
}
-#ifdef WITH_WARNINGS
-#warning NOTE!
-#endif
+ // NOTE:
// On my quest to solve the gs rendre hangups I am now
// disabling the SIGHUP completely, and will do a wait
// now and then instead. If the guess that xforms somehow
// rendering process.
// these comments posted to lyx@via
-//#if 0
{
int status = 1;
int pid = waitpid((pid_t)0, &status, WNOHANG);
else if (pid > 0)
sigchldhandler(pid, &status);
}
-//#endif
if (InsetUpdateList)
UpdateInsetUpdateList();
}
if (view->lyx_focus && view->work_area_focus) {
- if (!view->_buffer->the_locking_inset){
+ if (!view->buffer_->the_locking_inset){
view->screen->CursorToggle();
} else {
- view->_buffer->the_locking_inset->
+ view->buffer_->the_locking_inset->
ToggleInsetCursor();
}
goto set_timer_and_return;
} else {
// Make sure that the cursor is visible.
- if (!view->_buffer->the_locking_inset){
+ if (!view->buffer_->the_locking_inset){
view->screen->ShowCursor();
} else {
- if (!view->_buffer->the_locking_inset->isCursorVisible())
- view->_buffer->the_locking_inset->
+ if (!view->buffer_->the_locking_inset->isCursorVisible())
+ view->buffer_->the_locking_inset->
ToggleInsetCursor();
}
XGetInputFocus(fl_display, &tmpwin, &tmp);
if (lyxerr.debugging()) {
lyxerr << "tmpwin: " << tmpwin
- << "\nwindow: " << view->_owner->getForm()->window
+ << "\nwindow: " << view->owner_->getForm()->window
<< "\nwork_area_focus: " << view->work_area_focus
<< "\nlyx_focus : " << view->lyx_focus
<< endl;
}
- if (tmpwin != view->_owner->getForm()->window) {
+ if (tmpwin != view->owner_->getForm()->window) {
view->lyx_focus = false;
goto skip_timer;
} else {
int BufferView::WorkAreaSelectionNotify(FL_OBJECT *, Window win,
int /*w*/, int /*h*/, XEvent *event, void */*d*/)
{
- if (_buffer == 0) return 0;
+ if (buffer_ == 0) return 0;
if (event->type != SelectionNotify)
return 0;
Atom tmpatom;
unsigned long ul1;
unsigned long ul2;
- unsigned char* uc = 0;
+ unsigned char * uc = 0;
int tmpint;
screen->HideCursor();
BeforeChange();
XFlush(fl_display);
if (uc){
- if (!ascii_type)
- _buffer->text->
- InsertStringA((char*)uc);
- else
- _buffer->text->
- InsertStringB((char*)uc);
+#ifdef MOVE_TEXT
+ if (!ascii_type) {
+ text->InsertStringA(reinterpret_cast<char*>(uc));
+ } else {
+ text->InsertStringB(reinterpret_cast<char*>(uc));
+ }
+#else
+ if (!ascii_type) {
+ buffer_->text->
+ InsertStringA(reinterpret_cast<char*>(uc));
+ } else {
+ buffer_->text->
+ InsertStringB(reinterpret_cast<char*>(uc));
+ }
+#endif
free(uc);
uc = 0;
}
-
- _buffer->update(1);
+
+#ifdef MOVE_TEXT
+ update(1);
+#else
+ buffer_->update(1);
+#endif
}
return 0;
}
+#ifdef MOVE_TEXT
void BufferView::cursorPrevious()
{
- if (!currentBuffer()->text->cursor.row->previous) return;
+ if (!text->cursor.row->previous) return;
long y = getScreen()->first;
- Row* cursorrow = currentBuffer()->text->cursor.row;
- currentBuffer()->text->
- SetCursorFromCoordinates(currentBuffer()->text->
+ Row * cursorrow = text->cursor.row;
+ text->SetCursorFromCoordinates(text->cursor.x_fix, y);
+ text->FinishUndo();
+ // this is to allow jumping over large insets
+ if ((cursorrow == text->cursor.row))
+ text->CursorUp();
+
+ if (text->cursor.row->height < work_area->h)
+ getScreen()->Draw(text->cursor.y
+ - text->cursor.row->baseline
+ + text->cursor.row->height
+ - work_area->h +1 );
+}
+
+
+void BufferView::cursorNext()
+{
+ if (!text->cursor.row->next) return;
+
+ long y = getScreen()->first;
+ text->GetRowNearY(y);
+ Row * cursorrow = text->cursor.row;
+ text->SetCursorFromCoordinates(text->cursor.x_fix, y + work_area->h);
+ text->FinishUndo();
+ /* this is to allow jumping over large insets */
+ if ((cursorrow == text->cursor.row))
+ text->CursorDown();
+
+ if (text->cursor.row->height < work_area->h)
+ getScreen()->Draw(text->cursor.y
+ - text->cursor.row->baseline);
+}
+#else
+void BufferView::cursorPrevious()
+{
+ if (!buffer()->text->cursor.row->previous) return;
+
+ long y = getScreen()->first;
+ Row * cursorrow = buffer()->text->cursor.row;
+ buffer()->text->
+ SetCursorFromCoordinates(buffer()->text->
cursor.x_fix,
y);
- currentBuffer()->text->FinishUndo();
- /* this is to allow jumping over large insets */
- if ((cursorrow == currentBuffer()->text->cursor.row))
- currentBuffer()->text->CursorUp();
+ buffer()->text->FinishUndo();
+ // this is to allow jumping over large insets
+ if ((cursorrow == buffer()->text->cursor.row))
+ buffer()->text->CursorUp();
- if (currentBuffer()->text->cursor.row->height < work_area->h)
- getScreen()->Draw(currentBuffer()->text->cursor.y
- - currentBuffer()->text->cursor.row->baseline
- + currentBuffer()->text->cursor.row->height
+ if (buffer()->text->cursor.row->height < work_area->h)
+ getScreen()->Draw(buffer()->text->cursor.y
+ - buffer()->text->cursor.row->baseline
+ + buffer()->text->cursor.row->height
- work_area->h +1 );
}
void BufferView::cursorNext()
{
- if (!currentBuffer()->text->cursor.row->next) return;
+ if (!buffer()->text->cursor.row->next) return;
long y = getScreen()->first;
- currentBuffer()->text->GetRowNearY(y);
- Row* cursorrow = currentBuffer()->text->cursor.row;
- currentBuffer()->text->
- SetCursorFromCoordinates(currentBuffer()->text->
+ buffer()->text->GetRowNearY(y);
+ Row * cursorrow = buffer()->text->cursor.row;
+ buffer()->text->
+ SetCursorFromCoordinates(buffer()->text->
cursor.x_fix,
y + work_area->h);
- currentBuffer()->text->FinishUndo();
+ buffer()->text->FinishUndo();
/* this is to allow jumping over large insets */
- if ((cursorrow == currentBuffer()->text->cursor.row))
- currentBuffer()->text->CursorDown();
+ if ((cursorrow == buffer()->text->cursor.row))
+ buffer()->text->CursorDown();
- if (currentBuffer()->text->cursor.row->height < work_area->h)
- getScreen()->Draw(currentBuffer()->text->cursor.y
- - currentBuffer()->text->cursor.row->baseline);
+ if (buffer()->text->cursor.row->height < work_area->h)
+ getScreen()->Draw(buffer()->text->cursor.y
+ - buffer()->text->cursor.row->baseline);
}
-
+#endif
bool BufferView::available() const
{
- if (_buffer && _buffer->text) return true;
+#ifdef MOVE_TEXT
+ if (buffer_ && text) return true;
+#else
+ if (buffer_ && buffer_->text) return true;
+#endif
return false;
}
void BufferView::savePosition()
{
- backstack->push(currentBuffer()->getFileName(),
- currentBuffer()->text->cursor.x,
- currentBuffer()->text->cursor.y);
+#ifdef MOVE_TEXT
+ backstack.push(buffer()->fileName(),
+ text->cursor.x,
+ text->cursor.y);
+#else
+ backstack.push(buffer()->getFileName(),
+ buffer()->text->cursor.x,
+ buffer()->text->cursor.y);
+#endif
}
void BufferView::restorePosition()
{
+ if (backstack.empty()) return;
+
int x, y;
- string fname = backstack->pop(&x, &y);
+ string fname = backstack.pop(&x, &y);
BeforeChange();
- Buffer *b = (bufferlist.exists(fname)) ? bufferlist.getBuffer(fname):
+ Buffer * b = (bufferlist.exists(fname)) ? bufferlist.getBuffer(fname):
bufferlist.loadLyXFile(fname); // don't ask, just load it
- setBuffer(b);
- currentBuffer()->text->SetCursorFromCoordinates(x, y);
- currentBuffer()->update(0);
+ buffer(b);
+#ifdef MOVE_TEXT
+ text->SetCursorFromCoordinates(x, y);
+ update(0);
+#else
+ buffer()->text->SetCursorFromCoordinates(x, y);
+ buffer()->update(0);
+#endif
}
+
+
+#ifdef MOVE_TEXT
+// candidate for move to BufferView
+void BufferView::update(signed char f)
+{
+ owner()->updateLayoutChoice();
+
+ if (!text->selection && f > -3)
+ text->sel_cursor = text->cursor;
+
+ FreeUpdateTimer();
+ text->FullRebreak();
+
+ update();
+
+ if (f != 3 && f != -3) {
+ fitCursor();
+ updateScrollbar();
+ }
+
+ if (f == 1 || f == -1) {
+ if (buffer()->isLyxClean()) {
+ buffer()->markDirty();
+ owner()->getMiniBuffer()->setTimer(4);
+ } else {
+ buffer()->markDirty();
+ }
+ }
+}
+#endif
projects / lyx.git / blobdiff