* LyX, The Document Processor
*
* Copyright 1995 Matthias Ettrich
- * Copyright 1995-2000 The LyX Team.
+ * Copyright 1995-2001 The LyX Team.
*
* ====================================================== */
#include "WorkArea.h"
#include "debug.h"
#include "support/lstrings.h"
-#include "BufferView.h"
#include "LyXView.h"
-#include "lyxfunc.h"
+#include "support/filetools.h" // LibFileSearch
+#include "lyxrc.h" // lyxrc.show_banner
+#include "version.h" // LYX_VERSION
+#include "support/LAssert.h"
-#if FL_REVISION < 89
+#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
#include "lyxlookup.h"
#endif
// This is at least true for g++.
//using std::abs;
-static inline
+namespace {
+
+inline
void waitForX()
{
XSync(fl_get_display(), 0);
}
+} // anon namespace
+
extern "C" {
-// Just a bunch of C wrappers around static members of WorkArea
+ // Just a bunch of C wrappers around static members of WorkArea
+ static
void C_WorkArea_scroll_cb(FL_OBJECT * ob, long buf)
{
WorkArea::scroll_cb(ob, buf);
}
+
+ static
int C_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)
{
return WorkArea::work_area_handler(ob, event,
0, 0, key, xev);
}
-}
+ // Resizing the display causes the version string to move relative to
+ // the splash pixmap because the parameters xforms uses to control
+ // resizing are not very sophisticated.
+ // I found it easier, therefore, to just remove the splash screen.
+ // (Angus, 25 September 2001)
+ static
+ int C_WorkAreaSplashPH(FL_OBJECT * ob, int event,
+ FL_Coord, FL_Coord, int, void *)
+ {
+ static int counter = 0;
+ if (event != FL_DRAW || ++counter > 3) {
+ return 0;
+ }
-WorkArea::WorkArea(BufferView * o, int xpos, int ypos, int width, int height)
- : owner_(o), workareapixmap(0), painter_(*this)
+ lyx::Assert(ob && ob->u_vdata);
+ WorkArea * pre = static_cast<WorkArea *>(ob->u_vdata);
+
+ if (counter == 3) {
+ pre->destroySplash();
+ }
+
+ return 0;
+ }
+}
+
+
+WorkArea::WorkArea(int xpos, int ypos, int width, int height)
+ : splash_(0), splash_text_(0), workareapixmap(0), painter_(*this)
{
fl_freeze_all_forms();
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
if (lyxerr.debugging(Debug::GUI))
lyxerr << "\tbackground box: +"
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 = xpos + (width - 15 - splash_w) / 2;
+ int const splash_y = ypos + (height - splash_h) / 2;
+ splash_ = obj =
+ fl_add_pixmapbutton(FL_NORMAL_BUTTON,
+ splash_x, splash_y,
+ splash_w, splash_h, "");
+ obj->u_vdata = this;
+ fl_set_object_prehandler(obj, C_WorkAreaSplashPH);
+
+ 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 + 248;
+ int const text_y = splash_y + 265;
+ splash_text_ = obj =
+ fl_add_text(FL_NORMAL_TEXT, text_x, text_y, 170, 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_CENTER|FL_ALIGN_INSIDE);
+ fl_set_object_lstyle(obj, FL_BOLD_STYLE);
+
+ fl_hide_object(splash_);
+ fl_hide_object(splash_text_);
+ }
+
//
// THE SCROLLBAR
//
// a box
fl_set_object_geometry(backgroundbox, xpos, ypos, width - 15, height);
-
+
//
// THE SCROLLBAR
//
width - 15 - 2 * bw,
height - 2 * bw);
- fl_unfreeze_all_forms();
+ destroySplash();
+ fl_unfreeze_all_forms();
}
}
+void WorkArea::show() const
+{
+ if (!work_area->visible) {
+ fl_show_object(work_area);
+ }
+
+ destroySplash();
+}
+
+
void WorkArea::greyOut() const
{
- fl_winset(FL_ObjWin(work_area));
- fl_rectangle(1, work_area->x, work_area->y,
- work_area->w, work_area->h, FL_GRAY63);
+ if (work_area->visible) {
+ fl_hide_object(work_area);
+ }
+
+ if (splash_ && !splash_->visible) {
+ fl_show_object(splash_);
+ fl_show_object(splash_text_);
+ }
}
+void WorkArea::destroySplash() const
+{
+ if (splash_) {
+ if (splash_->visible) {
+ fl_hide_object(splash_);
+ }
+ fl_set_object_prehandler(splash_, 0);
+ // Causes a segmentation fault!
+ // fl_delete_object(splash_);
+ // fl_free_object(splash_);
+ splash_ = 0;
+ }
+
+ if (splash_text_) {
+ if (splash_text_->visible) {
+ fl_hide_object(splash_text_);
+ }
+ fl_delete_object(splash_text_);
+ fl_free_object(splash_text_);
+ splash_text_ = 0;
+ }
+}
+
+
void WorkArea::setFocus() const
{
fl_set_focus_object(work_area->form, work_area);
// 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)
- area->owner_->scrollCB(fl_get_scrollbar_value(ob));
+ area->scrollCB(fl_get_scrollbar_value(ob));
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,
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;
<< keysym << "]" << endl;
}
-#if FL_REVISION < 89
+#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
if (keysym == NoSymbol) {
lyxerr[Debug::KEY]
<< "Empty kdb action (probably composing)"
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 {
// It seems that this was a bit optimistic...
// With this hacking things seems to be better (Lgb)
- if (static_cast<unsigned char>(key) == key
- && !iscntrl(key))
- ret_key = key;
- else
+ //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;
+#endif
+ 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
// below, please contact me. (Lgb)
- static Time last_time_pressed = 0;
- static unsigned int last_key_pressed = 0;
- static unsigned int last_state_pressed = 0;
+ static Time last_time_pressed;
+ static unsigned int last_key_pressed;
+ static unsigned int last_state_pressed;
lyxerr[Debug::KEY] << "Workarea Diff: "
<< xke->time - last_time_pressed
<< endl;
- if (xke->time - last_time_pressed < 35 // should perhaps be tunable
- && xke->state == last_state_pressed
+ if (xke->time - last_time_pressed < 25 // should perhaps be tunable
+ && 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);
}
}
-static string clipboard_selection;
-static bool clipboard_read = false;
+namespace {
+
+string clipboard_selection;
+bool clipboard_read = false;
extern "C" {
+
static
-int request_clipboard_cb(FL_OBJECT * /*ob*/, long /*type*/,
- void const * data, long size)
-{
- clipboard_selection.erase();
-
- if (size > 0)
- clipboard_selection.reserve(size);
- for (int i = 0; i < size; ++i)
- clipboard_selection += static_cast<char const *>(data)[i];
- clipboard_read = true;
- return 0;
+ int request_clipboard_cb(FL_OBJECT * /*ob*/, long /*type*/,
+ void const * data, long size)
+ {
+ clipboard_selection.erase();
+
+ if (size > 0)
+ clipboard_selection.reserve(size);
+ for (int i = 0; i < size; ++i)
+ clipboard_selection +=
+ static_cast<char const *>(data)[i];
+ clipboard_read = true;
+ return 0;
+ }
+
}
-} // extern "C"
+} // namespace anon
string const WorkArea::getClipboard() const
{
static string hold;
hold = s;
- fl_stuff_clipboard(work_area, 0, hold.c_str(), hold.size(), 0);
+ fl_stuff_clipboard(work_area, 0, hold.data(), hold.size(), 0);
}
projects / lyx.git / blobdiff