anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 05:16:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

move workarea to xforms/ for a better diff.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4211 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
John Levon 2002-05-26 18:30:34 +00:00
parent 97ef9131ba
commit cc7901c5b8
7 changed files with 175 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/frontends/ChangeLog
View File

@ -1,3 +1,9 @@
2002-05-26 John Levon <moz@compsoc.man.ac.uk>
* Makefile.am:
* WorkArea.h:
* WorkArea.C: move to xforms/ for better diff
2002-05-26 John Levon <moz@compsoc.man.ac.uk>
* key_state.h:

1
src/frontends/Makefile.am
View File

@ -34,7 +34,6 @@ libfrontends_la_SOURCES = \
Toolbar.h \
LyXView.C \
LyXView.h \
WorkArea.C \
WorkArea.h \
font_loader.h \
font_metrics.h \

161
src/frontends/WorkArea.h
View File

@ -1,159 +1,2 @@
// -*- C++ -*-
/* This file is part of
* ======================================================
*
* LyX, The Document Processor
*
* Copyright 1995 Matthias Ettrich
* Copyright 1995-2001 The LyX Team.
*
* ======================================================*/
#ifndef WORKAREA_H
#define WORKAREA_H
#ifdef __GNUG__
#pragma interface
#endif
#include <utility>
#include <sigc++/signal_system.h>
#include FORMS_H_LOCATION
#include "frontends/Painter.h"
#include "frontends/mouse_state.h"
#include "frontends/key_state.h"
///
class WorkArea {
public:
///
WorkArea(int xpos, int ypos, int width, int height);
///
~WorkArea();
///
Painter & getPainter() { return painter_; }
///
int workWidth() const { return work_area->w; }
///
unsigned int width() const { return work_area->w + scrollbar->w; }
//unsigned int width() const { return backgroundbox->w + 15; }
///
unsigned int height() const { return work_area->h; }
//unsigned int height() const { return backgroundbox->h; }
///
int xpos() const { return work_area->x; }
//int xpos() const { return backgroundbox->x; }
///
int ypos() const { return work_area->y; }
//int ypos() const { return backgroundbox->y; }
///
void resize(int xpos, int ypos, int width, int height);
///
void redraw() const {
fl_redraw_object(work_area);
fl_redraw_object(scrollbar);
}
///
void setFocus() const;
///
Window getWin() const { return work_area->form->window; }
///
bool hasFocus() const { return work_area->focus; }
///
bool active() const { return work_area->active; }
///
bool belowMouse() const;
///
bool visible() const { return work_area->form->visible; }
///
void greyOut() const;
///
void setScrollbar(double pos, double length_fraction) const;
///
void setScrollbarValue(double y) const {
fl_set_scrollbar_value(scrollbar, y);
}
///
void setScrollbarBounds(double, double) const;
///
void setScrollbarIncrements(double inc) const;
///
double getScrollbarValue() const {
return fl_get_scrollbar_value(scrollbar);
}
///
std::pair<float, float> const getScrollbarBounds() const {
std::pair<float, float> p;
fl_get_scrollbar_bounds(scrollbar, &p.first, &p.second);
return p;
}
///
Pixmap getPixmap() const { return workareapixmap; }
/// xforms callback
static int work_area_handler(FL_OBJECT *, int event,
FL_Coord, FL_Coord,
int /*key*/, void * xev);
/// xforms callback
static void scroll_cb(FL_OBJECT *, long);
/// a selection exists
void haveSelection(bool) const;
///
string const getClipboard() const;
///
void putClipboard(string const &) const;
// Signals
///
SigC::Signal0<void> workAreaExpose;
///
SigC::Signal1<void, double> scrollCB;
///
SigC::Signal2<void, KeySym, key_modifier::state> workAreaKeyPress;
///
SigC::Signal3<void, int, int, mouse_button::state> workAreaButtonPress;
///
SigC::Signal3<void, int, int, mouse_button::state> workAreaButtonRelease;
///
SigC::Signal3<void, int, int, mouse_button::state> workAreaMotionNotify;
///
SigC::Signal0<void> workAreaFocus;
///
SigC::Signal0<void> workAreaUnfocus;
///
SigC::Signal0<void> workAreaEnter;
///
SigC::Signal0<void> workAreaLeave;
///
SigC::Signal3<void, int, int, mouse_button::state> workAreaDoubleClick;
///
SigC::Signal3<void, int, int, mouse_button::state> workAreaTripleClick;
/// emitted when an X client has requested our selection
SigC::Signal0<void> selectionRequested;
/// emitted when another X client has stolen our selection
SigC::Signal0<void> selectionLost;
/// handles SelectionRequest X Event, to fill the clipboard
int event_cb(XEvent * xev);
private:
///
void createPixmap(int, int);
///
FL_OBJECT * backgroundbox;
///
FL_OBJECT * work_area;
///
FL_OBJECT * scrollbar;
///
mutable FL_OBJECT * splash_;
///
mutable FL_OBJECT * splash_text_;
/// The pixmap overlay on the workarea
Pixmap workareapixmap;
///
Painter painter_;
/// if we call redraw with true needed for locking-insets
bool screen_cleared;
};
#endif
// very temporary
#include "xforms/XWorkArea.h"

