Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Introduce CogViewport, add support in the Wayland plug-in and example program #644

Merged
merged 4 commits into from
Nov 3, 2023
Merged

Introduce CogViewport, add support in the Wayland plug-in and example program #644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4562f3b
core: Introduce the CogViewport container
aperezdc Oct 26, 2023
a5aeda9
shell: Replace the single view with a CogViewport
aperezdc Oct 30, 2023
ded1a97
examples: Add "viewport" example program
aperezdc May 16, 2023
5ebdb45
wl: Support multiple web views
aperezdc Nov 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 65 additions & 23 deletions core/cog-shell.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include "cog-shell.h"

#include "cog-view.h"
#include "cog-viewport.h"

/**
* CogShell:
Expand All @@ -29,7 +30,8 @@ typedef struct {

WebKitSettings *web_settings;
WebKitWebContext *web_context;
WebKitWebView *web_view;
CogViewport *viewport;

#if !COG_USE_WPE2
WebKitWebsiteDataManager *web_data_manager;
#endif
Expand All @@ -52,6 +54,7 @@ enum {
PROP_WEB_SETTINGS,
PROP_WEB_CONTEXT,
PROP_WEB_VIEW,
PROP_VIEWPORT,
PROP_CONFIG_FILE,
PROP_DEVICE_SCALE_FACTOR,
PROP_AUTOMATED,
Expand Down Expand Up @@ -137,7 +140,8 @@ request_handler_map_entry_register (const char *scheme,
static WebKitWebView *
cog_shell_create_web_view_for_automation(WebKitAutomationSession *session, CogShell *shell)
{
return PRIV(shell)->web_view;
/* FIXME: Actually create a fresh web view. */
return cog_shell_get_web_view(shell);
}

static void
Expand All @@ -150,12 +154,6 @@ cog_shell_automation_started_callback(WebKitWebContext *context, WebKitAutomatio
g_signal_connect(session, "create-web-view", G_CALLBACK(cog_shell_create_web_view_for_automation), shell);
}

static void
cog_shell_web_view_close(WebKitWebView *view, CogShell *shell)
{
g_object_unref(view);
}

static void
cog_shell_startup_base(CogShell *shell)
{
Expand All @@ -167,19 +165,23 @@ cog_shell_startup_base(CogShell *shell)
priv->web_context);
}

g_signal_emit (shell, s_signals[CREATE_VIEW], 0, &priv->web_view);
g_object_notify_by_pspec (G_OBJECT (shell), s_properties[PROP_WEB_VIEW]);
g_autoptr(WebKitWebView) web_view = NULL;
g_signal_emit(shell, s_signals[CREATE_VIEW], 0, &web_view);

g_assert(COG_IS_VIEW(web_view));

/*
* The web context and settings being used by the web view must be
* the same that were pre-created by shell.
*/
g_assert (webkit_web_view_get_settings (priv->web_view) == priv->web_settings);
g_assert (webkit_web_view_get_context (priv->web_view) == priv->web_context);
g_assert(webkit_web_view_get_settings(web_view) == priv->web_settings);
g_assert(webkit_web_view_get_context(web_view) == priv->web_context);

webkit_web_context_set_automation_allowed(priv->web_context, priv->automated);
g_signal_connect(priv->web_context, "automation-started", G_CALLBACK(cog_shell_automation_started_callback), shell);
g_signal_connect(priv->web_view, "close", G_CALLBACK(cog_shell_web_view_close), shell);
g_signal_connect_swapped(web_view, "close", G_CALLBACK(cog_viewport_remove), priv->viewport);

cog_viewport_add(priv->viewport, COG_VIEW(web_view));
}

static void
Expand Down Expand Up @@ -207,6 +209,9 @@ cog_shell_get_property (GObject *object,
case PROP_WEB_VIEW:
g_value_set_object (value, cog_shell_get_web_view (shell));
break;
case PROP_VIEWPORT:
g_value_set_object(value, cog_shell_get_viewport(shell));
break;
#if COG_HAVE_MEM_PRESSURE
case PROP_WEB_MEMORY_SETTINGS:
g_value_set_boxed(value, PRIV(shell)->web_mem_settings);
Expand Down Expand Up @@ -273,6 +278,14 @@ cog_shell_set_property (GObject *object,
}
}

