From: Lars Gullik Bjønnes Date: Tue, 15 Feb 2000 14:28:15 +0000 (+0000) Subject: read changelog X-Git-Tag: 1.6.10~22377 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=56e007b94ecc2db8ae9e80dfba22f43bd356a846;p=features.git read changelog git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@557 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/ChangeLog b/ChangeLog index fd813fafd0..74d730c722 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2000-02-15 Lars Gullik Bjønnes + + * src/toolbar.C (set): use fl_set_object_helper for the tooltop + (bubble tip), this removes our special handling of this. + + * Remove all code that is unused now that we have the new + workarea. (Code that are not active when NEW_WA is defined.) + + * Make the uses of XSync not conditionalized on define USE_XSYNC. + 2000-02-15 Jean-Marc Lasgouttes * src/lyxfunc.C (Dispatch): fix LFUN_LAYOUT when giving a diff --git a/src/BufferView.C b/src/BufferView.C index 7cf2388264..90723b6a3c 100644 --- a/src/BufferView.C +++ b/src/BufferView.C @@ -35,11 +35,6 @@ using std::for_each; #include "minibuffer.h" #include "lyxscreen.h" -#ifndef NEW_WA -#include "up.xpm" -#include "down.xpm" -#endif - #include "debug.h" #include "lyx_gui_misc.h" #include "BackStack.h" @@ -72,11 +67,6 @@ extern InsetUpdateStruct * InsetUpdateList; extern void UpdateInsetUpdateList(); extern void FreeUpdateTimer(); -#ifndef NEW_WA -// This is _very_ temporary -FL_OBJECT * figinset_canvas; -#endif - BufferView::BufferView(LyXView * o, int xpos, int ypos, int width, int height) : owner_(o) @@ -84,25 +74,13 @@ BufferView::BufferView(LyXView * o, int xpos, int ypos, buffer_ = 0; text = 0; screen = 0; -#ifdef NEW_WA workarea = new WorkArea(this, xpos, ypos, width, height); -#else - figinset_canvas = 0; - work_area = 0; - scrollbar = 0; - button_down = 0; - button_up = 0; -#endif timer_cursor = 0; - create_view(xpos, ypos, width, height); + create_view(); current_scrollbar_value = 0; // Activate the timer for the cursor fl_set_timer(timer_cursor, 0.4); -#ifdef NEW_WA workarea->setFocus(); -#else - fl_set_focus_object(owner_->getForm(), work_area); -#endif work_area_focus = true; lyx_focus = false; the_locking_inset = 0; @@ -177,11 +155,7 @@ void BufferView::buffer(Buffer * b) lyxerr[Debug::INFO] << " No Buffer!" << endl; owner_->getMenus()->hideMenus(); updateScrollbar(); -#ifdef NEW_WA workarea->redraw(); -#else - fl_redraw_object(work_area); -#endif // Also remove all remaining text's from the testcache. // (there should not be any!) (if there is any it is a @@ -201,7 +175,6 @@ void BufferView::updateScreen() { // Regenerate the screen. delete screen; -#ifdef NEW_WA screen = new LyXScreen(this, workarea->getWin(), workarea->getPixmap(), @@ -210,25 +183,15 @@ void BufferView::updateScreen() workarea->xpos(), workarea->ypos(), text); -#else - screen = new LyXScreen(FL_ObjWin(work_area), - work_area->w, - work_area->h, - work_area->x, - work_area->y, - text); -#endif } -#ifdef NEW_WA void BufferView::resize(int xpos, int ypos, int width, int height) { workarea->resize(xpos, ypos, width, height); update(3); redraw(); } -#endif void BufferView::resize() @@ -239,23 +202,10 @@ void BufferView::resize() } -#ifndef NEW_WA -static bool lgb_hack = false; -#endif - void BufferView::redraw() { lyxerr[Debug::INFO] << "BufferView::redraw()" << endl; -#ifdef NEW_WA workarea->redraw(); -#else - lgb_hack = true; - fl_redraw_object(work_area); - fl_redraw_object(scrollbar); - fl_redraw_object(button_down); - fl_redraw_object(button_up); - lgb_hack = false; -#endif } @@ -279,12 +229,7 @@ void BufferView::updateScrollbar() * be possible */ if (!buffer_) { -#ifdef NEW_WA workarea->setScrollbar(0, 1.0); -#else - fl_set_slider_value(scrollbar, 0); - fl_set_slider_size(scrollbar, scrollbar->h); -#endif return; } @@ -300,7 +245,6 @@ void BufferView::updateScrollbar() cbsf = screen->first; // check if anything has changed. -#ifdef NEW_WA if (max2 == cbth && height2 == workarea->height() && current_scrollbar_value == cbsf) @@ -308,41 +252,19 @@ void BufferView::updateScrollbar() max2 = cbth; height2 = workarea->height(); current_scrollbar_value = cbsf; -#else - if (max2 == cbth && - height2 == work_area->h && - current_scrollbar_value == cbsf) - return; // no - max2 = cbth; - height2 = work_area->h; - current_scrollbar_value = cbsf; -#endif if (cbth <= height2) { // text is smaller than screen -#ifdef NEW_WA workarea->setScrollbar(0, 1.0); // right? -#else - fl_set_slider_size(scrollbar, scrollbar->h); -#endif return; } -#ifdef NEW_WA long maximum_height = workarea->height() * 3 / 4 + cbth; -#else - long maximum_height = work_area->h * 3 / 4 + cbth; -#endif long value = cbsf; // set the scrollbar -#ifdef NEW_WA double hfloat = workarea->height(); -#else - double hfloat = work_area->h; -#endif double maxfloat = maximum_height; -#ifdef NEW_WA float slider_size = 0.0; int slider_value = value; @@ -358,25 +280,6 @@ void BufferView::updateScrollbar() slider_size = hfloat; workarea->setScrollbar(slider_value, slider_size / workarea->height()); -#else - fl_set_slider_value(scrollbar, value); - fl_set_slider_bounds(scrollbar, 0, - maximum_height - work_area->h); - - double lineh = text->DefaultHeight(); - fl_set_slider_increment(scrollbar, work_area->h-lineh, lineh); - - if (maxfloat > 0){ - if ((hfloat / maxfloat) * float(height2) < 3) - fl_set_slider_size(scrollbar, - 3 / float(height2)); - else - fl_set_slider_size(scrollbar, - hfloat / maxfloat); - } else - fl_set_slider_size(scrollbar, hfloat); - fl_set_slider_precision(scrollbar, 0); -#endif } @@ -417,19 +320,11 @@ int BufferView::resizeCurrentBuffer() selection = text->selection; mark_set = text->mark_set; delete text; -#ifdef NEW_WA text = new LyXText(this, workarea->workWidth(), buffer_); -#else - text = new LyXText(work_area->w, buffer_); -#endif } else { // See if we have a text in TextCache that fits // the new buffer_ with the correct width. -#ifdef NEW_WA text = textcache.findFit(buffer_, workarea->workWidth()); -#else - text = textcache.findFit(buffer_, work_area->w); -#endif if (text) { if (lyxerr.debugging()) { lyxerr << "Found a LyXText that fits:\n"; @@ -440,11 +335,7 @@ int BufferView::resizeCurrentBuffer() if (lyxerr.debugging()) textcache.show(lyxerr, "resizeCurrentBuffer"); } else { -#ifdef NEW_WA text = new LyXText(this, workarea->workWidth(), buffer_); -#else - text = new LyXText(work_area->w, buffer_); -#endif } } updateScreen(); @@ -515,141 +406,18 @@ void BufferView::gotoError() } -#ifdef NEW_WA -extern "C" { - void C_BufferView_CursorToggleCB(FL_OBJECT * ob, long buf) - { - BufferView::CursorToggleCB(ob, buf); - } -} -#else extern "C" { -// Just a bunch of C wrappers around static members of BufferView - void C_BufferView_UpCB(FL_OBJECT * ob, long buf) - { - BufferView::UpCB(ob, buf); - } - - - void C_BufferView_DownCB(FL_OBJECT * ob, long buf) - { - BufferView::DownCB(ob, buf); - } - - - void C_BufferView_ScrollCB(FL_OBJECT * ob, long buf) - { - BufferView::ScrollCB(ob, buf); - } - - void C_BufferView_CursorToggleCB(FL_OBJECT * ob, long buf) { BufferView::CursorToggleCB(ob, buf); } - - - 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); - } } -#endif -void BufferView::create_view(int xpos, int ypos, int width, int height) +void BufferView::create_view() { FL_OBJECT * obj; -#ifndef NEW_WA - int const 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 = - fl_add_canvas(FL_NORMAL_CANVAS, - xpos + 1, - 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, ""); - fl_set_object_resize(obj, FL_RESIZE_ALL); - fl_set_object_gravity(obj, NorthWestGravity, SouthEastGravity); - - // the free object - work_area = obj = fl_add_free(FL_INPUT_FREE, - xpos + bw, ypos + bw, - width - 15 - 2 * bw /* scrollbarwidth */, - 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_resize(obj, FL_RESIZE_ALL); - fl_set_object_gravity(obj, NorthWestGravity, SouthEastGravity); - - // - // THE SCROLLBAR - // - - // up - scrollbar button - fl_set_border_width(-1); // to get visual feedback - - 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); - fl_set_object_resize(obj, FL_RESIZE_ALL); - 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(up_xpm)); - - // Remove the blue feedback rectangle - fl_set_pixmapbutton_focus_outline(obj, 0); - - // the scrollbar slider - fl_set_border_width(-bw); - 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); - 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, C_BufferView_ScrollCB, 0); - obj->u_vdata = this; - - // down - scrollbar button - fl_set_border_width(-1); // to get visible feedback - - 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); - fl_set_object_resize(obj, FL_RESIZE_ALL); - fl_set_object_gravity(obj, SouthEastGravity, SouthEastGravity); - fl_set_object_callback(obj, C_BufferView_DownCB, 0); - obj->u_vdata = this; - fl_set_pixmapbutton_data(obj, const_cast(down_xpm)); - fl_set_border_width(-bw); - // Remove the blue feedback rectangle - fl_set_pixmapbutton_focus_outline(obj, 0); -#endif // // TIMERS // @@ -663,7 +431,6 @@ void BufferView::create_view(int xpos, int ypos, int width, int height) // Callback for scrollbar up button -#ifdef NEW_WA void BufferView::UpCB(long time, int button) { if (buffer_ == 0) return; @@ -680,28 +447,6 @@ void BufferView::UpCB(long time, int button) break; } } -#else -void BufferView::UpCB(FL_OBJECT * ob, long) -{ - BufferView * view = static_cast(ob->u_vdata); - - if (view->buffer_ == 0) return; - - static long time = 0; - XEvent const * ev2 = fl_last_event(); - if (ev2->type == ButtonPress || ev2->type == ButtonRelease) - time = 0; - int button = fl_get_button_numb(ob); - switch (button) { - case 3: - view->ScrollUpOnePage(time++); break; - case 2: - view->ScrollDownOnePage(time++); break; - default: - view->ScrollUp(time++); break; - } -} -#endif static inline @@ -712,7 +457,6 @@ void waitForX() // Callback for scrollbar slider -#ifdef NEW_WA void BufferView::ScrollCB(double value) { extern bool cursor_follows_scrollbar; @@ -746,47 +490,9 @@ void BufferView::ScrollCB(double value) } waitForX(); } -#else -void BufferView::ScrollCB(FL_OBJECT * ob, long) -{ - BufferView * view = static_cast(ob->u_vdata); - extern bool cursor_follows_scrollbar; - - if (view->buffer_ == 0) return; - - view->current_scrollbar_value = long(fl_get_slider_value(ob)); - if (view->current_scrollbar_value < 0) - view->current_scrollbar_value = 0; - - if (!view->screen) - return; - - view->screen->Draw(view->current_scrollbar_value); - - if (cursor_follows_scrollbar) { - LyXText * vbt = view->text; - int height = vbt->DefaultHeight(); - - if (vbt->cursor.y < view->screen->first + height) { - vbt->SetCursorFromCoordinates(0, - view->screen->first + - height); - } - else if (vbt->cursor.y > - view->screen->first + view->work_area->h - height) { - vbt->SetCursorFromCoordinates(0, - view->screen->first + - view->work_area->h - - height); - } - } - waitForX(); -} -#endif // Callback for scrollbar down button -#ifdef NEW_WA void BufferView::DownCB(long time, int button) { if (buffer_ == 0) return; @@ -803,32 +509,8 @@ void BufferView::DownCB(long time, int button) break; } } -#else -void BufferView::DownCB(FL_OBJECT * ob, long) -{ - BufferView * view = static_cast(ob->u_vdata); - - if (view->buffer_ == 0) return; - - XEvent const * ev2; - static long time = 0; - ev2 = fl_last_event(); - if (ev2->type == ButtonPress || ev2->type == ButtonRelease) - time = 0; - int button = fl_get_button_numb(ob); - switch (button) { - case 2: - view->ScrollUpOnePage(time++); break; - case 3: - view->ScrollDownOnePage(time++); break; - default: - view->ScrollDown(time++); break; - } -} -#endif -#ifdef NEW_WA int BufferView::ScrollUp(long time) { if (buffer_ == 0) return 0; @@ -855,37 +537,8 @@ int BufferView::ScrollUp(long time) ScrollCB(value); return 0; } -#else -int BufferView::ScrollUp(long time) -{ - if (buffer_ == 0) return 0; - if (!screen) return 0; - - double value = fl_get_slider_value(scrollbar); - - if (value == 0) return 0; - - float add_value = (text->DefaultHeight() - + float(time) * float(time) * 0.125); - - if (add_value > work_area->h) - add_value = float(work_area->h - - text->DefaultHeight()); - - value -= add_value; - - if (value < 0) - value = 0; - - fl_set_slider_value(scrollbar, value); - - ScrollCB(scrollbar, 0); - return 0; -} -#endif -#ifdef NEW_WA int BufferView::ScrollDown(long time) { if (buffer_ == 0) return 0; @@ -914,39 +567,8 @@ int BufferView::ScrollDown(long time) ScrollCB(value); return 0; } -#else -int BufferView::ScrollDown(long time) -{ - if (buffer_ == 0) return 0; - if (!screen) return 0; - - double value= fl_get_slider_value(scrollbar); - double min, max; - fl_get_slider_bounds(scrollbar, &min, &max); - - if (value == max) return 0; - - float add_value = (text->DefaultHeight() - + float(time) * float(time) * 0.125); - - if (add_value > work_area->h) - add_value = float(work_area->h - - text->DefaultHeight()); - - value += add_value; - - if (value > max) - value = max; - - fl_set_slider_value(scrollbar, value); - - ScrollCB(scrollbar, 0); - return 0; -} -#endif -#ifdef NEW_WA void BufferView::ScrollUpOnePage() { if (buffer_ == 0) return; @@ -964,28 +586,8 @@ void BufferView::ScrollUpOnePage() ScrollCB(y); } -#else -void BufferView::ScrollUpOnePage(long /*time*/) -{ - if (buffer_ == 0) return; - if (!screen) return; - - long y = screen->first; - - if (!y) return; - - Row * row = text->GetRowNearY(y); - - y = y - work_area->h + row->height; - - fl_set_slider_value(scrollbar, y); - - ScrollCB(scrollbar, 0); -} -#endif -#ifdef NEW_WA void BufferView::ScrollDownOnePage() { if (buffer_ == 0) return; @@ -1003,135 +605,8 @@ void BufferView::ScrollDownOnePage() ScrollCB(y); } -#else -void BufferView::ScrollDownOnePage(long /*time*/) -{ - if (buffer_ == 0) return; - if (!screen) return; - - double min, max; - fl_get_slider_bounds(scrollbar, &min, &max); - long y = screen->first; - - if (y > text->height - work_area->h) - return; - - y += work_area->h; - text->GetRowNearY(y); - - fl_set_slider_value(scrollbar, y); - - ScrollCB(scrollbar, 0); -} -#endif - - -#ifndef NEW_WA -int BufferView::work_area_handler(FL_OBJECT * ob, int event, - FL_Coord, FL_Coord , - int /*key*/, void * xev) -{ - static int x_old = -1; - static int y_old = -1; - static long scrollbar_value_old = -1; - - XEvent * ev = static_cast(xev); - BufferView * view = static_cast(ob->u_vdata); - - // If we don't have a view yet; return - if (!view || quitting) return 0; - - switch (event){ - case FL_DRAW: - view->workAreaExpose(); - break; - case FL_PUSH: - view->WorkAreaButtonPress(ob, 0, 0, 0, ev, 0); - break; - case FL_RELEASE: - view->WorkAreaButtonRelease(ob, 0, 0, 0, ev, 0); - break; - case FL_MOUSE: - if (ev->xmotion.x != x_old || - ev->xmotion.y != y_old || - view->current_scrollbar_value != scrollbar_value_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); - } - break; - // Done by the raw callback: - // 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; - view->work_area_focus = true; - fl_set_timer(view->timer_cursor, 0.4); - break; - case FL_UNFOCUS: - view->owner_->getMiniBuffer()->ExecCommand(); - view->work_area_focus = false; - break; - case FL_ENTER: - SetXtermCursor(view->owner_->getForm()->window); - // reset the timer - view->lyx_focus = true; - fl_set_timer(view->timer_cursor, 0.4); - break; - case FL_LEAVE: - if (!input_prohibited) - XUndefineCursor(fl_display, - 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 - //fl_set_timer(view->timer_cursor, 0.01); // 0.1 sec blink - fl_set_timer(view->timer_cursor, 0.4); // 0.4 sec blink - break; - case FL_DBLCLICK: - // select a word - if (!view->the_locking_inset) { - if (view->screen && ev->xbutton.button == 1) { - view->screen->HideCursor(); - view->screen->ToggleSelection(); - view->text->SelectWord(); - view->screen->ToggleSelection(false); - /* This will fit the cursor on the screen - * if necessary */ - view->update(0); - } - } - break; - case FL_TRPLCLICK: - // select a line - if (view->buffer_ && view->screen && ev->xbutton.button == 1) { - view->screen->HideCursor(); - view->screen->ToggleSelection(); - view->text->CursorHome(); - view->text->sel_cursor = view->text->cursor; - view->text->CursorEnd(); - view->text->SetSelection(); - view->screen->ToggleSelection(false); - /* This will fit the cursor on the screen - * if necessary */ - view->update(0); - } - break; - case FL_OTHER: - view->WorkAreaSelectionNotify(ob, - view->owner_->getForm()->window, - 0, 0, ev, 0); - break; - } - return 1; -} -#endif -#ifdef NEW_WA void BufferView::WorkAreaMotionNotify(int x, int y, unsigned int state) { if (buffer_ == 0 || !screen) return; @@ -1168,67 +643,23 @@ void BufferView::WorkAreaMotionNotify(int x, int y, unsigned int state) } return; } + + +#ifdef USE_PAINTER +extern int bibitemMaxWidth(Painter &, LyXFont const &); #else -int BufferView::WorkAreaMotionNotify(FL_OBJECT * ob, Window, - int /*w*/, int /*h*/, - XEvent * ev, void * /*d*/) +extern int bibitemMaxWidth(LyXFont const &); +#endif + +// Single-click on work area +void BufferView::WorkAreaButtonPress(int xpos, int ypos, unsigned int button) { - if (buffer_ == 0) return 0; - if (!screen) return 0; + last_click_x = -1; + last_click_y = -1; - // Check for inset locking - if (the_locking_inset) { - LyXCursor cursor = text->cursor; - the_locking_inset-> - InsetMotionNotify(ev->xbutton.x - ob->x - cursor.x, - ev->xbutton.y - ob->y - - (cursor.y), - ev->xbutton.state); - return 0; - } + if (buffer_ == 0 || !screen) return; - // Only use motion with button 1 - if (!ev->xmotion.state & Button1MotionMask) - return 0; - - /* The selection possible is needed, that only motion events are - * used, where the bottom press event was on the drawing area too */ - if (selection_possible) { - screen->HideCursor(); - - 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(); - screen->ToggleToggle(); - if (screen->FitCursor()) - updateScrollbar(); - screen->ShowCursor(); - } - return 0; -} -#endif - -#ifdef USE_PAINTER -extern int bibitemMaxWidth(Painter &, LyXFont const &); -#else -extern int bibitemMaxWidth(LyXFont const &); -#endif - -// Single-click on work area -#ifdef NEW_WA -void BufferView::WorkAreaButtonPress(int xpos, int ypos, unsigned int button) -{ - last_click_x = -1; - last_click_y = -1; - - if (buffer_ == 0 || !screen) return; - - Inset * inset_hit = checkInsetHit(xpos, ypos); + Inset * inset_hit = checkInsetHit(xpos, ypos); // ok ok, this is a hack. if (button == 4 || button == 5) { @@ -1353,175 +784,8 @@ void BufferView::WorkAreaButtonPress(int xpos, int ypos, unsigned int button) return; } } -#else -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 (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) { - the_locking_inset-> - InsetButtonPress(inset_x, inset_y, - button); - return 0; - } else { - unlockInset(the_locking_inset); - } - } - - selection_possible = true; - screen->HideCursor(); - - // Right button mouse click on a table - if (button == 3 && - (text->cursor.par->table || - text->MouseHitInTable(x, y + screen->first))) { - // Set the cursor to the press-position - text->SetCursorFromCoordinates(x, y + screen->first); - bool doit = true; - - // Only show the table popup if the hit is in - // the table, too - if (!text->HitInTable(text->cursor.row, x)) - doit = false; - - // Hit above or below the table? - if (doit) { - if (!text->selection) { - screen->ToggleSelection(); - text->ClearSelection(); - 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 - && text->selection) { - owner_->getLyXFunc()->Dispatch(LFUN_COPY); - paste_internally = true; - } - - // Clear the selection - screen->ToggleSelection(); - text->ClearSelection(); - 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; - } - - text->SetCursorFromCoordinates(x, y + screen_first); - text->FinishUndo(); - text->sel_cursor = text->cursor; - text->cursor.x_fix = 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 NEW_WA void BufferView::WorkAreaButtonRelease(int x, int y, unsigned int button) { if (buffer_ == 0 || screen == 0) return; @@ -1675,165 +939,7 @@ void BufferView::WorkAreaButtonRelease(int x, int y, unsigned int button) return; } -#else -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 (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. */ - 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; - } - SetState(); - owner_->getMiniBuffer()->Set(CurrentState()); - - // 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_FOOTNOTE); - - int box_x = 20; // LYX_PAPER_MARGIN; - box_x += font.textWidth(" wide-tab ", 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; -} -#endif /* * Returns an inset if inset was hit. 0 otherwise. @@ -1976,7 +1082,7 @@ Inset * BufferView::checkInsetHit(int & x, int & y) } #endif -#ifdef NEW_WA + void BufferView::workAreaExpose() { // this is a hack to ensure that we only call this through @@ -2032,68 +1138,6 @@ void BufferView::workAreaExpose() owner_->updateLayoutChoice(); return; } -#else -int BufferView::workAreaExpose() -{ - if (!work_area || !work_area->form->visible) - return 1; - - // this is a hack to ensure that we only call this through - // BufferView::redraw(). - if (!lgb_hack) { - redraw(); - } - - static int work_area_width = work_area->w; - static int work_area_height = work_area->h; - - bool widthChange = work_area->w != work_area_width; - bool heightChange = work_area->h != work_area_height; - - // update from work area - work_area_width = work_area->w; - work_area_height = work_area->h; - if (buffer_ != 0) { - if (widthChange) { - // All buffers need a resize - bufferlist.resize(); - - // Remove all texts from the textcache - // This is not _really_ what we want to do. What - // we really want to do is to delete in textcache - // that does not have a BufferView with matching - // width, but as long as we have only one BufferView - // deleting all gives the same result. - if (lyxerr.debugging()) - textcache.show(lyxerr, "Expose delete all"); - textcache.clear(); - } else if (heightChange) { - // Rebuild image of current screen - updateScreen(); - // fitCursor() ensures we don't jump back - // to the start of the document on vertical - // resize - fitCursor(); - - // The main window size has changed, repaint most stuff - redraw(); - // ...including the minibuffer - owner_->getMiniBuffer()->Init(); - - } else if (screen) screen->Redraw(); - } else { - // Grey box when we don't have a buffer - fl_winset(FL_ObjWin(work_area)); - fl_rectangle(1, work_area->x, work_area->y, - work_area->w, work_area->h, FL_GRAY63); - } - - // always make sure that the scrollbar is sane. - updateScrollbar(); - owner_->updateLayoutChoice(); - return 1; -} -#endif // Callback for cursor timer @@ -2201,7 +1245,6 @@ void BufferView::CursorToggleCB(FL_OBJECT * ob, long) } -#ifdef NEW_WA static string fromClipboard(Window win, XEvent * event) { @@ -2277,84 +1320,7 @@ void BufferView::WorkAreaSelectionNotify(Window win, XEvent * event) } } -#else -int BufferView::WorkAreaSelectionNotify(FL_OBJECT *, Window win, - int /*w*/, int /*h*/, - XEvent * event, void */*d*/) -{ - if (buffer_ == 0) return 0; - if (event->type != SelectionNotify) - return 0; - - Atom tmpatom; - unsigned long ul1; - unsigned long ul2; - unsigned char * uc = 0; - int tmpint; - screen->HideCursor(); - beforeChange(); - if (event->xselection.type == XA_STRING - && event->xselection.property) { - - if (XGetWindowProperty( - fl_display /* display */, - win /* w */, - event->xselection.property /* property */, - 0 /* long_offset */, - 0 /* long_length */, - false /* delete */, - XA_STRING /* req_type */, - &tmpatom /* actual_type_return */, - &tmpint /* actual_format_return */, - &ul1 /* nitems_return */, - &ul2 /* bytes_after_return */, - &uc /* prop_return */ - ) != Success) { - return 0; - } - XFlush(fl_display); - - if (uc) { - free(uc); - uc = 0; - } - - if (XGetWindowProperty( - fl_display /* display */, - win /* w */, - event->xselection.property /* property */, - 0 /* long_offset */, - ul2/4+1 /* long_length */, - True /* delete */, - XA_STRING /* req_type */, - &tmpatom /* actual_type_return */, - &tmpint /* actual_format_return */, - &ul1 /* nitems_return */, - &ul2 /* bytes_after_return */, - &uc /* prop_return */ - ) != Success) { - return 0; - } - XFlush(fl_display); - - if (uc) { - if (!ascii_type) { - text->InsertStringA(reinterpret_cast(uc)); - } else { - text->InsertStringB(reinterpret_cast(uc)); - } - free(uc); - uc = 0; - } - - update(1); - } - return 0; -} -#endif - -#ifdef NEW_WA void BufferView::cursorPrevious() { if (!text->cursor.row->previous) return; @@ -2373,29 +1339,8 @@ void BufferView::cursorPrevious() + text->cursor.row->height - workarea->height() + 1 ); } -#else -void BufferView::cursorPrevious() -{ - if (!text->cursor.row->previous) return; - - long y = getScreen()->first; - 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 ); -} -#endif -#ifdef NEW_WA void BufferView::cursorNext() { if (!text->cursor.row->next) return; @@ -2414,25 +1359,6 @@ void BufferView::cursorNext() getScreen()->Draw(text->cursor.y - text->cursor.row->baseline); } -#else -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); -} -#endif bool BufferView::available() const diff --git a/src/BufferView.h b/src/BufferView.h index abbc288d0d..1d10fc9db4 100644 --- a/src/BufferView.h +++ b/src/BufferView.h @@ -21,8 +21,6 @@ #include "LaTeX.h" #include "undo.h" -#define NEW_WA 1 - class LyXView; class Buffer; class LyXScreen; @@ -43,19 +41,12 @@ public: /// Painter & painter(); #endif -#ifdef NEW_WA /// WorkArea * getWorkArea() { return workarea; } -#else - /// - FL_OBJECT * getWorkArea() { return work_area; } -#endif /// void buffer(Buffer * b); -#ifdef NEW_WA /// void resize(int, int, int, int); -#endif /// void resize(); /// @@ -195,23 +186,14 @@ private: /// Update pixmap of screen void updateScreen(); -#ifdef NEW_WA /// void workAreaExpose(); /// void ScrollUpOnePage(); /// void ScrollDownOnePage(); -#else - /// - int workAreaExpose(); /// - void ScrollUpOnePage(long /*time*/); - /// - void ScrollDownOnePage(long /*time*/); -#endif - /// - void create_view(int, int, int, int); + void create_view(); /// Inset * checkInsetHit(int & x, int & y); /// @@ -220,8 +202,6 @@ private: int ScrollDown(long time); public: - -#ifdef NEW_WA /// bool focus() const; /// @@ -234,28 +214,20 @@ public: void ScrollCB(double); /// A callback for the down arrow in the scrollbar. void DownCB(long time, int button); -#else - /// A callback for the up arrow in the scrollbar. - static void UpCB(FL_OBJECT * ob, long); - /// A callback for the slider in the scrollbar. - static void ScrollCB(FL_OBJECT * ob, long); - - /// A callback for the down arrow in the scrollbar. - static void DownCB(FL_OBJECT * ob, long); -#endif /// static void CursorToggleCB(FL_OBJECT * ob, long); +#if 0 /** Work area free object handler */ static int work_area_handler(FL_OBJECT *, int event, FL_Coord, FL_Coord, int key, void *xev); +#endif /// void SetState(); private: -#ifdef NEW_WA /// void WorkAreaMotionNotify(int x, int y, unsigned int state); /// @@ -264,27 +236,6 @@ private: void WorkAreaButtonRelease(int x, int y, unsigned int button); /// void WorkAreaSelectionNotify(Window win, XEvent * event); -#else - /// - int WorkAreaMotionNotify(FL_OBJECT * ob, - Window win, - int w, int h, - XEvent * ev, void * d); - /// - int WorkAreaButtonPress(FL_OBJECT * ob, - Window win, - int w, int h, - XEvent * ev, void * d); - /// - int WorkAreaButtonRelease(FL_OBJECT * ob, - Window win, - int w, int h, - XEvent * ev, void * d); - /// - int WorkAreaSelectionNotify(FL_OBJECT *, Window win, - int /*w*/, int /*h*/, - XEvent * event, void * /*d*/); -#endif /// LyXView * owner_; /// @@ -297,16 +248,6 @@ private: bool lyx_focus; /// bool work_area_focus; -#ifndef NEW_WA - /// - FL_OBJECT * work_area; - /// - FL_OBJECT * scrollbar; - /// - FL_OBJECT * button_down; - /// - FL_OBJECT * button_up; -#endif /// FL_OBJECT * figinset_canvas; /// @@ -315,10 +256,8 @@ private: BackStack backstack; /// int last_click_x, last_click_y; -#ifdef NEW_WA /// WorkArea * workarea; -#endif }; #endif diff --git a/src/LyXView.C b/src/LyXView.C index e083bb851f..fcaacfc7d3 100644 --- a/src/LyXView.C +++ b/src/LyXView.C @@ -337,8 +337,6 @@ int LyXView::KeyPressMask_raw_callback(FL_FORM * fl, void * xev) LyXView * view = static_cast(fl->u_vdata); int retval = 0; // 0 means XForms should have a look at this event -#define USE_XSYNC 1 -#ifdef USE_XSYNC XKeyEvent * xke = static_cast(xev); static Time last_time_pressed = 0; static Time last_time_released = 0; @@ -346,36 +344,23 @@ int LyXView::KeyPressMask_raw_callback(FL_FORM * fl, void * xev) static unsigned int last_key_released = 0; static unsigned int last_state_pressed = 0; static unsigned int last_state_released = 0; -#endif + // funny. Even though the raw_callback is registered with KeyPressMask, // also KeyRelease-events are passed through:-( // [It seems that XForms puts them in pairs... (JMarc)] if (static_cast(xev)->type == KeyPress -#ifdef NEW_WA && view->bufferview->focus() && view->bufferview->active()) -#else - && view->bufferview->getWorkArea()->focus - && view->bufferview->getWorkArea()->active) -#endif { -#ifdef USE_XSYNC last_time_pressed = xke->time; last_key_pressed = xke->keycode; last_state_pressed = xke->state; -#endif retval = view->getLyXFunc() ->processKeyEvent(static_cast(xev)); } -#ifdef USE_XSYNC else if (static_cast(xev)->type == KeyRelease -#ifdef NEW_WA && view->bufferview->focus() && view->bufferview->active()) -#else - && view->bufferview->getWorkArea()->focus - && view->bufferview->getWorkArea()->active) -#endif { last_time_released = xke->time; last_key_released = xke->keycode; @@ -396,7 +381,6 @@ int LyXView::KeyPressMask_raw_callback(FL_FORM * fl, void * xev) // purging of XEvents can cause any harm...after some testing // I can see no problems, but I'd like other reports too. } -#endif return retval; } diff --git a/src/Makefile.am b/src/Makefile.am index 1c9fdfb33f..31b75cf2da 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -186,10 +186,10 @@ lyx_SOURCES = \ vspace.C \ vspace.h -lyx_main.o: lyx_main.C lyx_main.h config.h version.h debug.h gettext.h \ - lyx_gui.h lyx_gui_misc.h lyxrc.h support/path.h support/filetools.h \ - bufferlist.h support/FileInfo.h lastfiles.h intl.h \ - lyxserver.h layout.h gettext.h +lyx_main.o: lyx_main.C lyx_main.h config.h version.h lyx_gui.h \ + lyx_gui_misc.h lyxrc.h support/path.h support/filetools.h \ + bufferlist.h debug.h support/FileInfo.h lastfiles.h intl.h \ + lyxserver.h layout.h gettext.h kbmap.h $(CXXCOMPILE) -DLYX_DIR=\"$(pkgdatadir)\" \ -DTOP_SRCDIR=\"$(top_srcdir)\" -c $(top_srcdir)/src/lyx_main.C diff --git a/src/WorkArea.C b/src/WorkArea.C index 29a783a527..7b885e7bb6 100644 --- a/src/WorkArea.C +++ b/src/WorkArea.C @@ -22,9 +22,7 @@ #include "support/lstrings.h" #include "BufferView.h" -#ifdef NEW_WA FL_OBJECT * figinset_canvas; -#endif static inline void waitForX() diff --git a/src/WorkArea.h b/src/WorkArea.h index 6bc18a4c70..cb4885aa8d 100644 --- a/src/WorkArea.h +++ b/src/WorkArea.h @@ -85,34 +85,6 @@ public: } /// Pixmap getPixmap() const { return workareapixmap; } - /// - //Signal2 up; - /// - //Signal2 down; - /// - //Signal1 scroll; - /// - //Signal0 expose; - /// - //Signal3 buttonPress; - /// - //Signal3 buttonRelease; - /// - //Signal3 motion; - /// - //Signal0 focus; - /// - //Signal0 unfocus; - /// - //Signal0 enter; - /// - //Signal0 leave; - /// - //Signal3 doubleclick; - /// - //Signal3 trippleclick; - /// - //Signal2 selection; /// xforms callback static int work_area_handler(FL_OBJECT *, int event, FL_Coord, FL_Coord, diff --git a/src/insets/insetlatexaccent.C b/src/insets/insetlatexaccent.C index 61d1b75cce..3e43f3c37a 100644 --- a/src/insets/insetlatexaccent.C +++ b/src/insets/insetlatexaccent.C @@ -514,24 +514,39 @@ void InsetLatexAccent::draw(Painter & pain, LyXFont const & font, } // now the rest - draw within (x, y, x+wid, y+hg) switch (modtype) { - case ACUTE: // acute + case ACUTE: // acute 0xB4 { +#if 0 pain.line(int(x2), int(y + hg), int(x2 + hg35), y + hg35); +#else + pain.text(x2 - font.width(0xB4) / 2, baseline, + char(0xB4), font); +#endif break; } - case GRAVE: // grave + case GRAVE: // grave 0x60 { +#if 0 pain.line(int(x2), int(y + hg), int(x2 - hg35), y + hg35); +#else + pain.text(x2 - font.width(0x60) / 2, baseline, + char(0x60), font); +#endif break; } case MACRON: // macron { +#if 0 pain.line(int(x2 - wid * 0.4), int(y + hg), int(x2 + wid * 0.4), int(y + hg)); +#else + pain.text(x2 - font.width(0xAF) / 2, baseline, + char(0xAF), font); +#endif break; } case TILDE: // tilde @@ -557,20 +572,26 @@ void InsetLatexAccent::draw(Painter & pain, LyXFont const & font, #else pain.text(x2 - font.width('~') / 2, baseline - font.ascent('~'), - "~", 1, font); + '~', font); #endif break; } - case UNDERBAR: // underbar + case UNDERBAR: // underbar 0x5F { +#if 0 pain.line(int(x2 - wid * 0.4), y + hg / 2.0, int(x2 + wid * 0.4), y + hg / 2.0); +#else + pain.text(x2 - font.width(0x5F) / 2, baseline, + char(0x5F), font); +#endif break; } case CEDILLA: // cedilla { +#if 0 int xp[4], yp[4]; xp[0] = int(x2); @@ -586,6 +607,11 @@ void InsetLatexAccent::draw(Painter & pain, LyXFont const & font, yp[3] = y + int(hg); pain.lines(xp, yp, 4); +#else + pain.text(x2 - font.width(0xB8) / 2, baseline, + char(0xB8), font); + +#endif break; } case UNDERDOT: // underdot @@ -606,9 +632,14 @@ void InsetLatexAccent::draw(Painter & pain, LyXFont const & font, case CIRCLE: // circle { +#if 0 pain.arc(int(x2 - (hg / 2.0)), y + (hg / 2.0), hg, hg , 0, 360 * 64); +#else + pain.text(x2 - font.width(0xB0) / 2, baseline, + char(0xB0), font); +#endif break; } case TIE: // tie @@ -694,18 +725,23 @@ void InsetLatexAccent::draw(Painter & pain, LyXFont const & font, } #else pain.text(x2 - font.width('¨') / 2, baseline, - "¨", 1, font); + '¨', font); #endif break; } case CIRCUMFLEX: // circumflex { +#if 0 int xp[3], yp[3]; xp[0] = int(x2 - hg35); yp[0] = y + int(hg); xp[1] = int(x2); yp[1] = int(y + hg35); xp[2] = int(x2 + hg35); yp[2] = y + int(hg); pain.lines(xp, yp, 3); +#else + pain.text(x2 - font.width(0x5E) / 2, baseline, + char(0x5E), font); +#endif break; } case OGONEK: // ogonek diff --git a/src/lyx_cb.C b/src/lyx_cb.C index e28a61aacc..a1a683ed61 100644 --- a/src/lyx_cb.C +++ b/src/lyx_cb.C @@ -244,7 +244,8 @@ void AllowInput() if (fd_form_character->form_character->visible) XUndefineCursor(fl_display, fd_form_character->form_character->window); -#ifndef NEW_WA +#if 0 + // What to do about this? (Lgb) if (current_view->getWorkArea()->belowmouse) SetXtermCursor(current_view->owner()->getForm()->window); #endif diff --git a/src/lyxfr1.C b/src/lyxfr1.C index 6143c9d8f1..1e7a0d97d5 100644 --- a/src/lyxfr1.C +++ b/src/lyxfr1.C @@ -266,13 +266,9 @@ bool LyXFindReplace1::SearchCB(bool fForward) result = false; } -#ifdef NEW_WA if (current_view->focus()) current_view->getScreen()->ShowCursor(); -#else - if (current_view->getWorkArea()->focus) - current_view->getScreen()->ShowCursor(); -#endif + return result; } diff --git a/src/lyxfunc.C b/src/lyxfunc.C index d5a806f837..6b4e33d007 100644 --- a/src/lyxfunc.C +++ b/src/lyxfunc.C @@ -663,19 +663,11 @@ string LyXFunc::Dispatch(int ac, case LFUN_CENTER: // this is center and redraw. owner->view()->beforeChange(); if (owner->view()->text->cursor.y > -#ifdef NEW_WA owner->view()->getWorkArea()->height() / 2) -#else - owner->view()->getWorkArea()->h / 2) -#endif { owner->view()->getScreen()-> Draw(owner->view()->text->cursor.y - -#ifdef NEW_WA owner->view()->getWorkArea()->height() / 2 -#else - owner->view()->getWorkArea()->h / 2 -#endif ); } else { // <= owner->view()->getScreen()-> @@ -2017,19 +2009,11 @@ string LyXFunc::Dispatch(int ac, // Recenter screen owner->view()->beforeChange(); if (owner->view()->text->cursor.y > -#ifdef NEW_WA owner->view()->getWorkArea()->height() / 2 -#else - owner->view()->getWorkArea()->h / 2 -#endif ) { owner->view()->getScreen()-> Draw(owner->view()->text->cursor.y - -#ifdef NEW_WA owner->view()->getWorkArea()->height() / 2 -#else - owner->view()->getWorkArea()->h / 2 -#endif ); } else { // <= owner->view()->getScreen()-> diff --git a/src/lyxscreen.h b/src/lyxscreen.h index 5899b4f8a1..f093a815ef 100644 --- a/src/lyxscreen.h +++ b/src/lyxscreen.h @@ -31,8 +31,6 @@ typedef unsigned short Dimension; class BufferView; -#define NEW_WA 1 - /** The class LyXScreen is used for the main Textbody. Concretely, the screen is held in a pixmap. This pixmap is kept up to date and used to optimize drawing on the screen. @@ -42,9 +40,7 @@ class LyXScreen { public: /// LyXScreen(BufferView *, Window window, -#ifdef NEW_WA Pixmap p, -#endif Dimension width, Dimension height, Dimension offset_x, diff --git a/src/minibuffer.C b/src/minibuffer.C index 1ddc787088..a2d8e22df1 100644 --- a/src/minibuffer.C +++ b/src/minibuffer.C @@ -46,12 +46,8 @@ void MiniBuffer::ExecutingCB(FL_OBJECT * ob, long) { MiniBuffer * obj = static_cast(ob->u_vdata); lyxerr.debug() << "Getting ready to execute: " << obj->cur_cmd << endl; -#ifdef NEW_WA obj->owner->view()->focus(true); -#else - fl_set_focus_object(obj->owner->getForm(), - obj->owner->view()->getWorkArea()); -#endif + if (obj->cur_cmd.empty()) { obj->Init(); return ; @@ -104,12 +100,7 @@ int MiniBuffer::peek_event(FL_OBJECT * ob, int event, FL_Coord, FL_Coord, case 27: case XK_Escape: // Abort -#ifdef NEW_WA mini->owner->view()->focus(true); -#else - fl_set_focus_object(mini->owner->getForm(), - mini->owner->view()->getWorkArea()); -#endif mini->Init(); return 1; case 13: diff --git a/src/screen.C b/src/screen.C index d73d1bddf2..19c1c0d56a 100644 --- a/src/screen.C +++ b/src/screen.C @@ -49,9 +49,7 @@ GC createGC() // Constructor LyXScreen::LyXScreen(BufferView * o, Window window, -#ifdef NEW_WA Pixmap p, -#endif Dimension width, Dimension height, Dimension offset_x, @@ -68,14 +66,8 @@ LyXScreen::LyXScreen(BufferView * o, Window window, screen_refresh_y = -1; /* create the foreground pixmap */ -#ifdef NEW_WA foreground = p; -#else - foreground = XCreatePixmap (fl_display, - fl_root, - _width, _height, - fl_get_visual_depth()); -#endif + cursor_pixmap = 0; cursor_pixmap_x = 0; cursor_pixmap_y = 0; @@ -90,12 +82,7 @@ LyXScreen::LyXScreen(BufferView * o, Window window, // Destructor -LyXScreen::~LyXScreen() -{ -#ifndef NEW_WA - XFreePixmap(fl_display, foreground); -#endif -} +LyXScreen::~LyXScreen() {} void LyXScreen::Redraw() diff --git a/src/support/Makefile.am b/src/support/Makefile.am index e0bdc56531..0181407c42 100644 --- a/src/support/Makefile.am +++ b/src/support/Makefile.am @@ -4,6 +4,8 @@ LIBS = ETAGS_ARGS = --c++ INCLUDES = -I${srcdir}/../ +EXTRA_DIST = lyxstring.C lyxstring.h regex.c lyxregex.h + if USE_LYXSTRING LYXSTRING = lyxstring.C lyxstring.h endif diff --git a/src/toolbar.C b/src/toolbar.C index 5ceb7a800f..f63268c3a3 100644 --- a/src/toolbar.C +++ b/src/toolbar.C @@ -93,6 +93,7 @@ #include "layout_std.xpm" #include "build.xpm" + // this one is not "C" because combox callbacks are really C++ %-| extern void LayoutsCB(int, void *); extern char const ** get_pixmap_from_symbol(char const * arg, int, int); @@ -122,7 +123,9 @@ Toolbar::Toolbar(Toolbar const &rct, LyXView *o, int x, int y) : owner(o), sxpos(x), sypos(y) { combox = 0; +#if FL_REVISION < 89 bubble_timer = 0; +#endif reset(); // extracts the toolbar struct form rct. @@ -136,6 +139,7 @@ Toolbar::Toolbar(Toolbar const &rct, LyXView *o, int x, int y) } +#if FL_REVISION < 89 // timer-cb for bubble-help (Matthias) void Toolbar::BubbleTimerCB(FL_OBJECT *, long data) { @@ -180,6 +184,7 @@ extern "C" int C_Toolbar_BubblePost(FL_OBJECT * ob, int event, { return Toolbar::BubblePost(ob, event, 0, 0, key, xev); } +#endif void Toolbar::activate() @@ -212,7 +217,11 @@ void Toolbar::deactivate() void Toolbar::ToolbarCB(FL_OBJECT * ob, long ac) { +#if FL_REVISION >= 89 + Toolbar * t = static_cast(ob->u_vdata); +#else Toolbar * t = reinterpret_cast(ob->u_ldata); +#endif string res = t->owner->getLyXFunc()->Dispatch(int(ac)); if(!res.empty()) @@ -287,10 +296,12 @@ void Toolbar::set(bool doingmain) fl_addto_form(owner->getForm()); } +#if FL_REVISION < 89 // add the time if it don't exist if (bubble_timer == 0) bubble_timer = fl_add_timer(FL_HIDDEN_TIMER, xpos, ypos, 0, 0, "Timer"); +#endif while(item != 0) { switch(item->action){ @@ -328,6 +339,14 @@ void Toolbar::set(bool doingmain) fl_set_pixmapbutton_focus_outline(obj, 0); // set the bubble-help (Matthias) +#if FL_REVISION >= 89 + // Set the tooltip + fl_set_object_helper(obj, item->help.c_str()); + // The toolbar that this object belongs too. + obj->u_vdata = this; + + +#else #ifdef WITH_WARNINGS #warning This is dangerous! #endif @@ -337,6 +356,7 @@ void Toolbar::set(bool doingmain) obj->u_ldata = reinterpret_cast(this); fl_set_object_posthandler(obj, C_Toolbar_BubblePost); +#endif fl_set_pixmapbutton_data(obj, const_cast(item->pixmap)); item = item->next; @@ -487,25 +507,21 @@ void Toolbar::add(int action, bool doclean) // adds an item to the list if (pixmap != 0 || action == TOOL_SEPARATOR - || action == TOOL_LAYOUTS) - { - newItem = new toolbarItem; - newItem->action = action; - newItem->pixmap = pixmap; - newItem->help = help; - // the new item is placed at the end of the list - tmp = toollist; - if (tmp != 0){ - while(tmp->next != 0) - tmp = tmp->next; + || action == TOOL_LAYOUTS) { + newItem = new toolbarItem; + newItem->action = action; + newItem->pixmap = pixmap; + newItem->help = help; + // the new item is placed at the end of the list + tmp = toollist; + if (tmp != 0){ + while(tmp->next != 0) + tmp = tmp->next; // here is tmp->next == 0 - tmp->next = newItem; - } else - toollist = newItem; - } - //if (action == TOOL_LAYOUTS) { - // combox = new Combox(FL_COMBOX_DROPLIST); - //} + tmp->next = newItem; + } else + toollist = newItem; + } } diff --git a/src/toolbar.h b/src/toolbar.h index 2884b05a20..256a6c313b 100644 --- a/src/toolbar.h +++ b/src/toolbar.h @@ -38,7 +38,9 @@ public: owner = 0; sxpos = 0; sypos = 0; +#if FL_REVISION < 89 bubble_timer = 0; +#endif combox = 0; reset(); init(); // set default toolbar. @@ -88,11 +90,14 @@ public: /// static void ToolbarCB(FL_OBJECT *, long); + +#if FL_REVISION < 89 /// static void BubbleTimerCB(FL_OBJECT *, long); /// static int BubblePost(FL_OBJECT * ob, int event, FL_Coord mx, FL_Coord my, int key, void * xev); +#endif private: /// @@ -111,7 +116,7 @@ private: /// char const ** pixmap; /// - toolbarItem(){ + toolbarItem() { next = 0; action = LFUN_NOACTION; icon = 0; @@ -132,8 +137,10 @@ private: toolbarItem * toollist; /// LyXView * owner; +#if FL_REVISION < 89 /// FL_OBJECT * bubble_timer; +#endif /// Starting position int sxpos, sypos; ///