Merge branch 'narrative'

Conflicts:
	src/mainwindow.c

1 files changed, 157 insertions, 0 deletions

diff --git a/src/sc_editor.h b/src/sc_editor.h
new file mode 100644
index 0000000..8bfcd59
--- /dev/null
+++ b/src/sc_editor.h
@@ -0,0 +1,157 @@
+/*
+ * sc_editor.h
+ *
+ * Copyright © 2014 Thomas White <taw@bitwiz.org.uk>
+ *
+ * This file is part of Colloquium.
+ *
+ * Colloquium is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef SC_EDITOR_H
+#define SC_EDITOR_H
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <gtk/gtk.h>
+#include <glib-object.h>
+
+#include "frame.h"
+
+struct presentation;
+
+
+#define SC_TYPE_EDITOR            (sc_editor_get_type())
+
+#define SC_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), \
+                                   SC_TYPE_EDITOR, SCEditor))
+
+#define SC_IS_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+                                   SC_TYPE_EDITOR))
+
+#define SC_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((obj), \
+                                   SC_TYPE_EDITOR, SCEditorClass))
+
+#define SC_IS_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((obj), \
+                                   SC_TYPE_EDITOR))
+
+#define SC_EDITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), \
+                                   SC_TYPE_EDITOR, SCEditorClass))
+
+enum drag_reason
+{
+	DRAG_REASON_NONE,
+	DRAG_REASON_CREATE,
+	DRAG_REASON_IMPORT,
+	DRAG_REASON_RESIZE,
+	DRAG_REASON_MOVE
+};
+
+
+enum corner
+{
+	CORNER_NONE,
+	CORNER_TL,
+	CORNER_TR,
+	CORNER_BL,
+	CORNER_BR
+};
+
+
+enum drag_status
+{
+	DRAG_STATUS_NONE,
+	DRAG_STATUS_COULD_DRAG,
+	DRAG_STATUS_DRAGGING,
+};
+
+
+struct _sceditor
+{
+	GtkDrawingArea       parent_instance;
+
+	/*< private >*/
+	GtkIMContext        *im_context;
+	int                  w;   /* Surface size in pixels */
+	int                  h;
+	double               log_w;  /* Size of surface in "SC units" */
+	double               log_h;
+	SCBlock             *scblocks;
+	cairo_surface_t     *surface;
+	SCBlock             *stylesheet;
+	ImageStore          *is;
+
+	/* Pointers to the frame currently being edited */
+	struct frame        *selection;
+
+	PangoContext        *pc;
+
+	/* Location of the cursor */
+	struct frame        *cursor_frame;
+	int                  cursor_line;
+	int                  cursor_box;
+	int                  cursor_pos;  /* characters into box */
+
+	/* Border surrounding actual slide within drawingarea */
+	double               border_offs_x;
+	double               border_offs_y;
+	double               bgcol[3];
+
+	/* Rubber band boxes and related stuff */
+	double               start_corner_x;
+	double               start_corner_y;
+	double               drag_corner_x;
+	double               drag_corner_y;
+	double               diagonal_length;
+	double               box_x;
+	double               box_y;
+	double               box_width;
+	double               box_height;
+	enum drag_reason     drag_reason;
+	enum drag_status     drag_status;
+	enum corner          drag_corner;
+
+	/* Stuff to do with drag and drop import of "content" */
+	int                  drag_preview_pending;
+	int                  have_drag_data;
+	int                  drag_highlight;
+	double               import_width;
+	double               import_height;
+	int                  import_acceptable;
+
+	/* Stuff that doesn't really belong here */
+	int                  slidenum;
+};
+
+struct _sceditorclass
+{
+	GtkDrawingAreaClass parent_class;
+};
+
+typedef struct _sceditor SCEditor;
+typedef struct _sceditorclass SCEditorClass;
+
+extern void sc_editor_set_scblock(SCEditor *e, SCBlock *scblocks);
+extern GtkWidget *sc_editor_get_widget(SCEditor *e);
+extern SCEditor *sc_editor_new(SCBlock *scblocks, SCBlock *stylesheet);
+extern void sc_editor_set_size(SCEditor *e, int w, int h);
+extern void sc_editor_set_logical_size(SCEditor *e, double w, double h);
+extern void sc_editor_redraw(SCEditor *e);
+extern void sc_editor_set_background(SCEditor *e, double r, double g, double b);
+extern void sc_editor_set_slidenum(SCEditor *e, int slidenum);
+
+#endif	/* SC_EDITOR_H */