* ====================================================== */
#include <config.h>
-#include <cmath>
-#include <cctype>
+
#ifdef __GNUG__
#pragma implementation
#endif
#include "WorkArea.h"
#include "debug.h"
-#include "support/lstrings.h"
#include "LyXView.h"
-#include "support/filetools.h" // LibFileSearch
#include "lyxrc.h" // lyxrc.show_banner
-#include "version.h" // LYX_VERSION
-#include "support/LAssert.h"
+#include "version.h" // lyx_version
#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
#include "lyxlookup.h"
#endif
+#include "support/filetools.h" // LibFileSearch
+#include "support/lstrings.h"
+#include "support/LAssert.h"
+
+#include <cmath>
+#include <cctype>
+
using std::endl;
+using std::abs;
FL_OBJECT * figinset_canvas;
-// needed to make the c++ compiler find the correct version of abs.
-// This is at least true for g++.
-//using std::abs;
-
namespace {
inline
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;
- }
-
- lyx::Assert(ob && ob->u_vdata);
- WorkArea * pre = static_cast<WorkArea *>(ob->u_vdata);
-
- if (counter == 3) {
- pre->destroySplash();
- }
-
- return 0;
- }
}
figinset_canvas = 0;
- if (lyxerr.debugging(Debug::GUI))
+ if (lyxerr.debugging(Debug::WORKAREA))
lyxerr << "Creating work area: +"
<< xpos << '+' << ypos << ' '
<< width << 'x' << height << endl;
//
FL_OBJECT * obj;
- int const bw = int(std::abs(float(fl_get_border_width())));
+ int const bw = int(abs(fl_get_border_width()));
// We really want to get rid of figinset_canvas.
::figinset_canvas = figinset_canvas = obj =
fl_set_object_gravity(obj, NorthWestGravity, NorthWestGravity);
// a box
- if (lyxerr.debugging(Debug::GUI))
+ if (lyxerr.debugging(Debug::WORKAREA))
lyxerr << "\tbackground box: +"
<< xpos << '+' << ypos << ' '
<< width - 15 << 'x' << height << endl;
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;
+ 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, 170, 16,
- LYX_VERSION);
+ 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_CENTER|FL_ALIGN_INSIDE);
+ fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-
- fl_hide_object(splash_);
- fl_hide_object(splash_text_);
}
//
// We add this object as late as possible to avoit problems
// with drawing.
- if (lyxerr.debugging(Debug::GUI))
+ if (lyxerr.debugging(Debug::WORKAREA))
lyxerr << "\tfree object: +"
<< xpos + bw << '+' << ypos + bw << ' '
<< width - 15 - 2 * bw << 'x'
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;
}
{
fl_freeze_all_forms();
- int const bw = int(std::abs(float(fl_get_border_width())));
+ int const bw = int(abs(fl_get_border_width()));
// a box
fl_set_object_geometry(backgroundbox, xpos, ypos, width - 15, height);
width - 15 - 2 * bw,
height - 2 * bw);
- destroySplash();
-
fl_unfreeze_all_forms();
}
+namespace {
+void destroy_object(FL_OBJECT * obj)
+{
+ if (!obj)
+ return;
+
+ if (obj->visible) {
+ fl_hide_object(obj);
+ }
+ fl_delete_object(obj);
+ fl_free_object(obj);
+}
+} // namespace anon
+
+
void WorkArea::createPixmap(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 (workareapixmap)
XFreePixmap(fl_get_display(), workareapixmap);
- if (lyxerr.debugging(Debug::GUI))
+ if (lyxerr.debugging(Debug::WORKAREA))
lyxerr << "Creating pixmap ("
<< width << 'x' << height << ")" << endl;
width,
height,
fl_get_visual_depth());
- if (lyxerr.debugging(Debug::GUI))
+ if (lyxerr.debugging(Debug::WORKAREA))
lyxerr << "\tpixmap=" << workareapixmap << endl;
}
-void WorkArea::show() const
-{
- if (!work_area->visible) {
- fl_show_object(work_area);
- }
-
- destroySplash();
-}
-
-
void WorkArea::greyOut() const
{
- if (work_area->visible) {
- fl_hide_object(work_area);
- }
-
- if (splash_ && !splash_->visible) {
- fl_show_object(splash_);
- fl_show_object(splash_text_);
+ 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);
}
}
-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);
}
-bool Lgb_bug_find_hack = false;
-
int WorkArea::work_area_handler(FL_OBJECT * ob, int event,
FL_Coord, FL_Coord ,
int key, void * xev)
if (!area->work_area ||
!area->work_area->form->visible)
return 1;
- lyxerr[Debug::GUI] << "Workarea event: DRAW" << endl;
+ lyxerr[Debug::WORKAREA] << "Workarea event: DRAW" << endl;
area->createPixmap(area->workWidth(), area->height());
- Lgb_bug_find_hack = true;
area->workAreaExpose();
- Lgb_bug_find_hack = false;
break;
case FL_PUSH:
if (!ev || ev->xbutton.button == 0) break;
// Should really have used xbutton.state
- lyxerr[Debug::GUI] << "Workarea event: PUSH" << endl;
+ lyxerr[Debug::WORKAREA] << "Workarea event: PUSH" << endl;
area->workAreaButtonPress(ev->xbutton.x - ob->x,
ev->xbutton.y - ob->y,
ev->xbutton.button);
case FL_RELEASE:
if (!ev || ev->xbutton.button == 0) break;
// Should really have used xbutton.state
- lyxerr[Debug::GUI] << "Workarea event: RELEASE" << endl;
+ lyxerr[Debug::WORKAREA] << "Workarea event: RELEASE" << endl;
area->workAreaButtonRelease(ev->xbutton.x - ob->x,
ev->xbutton.y - ob->y,
ev->xbutton.button);
ev->xmotion.y != y_old ||
fl_get_scrollbar_value(area->scrollbar) != scrollbar_value_old
) {
- lyxerr[Debug::GUI] << "Workarea event: MOUSE" << endl;
+ lyxerr[Debug::WORKAREA] << "Workarea event: MOUSE" << endl;
area->workAreaMotionNotify(ev->xmotion.x - ob->x,
ev->xmotion.y - ob->y,
ev->xbutton.state);
case FL_KEYPRESS:
#endif
{
- lyxerr[Debug::KEY] << "Workarea event: KEYBOARD" << endl;
+ lyxerr[Debug::WORKAREA] << "Workarea event: KEYBOARD" << endl;
KeySym keysym = 0;
char dummy[1];
string const stm = (tmp ? tmp : "");
string const stm2 = (tmp2 ? tmp2 : "");
- lyxerr << "WorkArea: Key is `" << stm << "' ["
+ lyxerr[Debug::KEY] << "WorkArea: Key is `" << stm << "' ["
<< key << "]" << endl;
- lyxerr << "WorkArea: Keysym is `" << stm2 << "' ["
+ lyxerr[Debug::KEY] << "WorkArea: Keysym is `" << stm2 << "' ["
<< keysym << "]" << endl;
}
#if FL_REVISION >= 89
case FL_KEYRELEASE:
- lyxerr << "Workarea event: KEYRELEASE" << endl;
+ lyxerr[Debug::WORKAREA] << "Workarea event: KEYRELEASE" << endl;
break;
#endif
case FL_FOCUS:
- lyxerr[Debug::GUI] << "Workarea event: FOCUS" << endl;
+ lyxerr[Debug::WORKAREA] << "Workarea event: FOCUS" << endl;
area->workAreaFocus();
break;
case FL_UNFOCUS:
- lyxerr[Debug::GUI] << "Workarea event: UNFOCUS" << endl;
+ lyxerr[Debug::WORKAREA] << "Workarea event: UNFOCUS" << endl;
area->workAreaUnfocus();
break;
case FL_ENTER:
- lyxerr[Debug::GUI] << "Workarea event: ENTER" << endl;
+ lyxerr[Debug::WORKAREA] << "Workarea event: ENTER" << endl;
area->workAreaEnter();
break;
case FL_LEAVE:
- lyxerr[Debug::GUI] << "Workarea event: LEAVE" << endl;
+ lyxerr[Debug::WORKAREA] << "Workarea event: LEAVE" << endl;
area->workAreaLeave();
break;
case FL_DBLCLICK:
if (!ev) break;
- lyxerr[Debug::GUI] << "Workarea event: DBLCLICK" << endl;
+ lyxerr[Debug::WORKAREA] << "Workarea event: DBLCLICK" << endl;
area->workAreaDoubleClick(ev->xbutton.x - ob->x,
ev->xbutton.y - ob->y,
ev->xbutton.button);
break;
case FL_TRPLCLICK:
if (!ev) break;
- lyxerr[Debug::GUI] << "Workarea event: TRPLCLICK" << endl;
+ lyxerr[Debug::WORKAREA] << "Workarea event: TRPLCLICK" << endl;
area->workAreaTripleClick(ev->xbutton.x - ob->x,
ev->xbutton.y - ob->y,
ev->xbutton.button);
break;
case FL_OTHER:
if (!ev) break;
- lyxerr[Debug::GUI] << "Workarea event: OTHER" << endl;
-
+ lyxerr[Debug::WORKAREA] << "Workarea event: OTHER" << endl;
break;
}
while (!clipboard_read) {
if (fl_check_forms() == FL_EVENT) {
- lyxerr << "LyX: This shouldn't happen..." << endl;
fl_XNextEvent(&ev);
+ lyxerr << "Received unhandled X11 event" << endl;
+ lyxerr << "Type: 0x" << std::hex << ev.xany.type <<
+ "Target: 0x" << std::hex << ev.xany.window << endl;
}
}
return clipboard_selection;
projects / lyx.git / blobdiff