X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbcwindowbase.h;h=f231c6d20a68da704ed3b8acf103ff5362137673;hp=ca73b39e61c696d37648cf3243243475ece56daa;hb=fb661e853152fd63537629a20f493a4cdcd4f019;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1

diff --git a/cinelerra-5.1/guicast/bcwindowbase.h b/cinelerra-5.1/guicast/bcwindowbase.h
index ca73b39e..f231c6d2 100644
--- a/cinelerra-5.1/guicast/bcwindowbase.h
+++ b/cinelerra-5.1/guicast/bcwindowbase.h
@@ -173,6 +173,7 @@ public:
 	friend class BC_Tumbler;
 	friend class BC_Window;
 	friend class BC_WindowEvents;
+	friend class Shuttle;
 
 // Main loop
 	int run_window();
@@ -236,10 +237,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 +250,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);
@@ -310,6 +311,7 @@ public:
 	int get_dragging();
 	wchar_t* get_wkeystring(int *length = 0);
 	int get_keypress();
+	int get_keysym() { return keysym; }
 #ifdef X_HAVE_UTF8_STRING
 	char* get_keypress_utf8();
 #endif
@@ -583,7 +585,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);