X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Ftitler%2Ftitlerwindow.h;h=1f968301b82f73c8435f604651e8cc5a644c2951;hb=a07e46d684a8aff4b56566b010b697ba9891872d;hp=7e73324f1ad89084724b415e267efc5db26bfab2;hpb=624f99bd6dccb2af28fdbef8fbb3ae41c19fcbd2;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/plugins/titler/titlerwindow.h b/cinelerra-5.1/plugins/titler/titlerwindow.h
index 7e73324f..1f968301 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;
@@ -78,6 +78,7 @@ class TitleCurSubMenu;
 class TitleCurSubMenuItem;
 class TitleFontsPopup;
 class TitleColorPopup;
+class TitlePngPopup;
 
 class TitleWindow : public PluginClientWindow
 {
@@ -90,10 +91,13 @@ public:
 	int grab_event(XEvent *event);
 	void update_color();
 	void update_justification();
+	void update_stats();
 	void update();
 	void previous_font();
 	void next_font();
-	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);
 
 	TitleMain *client;
 
@@ -121,6 +125,7 @@ public:
 	TitleCurPopup *cur_popup;
 	TitleFontsPopup *fonts_popup;
 	TitleColorPopup *color_popup;
+	TitlePngPopup *png_popup;
 
 	int color_x, color_y;
 	int outline_color_x, outline_color_y;
@@ -148,6 +153,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;
@@ -349,6 +356,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:
@@ -466,7 +488,7 @@ public:
 	TitleMain *client;
 	TitleWindow *window;
 };
-class TitleColorThread : public ColorThread
+class TitleColorThread : public ColorPicker
 {
 public:
 	TitleColorThread(TitleMain *client, TitleWindow *window, int is_outline);
@@ -522,23 +544,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_subitem(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_subitem(popup_type, ap, fmt); va_end(ap);
+	}
+	void add_subitem(const char *fmt,...) { va_list ap;
+		va_start(ap, fmt); add_subitem(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
@@ -546,13 +577,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);
@@ -566,4 +601,18 @@ public:
 	int color_value;
 };
 
+class TitlePngPopup : public BC_DialogThread
+{
+public:
+	TitlePngPopup(TitleMain *client, TitleWindow *window);
+	~TitlePngPopup();
+
+	void handle_done_event(int result);
+	BC_Window* new_gui();
+	int activate();
+
+	TitleMain *client;
+	TitleWindow *window;
+};
+
 #endif