#include "support/lstrings.h"
#include "BufferView.h"
-#ifdef NEW_WA
+using std::endl;
+
FL_OBJECT * figinset_canvas;
-#endif
+
+// need to make the c++ compiler fint the correct version of abs.
+// This is at least true for g++.
+using std::abs;
static inline
void waitForX()
XSync(fl_get_display(), 0);
}
+extern "C" {
+// Just a bunch of C wrappers around static members of WorkArea
+ void C_WorkArea_up_cb(FL_OBJECT * ob, long buf)
+ {
+ WorkArea::up_cb(ob, buf);
+ }
+
+ void C_WorkArea_down_cb(FL_OBJECT * ob, long buf)
+ {
+ WorkArea::down_cb(ob, buf);
+ }
+
+ void C_WorkArea_scroll_cb(FL_OBJECT * ob, long buf)
+ {
+ WorkArea::scroll_cb(ob, buf);
+ }
+
+ int C_WorkArea_work_area_handler(FL_OBJECT * ob, int event,
+ FL_Coord, FL_Coord,
+ int key, void * xev)
+ {
+ return WorkArea::work_area_handler(ob, event,
+ 0, 0, key, xev);
+ }
+}
+
+
WorkArea::WorkArea(BufferView * o, int xpos, int ypos, int width, int height)
- : owner(o), workareapixmap(0)
-#ifdef USE_PAINTER
- , painter_(*this)
-#endif
+ : owner(o), workareapixmap(0), painter_(*this)
{
fl_freeze_all_forms();
figinset_canvas = 0;
-
- lyxerr << "Creating work area: +"
- << xpos << '+' << ypos << ' '
- << width << 'x' << height << endl;
+
+ if (lyxerr.debugging())
+ lyxerr << "Creating work area: +"
+ << xpos << '+' << ypos << ' '
+ << width << 'x' << height << endl;
//
FL_OBJECT * obj;
const int bw = int(abs(float(fl_get_border_width())));
fl_set_object_gravity(obj, NorthWestGravity, NorthWestGravity);
// a box
- lyxerr << "\tbackground box: +"
- << xpos << '+' << ypos << ' '
- << width - 15 << 'x' << height << endl;
+ if (lyxerr.debugging())
+ lyxerr << "\tbackground box: +"
+ << xpos << '+' << ypos << ' '
+ << width - 15 << 'x' << height << endl;
backgroundbox = obj = fl_add_box(FL_BORDER_BOX,
xpos, ypos,
width - 15,
// up - scrollbar button
fl_set_border_width(-1);
- lyxerr << "\tup button: +"
- << xpos + width - 15 << '+' << ypos << ' '
- << 15 << 'x' << 15 << endl;
+ if (lyxerr.debugging())
+ lyxerr << "\tup button: +"
+ << xpos + width - 15 << '+' << ypos << ' '
+ << 15 << 'x' << 15 << endl;
button_up = obj = fl_add_pixmapbutton(FL_TOUCH_BUTTON,
xpos + width - 15,
ypos,
fl_set_object_resize(obj, FL_RESIZE_ALL);
fl_set_object_gravity(obj,NorthEastGravity, NorthEastGravity);
obj->u_vdata = this;
- fl_set_object_callback(obj,up_cb, 0);
+ fl_set_object_callback(obj,C_WorkArea_up_cb, 0);
fl_set_pixmapbutton_data(obj, const_cast<char**>(up_xpm));
// Remove the blue feedback rectangle
// the scrollbar slider
fl_set_border_width(-bw);
- lyxerr << "\tscrollbar slider: +"
- << xpos + width - 15 << '+' << ypos + 15 << ' '
- << 15 << 'x' << height - 30 << endl;
+
+ if (lyxerr.debugging())
+ lyxerr << "\tscrollbar slider: +"
+ << xpos + width - 15 << '+' << ypos + 15 << ' '
+ << 15 << 'x' << height - 30 << endl;
scrollbar = obj = fl_add_slider(FL_VERT_SLIDER,
xpos + width - 15,
ypos + 15,
fl_set_object_resize(obj, FL_RESIZE_ALL);
fl_set_object_gravity(obj, NorthEastGravity, SouthEastGravity);
obj->u_vdata = this;
- fl_set_object_callback(obj, scroll_cb, 0);
+ fl_set_object_callback(obj, C_WorkArea_scroll_cb, 0);
fl_set_slider_precision(obj, 0);
// down - scrollbar button
fl_set_border_width(-1);
- lyxerr << "\tdown button: +"
- << xpos + width - 15 << '+' << ypos + height - 15 << ' '
- << 15 << 'x' << 15 << endl;
+ if (lyxerr.debugging())
+ lyxerr << "\tdown button: +"
+ << xpos + width - 15 << '+'
+ << ypos + height - 15 << ' '
+ << 15 << 'x' << 15 << endl;
button_down = obj = fl_add_pixmapbutton(FL_TOUCH_BUTTON,
xpos + width - 15,
ypos + height - 15,
fl_set_object_resize(obj, FL_RESIZE_ALL);
fl_set_object_gravity(obj, SouthEastGravity, SouthEastGravity);
obj->u_vdata = this;
- fl_set_object_callback(obj, down_cb, 0);
+ fl_set_object_callback(obj, C_WorkArea_down_cb, 0);
fl_set_pixmapbutton_data(obj, const_cast<char**>(down_xpm));
fl_set_border_width(-bw);
// Create the workarea pixmap
createPixmap(width - 15 - 2 * bw, height - 2 * bw);
-#ifdef USE_PAINTER
+
// setup the painter
painter_.setDisplay(fl_display);
- painter_.setDrawable(workareapixmap);
-#endif
// We add this object as late as possible to avoit problems
// with drawing.
- lyxerr << "\tfree object: +"
- << xpos + bw << '+' << ypos + bw << ' '
- << width - 15 - 2 * bw << 'x' << height - 2 * bw << endl;
+ if (lyxerr.debugging())
+ lyxerr << "\tfree object: +"
+ << xpos + bw << '+' << ypos + bw << ' '
+ << width - 15 - 2 * bw << 'x'
+ << height - 2 * bw << endl;
+
work_area = obj = fl_add_free(FL_INPUT_FREE,
xpos + bw, ypos + bw,
width - 15 - 2 * bw, // scrollbarwidth
height - 2 * bw, "",
- work_area_handler);
+ C_WorkArea_work_area_handler);
obj->wantkey = FL_KEY_TAB;
obj->u_vdata = this; /* This is how we pass the WorkArea
to the work_area_handler. */
}
+bool WorkArea::belowMouse() const
+{
+ FL_Coord x, y;
+ unsigned int button;
+ fl_get_mouse(&x, &y, &button);
+ FL_Coord ulx = work_area->form->x + work_area->x;
+ FL_Coord uly = work_area->form->y + work_area->y;
+ FL_Coord w = work_area->w;
+ FL_Coord h = work_area->h;
+ if (x > ulx && y > uly && x < ulx + h && y < uly + w)
+ return true;
+ return false;
+
+
+ //lyxerr << "Mouse: (" << x << ", " << y <<") button = " << button << endl;
+ //lyxerr << "Workarea: (" << work_area->x + work_area->form->x << ", " << work_area->y + work_area->form->y << ", " << work_area->w << ", " << work_area->h << ")" << endl;
+ //lyxerr << "Below mouse: " << work_area->belowmouse << endl;
+ //return work_area->belowmouse;
+}
+
+
void WorkArea::resize(int xpos, int ypos, int width, int height)
{
fl_freeze_all_forms();
// Create the workarea pixmap
createPixmap(width - 15 - 2 * bw, height - 2 * bw);
-#ifdef USE_PAINTER
- // reset the painter
- painter_.setDrawable(workareapixmap);
-#endif
-
// the free object
fl_set_object_geometry(work_area, xpos + bw, ypos + bw,
width - 15 - 2 * bw,
if (workareapixmap)
XFreePixmap(fl_display, workareapixmap);
-
- lyxerr << "Creating pixmap (" << width << 'x' << height << ")" << endl;
+
+ if (lyxerr.debugging())
+ lyxerr << "Creating pixmap ("
+ << width << 'x' << height << ")" << endl;
workareapixmap = XCreatePixmap(fl_display,
RootWindow(fl_display, 0),
width,
height,
fl_get_visual_depth());
- lyxerr << "\tpixmap=" << workareapixmap << endl;
+ if (lyxerr.debugging())
+ lyxerr << "\tpixmap=" << workareapixmap << endl;
}
if (ev2->type == ButtonPress || ev2->type == ButtonRelease)
time = 0;
//area->up(time++, fl_get_button_numb(ob));
- area->owner->UpCB(time++, fl_get_button_numb(ob));
+ area->owner->upCB(time++, fl_get_button_numb(ob));
}
if (ev2->type == ButtonPress || ev2->type == ButtonRelease)
time = 0;
//area->down(time++, fl_get_button_numb(ob));
- area->owner->DownCB(time++, fl_get_button_numb(ob));
+ area->owner->downCB(time++, fl_get_button_numb(ob));
}
WorkArea * area = static_cast<WorkArea*>(ob->u_vdata);
//area->scroll(fl_get_slider_value(ob));
- area->owner->ScrollCB(fl_get_slider_value(ob));
+ area->owner->scrollCB(fl_get_slider_value(ob));
waitForX();
}
bool Lgb_bug_find_hack = false;
int WorkArea::work_area_handler(FL_OBJECT * ob, int event,
- FL_Coord, FL_Coord ,
- int /*key*/, void * xev)
+ FL_Coord, FL_Coord ,
+ int /*key*/, void * xev)
{
static int x_old = -1;
static int y_old = -1;
lyxerr.debug() << "Workarea event: DRAW" << endl;
area->createPixmap(area->workWidth(), area->height());
Lgb_bug_find_hack = true;
- //area->expose();
area->owner->workAreaExpose();
Lgb_bug_find_hack = false;
break;
if (!ev) break;
// Should really have used xbutton.state
lyxerr.debug() << "Workarea event: PUSH" << endl;
- //area->buttonPress(ev->xbutton.x - ob->x,
- // ev->xbutton.y - ob->y,
- // ev->xbutton.button);
- area->owner->WorkAreaButtonPress(ev->xbutton.x - ob->x,
+ area->owner->workAreaButtonPress(ev->xbutton.x - ob->x,
ev->xbutton.y - ob->y,
ev->xbutton.button);
break;
if (!ev) break;
// Should really have used xbutton.state
lyxerr.debug() << "Workarea event: RELEASE" << endl;
- //area->buttonRelease(ev->xbutton.x - ob->x,
- // ev->xbutton.y - ob->y,
- // ev->xbutton.button);
- area->owner->WorkAreaButtonRelease(ev->xbutton.x - ob->x,
+ area->owner->workAreaButtonRelease(ev->xbutton.x - ob->x,
ev->xbutton.y - ob->y,
ev->xbutton.button);
break;
ev->xmotion.y != y_old ||
fl_get_slider_value(area->scrollbar) != scrollbar_value_old) {
lyxerr.debug() << "Workarea event: MOUSE" << endl;
- //area->motion(ev->xmotion.x - ob->x,
- // ev->xmotion.y - ob->y,
- // ev->xbutton.state);
- area->owner->WorkAreaMotionNotify(ev->xmotion.x - ob->x,
+ area->owner->workAreaMotionNotify(ev->xmotion.x - ob->x,
ev->xmotion.y - ob->y,
ev->xbutton.state);
}
// case FL_KEYBOARD: WorkAreaKeyPress(ob, 0,0,0,ev,0); break;
case FL_FOCUS:
lyxerr.debug() << "Workarea event: FOCUS" << endl;
- //area->focus();
break;
case FL_UNFOCUS:
lyxerr.debug() << "Workarea event: UNFOCUS" << endl;
- //area->unfocus();
break;
case FL_ENTER:
lyxerr.debug() << "Workarea event: ENTER" << endl;
- //area->enter();
+ area->owner->enterView();
break;
case FL_LEAVE:
lyxerr.debug() << "Workarea event: LEAVE" << endl;
- //area->leave();
+ area->owner->leaveView();
break;
case FL_DBLCLICK:
if (!ev) break;
- lyxerr.debug() << "Workarea event: DBLCLICK" << endl;;
- //area->doubleclick(ev->xbutton.x,
- // ev->xbutton.y,
- // ev->xbutton.button);
+ lyxerr.debug() << "Workarea event: DBLCLICK" << endl;
+ area->owner->doubleClick(ev->xbutton.x - ob->x,
+ ev->xbutton.y - ob->y,
+ ev->xbutton.button);
break;
case FL_TRPLCLICK:
if (!ev) break;
lyxerr.debug() << "Workarea event: TRPLCLICK" << endl;
- //area->trippleclick(ev->xbutton.x,
- // ev->xbutton.y,
- // ev->xbutton.button);
+ area->owner->tripleClick(ev->xbutton.x - ob->x,
+ ev->xbutton.y - ob->y,
+ ev->xbutton.button);
break;
case FL_OTHER:
if (!ev) break;
if (ev->type == SelectionNotify) {
lyxerr.debug() << "Workarea event: SELECTION" << endl;
- //area->selection(area->work_area->form->window, ev);
- area->owner->WorkAreaSelectionNotify(area->work_area->form->window, ev);
+ area->owner->workAreaSelectionNotify(area->work_area->form->window, ev);
} else
lyxerr.debug() << "Workarea event: OTHER" << endl;
projects / lyx.git / blobdiff