6
src/frontends/xforms/ChangeLog
View File

@ -1,3 +1,9 @@
2002-05-26 John Levon <moz@compsoc.man.ac.uk>
* Makefile.am:
* XWorkArea.h:
* XWorkArea.C: moved here
2002-05-24 John Levon <moz@compsoc.man.ac.uk>
* ColorHandler.h:

2
src/frontends/xforms/Makefile.am
View File

@ -218,6 +218,8 @@ libxforms_la_SOURCES = \
XFormsView.h \
XPainter.C \
XPainter.h \
XWorkArea.h \
XWorkArea.C \
xfont_loader.C \
xfont_loader.h \
xfont_metrics.C \

0
src/frontends/WorkArea.C → src/frontends/xforms/XWorkArea.C
View File

159
src/frontends/xforms/XWorkArea.h Normal file
View File

@ -0,0 +1,159 @@
// -*- C++ -*-
/* This file is part of
* ======================================================
*
* LyX, The Document Processor
*
* Copyright 1995 Matthias Ettrich
* Copyright 1995-2001 The LyX Team.
*
* ======================================================*/
#ifndef WORKAREA_H
#define WORKAREA_H
#ifdef __GNUG__
#pragma interface
#endif
#include <utility>
#include <sigc++/signal_system.h>
#include FORMS_H_LOCATION
#include "frontends/Painter.h"
#include "frontends/mouse_state.h"
#include "frontends/key_state.h"
///
class WorkArea {
public:
///
WorkArea(int xpos, int ypos, int width, int height);
///
~WorkArea();
///
Painter & getPainter() { return painter_; }
///
int workWidth() const { return work_area->w; }
///
unsigned int width() const { return work_area->w + scrollbar->w; }
//unsigned int width() const { return backgroundbox->w + 15; }
///
unsigned int height() const { return work_area->h; }
//unsigned int height() const { return backgroundbox->h; }
///
int xpos() const { return work_area->x; }
//int xpos() const { return backgroundbox->x; }
///
int ypos() const { return work_area->y; }
//int ypos() const { return backgroundbox->y; }
///
void resize(int xpos, int ypos, int width, int height);
///
void redraw() const {
fl_redraw_object(work_area);
fl_redraw_object(scrollbar);
}
///
void setFocus() const;
///
Window getWin() const { return work_area->form->window; }
///
bool hasFocus() const { return work_area->focus; }
///
bool active() const { return work_area->active; }
///
bool belowMouse() const;
///
bool visible() const { return work_area->form->visible; }
///
void greyOut() const;
///
void setScrollbar(double pos, double length_fraction) const;
///
void setScrollbarValue(double y) const {
fl_set_scrollbar_value(scrollbar, y);
}
///
void setScrollbarBounds(double, double) const;
///
void setScrollbarIncrements(double inc) const;
///
double getScrollbarValue() const {
return fl_get_scrollbar_value(scrollbar);
}
///
std::pair<float, float> const getScrollbarBounds() const {
std::pair<float, float> p;
fl_get_scrollbar_bounds(scrollbar, &p.first, &p.second);
return p;
}
///
Pixmap getPixmap() const { return workareapixmap; }
/// xforms callback
static int work_area_handler(FL_OBJECT *, int event,
FL_Coord, FL_Coord,
int /*key*/, void * xev);
/// xforms callback
static void scroll_cb(FL_OBJECT *, long);
/// a selection exists
void haveSelection(bool) const;
///
string const getClipboard() const;
///
void putClipboard(string const &) const;
// Signals
///
SigC::Signal0<void> workAreaExpose;
///
SigC::Signal1<void, double> scrollCB;
///
SigC::Signal2<void, KeySym, key_modifier::state> workAreaKeyPress;
///
SigC::Signal3<void, int, int, mouse_button::state> workAreaButtonPress;
///
SigC::Signal3<void, int, int, mouse_button::state> workAreaButtonRelease;
///
SigC::Signal3<void, int, int, mouse_button::state> workAreaMotionNotify;
///
SigC::Signal0<void> workAreaFocus;
///
SigC::Signal0<void> workAreaUnfocus;
///
SigC::Signal0<void> workAreaEnter;
///
SigC::Signal0<void> workAreaLeave;
///
SigC::Signal3<void, int, int, mouse_button::state> workAreaDoubleClick;
///
SigC::Signal3<void, int, int, mouse_button::state> workAreaTripleClick;
/// emitted when an X client has requested our selection
SigC::Signal0<void> selectionRequested;
/// emitted when another X client has stolen our selection
SigC::Signal0<void> selectionLost;
/// handles SelectionRequest X Event, to fill the clipboard
int event_cb(XEvent * xev);
private:
///
void createPixmap(int, int);
///
FL_OBJECT * backgroundbox;
///
FL_OBJECT * work_area;
///
FL_OBJECT * scrollbar;
///
mutable FL_OBJECT * splash_;
///
mutable FL_OBJECT * splash_text_;
/// The pixmap overlay on the workarea
Pixmap workareapixmap;
///
Painter painter_;
/// if we call redraw with true needed for locking-insets
bool screen_cleared;
};
#endif