#include <config.h>
#include <cmath>
-
+#include <cctype>
#ifdef __GNUG__
#pragma implementation
#endif
#include "WorkArea.h"
#include "debug.h"
#include "support/lstrings.h"
+#if 0
#include "BufferView.h"
+#endif
#include "LyXView.h"
#include "lyxfunc.h"
-#if FL_REVISION < 89
+#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
#include "lyxlookup.h"
#endif
-WorkArea::WorkArea(BufferView * o, int xpos, int ypos, int width, int height)
- : owner_(o), workareapixmap(0), painter_(*this)
+WorkArea::WorkArea(
+#if 0
+ BufferView * o,
+#endif
+ int xpos, int ypos, int width, int height)
+ :
+#if 0
+ owner_(o),
+#endif
+ workareapixmap(0), painter_(*this)
{
fl_freeze_all_forms();
<< width << 'x' << height << endl;
//
FL_OBJECT * obj;
- const int bw = int(std::abs(float(fl_get_border_width())));
+ int const bw = int(std::abs(float(fl_get_border_width())));
// We really want to get rid of figinset_canvas.
::figinset_canvas = figinset_canvas = obj =
<< width - 15 - 2 * bw << 'x'
<< height - 2 * bw << endl;
- work_area = obj = fl_add_free(FL_INPUT_FREE,
+ work_area = obj = fl_add_free(FL_ALL_FREE,
xpos + bw, ypos + bw,
width - 15 - 2 * bw, // scrollbarwidth
height - 2 * bw, "",
WorkArea::~WorkArea()
{
if (workareapixmap)
- XFreePixmap(fl_display, workareapixmap);
+ XFreePixmap(fl_get_display(), workareapixmap);
}
{
fl_freeze_all_forms();
- const int bw = int(std::abs(float(fl_get_border_width())));
+ int const bw = int(std::abs(float(fl_get_border_width())));
// a box
fl_set_object_geometry(backgroundbox, xpos, ypos, width - 15, height);
cur_height = height;
if (workareapixmap)
- XFreePixmap(fl_display, workareapixmap);
+ XFreePixmap(fl_get_display(), workareapixmap);
if (lyxerr.debugging(Debug::GUI))
lyxerr << "Creating pixmap ("
<< width << 'x' << height << ")" << endl;
- workareapixmap = XCreatePixmap(fl_display,
- RootWindow(fl_display, 0),
+ workareapixmap = XCreatePixmap(fl_get_display(),
+ RootWindow(fl_get_display(), 0),
width,
height,
fl_get_visual_depth());
// If we really want the accellerating scroll we can do that
// from here. IMHO that is a waste of effort since we already
// have other ways to move fast around in the document. (Lgb)
+#if 0
area->owner_->scrollCB(fl_get_scrollbar_value(ob));
+#else
+ area->scrollCB(fl_get_scrollbar_value(ob));
+#endif
waitForX();
}
Lgb_bug_find_hack = false;
break;
case FL_PUSH:
- if (!ev) break;
+ if (!ev || ev->xbutton.button == 0) break;
// Should really have used xbutton.state
lyxerr[Debug::GUI] << "Workarea event: PUSH" << endl;
area->workAreaButtonPress(ev->xbutton.x - ob->x,
//area->workAreaKeyPress(XK_Pointer_Button1, ev->xbutton.state);
break;
case FL_RELEASE:
- if (!ev) break;
+ if (!ev || ev->xbutton.button == 0) break;
// Should really have used xbutton.state
lyxerr[Debug::GUI] << "Workarea event: RELEASE" << endl;
area->workAreaButtonRelease(ev->xbutton.x - ob->x,
ev->xbutton.y - ob->y,
ev->xbutton.button);
break;
+#if FL_REVISION < 89
case FL_MOUSE:
+#else
+ case FL_DRAG:
+#endif
if (!ev || ! area->scrollbar) break;
if (ev->xmotion.x != x_old ||
ev->xmotion.y != y_old ||
ev->xbutton.state);
}
break;
+#if FL_REVISION < 89
case FL_KEYBOARD:
+#else
+ case FL_KEYPRESS:
+#endif
{
lyxerr[Debug::KEY] << "Workarea event: KEYBOARD" << endl;
KeySym keysym = 0;
char dummy[1];
XKeyEvent * xke = reinterpret_cast<XKeyEvent *>(ev);
-#if FL_REVISION < 89
- // XForms < 0.89 does not have compose support
+#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
+ // XForms < 0.89.5 does not have compose support
// so we are using our own compose support
LyXLookupString(ev, dummy, 1, &keysym);
#else
if (lyxerr.debugging(Debug::KEY)) {
char const * tmp = XKeysymToString(key);
char const * tmp2 = XKeysymToString(keysym);
- string stm = (tmp ? tmp : "");
- string stm2 = (tmp2 ? tmp2 : "");
+ string const stm = (tmp ? tmp : "");
+ string const stm2 = (tmp2 ? tmp2 : "");
lyxerr << "WorkArea: Key is `" << stm << "' ["
<< key << "]" << endl;
if (!key) {
// We migth have to add more keysyms here also,
// we will do that as the issues arise. (Lgb)
- if (keysym == XK_space)
+ if (keysym == XK_space) {
ret_key = keysym;
- else
+ lyxerr[Debug::KEY] << "Using keysym [A]"
+ << endl;
+ } else
break;
} else {
- ret_key = (keysym ? keysym : key);
+ // It seems that this was a bit optimistic...
+ // With this hacking things seems to be better (Lgb)
+ //if (!iscntrl(key)) {
+ // ret_key = key;
+ // lyxerr[Debug::KEY]
+ // << "Using key [B]\n"
+ // << "Uchar["
+ // << static_cast<unsigned char>(key)
+ // << endl;
+ //} else {
+ ret_key = (keysym ? keysym : key);
+ lyxerr[Debug::KEY] << "Using keysym [B]"
+ << endl;
+ //}
}
#endif
- unsigned int ret_state = xke->state;
+ unsigned int const ret_state = xke->state;
// If you have a better way to handle "wild-output" of
// characters after the key has been released than the one
<< xke->time - last_time_pressed
<< endl;
if (xke->time - last_time_pressed < 35 // should perhaps be tunable
- && xke->state == last_state_pressed
+ && ret_state == last_state_pressed
&& xke->keycode == last_key_pressed) {
lyxerr[Debug::KEY]
<< "Workarea: Purging X events." << endl;
}
last_time_pressed = xke->time;
last_key_pressed = xke->keycode;
- last_state_pressed = xke->state;
+ last_state_pressed = ret_state;
area->workAreaKeyPress(ret_key, ret_state);
}
break;
+
+#if FL_REVISION >= 89
+ case FL_KEYRELEASE:
+ lyxerr << "Workarea event: KEYRELEASE" << endl;
+ break;
+#endif
+
case FL_FOCUS:
lyxerr[Debug::GUI] << "Workarea event: FOCUS" << endl;
area->workAreaFocus();
projects / lyx.git / blobdiff