X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcwindowtool.h;h=5e290b1370a69745f4ee72ea3cc6a1e3eef32c2f;hp=ced331bc376897462a9dbd324f753f7606f64125;hb=a9a62511f2f31cf17307d877ec4e345bf0925aee;hpb=9af81a9c7d1206521ffb3d21973a692dceded3cd

diff --git a/cinelerra-5.1/cinelerra/cwindowtool.h b/cinelerra-5.1/cinelerra/cwindowtool.h
index ced331bc..5e290b13 100644
--- a/cinelerra-5.1/cinelerra/cwindowtool.h
+++ b/cinelerra-5.1/cinelerra/cwindowtool.h
@@ -31,6 +31,17 @@
 #include "maskautos.inc"
 #include "mwindow.inc"
 
+enum {
+	MASK_SHAPE_SQUARE,
+	MASK_SHAPE_CIRCLE,
+	MASK_SHAPE_TRIANGLE,
+	MASK_SHAPE_OVAL,
+};
+enum {
+	MASK_SCALE_X,
+	MASK_SCALE_Y,
+	MASK_SCALE_XY,
+};
 
 // This common thread supports all the tool GUI's.
 class CWindowTool : public Thread
@@ -189,11 +200,11 @@ public:
 	void update_items(MaskAuto *keyframe);
 };
 
-class CWindowMaskUnclear : public BC_GenericButton
+class CWindowMaskUnclear : public BC_Button
 {
 public:
 	CWindowMaskUnclear(MWindow *mwindow, CWindowMaskGUI *gui,
-			int x, int y, int w);
+			int x, int y);
 	int handle_event();
 	MWindow *mwindow;
 	CWindowMaskGUI *gui;
@@ -312,6 +323,39 @@ public:
 	CWindowMaskGUI *gui;
 };
 
+class CWindowMaskGangFocus : public BC_Toggle
+{
+public:
+	CWindowMaskGangFocus(MWindow *mwindow, CWindowMaskGUI *gui,
+			int x, int y);
+	~CWindowMaskGangFocus();
+	int handle_event();
+	MWindow *mwindow;
+	CWindowMaskGUI *gui;
+};
+
+class CWindowMaskGangPoint : public BC_Toggle
+{
+public:
+	CWindowMaskGangPoint(MWindow *mwindow, CWindowMaskGUI *gui,
+			int x, int y);
+	~CWindowMaskGangPoint();
+	int handle_event();
+	MWindow *mwindow;
+	CWindowMaskGUI *gui;
+};
+
+class CWindowMaskSmoothButton : public BC_Button
+{
+public:
+	CWindowMaskSmoothButton(MWindow *mwindow, CWindowMaskGUI *gui,
+		const char *tip, int type, int on, int x, int y, const char *images);
+	int handle_event();
+	MWindow *mwindow;
+	CWindowMaskGUI *gui;
+	int type, on;
+};
+
 class CWindowMaskAffectedPoint : public BC_TumbleTextBox
 {
 public:
@@ -332,6 +376,20 @@ public:
 	int handle_event();
 	MWindow *mwindow;
 	CWindowMaskGUI *gui;
+	static int calculate_w(CWindowMaskGUI *gui);
+};
+
+class CWindowMaskScaleXY : public BC_Toggle
+{
+public:
+	CWindowMaskScaleXY(MWindow *mwindow, CWindowMaskGUI *gui,
+			int x, int y, VFrame **data, int v,
+			int id, const char *tip);
+	~CWindowMaskScaleXY();
+	int handle_event();
+	MWindow *mwindow;
+	CWindowMaskGUI *gui;
+	int id;
 };
 
 class CWindowMaskHelp : public BC_CheckBox
@@ -427,6 +485,131 @@ public:
 	CWindowMaskGUI *gui;
 };
 