static void
cog_shell_viewport_visible_view_changed(CogViewport *viewport G_GNUC_UNUSED,
GParamSpec *pspec G_GNUC_UNUSED,
GObject *shell)
{
g_object_notify_by_pspec(shell, s_properties[PROP_WEB_VIEW]);
}

static void
cog_shell_constructed(GObject *object)
{
Expand Down Expand Up @@ -306,14 +319,18 @@ cog_shell_constructed(GObject *object)
"memory-pressure-settings", priv->web_mem_settings,
#endif
NULL);

priv->viewport = g_object_new(COG_TYPE_VIEWPORT, NULL);
g_signal_connect_object(priv->viewport, "notify::visible-view", G_CALLBACK(cog_shell_viewport_visible_view_changed),
object, 0);
}

static void
cog_shell_dispose(GObject *object)
{
CogShellPrivate *priv = PRIV(object);

g_clear_object(&priv->web_view);
g_clear_object(&priv->viewport);
g_clear_object(&priv->web_context);
g_clear_object(&priv->web_settings);
#if !COG_USE_WPE2
Expand Down Expand Up @@ -415,12 +432,21 @@ cog_shell_class_init (CogShellClass *klass)
* The [[email protected]] managed by this shell.
*/
s_properties[PROP_WEB_VIEW] =
g_param_spec_object ("web-view",
"Web View",
"The WebKitWebView used by the shell",
WEBKIT_TYPE_WEB_VIEW,
G_PARAM_READABLE |
G_PARAM_STATIC_STRINGS);
g_param_spec_object("web-view",
"Web View",
"The WebKitWebView used by the shell",
WEBKIT_TYPE_WEB_VIEW,
G_PARAM_READABLE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);

/**
* CogShell:viewport: (attributes org.gtk.Property.get=cog_shell_get_viewport) (getter get_viewport):
*
* The [class@Viewport] managed by this shell.
*
* Since: 0.20
*/
s_properties[PROP_VIEWPORT] =
g_param_spec_object("viewport", NULL, NULL, COG_TYPE_VIEWPORT, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);

/**
* CogShell:config-file: (attributes org.gtk.Property.get=cog_shell_get_config_file):
Expand Down Expand Up @@ -551,15 +577,15 @@ cog_shell_get_web_settings (CogShell *shell)
/**
* cog_shell_get_web_view:
*
* Obtains the [[email protected]] for this shell.
* Obtains the visible [[email protected]] for this shell.
*
* Returns: A web view.
* Returns: (nullable): A web view.
*/
WebKitWebView*
cog_shell_get_web_view (CogShell *shell)
{
g_return_val_if_fail (COG_IS_SHELL (shell), NULL);
return PRIV (shell)->web_view;
return WEBKIT_WEB_VIEW(cog_viewport_get_visible_view(PRIV(shell)->viewport));
}

/**
Expand Down Expand Up @@ -676,3 +702,19 @@ cog_shell_shutdown (CogShell *shell)
CogShellClass *klass = COG_SHELL_GET_CLASS (shell);
(*klass->shutdown) (shell);
}

/**
* cog_shell_get_viewport:
*
* Gets the viewport managed by the shell.
*
* Returns: (transfer none): A viewport.
*
* Since: 0.20
*/
CogViewport *
cog_shell_get_viewport(CogShell *shell)
{
g_return_val_if_fail(COG_IS_SHELL(shell), NULL);
return PRIV(shell)->viewport;
}
5 changes: 4 additions & 1 deletion core/cog-shell.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,12 @@

#include "cog-export.h"
#include "cog-request-handler.h"
#include "cog-webkit-utils.h"

G_BEGIN_DECLS

typedef struct _CogViewport CogViewport;
typedef struct _WebKitWebView WebKitWebView;

#define COG_TYPE_SHELL (cog_shell_get_type ())

COG_API
Expand All @@ -43,5 +45,6 @@ COG_API void cog_shell_set_request_handler(CogShell *shell, const char *scheme,

COG_API void cog_shell_startup(CogShell *shell);
COG_API void cog_shell_shutdown(CogShell *shell);
COG_API CogViewport *cog_shell_get_viewport(CogShell *shell);

G_END_DECLS
Loading