X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-dualscreen.c;h=3a0beaea8aac23f9e5e51bb592a569f25117650e;hb=f2366d56fd604175c94a14a4e597984424c73dd6;hp=0f94912e7d9f2bcc918326d711a3315765ac1122;hpb=d615efd1bc513e5782f6824cec0a26547ee43bdf;p=evince.git

diff --git a/shell/ev-dualscreen.c b/shell/ev-dualscreen.c
index 0f94912e..3a0beaea 100644
--- a/shell/ev-dualscreen.c
+++ b/shell/ev-dualscreen.c
@@ -42,7 +42,7 @@ struct _EvDSCWindowPrivate {
 	EvWindow *presentation_window;
 	EvDocument * presentation_document;
 	gint moveback_monitor;
-} EvDSCWindowPrivate;
+};
 
 #define EV_DSCWINDOW_GET_PRIVATE(object) \
 	(G_TYPE_INSTANCE_GET_PRIVATE ((object), EV_TYPE_DSCWINDOW, EvDSCWindowPrivate))
@@ -140,6 +140,74 @@ ev_dscwindow_notes_interaction (GtkContainer *container, EvDSCWindow *self)
 	return TRUE;
 }
 
+/**
+ * ev_dscwindow_get_control: Get the control instance.
+ *
+ * If there is none, create one.
+ *
+ * Returns: control instance
+ **/
+EvDSCWindow *
+ev_dscwindow_get_control (void)
+{
+	static EvDSCWindow * control = NULL;
+
+	if (!control || !EV_IS_DSCWINDOW (control)) {
+		control = EV_DSCWINDOW (g_object_new (EV_TYPE_DSCWINDOW, NULL));
+	}
+
+	return control;
+}
+/*TODO: Fix me!*/
+static void
+ev_dscwindow_window_placement (EvDSCWindow *ev_dscwindow)
+{
+	gint num_monitors = get_num_monitors (GTK_WINDOW (ev_dscwindow));
+	if (num_monitors == 2) {
+		GtkWindow * presentation_window = GTK_WINDOW (ev_dscwindow->priv->presentation_window);
+		GdkScreen * screen = gtk_window_get_screen (presentation_window);
+
+		gint work_monitor = gdk_screen_get_monitor_at_window (screen,
+			GTK_WIDGET (presentation_window)->window);
+
+		gint presentation_monitor = (work_monitor + 1) % 2;
+
+		GdkRectangle coords;
+		gdk_screen_get_monitor_geometry (screen, presentation_monitor,
+			&coords);
+
+		gtk_window_move (presentation_window, coords.x, coords.y);
+		ev_window_run_presentation (ev_dscwindow->priv->presentation_window);
+		ev_dscwindow->priv->moveback_monitor = work_monitor;
+
+		gtk_window_maximize (GTK_WINDOW (ev_dscwindow));
+	}
+}
+
+
+/**
+ * ev_dscwindow_set_presentation: Set presentation document
+ * @presentation_window: Main window we can reuse for presentation
+ **/
+void
+ev_dscwindow_set_presentation (EvDSCWindow *ev_dscwindow,
+	EvWindow *presentation_window)
+{
+	if (!EV_IS_WINDOW (presentation_window))
+		return;
+
+	ev_dscwindow->priv->presentation_window = presentation_window;
+	ev_dscwindow->priv->presentation_document = document;
+
+	ev_document_model_set_document(ev_dscwindow->priv->model,
+		presentation_window->priv->document);
+/*	ev_view_set_document (EV_VIEW (priv->notesview),
+		priv->presentation_document);
+	ev_dscwindow_window_placement (self);
+	ev_dscwindow_handle_resized (NULL, NULL, self);
+	*/
+}
+
 /**
  * ev_dscwindow_end: Stop presentation mode.
  */
@@ -150,8 +218,6 @@ ev_dscwindow_end (GtkWidget *widget, GdkEvent *event)
 	return TRUE;
 }
 