+class CWindowMaskLoadList : public BC_ListBox
+{
+public:
+	CWindowMaskLoadList(MWindow *mwindow, CWindowMaskGUI *gui);
+	~CWindowMaskLoadList();
+	void create_objects();
+	int handle_event();
+
+	MWindow *mwindow;
+	CWindowMaskGUI *gui;
+	CWindowMaskItems shape_items;
+};
+
+class CWindowMaskLoad : public BC_Button
+{
+public:
+	CWindowMaskLoad(MWindow *mwindow, CWindowMaskGUI *gui,
+			int x, int y, int w);
+	int handle_event();
+
+	MWindow *mwindow;
+	CWindowMaskGUI *gui;
+};
+
+class CWindowMaskSave : public BC_Button
+{
+public:
+	CWindowMaskSave(MWindow *mwindow, CWindowMaskGUI *gui,
+			int x, int y, int w);
+	~CWindowMaskSave();
+	int handle_event();
+
+	MWindow *mwindow;
+	CWindowMaskGUI *gui;
+	CWindowMaskPresetDialog *preset_dialog;
+};
+
+class CWindowMaskPresetDialog : public BC_DialogThread
+{
+public:
+	CWindowMaskPresetDialog(MWindow *mwindow, CWindowMaskGUI *gui);
+	~CWindowMaskPresetDialog();
+	void handle_close_event(int result);
+	void handle_done_event(int result);
+	BC_Window* new_gui();
+	void start_dialog(int sx, int sy, MaskAuto *keyframe);
+
+	MWindow *mwindow;
+	CWindowMaskGUI *gui;
+	CWindowMaskPresetGUI *pgui;
+	int sx, sy;
+	MaskAuto *keyframe;
+};
+
+class CWindowMaskPresetGUI : public BC_Window
+{
+public:
+	CWindowMaskPresetGUI(CWindowMaskPresetDialog *preset_dialog,
+			int x, int y, const char *title);
+	void create_objects();
+
+	CWindowMaskPresetDialog *preset_dialog;
+	CWindowMaskPresetText *preset_text;
+};
+
+class CWindowMaskPresetText : public BC_PopupTextBox
+{
+public:
+	CWindowMaskPresetText(CWindowMaskPresetGUI *pgui,
+		int x, int y, int w, int h, const char *text);
+	int handle_event();
+	void update_items();
+
+	CWindowMaskPresetGUI *pgui;
+	CWindowMaskItems mask_items;
+};
+
+class CWindowMaskDelete : public BC_Button
+{
+public:
+	CWindowMaskDelete(MWindow *mwindow, CWindowMaskGUI *gui,
+			int x, int y, int w);
+	int handle_event();
+
+	MWindow *mwindow;
+	CWindowMaskGUI *gui;
+};
+
+class CWindowMaskCenter : public BC_Button
+{
+public:
+	CWindowMaskCenter(MWindow *mwindow, CWindowMaskGUI *gui,
+			int x, int y, int w);
+	int handle_event();
+
+	MWindow *mwindow;
+	CWindowMaskGUI *gui;
+};
+
+class CWindowMaskNormal : public BC_Button
+{
+public:
+	CWindowMaskNormal(MWindow *mwindow, CWindowMaskGUI *gui,
+			int x, int y, int w);
+	int handle_event();
+
+	MWindow *mwindow;
+	CWindowMaskGUI *gui;
+};
+
+class CWindowMaskShape : public BC_Button
+{
+public:
+	CWindowMaskShape(MWindow *mwindow, CWindowMaskGUI *gui,
+		const char *images, int shape, int x, int y, const char *tip);
+	~CWindowMaskShape();
+	void builtin_shape(int i, SubMask *sub_mask);
+	int handle_event();
+
+	MWindow *mwindow;
+	CWindowMaskGUI *gui;
+	int shape;
+	CWindowMaskItems shape_items;
+};
+
 class CWindowDisableOpenGLMasking : public BC_CheckBox
 {
 public:
@@ -445,11 +628,18 @@ public:
 	void update();
 	int close_event();
 	void done_event();
+	void handle_event();
 	void set_focused(int v, float cx, float cy);
 	void update_buttons(MaskAuto *keyframe, int k);
-	void handle_event();
 	void get_keyframe(Track* &track, MaskAutos* &autos, MaskAuto* &keyframe,
 		SubMask* &mask, MaskPoint* &point, int create_it);
+	void load_masks(ArrayList<SubMask *> &masks);
+	void save_masks(ArrayList<SubMask *> &masks);
+	int smooth_mask(int typ, int on);
+	int save_mask(const char *nm);
+	int del_mask(const char *nm);
+	int center_mask();
+	int normal_mask();
 
 	CWindowMaskOnTrack *mask_on_track;
 	CWindowMaskTrackTumbler *mask_track_tumbler;
@@ -459,17 +649,35 @@ public:
 	BC_Title *mask_blabels[SUBMASKS];
 	CWindowMaskEnable *mask_enables[SUBMASKS];
 	CWindowMaskSoloTrack *mask_solo_track;
-	CWindowMaskDelMask *del_mask;
-	CWindowMaskUnclear *unclr_mask;
-	CWindowMaskClrMask *clr_mask;
+	CWindowMaskDelMask *mask_del;
+	CWindowMaskUnclear *mask_unclr;
+	CWindowMaskClrMask *mask_clr;
+	CWindowMaskShape *mask_shape_sqr;
+	CWindowMaskShape *mask_shape_crc;
+	CWindowMaskShape *mask_shape_tri;
+	CWindowMaskShape *mask_shape_ovl;
+	CWindowMaskLoadList *mask_load_list;
+	CWindowMaskLoad *mask_load;
+	CWindowMaskSave *mask_save;
+	CWindowMaskDelete *mask_delete;
+	CWindowMaskPresetDialog *preset_dialog;
+	CWindowMaskCenter *mask_center;
+	CWindowMaskNormal *mask_normal;
 	CWindowMaskFade *fade;
 	CWindowMaskFadeSlider *fade_slider;
 	CWindowMaskGangFader *gang_fader;
 	CWindowMaskAffectedPoint *active_point;
 	CWindowMaskDelPoint *del_point;
+	CWindowMaskGangPoint *gang_point;
+	CWindowMaskSmoothButton *mask_pnt_linear, *mask_pnt_smooth;
+	CWindowMaskSmoothButton *mask_crv_linear, *mask_crv_smooth;
+	CWindowMaskSmoothButton *mask_all_linear, *mask_all_smooth;
 	CWindowCoord *x, *y;
+	CWindowMaskScaleXY *mask_scale_x, *mask_scale_y, *mask_scale_xy;
+	int scale_mode;
 	CWindowMaskFocus *focus;
 	int focused;
+	CWindowMaskGangFocus *gang_focus;
 	CWindowMaskHelp *help;
 	int helped, help_y, help_h;
 	CWindowMaskDrawMarkers *draw_markers;