/**
* \file XWorkArea.C
- * Copyright 1995-2002 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
*
* \author unknown
- * \author John Levon <moz@compsoc.man.ac.uk>
+ * \author John Levon
+ *
+ * Full author contact details are available in file CREDITS
*/
#include <config.h>
#include "LyXView.h"
#include "XLyXKeySym.h"
#include "ColorHandler.h"
+#include "funcrequest.h"
#if FL_VERSION < 1 && (FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5))
#include "lyxlookup.h"
using std::endl;
using std::abs;
using std::hex;
+using std::dec;
namespace {
}
-// FIXME !
mouse_button::state x_button_state(unsigned int button)
{
mouse_button::state b = mouse_button::none;
}
-// FIXME
mouse_button::state x_motion_state(unsigned int state)
{
mouse_button::state b = mouse_button::none;
int const bw = int(abs(fl_get_border_width()));
// Create the workarea pixmap
- createPixmap(w - 15 - 2 * bw, h - 2 * bw);
+ // FIXME remove redraw(w - 15 - 2 * bw, h - 2 * bw);
if (lyxerr.debugging(Debug::WORKAREA))
lyxerr << "\tfree object: +"
fl_register_raw_callback(fl_current_form, FL_ALL_EVENT, C_XWorkAreaEventCB);
fl_unfreeze_all_forms();
+
+ XGCValues val;
+
+ val.function = GXcopy;
+ copy_gc = XCreateGC(fl_get_display(), RootWindow(fl_get_display(), 0),
+ GCFunction, &val);
}
XWorkArea::~XWorkArea()
{
+ XFreeGC(fl_get_display(), copy_gc);
if (workareapixmap)
XFreePixmap(fl_get_display(), workareapixmap);
}
} // namespace anon
-void XWorkArea::createPixmap(int width, int height)
+void XWorkArea::redraw(int width, int height)
{
static int cur_width = -1;
static int cur_height = -1;
- if (cur_width == width && cur_height == height && workareapixmap)
+ if (cur_width == width && cur_height == height && workareapixmap) {
+ XCopyArea(fl_get_display(),
+ getPixmap(), getWin(), copy_gc,
+ 0, 0, width, height, xpos(), ypos());
return;
+ }
cur_width = width;
cur_height = height;
- if (workareapixmap)
- XFreePixmap(fl_get_display(), workareapixmap);
-
- if (lyxerr.debugging(Debug::WORKAREA))
- lyxerr << "Creating pixmap ("
+ if (lyxerr.debugging(Debug::WORKAREA)) {
+ lyxerr << "(Re)creating pixmap ("
<< width << 'x' << height << ")" << endl;
+ }
+
+ if (workareapixmap) {
+ XFreePixmap(fl_get_display(), workareapixmap);
+ }
workareapixmap = XCreatePixmap(fl_get_display(),
RootWindow(fl_get_display(), 0),
width,
height,
fl_get_visual_depth());
- if (lyxerr.debugging(Debug::WORKAREA))
- lyxerr << "\tpixmap=" << workareapixmap << endl;
+
+ workAreaResize();
}
int XWorkArea::work_area_handler(FL_OBJECT * ob, int event,
- FL_Coord, FL_Coord ,
+ FL_Coord, FL_Coord,
int key, void * xev)
{
static int x_old = -1;
static int y_old = -1;
- static long scrollbar_value_old = -1;
+ static double scrollbar_value_old = -1.0;
XEvent * ev = static_cast<XEvent*>(xev);
XWorkArea * area = static_cast<XWorkArea*>(ob->u_vdata);
!area->work_area->form->visible)
return 1;
lyxerr[Debug::WORKAREA] << "Workarea event: DRAW" << endl;
- area->createPixmap(area->workWidth(), area->workHeight());
- area->workAreaResize();
- area->redraw();
+ area->redraw(area->workWidth(), area->workHeight());
break;
case FL_PUSH:
if (!ev || ev->xbutton.button == 0) break;
// Should really have used xbutton.state
lyxerr[Debug::WORKAREA] << "Workarea event: PUSH" << endl;
- area->workAreaButtonPress(ev->xbutton.x - ob->x,
- ev->xbutton.y - ob->y,
- x_button_state(ev->xbutton.button));
+ area->dispatch(
+ FuncRequest(LFUN_MOUSE_PRESS, ev->xbutton.x - ob->x,
+ ev->xbutton.y - ob->y,
+ x_button_state(ev->xbutton.button)));
break;
case FL_RELEASE:
if (!ev || ev->xbutton.button == 0) break;
// Should really have used xbutton.state
lyxerr[Debug::WORKAREA] << "Workarea event: RELEASE" << endl;
- area->workAreaButtonRelease(ev->xbutton.x - ob->x,
- ev->xbutton.y - ob->y,
- x_button_state(ev->xbutton.button));
+ area->dispatch(
+ FuncRequest(LFUN_MOUSE_RELEASE, ev->xbutton.x - ob->x,
+ ev->xbutton.y - ob->y,
+ x_button_state(ev->xbutton.button)));
break;
#if FL_VERSION < 1 && FL_REVISION < 89
case FL_MOUSE:
#else
case FL_DRAG:
#endif
- if (!ev || ! area->scrollbar) break;
+ if (!ev || !area->scrollbar)
+ break;
if (ev->xmotion.x != x_old ||
ev->xmotion.y != y_old ||
fl_get_scrollbar_value(area->scrollbar) != scrollbar_value_old
) {
+ x_old = ev->xmotion.x;
+ y_old = ev->xmotion.y;
+ scrollbar_value_old = fl_get_scrollbar_value(area->scrollbar);
lyxerr[Debug::WORKAREA] << "Workarea event: MOUSE" << endl;
- area->workAreaMotionNotify(ev->xmotion.x - ob->x,
- ev->xmotion.y - ob->y,
- x_motion_state(ev->xbutton.state));
+ area->dispatch(
+ FuncRequest(LFUN_MOUSE_MOTION, ev->xbutton.x - ob->x,
+ ev->xbutton.y - ob->y,
+ x_button_state(ev->xbutton.button)));
}
break;
#if FL_VERSION < 1 && FL_REVISION < 89
lyxerr[Debug::WORKAREA] << "Workarea event: LEAVE" << endl;
break;
case FL_DBLCLICK:
- if (!ev) break;
- lyxerr[Debug::WORKAREA] << "Workarea event: DBLCLICK" << endl;
- area->workAreaDoubleClick(ev->xbutton.x - ob->x,
- ev->xbutton.y - ob->y,
- x_button_state(ev->xbutton.button));
+ if (ev) {
+ lyxerr[Debug::WORKAREA] << "Workarea event: DBLCLICK" << endl;
+ FuncRequest cmd(LFUN_MOUSE_DOUBLE, ev->xbutton.x - ob->x,
+ ev->xbutton.y - ob->y,
+ x_button_state(ev->xbutton.button));
+ area->dispatch(cmd);
+ }
break;
case FL_TRPLCLICK:
- if (!ev) break;
- lyxerr[Debug::WORKAREA] << "Workarea event: TRPLCLICK" << endl;
- area->workAreaTripleClick(ev->xbutton.x - ob->x,
- ev->xbutton.y - ob->y,
- x_button_state(ev->xbutton.button));
+ if (ev) {
+ lyxerr[Debug::WORKAREA] << "Workarea event: TRPLCLICK" << endl;
+ FuncRequest cmd(LFUN_MOUSE_TRIPLE, ev->xbutton.x - ob->x,
+ ev->xbutton.y - ob->y,
+ x_button_state(ev->xbutton.button));
+ area->dispatch(cmd);
+ }
break;
case FL_OTHER:
- if (!ev) break;
- lyxerr[Debug::WORKAREA] << "Workarea event: OTHER" << endl;
+ if (ev)
+ lyxerr[Debug::WORKAREA] << "Workarea event: OTHER" << endl;
break;
}
fl_XNextEvent(&ev);
lyxerr << "Received unhandled X11 event" << endl;
lyxerr << "Type: 0x" << hex << ev.xany.type <<
- " Target: 0x" << hex << ev.xany.window << endl;
+ " Target: 0x" << hex << ev.xany.window << dec << endl;
}
}
return clipboard_selection;
projects / lyx.git / blobdiff