X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Ftitler%2Ftitlerwindow.h;h=9752b5f943f944f2ae87682b5edac64405ab51f4;hb=74afbc29ac4ce9d94d53e10342979f2c59f1f193;hp=0461cee4a010920a60a8a6f02fc683eded226a72;hpb=331564c0ebb30688da917fc1c89058e12771e348;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/plugins/titler/titlerwindow.h b/cinelerra-5.1/plugins/titler/titlerwindow.h
index 0461cee4..9752b5f9 100644
--- a/cinelerra-5.1/plugins/titler/titlerwindow.h
+++ b/cinelerra-5.1/plugins/titler/titlerwindow.h
@@ -33,9 +33,7 @@ class TitleInterlace;
 #include "mutex.h"
 #include "titler.h"
 
-
-
-
+#include <stdarg.h>
 
 class TitleFontTumble;
 class TitleSizeTumble;
@@ -54,6 +52,8 @@ class TitleLinePitch;
 class TitleFade;
 class TitleFont;
 class TitleText;
+class TitleTextChars;
+class TitleTextBfrSz;
 class TitleX;
 class TitleY;
 class TitleW;
@@ -91,11 +91,15 @@ public:
 	int grab_event(XEvent *event);
 	void update_color();
 	void update_justification();
+	void update_stats();
 	void update();
 	void previous_font();
 	void next_font();
-	void check_style(const char *font_name);
-	int insert_ibeam(const char *txt, int adv);
+	void check_style(const char *font_name, int update);
+	int insert_ibeam(const char *txt, int ofs=0);
+	void done_event(int result);
+	void send_configure_change();
+	int check_configure_change(int ret);
 
 	TitleMain *client;
 
@@ -128,7 +132,7 @@ public:
 	int color_x, color_y;
 	int outline_color_x, outline_color_y;
 	int drag_dx, drag_dy, dragging;
-	int cur_ibeam;
+	int cur_ibeam, pending_config;
 
 	BC_Title *size_title;
 	TitleSize *size;
@@ -151,6 +155,8 @@ public:
 	TitleFade *fade_out;
 	BC_Title *text_title;
 	TitleText *text;
+	TitleTextChars *text_chars;
+	TitleTextBfrSz *text_bfrsz;
 	BC_Title *justify_title;
 	TitleLeft *left;
 	TitleCenter *center;
@@ -289,7 +295,7 @@ public:
 class TitleLoop : public BC_CheckBox
 {
 public:
-	TitleLoop(TitleMain *client, int x, int y);
+	TitleLoop(TitleMain *client, TitleWindow *window, int x, int y);
 	int handle_event();
 	TitleMain *client;
 	TitleWindow *window;
@@ -297,7 +303,7 @@ public:
 class TitleLinePitch : public BC_CheckBox
 {
 public:
-	TitleLinePitch(TitleMain *client, int x, int y);
+	TitleLinePitch(TitleMain *client, TitleWindow *window, int x, int y);
 	int handle_event();
 	TitleMain *client;
 	TitleWindow *window;
@@ -306,19 +312,21 @@ public:
 class TitleTimecode : public BC_CheckBox
 {
 public:
-	TitleTimecode(TitleMain *client, int x, int y);
+	TitleTimecode(TitleMain *client, TitleWindow *window, int x, int y);
 	int handle_event();
 	TitleMain *client;
+	TitleWindow *window;
 };
 
 class TitleTimecodeFormat : public BC_PopupMenu
 {
 public:
-	TitleTimecodeFormat(TitleMain *client, int x, int y, const char *text);
+	TitleTimecodeFormat(TitleMain *client, TitleWindow *window, int x, int y, const char *text);
 	void create_objects();
 	int update(int timecode_format);
 	int handle_event();
 	TitleMain *client;
+	TitleWindow *window;
 };
 
 class TitleFade : public BC_TextBox
@@ -352,6 +360,21 @@ public:
 	TitleMain *client;
 	TitleWindow *window;
 };
+class TitleTextChars : public BC_Title
+{
+public:
+	int update(int n);
+	TitleTextChars(int x, int y, int w);
+	~TitleTextChars();
+};
+class TitleTextBfrSz : public BC_Title
+{
+public:
+	int update(int n);
+	TitleTextBfrSz(int x, int y, int w);
+	~TitleTextBfrSz();
+};
+
 class TitleX : public BC_TumbleTextBox
 {
 public:
@@ -418,6 +441,7 @@ public:
 	TitleSpeed(TitleMain *client, TitleWindow *window, int x, int y);
 	int handle_event();
 	TitleMain *client;
+	TitleWindow *window;
 };
 
 class TitleLeft : public BC_Radial
@@ -469,7 +493,7 @@ public:
 	TitleMain *client;
 	TitleWindow *window;
 };
-class TitleColorThread : public ColorThread
+class TitleColorThread : public ColorPicker
 {
 public:
 	TitleColorThread(TitleMain *client, TitleWindow *window, int is_outline);
@@ -497,7 +521,7 @@ public:
 class TitleLoopPlayback : public BC_CheckBox
 {
 public:
-	TitleLoopPlayback(TitleMain *client, int x, int y);
+	TitleLoopPlayback(TitleMain *client, TitleWindow *window, int x, int y);
 	int handle_event();
 	TitleMain *client;
 	TitleWindow *window;
@@ -525,23 +549,32 @@ public:
         TitleCurPopup *popup;
 };
 
+enum { POPUP_OFFSET=-1, POPUP_NONE=0, POPUP_FONT, POPUP_COLOR, POPUP_PNG, };
+
 class TitleCurSubMenu : public BC_SubMenu
 {
 public:
         TitleCurSubMenu(TitleCurItem *cur_item);
         ~TitleCurSubMenu();
-
+	void add_subitemx(int popup_type, va_list ap, const char *fmt);
+	void add_subitem(int popup_type, const char *fmt,...) { va_list ap;
+		va_start(ap, fmt); add_subitemx(popup_type, ap, fmt); va_end(ap);
+	}
+	void add_subitem(const char *fmt,...) { va_list ap;
+		va_start(ap, fmt); add_subitemx(POPUP_NONE, ap, fmt); va_end(ap);
+	}
         TitleCurItem *cur_item;
 };
 
 class TitleCurSubMenuItem : public BC_MenuItem
 {
 public:
-        TitleCurSubMenuItem(TitleCurSubMenu *submenu, const char *text);
+        TitleCurSubMenuItem(TitleCurSubMenu *submenu, const char *text, int popup_type);
         ~TitleCurSubMenuItem();
         int handle_event();
 
         TitleCurSubMenu *submenu;
+	int popup_type;
 };
 
 class TitleFontsPopup : public BC_ListBox
@@ -549,13 +582,17 @@ class TitleFontsPopup : public BC_ListBox
 public:
 	TitleFontsPopup(TitleMain *client, TitleWindow *window);
 	~TitleFontsPopup();
+	int keypress_event();
 	int handle_event();
+	int show_tooltip(const char *text, int x,int y, int w,int h) {
+		return gui_tooltip(text);
+	}
 
 	TitleMain *client;
 	TitleWindow *window;
 };
 
-class TitleColorPopup : public ColorThread
+class TitleColorPopup : public ColorPicker
 {
 public:
 	TitleColorPopup(TitleMain *client, TitleWindow *window);