/**
* \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 "XWorkArea.h"
#include "debug.h"
#include "LyXView.h"
-#include "lyxrc.h" // lyxrc.show_banner
-#include "version.h" // lyx_version
+#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"
// xforms doesn't define this (but it should be in <forms.h>).
extern "C"
FL_APPEVENT_CB fl_set_preemptive_callback(Window, FL_APPEVENT_CB, void *);
-
+
using std::endl;
using std::abs;
using std::hex;
+using std::dec;
namespace {
XDefineCursor(fl_get_display(), win, cursor);
XFlush(fl_get_display());
}
-
-// 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;
extern "C" {
- // Just a bunch of C wrappers around static members of WorkArea
+ // Just a bunch of C wrappers around static members of XWorkArea
static
- void C_WorkArea_scroll_cb(FL_OBJECT * ob, long)
+ void C_XWorkArea_scroll_cb(FL_OBJECT * ob, long)
{
- WorkArea * area = static_cast<WorkArea*>(ob->u_vdata);
+ XWorkArea * area = static_cast<XWorkArea*>(ob->u_vdata);
area->scroll_cb();
}
static
- int C_WorkArea_work_area_handler(FL_OBJECT * ob, int event,
+ int C_XWorkArea_work_area_handler(FL_OBJECT * ob, int event,
FL_Coord, FL_Coord,
int key, void * xev)
{
- return WorkArea::work_area_handler(ob, event,
+ return XWorkArea::work_area_handler(ob, event,
0, 0, key, xev);
}
static
- int C_WorkAreaEventCB(FL_FORM * form, void * xev) {
- WorkArea * wa = static_cast<WorkArea*>(form->u_vdata);
+ int C_XWorkAreaEventCB(FL_FORM * form, void * xev) {
+ XWorkArea * wa = static_cast<XWorkArea*>(form->u_vdata);
return wa->event_cb(static_cast<XEvent*>(xev));
}
}
-WorkArea::WorkArea(int x, int y, int w, int h)
- : splash_(0), splash_text_(0), workareapixmap(0), painter_(*this)
+XWorkArea::XWorkArea(int x, int y, int w, int h)
+ : workareapixmap(0), painter_(*this)
{
fl_freeze_all_forms();
- //
FL_OBJECT * obj;
- // a box
if (lyxerr.debugging(Debug::WORKAREA))
lyxerr << "\tbackground box: +"
<< x << '+' << y << ' '
fl_set_object_resize(obj, FL_RESIZE_ALL);
fl_set_object_gravity(obj, NorthWestGravity, SouthEastGravity);
- // Add a splash screen to the centre of the work area
- string const splash_file = (lyxrc.show_banner) ?
- LibFileSearch("images", "banner", "xpm") : string();
-
- if (!splash_file.empty()) {
- int const splash_w = 425;
- int const splash_h = 290;
- int const splash_x = x + (w - 15 - splash_w) / 2;
- int const splash_y = y + (h - splash_h) / 2;
- splash_ = obj =
- fl_add_pixmapbutton(FL_NORMAL_BUTTON,
- splash_x, splash_y,
- splash_w, splash_h, "");
- fl_set_pixmapbutton_file(obj, splash_file.c_str());
- fl_set_pixmapbutton_focus_outline(obj, 3);
- fl_set_object_boxtype(obj, FL_NO_BOX);
-
- int const text_x = splash_x + 260;
- int const text_y = splash_y + 255;
- splash_text_ = obj =
- fl_add_text(FL_NORMAL_TEXT, text_x, text_y, 160, 16,
- lyx_version);
- fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_mapcolor(FL_FREE_COL2, 0x2b, 0x47, 0x82);
- fl_mapcolor(FL_FREE_COL3, 0xe1, 0xd2, 0x9b);
- fl_set_object_color(obj, FL_FREE_COL2, FL_FREE_COL2);
- fl_set_object_lcol(obj, FL_FREE_COL3);
- fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
- fl_set_object_lstyle(obj, FL_BOLD_STYLE);
- }
-
scrollbar = obj = fl_add_scrollbar(FL_VERT_SCROLLBAR,
x + w - 15,
y, 17, h, "");
fl_set_object_resize(obj, FL_RESIZE_ALL);
fl_set_object_gravity(obj, NorthEastGravity, SouthEastGravity);
obj->u_vdata = this;
- fl_set_object_callback(obj, C_WorkArea_scroll_cb, 0);
+ fl_set_object_callback(obj, C_XWorkArea_scroll_cb, 0);
fl_set_scrollbar_bounds(scrollbar, 0.0, 0.0);
fl_set_scrollbar_value(scrollbar, 0.0);
fl_set_scrollbar_size(scrollbar, scrollbar->h);
-
- ///
- /// The free object
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);
- // We add this object as late as possible to avoit problems
- // with drawing.
if (lyxerr.debugging(Debug::WORKAREA))
lyxerr << "\tfree object: +"
<< x + bw << '+' << y + bw << ' '
<< w - 15 - 2 * bw << 'x'
<< h - 2 * bw << endl;
+ // We add this object as late as possible to avoid problems
+ // with drawing.
+ // FIXME: like ??
work_area = obj = fl_add_free(FL_ALL_FREE,
x + bw, y + bw,
- w - 15 - 2 * bw, // scrollbarwidth
+ w - 15 - 2 * bw,
h - 2 * bw, "",
- C_WorkArea_work_area_handler);
+ C_XWorkArea_work_area_handler);
obj->wantkey = FL_KEY_ALL;
- obj->u_vdata = this; /* This is how we pass the WorkArea
- to the work_area_handler. */
+ obj->u_vdata = this;
+
fl_set_object_boxtype(obj,FL_DOWN_BOX);
fl_set_object_resize(obj, FL_RESIZE_ALL);
fl_set_object_gravity(obj, NorthWestGravity, SouthEastGravity);
/// X selection hook - xforms gets it wrong
fl_current_form->u_vdata = this;
- fl_register_raw_callback(fl_current_form, FL_ALL_EVENT, C_WorkAreaEventCB);
+ fl_register_raw_callback(fl_current_form, FL_ALL_EVENT, C_XWorkAreaEventCB);
fl_unfreeze_all_forms();
-}
+ XGCValues val;
-WorkArea::~WorkArea()
-{
- if (workareapixmap)
- XFreePixmap(fl_get_display(), workareapixmap);
+ val.function = GXcopy;
+ copy_gc = XCreateGC(fl_get_display(), RootWindow(fl_get_display(), 0),
+ GCFunction, &val);
}
-void WorkArea::resize(int xpos, int ypos, int width, int height)
+XWorkArea::~XWorkArea()
{
- fl_freeze_all_forms();
-
- int const bw = int(abs(fl_get_border_width()));
-
- // a box
- fl_set_object_geometry(backgroundbox, xpos, ypos, width - 15, height);
-
- //
- // THE SCROLLBAR
- //
- fl_set_object_geometry(scrollbar, xpos + width - 15,
- ypos, 17, height);
-
- // Create the workarea pixmap
- createPixmap(width - 15 - 2 * bw, height - 2 * bw);
-
- // the free object
- fl_set_object_geometry(work_area, xpos + bw, ypos + bw,
- width - 15 - 2 * bw,
- height - 2 * bw);
-
- fl_unfreeze_all_forms();
+ XFreeGC(fl_get_display(), copy_gc);
+ if (workareapixmap)
+ XFreePixmap(fl_get_display(), workareapixmap);
}
} // namespace anon
-void WorkArea::createPixmap(int width, int height)
+void XWorkArea::redraw(int width, int height)
{
- // Three calls to createPixmap are needed to draw the initial view
- // of LyX. Any more and the splash is destroyed.
- static int counter = 0;
- if (++counter == 4) {
- destroy_object(splash_);
- splash_ = 0;
- destroy_object(splash_text_);
- splash_text_ = 0;
- }
-
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;
-}
-
-void WorkArea::greyOut() const
-{
- if (!splash_) {
- fl_winset(FL_ObjWin(work_area));
- fl_rectangle(1, work_area->x, work_area->y,
- work_area->w, work_area->h, FL_GRAY63);
- }
+ workAreaResize();
}
-void WorkArea::setFocus() const
-{
- fl_set_focus_object(work_area->form, work_area);
-}
-
-
-void WorkArea::setScrollbarParams(int height, int pos, int line_height)
+void XWorkArea::setScrollbarParams(int height, int pos, int line_height)
{
// we need to cache this for scroll_cb
doc_height_ = height;
lyxerr[Debug::GUI] << "scroll: height now " << height << endl;
lyxerr[Debug::GUI] << "scroll: work_height " << work_height << endl;
-
+
/* If the text is smaller than the working area, the scrollbar
* maximum must be the working area height. No scrolling will
* be possible */
// callback for scrollbar slider
-void WorkArea::scroll_cb()
+void XWorkArea::scroll_cb()
{
double const val = fl_get_scrollbar_value(scrollbar);
lyxerr[Debug::GUI] << "scroll: val: " << val << endl;
}
-int WorkArea::work_area_handler(FL_OBJECT * ob, int event,
- FL_Coord, FL_Coord ,
+int XWorkArea::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;
+ static double scrollbar_value_old = -1.0;
XEvent * ev = static_cast<XEvent*>(xev);
- WorkArea * area = static_cast<WorkArea*>(ob->u_vdata);
+ XWorkArea * area = static_cast<XWorkArea*>(ob->u_vdata);
if (!area) return 1;
!area->work_area->form->visible)
return 1;
lyxerr[Debug::WORKAREA] << "Workarea event: DRAW" << endl;
- area->createPixmap(area->workWidth(), area->workHeight());
- area->workAreaExpose();
+ 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 << "We have " << num_keys << " keys in the returned buffer" << endl;
// lyxerr << "Our dummy string is " << dummy << endl;
#endif
+
if (lyxerr.debugging(Debug::KEY)) {
char const * tmp = XKeysymToString(key);
char const * tmp2 = XKeysymToString(keysym);
string const stm = (tmp ? tmp : "");
string const stm2 = (tmp2 ? tmp2 : "");
- lyxerr[Debug::KEY] << "WorkArea: Key is `" << stm << "' ["
+ lyxerr[Debug::KEY] << "XWorkArea: Key is `" << stm << "' ["
<< key << "]" << endl;
- lyxerr[Debug::KEY] << "WorkArea: Keysym is `" << stm2 << "' ["
+ lyxerr[Debug::KEY] << "XWorkArea: Keysym is `" << stm2 << "' ["
<< keysym << "]" << endl;
}
last_key_pressed = xke->keycode;
last_state_pressed = ret_state;
- area->workAreaKeyPress(ret_key, x_key_state(ret_state));
+ XLyXKeySym * xlk = new XLyXKeySym;
+ xlk->initFromKeySym(ret_key);
+
+ area->workAreaKeyPress(LyXKeySymPtr(xlk),
+ x_key_state(ret_state));
}
break;
break;
#endif
- case FL_FOCUS:
- lyxerr[Debug::WORKAREA] << "Workarea event: FOCUS" << endl;
- area->workAreaFocus();
- break;
- case FL_UNFOCUS:
- lyxerr[Debug::WORKAREA] << "Workarea event: UNFOCUS" << endl;
- area->workAreaUnfocus();
- break;
case FL_ENTER:
lyxerr[Debug::WORKAREA] << "Workarea event: ENTER" << endl;
break;
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;
}
} // namespace anon
-int WorkArea::event_cb(XEvent * xev)
+int XWorkArea::event_cb(XEvent * xev)
{
int ret = 0;
switch (xev->type) {
}
-void WorkArea::haveSelection(bool yes) const
+void XWorkArea::haveSelection(bool yes) const
{
if (!yes) {
XSetSelectionOwner(fl_get_display(), XA_PRIMARY, None, CurrentTime);
}
-string const WorkArea::getClipboard() const
+string const XWorkArea::getClipboard() const
{
clipboard_read = false;
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;
}
-void WorkArea::putClipboard(string const & s) const
+void XWorkArea::putClipboard(string const & s) const
{
static string hold;
hold = s;