summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McDermott <pj@pehjota.net>2017-10-17 22:03:25 (EDT)
committer Patrick McDermott <pj@pehjota.net>2017-10-17 22:03:25 (EDT)
commitadaaff3dcc7c49a4e2c0d983a7dd5ee436a403a8 (patch)
treeb6489ecb45b9c754bb561d8d7217077c4dfa0a74
parent8cfd7bff52ffab2b97899756db08200c2b5c4fe4 (diff)
downloadmarquee-adaaff3dcc7c49a4e2c0d983a7dd5ee436a403a8.zip
marquee-adaaff3dcc7c49a4e2c0d983a7dd5ee436a403a8.tar.gz
marquee-adaaff3dcc7c49a4e2c0d983a7dd5ee436a403a8.tar.bz2
[WIP] MqTabPage: New class
-rw-r--r--src/local.mk1
-rw-r--r--src/tab-page.c307
-rw-r--r--src/tab-page.h117
3 files changed, 425 insertions, 0 deletions
diff --git a/src/local.mk b/src/local.mk
index 64d12ab..2ce9da7 100644
--- a/src/local.mk
+++ b/src/local.mk
@@ -7,6 +7,7 @@ marquee_SOURCES += \
%reldir%/main.c \
%reldir%/tab.c \
%reldir%/tab-label.c \
+ %reldir%/tab-page.c \
%reldir%/web-settings.c \
%reldir%/web-view.c \
%reldir%/window.c
diff --git a/src/tab-page.c b/src/tab-page.c
new file mode 100644
index 0000000..eecfabd
--- /dev/null
+++ b/src/tab-page.c
@@ -0,0 +1,307 @@
+/*
+ * Tab page
+ *
+ * Copyright (C) 2017 Patrick McDermott
+ *
+ * This file is part of Marquee.
+ *
+ * Marquee 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.
+ *
+ * Marquee 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 Marquee. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "tab-page.h"
+
+#include <stdarg.h>
+#include <stdlib.h>
+
+#include <glib.h>
+#include <gtk/gtk.h>
+#include <webkit2/webkit2.h>
+
+#include "application.h"
+#include "tab-label.h"
+#include "toolbars/find-toolbar.h"
+#include "toolbars/navigation-toolbar.h"
+#include "web-view.h"
+#include "window.h"
+
+typedef enum {
+ CREATE_NONE,
+ CREATE_ROOT,
+ CREATE_SIBLING,
+ CREATE_CHILD,
+ N_CREATE_TYPES
+} CreateType;
+
+struct _MqTabPage {
+ GtkBox parent_instance;
+ CreateType create_type;
+ MqWindow *window;
+ const gchar *uri;
+ MqTabPage *source;
+ MqTabPage *root;
+ MqTabPage *parent;
+ MqTabPage *prev;
+ MqTabPage *next;
+ MqTabPage *first_child;
+ MqTabPage *last_child;
+ guint position;
+ guint tree_size;
+ MqApplication *application;
+ GtkWidget *container;
+ GtkWidget *tab;
+ const gchar *title;
+ WebKitWebView *web_view;
+};
+
+enum {
+ PROP_CREATE_TYPE = 1,
+ PROP_WINDOW,
+ PROP_URI,
+ PROP_SOURCE,
+ N_PROPERTIES
+};
+
+static GParamSpec *obj_properties[N_PROPERTIES] = {NULL,};
+
+struct _MqTabPageClass {
+ GtkBoxClass parent_class;
+};
+
+G_DEFINE_TYPE(MqTabPage, mq_tab_page, GTK_TYPE_BOX)
+
+static void
+title_cb(WebKitWebView *web_view, GParamSpec G_GNUC_UNUSED *param_spec,
+ MqTabPage *tab_page)
+{
+ tab_page->title = webkit_web_view_get_title(web_view);
+ mq_window_update_tab_title(tab_page->window, tab_page->position,
+ tab_page->title);
+}
+
+static void
+init_root(MqTabPage *tab_page)
+{
+ tab_page->root = tab_page;
+ tab_page->parent = NULL;
+ tab_page->prev = NULL;
+ tab_page->next = NULL;
+ tab_page->first_child = tab_page->last_child = NULL;
+ tab_page->position = 0;
+ tab_page->tree_size = 1;
+}
+
+static void
+init_non_root(MqTabPage *tab_page)
+{
+ GtkWidget *navigation_toolbar;
+ GtkWidget *find_toolbar;
+
+ tab_page->parent = NULL;
+ tab_page->prev = NULL;
+ tab_page->next = NULL;
+ tab_page->first_child = tab_page->last_child = NULL;
+ tab_page->tree_size = 1;
+ tab_page->title = "New tab";
+
+ tab_page->window = tab_page->source->window;
+ tab_page->application = mq_window_get_application(tab_page->window);
+
+ tab_page->web_view = WEBKIT_WEB_VIEW(mq_web_view_new(tab_page,
+ tab_page->uri));
+ g_signal_connect(tab_page->web_view, "notify::title",
+ G_CALLBACK(title_cb), tab_page);
+
+ tab_page->tab = mq_tab_label_new(tab_page,
+ MQ_WEB_VIEW(tab_page->web_view));
+
+ find_toolbar = mq_find_toolbar_new(MQ_WEB_VIEW(tab_page->web_view));
+
+ /* FIXME: Replace tab_page->window->config */
+ navigation_toolbar = mq_navigation_toolbar_new(tab_page->window->config,
+ tab_page, MQ_FIND_TOOLBAR(find_toolbar),
+ MQ_WEB_VIEW(tab_page->web_view), tab_page->uri);
+
+ gtk_box_pack_start(GTK_BOX(tab_page),
+ navigation_toolbar, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(tab_page),
+ find_toolbar, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(tab_page),
+ GTK_WIDGET(tab_page->web_view), TRUE, TRUE, 0);
+}
+
+static void
+constructed(GObject *object)
+{
+ MqTabPage *tab_page;
+
+ if (G_OBJECT_CLASS(mq_tab_page_parent_class)->constructed) {
+ G_OBJECT_CLASS(mq_tab_page_parent_class)->constructed(object);
+ }
+
+ tab_page = MQ_TAB_PAGE(object);
+
+ switch (tab_page->create_type) {
+ case CREATE_ROOT:
+ init_root(tab_page);
+ break;
+ case CREATE_SIBLING:
+ init_non_root(tab_page);
+// append_sibling(tab_page);
+ break;
+ case CREATE_CHILD:
+ init_non_root(tab_page);
+// append_child(tab_page);
+ break;
+ case CREATE_NONE:
+ case N_CREATE_TYPES:
+ g_assert_not_reached();
+ break;
+ }
+}
+
+static void
+get_property(GObject *object, guint property_id, GValue *value,
+ GParamSpec *param_spec)
+{
+ MqTabPage *tab_page;
+
+ tab_page = MQ_TAB_PAGE(object);
+
+ switch (property_id) {
+ case PROP_CREATE_TYPE:
+ g_value_set_uint(value, tab_page->create_type);
+ break;
+ case PROP_WINDOW:
+ g_value_set_pointer(value, tab_page->window);
+ break;
+ case PROP_URI:
+ g_value_set_string(value, tab_page->uri);
+ break;
+ case PROP_SOURCE:
+ g_value_set_object(value, tab_page->source);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id,
+ param_spec);
+ break;
+ }
+}
+
+static void
+set_property(GObject *object, guint property_id, const GValue *value,
+ GParamSpec *param_spec)
+{
+ MqTabPage *tab_page;
+
+ tab_page = MQ_TAB_PAGE(object);
+
+ switch (property_id) {
+ case PROP_CREATE_TYPE:
+ tab_page->create_type = g_value_get_uint(value);
+ break;
+ case PROP_WINDOW:
+ tab_page->window = g_value_get_pointer(value);
+ break;
+ case PROP_URI:
+ tab_page->uri = g_value_get_string(value);
+ break;
+ case PROP_SOURCE:
+ tab_page->source = g_value_get_object(value);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id,
+ param_spec);
+ break;
+ }
+}
+
+static void
+mq_tab_page_class_init(MqTabPageClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS(klass);
+
+ object_class->constructed = constructed;
+ object_class->get_property = get_property;
+ object_class->set_property = set_property;
+
+ obj_properties[PROP_CREATE_TYPE] = g_param_spec_uint(
+ "create-type",
+ "Type",
+ "The type of tab page to create (root, sibling, or child)",
+ CREATE_NONE, N_CREATE_TYPES, CREATE_NONE,
+ G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY |
+ G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB);
+ obj_properties[PROP_WINDOW] = g_param_spec_pointer(
+ "window",
+ "MqWindow",
+ "The parent MqWindow instance",
+ G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY |
+ G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB);
+ obj_properties[PROP_URI] = g_param_spec_string(
+ "uri",
+ "URI",
+ "The URI to load",
+ "",
+ G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY |
+ G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB);
+ obj_properties[PROP_SOURCE] = g_param_spec_object(
+ "source",
+ "Source MqTabPage",
+ "The source (previous sibling or parent) MqTabPage instance",
+ MQ_TYPE_TAB_PAGE,
+ G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY |
+ G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB);
+ g_object_class_install_properties(object_class, N_PROPERTIES,
+ obj_properties);
+}
+
+static void
+mq_tab_page_init(MqTabPage G_GNUC_UNUSED *tab_page)
+{
+}
+
+MqTabPage *
+mq_tab_page_new(const gchar *uri, MqTabPage *source)
+{
+ return g_object_new(MQ_TYPE_TAB_PAGE,
+ "orientation", GTK_ORIENTATION_VERTICAL,
+ "spacing", 0,
+ "create-type", CREATE_SIBLING,
+ "uri", uri,
+ "source", source,
+ NULL);
+}
+
+MqTabPage *
+mq_tab_page_new_relative(const gchar *uri, MqTabPage *source)
+{
+ return g_object_new(MQ_TYPE_TAB_PAGE,
+ "orientation", GTK_ORIENTATION_VERTICAL,
+ "spacing", 0,
+ "create-type", CREATE_CHILD,
+ "uri", uri,
+ "source", source,
+ NULL);
+}
+
+MqTabPage *
+mq_tab_page_new_root(MqWindow *window)
+{
+ return g_object_new(MQ_TYPE_TAB_PAGE,
+ "orientation", GTK_ORIENTATION_VERTICAL,
+ "spacing", 0,
+ "create-type", CREATE_ROOT,
+ "window", window, /* TODO: Use gtk_widget_get_parent()? */
+ NULL);
+}
diff --git a/src/tab-page.h b/src/tab-page.h
new file mode 100644
index 0000000..0078fc9
--- /dev/null
+++ b/src/tab-page.h
@@ -0,0 +1,117 @@
+/*
+ * Tab page
+ *
+ * Copyright (C) 2017 Patrick McDermott
+ *
+ * This file is part of Marquee.
+ *
+ * Marquee 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.
+ *
+ * Marquee 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 Marquee. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+typedef struct _MqTabPage MqTabPage;
+typedef struct _MqTabPageClass MqTabPageClass;
+
+#ifndef MQ_TAB_PAGE_H
+#define MQ_TAB_PAGE_H
+
+#include <stdarg.h>
+
+#include <glib.h>
+#include <gtk/gtk.h>
+#include <webkit2/webkit2.h>
+
+#include "application.h"
+#include "window.h"
+
+G_BEGIN_DECLS
+
+#define MQ_TYPE_TAB_PAGE (mq_tab_page_get_type())
+#define MQ_TAB_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \
+ MQ_TYPE_TAB_PAGE, MqTabPage))
+#define MQ_IS_TAB_PAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+ MQ_TYPE_TAB_PAGE))
+#define MQ_TAB_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), \
+ MQ_TYPE_TAB_PAGE, MqTabPageClass))
+#define MQ_IS_TAB_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), \
+ MQ_TYPE_TAB_PAGE))
+#define MQ_TAB_PAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), \
+ MQ_TYPE_TAB_PAGE, MqTabPageClass))
+
+GType
+mq_tab_page_get_type(void);
+
+MqTabPage *
+mq_tab_page_new(const gchar *uri, MqTabPage *source);
+
+MqTabPage *
+mq_tab_page_new_relative(const gchar *uri, MqTabPage *source);
+
+MqTabPage *
+mq_tab_page_new_root(MqWindow *window);
+
+void
+mq_tab_page_quit(MqTabPage *tab_page);
+
+MqApplication *
+mq_tab_page_get_application(MqTabPage *tab_page);
+
+MqWindow *
+mq_tab_page_get_window(MqTabPage *tab_page);
+
+void
+mq_tab_page_update_positions(MqTabPage *node, gint step);
+
+void
+mq_tab_page_update_position(MqTabPage *tab_page, guint position);
+
+guint
+mq_tab_page_get_position(MqTabPage *tab_page);
+
+guint
+mq_tab_page_get_tree_size(MqTabPage *tab_page);
+
+const gchar *
+mq_tab_page_get_title(MqTabPage *tab_page);
+
+MqTabPage *
+mq_tab_page_seek(MqTabPage *node, guint position);
+
+void
+mq_tab_page_foreach(MqTabPage *node, void (*cb)(MqTabPage *node, va_list ap),
+ ...);
+
+MqTabPage *
+mq_tab_page_root(MqTabPage *node);
+
+MqTabPage *
+mq_tab_page_previous(MqTabPage *node);
+
+MqTabPage *
+mq_tab_page_next(MqTabPage *node);
+
+MqTabPage *
+mq_tab_page_first_child(MqTabPage *node);
+
+void
+mq_tab_page_scroll_tab_labels(MqTabPage *node);
+
+void
+mq_tab_page_begin_scrolling_tab_labels(MqTabPage *node);
+
+void
+mq_tab_page_end_scrolling_tab_labels(MqTabPage *node);
+
+G_END_DECLS
+
+#endif /* MQ_TAB_PAGE_H */