*
*/
-#ifndef __CRIKEYWINDOW_H__
-#define __CRIKEYWINDOW_H__
+#ifndef __SKETCHERWINDOW_H__
+#define __SKETCHERWINDOW_H__
#include "sketcher.h"
#include "guicast.h"
class SketcherCurvePenItem;
class SketcherCurvePen;
class SketcherCurveColor;
-class SketcherCurveColorPicker;
-class SketcherCurveColorThread;
class SketcherNewCurve;
class SketcherDelCurve;
class SketcherCurveUp;
void update(int pen);
SketcherWindow *gui;
+ int pen;
};
-class SketcherCurveColor : public BC_Button
+class SketcherCurveColor : public ColorBoxButton
{
public:
- SketcherCurveColor(SketcherWindow *gui, int x, int y, int w, int h);
+ SketcherCurveColor(SketcherWindow *gui,
+ int x, int y, int w, int h, int color, int alpha);
~SketcherCurveColor();
- void set_color(int color);
- void update_gui(int color);
- int handle_event();
-
- int color;
- VFrame *vframes[3];
- SketcherWindow *gui;
-};
-
-class SketcherCurveColorPicker : public ColorPicker
-{
-public:
- SketcherCurveColorPicker(SketcherWindow *gui, SketcherCurveColor *curve_color);
- ~SketcherCurveColorPicker();
- void start(int color);
int handle_new_color(int color, int alpha);
- void update_gui();
void handle_done_event(int result);
- SketcherWindow *gui;
int color;
- SketcherCurveColor *color_button;
- SketcherCurveColorThread *color_update;
-};
-
-class SketcherCurveColorThread : public Thread
-{
-public:
- SketcherCurveColorThread(SketcherCurveColorPicker *color_picker);
- ~SketcherCurveColorThread();
-
- void start();
- void stop();
- void run();
-
- SketcherCurveColorPicker *color_picker;
- int done;
- Condition *update_lock;
+ VFrame *vframes[3];
+ SketcherWindow *gui;
};
class SketcherNewCurve : public BC_GenericButton
class SketcherCurveWidth : public SketcherNum
{
public:
- SketcherCurveWidth(SketcherWindow *gui, int x, int y, float output)
- : SketcherNum(gui, x, y, output, 0, 255) {}
- ~SketcherCurveWidth() {}
+ SketcherCurveWidth(SketcherWindow *gui, int x, int y, int width);
+ ~SketcherCurveWidth();
int handle_event();
+ void update(int width);
+ int width;
};
class SketcherCurveList : public BC_ListBox
class SketcherPointTypeItem : public BC_MenuItem
{
public:
- SketcherPointTypeItem(int pty);
+ SketcherPointTypeItem(int arc);
int handle_event();
- int pty;
+ int arc;
};
class SketcherPointType : public BC_PopupMenu
{
public:
- SketcherPointType(SketcherWindow *gui, int x, int y, int pty);
+ SketcherPointType(SketcherWindow *gui, int x, int y, int arc);
void create_objects();
- void update(int pty);
+ void update(int arc);
SketcherWindow *gui;
+ int type;
};
~SketcherWindow();
void create_objects();
+ void done_event(int result);
void update_gui();
- void start_color_thread(SketcherCurveColor *curve_color);
int grab_event(XEvent *event);
- int grab_button_press(XEvent *event);
- int grab_cursor_motion(XEvent *event);
int do_grab_event(XEvent *event);
- void done_event(int result);
+ int grab_button_press(XEvent *event);
+ int grab_cursor_motion();
void send_configure_change();
int keypress_event();
SketcherCurveType *curve_type;
SketcherCurvePen *curve_pen;
SketcherCurveColor *curve_color;
- SketcherCurveColorPicker *color_picker;
SketcherNewCurve *new_curve;
SketcherDelCurve *del_curve;
SketcherCurveUp *curve_up;
int pending_motion, pending_config;
XEvent motion_event;
float last_x, last_y;
- BC_Title *notes0, *notes1, *notes2;
+ BC_Title *notes0, *notes1, *notes2, *notes3;
};
#endif