X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcanvas.h;h=dd3b574d05952f4b9c638ddaace21b0abecc9bb0;hp=775df7d016c0bfd4455d933deb20aecbc92cce63;hb=9b18af02dc4ccbf052ef9d70180a3d16c0f9848b;hpb=307d7f624510fcca7a7f6c1e683796cb73637106

diff --git a/cinelerra-5.1/cinelerra/canvas.h b/cinelerra-5.1/cinelerra/canvas.h
index 775df7d0..dd3b574d 100644
--- a/cinelerra-5.1/cinelerra/canvas.h
+++ b/cinelerra-5.1/cinelerra/canvas.h
@@ -58,24 +58,17 @@ public:
 	void start_single();
 	void stop_single();
 
-	void start_fullscreen();
-	void stop_fullscreen();
-
 // Don't call from inside the canvas
 	void create_canvas();
 
-
-
 // Processing or video playback changed.
 	virtual void status_event() {};
 
-
 	virtual void reset_camera() {}
 	virtual void reset_projector() {}
 	virtual void camera_keyframe() {}
 	virtual void projector_keyframe() {}
 	virtual void zoom_resize_window(float percentage) {}
-	virtual void zoom_auto() {}
 	virtual int cursor_leave_event() { return 0; }
 	virtual int cursor_enter_event() { return 0; }
 	virtual int button_release_event() { return 0; }
@@ -86,16 +79,13 @@ public:
 	virtual void toggle_controls() {}
 	virtual int get_cwindow_controls() { return 0; }
 	virtual int get_fullscreen();
-	virtual void set_fullscreen(int value);
+	virtual int get_clear_color();
+	virtual int set_fullscreen(int on, int unlock);
 
 	int cursor_leave_event_base(BC_WindowBase *caller);
 	int cursor_enter_event_base(BC_WindowBase *caller);
 	int button_press_event_base(BC_WindowBase *caller);
 	int keypress_event(BC_WindowBase *caller);
-// Use menu different options for different windows
-	void use_cwindow();
-	void use_rwindow();
-	void use_vwindow();
 	void use_auxwindow(BC_WindowBase *aux);
 
 // Provide canvas dimensions since a BC_Bitmap containing obsolete dimensions
@@ -120,14 +110,17 @@ public:
 	virtual void reset_translation() {};
 	virtual void close_source() {};
 // Updates the stores
-	virtual void update_zoom(int x, int y, float zoom) {};
+	virtual void update_zoom(int x, int y, float zoom) {}
 	void check_boundaries(EDL *edl, int &x, int &y, float &zoom);
-	void update_scrollbars(int flush);
+	void clear_borders(EDL *edl);
+	void update_scrollbars(EDL *edl, int flush);
 // Get scrollbar positions relative to output.
 // No correction is done if output is smaller than canvas
-	virtual int get_xscroll() { return 0; };
-	virtual int get_yscroll() { return 0; };
-	virtual float get_zoom() { return 0; };
+	virtual int get_xscroll() { return 0; }
+	virtual int get_yscroll() { return 0; }
+	virtual float get_zoom() { return 0; }
+	virtual float get_auto_zoom(EDL *edl);
+	virtual void zoom_auto();
 // Updates the refresh_frame
 	void update_refresh(VideoDevice *device, VFrame *output_frame);
 // Redraws the refresh_frame
@@ -136,23 +129,16 @@ public:
 
 // Get top left offset of canvas relative to output.
 // Normally negative.  Can be positive if output is smaller than canvas.
-	float get_x_offset(EDL *edl,
-		int single_channel,
-		float zoom_x,
-		float conformed_w,
-		float conformed_h);
-	float get_y_offset(EDL *edl,
-		int single_channel,
-		float zoom_y,
-		float conformed_w,
-		float conformed_h);
-	void get_zooms(EDL *edl,
-		int single_channel,
-		float &zoom_x,
-		float &zoom_y,
-		float &conformed_w,
-		float &conformed_h);
+	float get_x_offset(EDL *edl, int single_channel, float zoom_x,
+			float conformed_w, float conformed_h);
+	float get_y_offset(EDL *edl, int single_channel, float zoom_y,
+			float conformed_w, float conformed_h);
 
+	void get_zooms(EDL *edl, int single_channel,
+			float &zoom_x, float &zoom_y,
+			float &conformed_w, float &conformed_h);
+	void set_zoom(EDL *edl, float zoom);
+	void set_zoom(EDL *edl, float zoom, float cx, float cy);
 
 // Convert coord from output to canvas position, including
 // x and y scroll offsets
@@ -194,28 +180,25 @@ public:
 // refreshes.
 	VFrame *refresh_frame;
 // Results from last get_scrollbars
-	int w_needed;
-	int h_needed;
-	int w_visible;
-	int h_visible;
+	int w_needed, h_needed;
+	int w_visible, h_visible;
 // For cases where video is not enabled on the canvas but processing is
 // occurring for a single frame, this causes the status to update.
 	int is_processing;
 	int is_fullscreen;
 // Cursor is inside video surface
 	int cursor_inside;
-	int view_x;
-	int view_y;
-	int view_w;
-	int view_h;
-	int scr_w0;
+	int view_x, view_y, view_w, view_h;
 	int root_w, root_h;
+	int scr_w0;
 
 	MWindow *mwindow;
 
 private:
-	void get_scrollbars(EDL *edl,
-		int &canvas_x, int &canvas_y, int &canvas_w, int &canvas_h);
+	int get_scrollbars(EDL *edl);
+	void start_fullscreen();
+	void stop_fullscreen();
+
 // Lock access to the canvas pointer.
 	Condition *canvas_lock;
 };
@@ -296,8 +279,6 @@ public:
 	CanvasFullScreenPopup(Canvas *canvas);
 
 	void create_objects();
-	void use_cwindow();
-
 	Canvas *canvas;
 };
 
@@ -316,12 +297,7 @@ public:
 	~CanvasPopup();
 
 	void create_objects();
-	void use_cwindow();
-	void use_rwindow();
-	void use_vwindow();
-
 	Canvas *canvas;
-	CanvasToggleControls *toggle_controls;
 };
 
 class CanvasZoomSize : public BC_MenuItem
@@ -390,15 +366,6 @@ public:
 	Canvas *canvas;
 };
 
-class CanvasToggleControls : public BC_MenuItem
-{
-public:
-	CanvasToggleControls(Canvas *canvas);
-	int handle_event();
-	static char* calculate_text(int cwindow_controls);
-	Canvas *canvas;
-};
-
 class CanvasFullScreenItem : public BC_MenuItem
 {
 public:
@@ -415,7 +382,6 @@ public:
 	Canvas *canvas;
 };
 
-
 class CanvasPopupRemoveSource : public BC_MenuItem
 {
 public:
@@ -424,8 +390,4 @@ public:
 	Canvas *canvas;
 };
 
-
-
-
-
 #endif