X-Git-Url: https://cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbcwindowbase.h;h=a39010981dc17e99d628e1dd5c37c7ca2a478863;hb=0df48ad2d876409c5beeae2e21933a728ea76c33;hp=84cb089608cf642ea9c2d19fdef65ff720f4ff6e;hpb=83bfb86d01b353bab485d0ccc336e0572bcb63c6;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/guicast/bcwindowbase.h b/cinelerra-5.1/guicast/bcwindowbase.h
index 84cb0896..a3901098 100644
--- a/cinelerra-5.1/guicast/bcwindowbase.h
+++ b/cinelerra-5.1/guicast/bcwindowbase.h
@@ -97,7 +97,9 @@
 #include <GL/glx.h>
 #endif
 
-
+// scaled x,y unit
+#define xS(v) (BC_WindowBase::get_resources()->x_scale*(v))
+#define yS(v) (BC_WindowBase::get_resources()->y_scale*(v))
 
 #ifdef HAVE_GL
 //typedef void* GLXContext;
@@ -173,6 +175,7 @@ public:
 	friend class BC_Tumbler;
 	friend class BC_Window;
 	friend class BC_WindowEvents;
+	friend class Shuttle;
 
 // Main loop
 	int run_window();
@@ -236,10 +239,9 @@ public:
 	void disable_opengl();
 	void flip_opengl();
 
-// Calls the BC_Synchronous version of the function with the window_id.
-// Not run in OpenGL thread because it has its own lock.
-	unsigned int get_shader(char *title, int *got_it);
-	void put_shader(unsigned int handle, char *title);
+// Calls the BC_Synchronous version of the function
+	int get_shader(unsigned int *handle, const char *vert, const char *frag);
+	void put_shader(unsigned int handle, const char *vert, const char *frag);
 	int get_opengl_server_version();
 
 	int flash(int x, int y, int w, int h, int flush = 1);
@@ -250,6 +252,7 @@ public:
 	int lock_window(const char *location = 0);
 	int unlock_window();
 	int get_window_lock();
+	int break_lock();
 
 	BC_MenuBar* add_menubar(BC_MenuBar *menu_bar);
 	BC_WindowBase* add_subwindow(BC_WindowBase *subwindow);
@@ -584,7 +587,7 @@ private:
 	XFontSet get_fontset(int font);
 	XFontSet get_curr_fontset(void);
 	void set_fontset(int font);
-	int dispatch_event(XEvent *event);
+	int dispatch_event();
 
 	int get_key_masks(unsigned int key_state);