-
-
 /**
 * ev_dscwindow_init: Initialize multihead presentation
 *
@@ -166,14 +232,14 @@ ev_dscwindow_init (EvDSCWindow *ev_dscwindow)
 	ev_dscwindow->priv->moveback_monitor = -1;
 	ev_dscwindow->priv->notesdocument = NULL;
 
-	gtk_window_set_title (GTK_WINDOW (self), _("Presentation Control"));
+	gtk_window_set_title (GTK_WINDOW (ev_dscwindow), _("Presentation Control"));
 
 	GtkWidget *h = gtk_hpaned_new ();
 	GtkWidget *v = gtk_vbox_new (FALSE, 0);
 
 	ev_dscwindow->priv->overview_scrolled_window = GTK_WIDGET (g_object_new (
 			GTK_TYPE_SCROLLED_WINDOW, "shadow-type", GTK_SHADOW_IN, NULL));
-	gtk_box_pack_start_defaults (GTK_BOX (v), priv->overview_scrolled_window);
+	gtk_box_pack_start (GTK_BOX (v), ev_dscwindow->priv->overview_scrolled_window, TRUE, TRUE, 0);
 
 	ev_dscwindow->priv->model = ev_document_model_new ();
 	ev_dscwindow->priv->overview = ev_view_new ();
@@ -184,8 +250,8 @@ ev_dscwindow_init (EvDSCWindow *ev_dscwindow)
 	ev_document_model_set_sizing_mode (ev_dscwindow->priv->model, EV_SIZING_BEST_FIT);
 
 
-	gtk_container_add (GTK_CONTAINER (priv->overview_scrolled_window),
-				   priv->overview);
+	gtk_container_add (GTK_CONTAINER (ev_dscwindow->priv->overview_scrolled_window),
+				   ev_dscwindow->priv->overview);
 
 
 	GtkWidget *e = gtk_expander_new (_("Expensive features"));
@@ -197,13 +263,13 @@ ev_dscwindow_init (EvDSCWindow *ev_dscwindow)
 	gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (b_switch), "object-flip-horizontal");
 	gtk_toolbar_insert (GTK_TOOLBAR (t), b_switch, -1);
 	g_signal_connect (b_switch, "clicked",
-		G_CALLBACK (ev_dscwindow_switch_monitors), self);
+		G_CALLBACK (ev_dscwindow_switch_monitors), ev_dscwindow);
 
 	GtkToolItem* b_notes = gtk_tool_button_new (NULL, _("Load notes ..."));
 	gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (b_notes), "object-flip-horizontal");
 	gtk_toolbar_insert (GTK_TOOLBAR (t), b_notes, -1);
 	g_signal_connect (b_notes, "clicked",
-		G_CALLBACK (ev_dscwindow_notes_interaction), self);
+		G_CALLBACK (ev_dscwindow_notes_interaction), ev_dscwindow);
 
 	GtkToolItem* b_close = gtk_tool_button_new (NULL, _("End presentation"));
 	gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (b_close), "view-restore");
@@ -260,7 +326,7 @@ ev_dscwindow_init (EvDSCWindow *ev_dscwindow)
 static void
 ev_dscwindow_dispose (GObject *obj)
 {
-	EvDSCWindow * self = EV_DSCWINDOW (obj);
+	EvDSCWindow * ev_dscwindow = EV_DSCWINDOW (obj);
 	EvDSCWindowPrivate *priv = ev_dscwindow->priv;
 
 /*	if (EV_IS_VIEW (priv->overview) {
@@ -273,7 +339,8 @@ ev_dscwindow_dispose (GObject *obj)
 +		ev_view_set_document (EV_VIEW (priv->notesview), NULL);
 +		g_object_unref (priv->notesview);
 +	}*/
-	ev_window_stop_presentation (priv->presentation_window);
+/*TODO: save fulscreen state*/
+	ev_window_stop_presentation (priv->presentation_window, 0);
 
 	if (priv->moveback_monitor >= 0) {
 		GtkWindow * presentation_window = GTK_WINDOW (priv->presentation_window);
@@ -286,25 +353,24 @@ ev_dscwindow_dispose (GObject *obj)
 		gtk_window_move (presentation_window, coords.x, coords.y);
 	}
 
-	G_OBJECT_CLASS (parent_class)->dispose (obj);
+	G_OBJECT_CLASS (ev_dscwindow_parent_class)->dispose (obj);
 }
 
 
 static void
-ev_dscwindow_class_init (EvDSCWindowClass * klass)
+ev_dscwindow_class_init (EvDSCWindowClass *ev_dscwindow_class)
 {
-/*	GObjectClass *g_object_class = G_OBJECT_CLASS (klass);
- *	parent_class = g_type_class_peek_parent (klass);
- *	g_type_class_add_private (klass, sizeof (EvDSCWindowPrivate));
- *	g_object_class->dispose  = ev_dscwindow_dispose;
- */
+	GObjectClass *g_object_class = G_OBJECT_CLASS (ev_dscwindow_class);
+	/*parent_class = g_type_class_peek_parent (ev_dscwindow_class);*/
+	g_type_class_add_private (g_object_class, sizeof (EvDSCWindowPrivate));
+	g_object_class->dispose  = ev_dscwindow_dispose;
 }
 
 GtkWidget *
 ev_dscwindow_new (void)
 {
-	EvDSCWindow *dsc_window;
+	EvDSCWindow *ev_dscwindow;
 
-	dsc_window = g_object_new (EV_TYPE_DSCWINDOW, "type", GTK_WINDOW_TOPLEVEL, NULL);
-	return GTK_WIDGET (dsc_window);
+	ev_dscwindow = g_object_new (EV_TYPE_DSCWINDOW, "type", GTK_WINDOW_TOPLEVEL, NULL);
+	return GTK_WIDGET (ev_dscwindow);
 }