fix of indexes
This commit is contained in:
fenze
parent
78a46bd5b5
commit
552ee15c5f
1
rose.c
1
rose.c
|
|
@ -8,7 +8,6 @@ Display *glob_dpy; /* defined in rose.h */
|
|||
static guint glob_xid;
|
||||
static Atom glob_atoms[AtomLast];
|
||||
|
||||
|
||||
void setatom(int a, const char *v)
|
||||
{
|
||||
XChangeProperty(glob_dpy, glob_xid,
|
||||
|
|
|
|||
1
rose.h
1
rose.h
|
|
@ -1,7 +1,6 @@
|
|||
#pragma once
|
||||
|
||||
#include "window.h"
|
||||
#include "webview.h"
|
||||
#include "config.h"
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
|
|
|
|||
209
webview.c
209
webview.c
|
|
@ -1,209 +0,0 @@
|
|||
#include "webview.h"
|
||||
|
||||
struct _RoseWebView {
|
||||
WebKitWebView parent_instance;
|
||||
|
||||
GCancellable *cancellable;
|
||||
RoseWebViewNavigationFlags navigation;
|
||||
|
||||
char *address;
|
||||
};
|
||||
|
||||
enum {
|
||||
LAST_PROP,
|
||||
PROP_NAVIGATION,
|
||||
PROP_ADDRESS
|
||||
};
|
||||
|
||||
static GParamSpec *obj_properties[LAST_PROP];
|
||||
|
||||
G_DEFINE_TYPE(RoseWebView, rose_webview, WEBKIT_TYPE_WEB_VIEW)
|
||||
|
||||
static void update_navigation_flags(RoseWebView *webview)
|
||||
{
|
||||
guint flags = 0;
|
||||
if (webkit_web_view_can_go_back(WEBKIT_WEB_VIEW(webview)))
|
||||
flags |= ROSE_WEBVIEW_NAV_BACK;
|
||||
|
||||
if (webkit_web_view_can_go_forward(WEBKIT_WEB_VIEW(webview)))
|
||||
flags |= ROSE_WEBVIEW_FORWARD;
|
||||
|
||||
if (webview->navigation != (RoseWebViewNavigationFlags) flags) {
|
||||
webview->navigation = (RoseWebViewNavigationFlags) flags;
|
||||
g_object_notify_by_pspec(G_OBJECT(webview), obj_properties[PROP_NAVIGATION]);
|
||||
}
|
||||
}
|
||||
|
||||
static void rose_webview_constructed(GObject *object)
|
||||
{
|
||||
RoseWebView *webview = ROSE_WEBVIEW(object);
|
||||
g_auto(GStrv) cors_allowlist = NULL;
|
||||
GtkStyleContext *context;
|
||||
GdkRGBA color;
|
||||
|
||||
G_OBJECT_CLASS(rose_webview_parent_class)->constructed (object);
|
||||
|
||||
g_signal_connect_swapped(webkit_web_view_get_back_forward_list(WEBKIT_WEB_VIEW(webview)),
|
||||
"changed", G_CALLBACK(update_navigation_flags), webview);
|
||||
|
||||
context = gtk_widget_get_style_context(GTK_WIDGET(webview));
|
||||
|
||||
if (gtk_style_context_lookup_color(context, "theme_base_color", &color))
|
||||
webkit_web_view_set_background_color(WEBKIT_WEB_VIEW(webview), &color);
|
||||
|
||||
cors_allowlist = g_new(char*, 2);
|
||||
cors_allowlist[0] = g_strdup("rose-resource://*/*");
|
||||
cors_allowlist[1] = NULL;
|
||||
|
||||
webkit_web_view_set_cors_allowlist(WEBKIT_WEB_VIEW(webview), (const char* const *) cors_allowlist);
|
||||
}
|
||||
|
||||
static void rose_webview_dispose(GObject *object)
|
||||
{
|
||||
RoseWebView *webview = ROSE_WEBVIEW(object);
|
||||
|
||||
if (webview->cancellable) {
|
||||
g_cancellable_cancel(webview->cancellable);
|
||||
g_clear_object(&webview->cancellable);
|
||||
}
|
||||
|
||||
G_OBJECT_CLASS(rose_webview_parent_class)->dispose (object);
|
||||
}
|
||||
|
||||
static void rose_webview_finalize(GObject *object)
|
||||
{
|
||||
RoseWebView *view = ROSE_WEBVIEW(object);
|
||||
|
||||
g_free(view->address);
|
||||
|
||||
G_OBJECT_CLASS(rose_webview_parent_class)->finalize (object);
|
||||
}
|
||||
|
||||
static void rose_webview_class_init(RoseWebViewClass *class)
|
||||
{
|
||||
GObjectClass *object_class = G_OBJECT_CLASS(class);
|
||||
|
||||
object_class->dispose = rose_webview_dispose;
|
||||
object_class->finalize = rose_webview_finalize;
|
||||
object_class->constructed = rose_webview_constructed;
|
||||
|
||||
obj_properties[PROP_ADDRESS] =
|
||||
g_param_spec_string ("address",
|
||||
"Address",
|
||||
"address",
|
||||
"",
|
||||
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
|
||||
}
|
||||
|
||||
static void rose_webview_init(RoseWebView *webview)
|
||||
{
|
||||
gtk_widget_set_overflow(GTK_WIDGET(webview), GTK_OVERFLOW_HIDDEN);
|
||||
}
|
||||
|
||||
void rose_webview_load_url(WebKitWebView *webview, const char *url)
|
||||
{
|
||||
webkit_web_view_load_uri(WEBKIT_WEB_VIEW(webview), url);
|
||||
setatom(AtomUri, url);
|
||||
}
|
||||
|
||||
void rose_load_changed_callback(WebKitWebView *webview,
|
||||
WebKitLoadEvent event)
|
||||
{
|
||||
if (event == WEBKIT_LOAD_FINISHED) {
|
||||
const char *uri = webkit_web_view_get_uri(webview);
|
||||
char *cookiefile = calloc(1, sizeof(char) * (strlen(options[CACHE]) + 32) + 1);
|
||||
sprintf(cookiefile, "%s/history", options[CACHE]);
|
||||
|
||||
FILE *cookie = fopen(cookiefile, "a");
|
||||
|
||||
fprintf(cookie, "%s\n", uri);
|
||||
fclose(cookie);
|
||||
free(cookiefile);
|
||||
}
|
||||
}
|
||||
|
||||
static void rose_download(const char* uri)
|
||||
{
|
||||
char *cmd = calloc(1, sizeof(char) * strlen(uri) + 1);
|
||||
char *url = calloc(1, sizeof(char) * strlen(uri) + 1);
|
||||
|
||||
strcpy(url, uri);
|
||||
|
||||
int id = fork();
|
||||
if (id == 0) {
|
||||
setsid();
|
||||
char *argv[] = { "/bin/sh", "-c", "st -e /bin/sh -c", "\"aria2c \\", cmd, "\"", NULL };
|
||||
execvp("/bin/sh", argv);
|
||||
perror(" failed");
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
static void rose_response_reciver(WebKitDownload *download)
|
||||
{
|
||||
const char *uri = webkit_uri_response_get_uri(webkit_download_get_response(download));
|
||||
|
||||
rose_download(uri);
|
||||
}
|
||||
|
||||
static void rose_download_callback(WebKitDownload *download)
|
||||
{
|
||||
g_signal_connect(G_OBJECT(download), "notify::response",
|
||||
G_CALLBACK(rose_response_reciver), NULL);
|
||||
}
|
||||
|
||||
GtkWidget* rose_webview_new()
|
||||
{
|
||||
char cookiefile[128];
|
||||
WebKitCookieManager *cookiemanager;
|
||||
WebKitUserContentManager *contentmanager;
|
||||
|
||||
WebKitSettings *settings = webkit_settings_new_with_settings(
|
||||
"auto-load-images", TRUE,
|
||||
"enable-back-forward-navigation-gestures", TRUE,
|
||||
"enable-developer-extras", TRUE,
|
||||
"enable-media-stream", TRUE,
|
||||
"enable-plugins", FALSE,
|
||||
"enable-dns-prefetching", TRUE,
|
||||
"enable-smooth-scrolling", TRUE,
|
||||
"media-content-types-requiring-hardware-support", "video:/mp4;codecs=\"H.264-encoded\"",
|
||||
"hardware-acceleration-policy", WEBKIT_HARDWARE_ACCELERATION_POLICY_ALWAYS,
|
||||
"javascript-can-access-clipboard", TRUE, NULL);
|
||||
|
||||
if (!options[CACHE]) {
|
||||
const char *HOME = getenv("HOME");
|
||||
char *buf = calloc(1, sizeof(char) * (strlen(HOME) + 32) + 1);
|
||||
sprintf(buf, "%s/.cache/rose/", HOME);
|
||||
options[CACHE] = buf;
|
||||
}
|
||||
|
||||
WebKitWebContext *context = webkit_web_context_new_with_website_data_manager(
|
||||
webkit_website_data_manager_new(
|
||||
"base-cache-directory", options[CACHE],
|
||||
"base-data-directory", options[CACHE],
|
||||
NULL));
|
||||
|
||||
webkit_settings_set_user_agent_with_application_details(
|
||||
settings, "Mini", "0.1");
|
||||
|
||||
webkit_web_context_set_cache_model(context, WEBKIT_CACHE_MODEL_WEB_BROWSER);
|
||||
contentmanager = webkit_user_content_manager_new();
|
||||
cookiemanager = webkit_web_context_get_cookie_manager(context);
|
||||
|
||||
strcpy(cookiefile, options[CACHE]);
|
||||
strcat(cookiefile, "cookies");
|
||||
|
||||
webkit_cookie_manager_set_persistent_storage(cookiemanager,
|
||||
cookiefile, WEBKIT_COOKIE_PERSISTENT_STORAGE_SQLITE);
|
||||
|
||||
webkit_cookie_manager_set_accept_policy(cookiemanager, WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS);
|
||||
|
||||
g_signal_connect(G_OBJECT(context), "download-started",
|
||||
G_CALLBACK(rose_download_callback), NULL);
|
||||
|
||||
return g_object_new(
|
||||
WEBKIT_TYPE_WEB_VIEW,
|
||||
"settings", settings,
|
||||
"user-content-manager", contentmanager,
|
||||
"web-context", context, NULL);
|
||||
}
|
||||
29
webview.h
29
webview.h
|
|
@ -1,29 +0,0 @@
|
|||
#pragma once
|
||||
|
||||
#include "rose.h"
|
||||
|
||||
#include <webkit2/webkit2.h>
|
||||
#include <gdk/gdk.h>
|
||||
|
||||
#define ROSE_TYPE_WEBVIEW rose_webview_get_type()
|
||||
|
||||
G_DECLARE_FINAL_TYPE(RoseWebView, rose_webview, ROSE, WEBVIEW, WebKitWebView)
|
||||
|
||||
typedef enum
|
||||
{
|
||||
ROSE_WEBVIEW_NAV_BACK = 1 << 0,
|
||||
ROSE_WEBVIEW_FORWARD = 1 << 1
|
||||
} RoseWebViewNavigationFlags;
|
||||
|
||||
GtkWidget* rose_webview_new();
|
||||
void rose_webview_load_url(WebKitWebView *webview, const char *url);
|
||||
|
||||
RoseWebViewNavigationFlags rose_webview_get_navigation_flags(RoseWebView *webview);
|
||||
|
||||
void rose_webview_go_back(RoseWebView *window);
|
||||
void rose_webview_go_forward(RoseWebView *window);
|
||||
|
||||
void rose_load_changed_callback(WebKitWebView *webview,
|
||||
WebKitLoadEvent event);
|
||||
|
||||
const char* rose_webview_get_address(RoseWebView *webview);
|
||||
125
window.c
125
window.c
|
|
@ -22,7 +22,7 @@ enum {
|
|||
};
|
||||
|
||||
static float zoom = 1.0;
|
||||
static unsigned tabid = 0;
|
||||
static int tabid;
|
||||
|
||||
G_DEFINE_TYPE(RoseWindow, rose_window, GTK_TYPE_APPLICATION_WINDOW)
|
||||
|
||||
|
|
@ -39,50 +39,57 @@ static void read_clipboard(GObject *object,
|
|||
|
||||
static void new_tab(RoseWindow *window, unsigned id)
|
||||
{
|
||||
window->webview[id] = WEBKIT_WEB_VIEW(webkit_web_view_new());
|
||||
/* window->webview[id] = WEBKIT_WEB_VIEW(rose_webview_new()); */
|
||||
|
||||
if (!options[HOMEPAGE])
|
||||
options[HOMEPAGE] = "https://duckduckgo.com";
|
||||
/* if (!options[HOMEPAGE]) */
|
||||
/* options[HOMEPAGE] = "https://duckduckgo.com"; */
|
||||
/* */
|
||||
/* rose_webview_load_url(WEBKIT_WEB_VIEW(window->webview[id]), */
|
||||
/* options[HOMEPAGE]); */
|
||||
|
||||
webkit_web_view_load_uri(WEBKIT_WEB_VIEW(window->webview[id]),
|
||||
options[HOMEPAGE]);
|
||||
/* gtk_window_set_child( */
|
||||
/* GTK_WINDOW( */
|
||||
/* gtk_widget_get_root( */
|
||||
/* GTK_WIDGET( */
|
||||
/* window->webview[tabid++] */
|
||||
/* ) */
|
||||
/* ) */
|
||||
/* ), */
|
||||
/* GTK_WIDGET(window->webview[id]) */
|
||||
/* ); */
|
||||
|
||||
/* gtk_widget_hide(GTK_WIDGET(window->webview[id])); */
|
||||
|
||||
gtk_window_set_child(
|
||||
GTK_WINDOW(
|
||||
gtk_widget_get_root(
|
||||
GTK_WIDGET(
|
||||
window->webview[tabid++]
|
||||
)
|
||||
)
|
||||
),
|
||||
GTK_WIDGET(window->webview[id])
|
||||
);
|
||||
|
||||
gtk_widget_show(GTK_WIDGET(window->webview[tabid]));
|
||||
/* gtk_widget_show(GTK_WIDGET(window->webview[id])); */
|
||||
}
|
||||
|
||||
static void goto_tab(RoseWindow *window, unsigned id)
|
||||
{
|
||||
if (!window->webview[id]) {
|
||||
new_tab(window, id);
|
||||
return;
|
||||
}
|
||||
/* if (window->webview[id]) { */
|
||||
/* puts("new tab"); */
|
||||
/* new_tab(window, id); */
|
||||
/* return; */
|
||||
/* } */
|
||||
|
||||
gtk_window_set_child(
|
||||
GTK_WINDOW(
|
||||
gtk_widget_get_root(
|
||||
GTK_WIDGET(
|
||||
window->webview[tabid]
|
||||
)
|
||||
)
|
||||
),
|
||||
GTK_WIDGET(window->webview[id])
|
||||
);
|
||||
/* printf("%u -> %u\n", tabid, id); */
|
||||
|
||||
int len = LENGTH(window->webview);
|
||||
while (len--)
|
||||
printf("%i", WEBKIT_IS_WEB_VIEW(window->webview[len]));
|
||||
|
||||
puts("");
|
||||
/* new_tab(window, id); */
|
||||
/* gtk_window_set_child( */
|
||||
/* GTK_WINDOW( */
|
||||
/* gtk_widget_get_root( */
|
||||
/* GTK_WIDGET( */
|
||||
/* window->webview[id] */
|
||||
/* ) */
|
||||
/* ) */
|
||||
/* ), */
|
||||
/* GTK_WIDGET(window->webview[id]) */
|
||||
/* ); */
|
||||
/* */
|
||||
/* gtk_widget_hide(GTK_WIDGET(window->webview[tabid])); */
|
||||
gtk_widget_show(GTK_WIDGET(window->webview[id]));
|
||||
/* gtk_widget_show(GTK_WIDGET(window->webview[id])); */
|
||||
}
|
||||
|
||||
static gboolean key_press_callback(RoseWindow *window,
|
||||
|
|
@ -139,7 +146,7 @@ static gboolean key_press_callback(RoseWindow *window,
|
|||
wait(&id);
|
||||
char *uri;
|
||||
if (strcmp((uri = (char*)getatom(AtomGo)), ""))
|
||||
rose_webview_load_url(window->webview[tabid], uri);
|
||||
webkit_web_view_load_uri(window->webview[tabid], uri);
|
||||
}
|
||||
} break;
|
||||
|
||||
|
|
@ -226,7 +233,7 @@ static gboolean key_press_callback(RoseWindow *window,
|
|||
wait(&id);
|
||||
char *uri;
|
||||
if (strcmp((uri = (char*)getatom(AtomGo)), ""))
|
||||
rose_webview_load_url(window->webview[tabid], uri);
|
||||
webkit_web_view_load_uri(window->webview[tabid], uri);
|
||||
}
|
||||
} break;
|
||||
|
||||
|
|
@ -241,21 +248,16 @@ static gboolean key_press_callback(RoseWindow *window,
|
|||
NULL, NULL, NULL);
|
||||
} break;
|
||||
|
||||
case tabnext: {
|
||||
if (tabid + 1 > 9)
|
||||
return GDK_EVENT_PROPAGATE;
|
||||
case tabnext:
|
||||
if (tabid != 8)
|
||||
goto_tab(window, ++tabid);
|
||||
break;
|
||||
|
||||
goto_tab(window, tabid + 1);
|
||||
printf("%i\n", tabid);
|
||||
} break;
|
||||
case tabprev:
|
||||
if (tabid != 0)
|
||||
goto_tab(window, --tabid);
|
||||
|
||||
case tabprev: {
|
||||
if (!tabid)
|
||||
return GDK_EVENT_PROPAGATE;
|
||||
|
||||
goto_tab(window, tabid - 1);
|
||||
printf("%i\n", tabid);
|
||||
} break;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -281,11 +283,15 @@ static void destroy()
|
|||
|
||||
guint rose_window_show(GtkApplication *app, RoseWindow *window, const char *url)
|
||||
{
|
||||
tabid = 0;
|
||||
memset(window, 0, sizeof(*window));
|
||||
|
||||
window->app = app;
|
||||
window->window = GTK_WINDOW(gtk_application_window_new(window->app));
|
||||
|
||||
/* gtk_application_set_menubar(window->app, FALSE); */
|
||||
window->webview[tabid] = WEBKIT_WEB_VIEW(rose_webview_new());
|
||||
window->webview[0] = WEBKIT_WEB_VIEW(webkit_web_view_new());
|
||||
|
||||
|
||||
g_signal_connect(G_OBJECT(window->window), "destroy",
|
||||
G_CALLBACK(destroy), NULL);
|
||||
|
|
@ -293,19 +299,20 @@ guint rose_window_show(GtkApplication *app, RoseWindow *window, const char *url)
|
|||
g_signal_connect(G_OBJECT(window->webview[tabid]), "web-process-terminated",
|
||||
G_CALLBACK(destroy), NULL);
|
||||
|
||||
g_signal_connect(G_OBJECT(window->webview[tabid]), "load-changed",
|
||||
G_CALLBACK(rose_load_changed_callback), window->webview[tabid]);
|
||||
/* g_signal_connect(G_OBJECT(window->webview[tabid]), "load-changed", */
|
||||
/* G_CALLBACK(rose_load_changed_callback), window->webview[0]); */
|
||||
|
||||
if (url) {
|
||||
rose_webview_load_url(WEBKIT_WEB_VIEW(window->webview[tabid]), url);
|
||||
setatom(AtomUri, url);
|
||||
}
|
||||
if (url)
|
||||
webkit_web_view_load_uri(WEBKIT_WEB_VIEW(window->webview[tabid]), url);
|
||||
|
||||
if (!(appearance[WIDTH] && appearance[HEIGHT])) {
|
||||
appearance[WIDTH] = 1280;
|
||||
appearance[HEIGHT] = 720;
|
||||
}
|
||||
|
||||
|
||||
puts("");
|
||||
|
||||
gtk_window_set_default_size(GTK_WINDOW(window->window), appearance[WIDTH], appearance[HEIGHT]);
|
||||
|
||||
gtk_window_set_child(GTK_WINDOW(window->window), GTK_WIDGET(window->webview[tabid]));
|
||||
|
|
@ -316,14 +323,14 @@ guint rose_window_show(GtkApplication *app, RoseWindow *window, const char *url)
|
|||
gtk_widget_add_controller(GTK_WIDGET(window->window), controller);
|
||||
|
||||
gtk_widget_show(GTK_WIDGET(window->window));
|
||||
gtk_widget_show(GTK_WIDGET(window->webview[tabid]));
|
||||
gtk_widget_show(GTK_WIDGET(window->webview[0]));
|
||||
|
||||
return 12;
|
||||
}
|
||||
|
||||
void rose_window_set_webview(RoseWindow *window, GtkWidget *webview)
|
||||
{
|
||||
window->webview[tabid] = WEBKIT_WEB_VIEW(webview);
|
||||
/* window->webview[tabid] = WEBKIT_WEB_VIEW(webview); */
|
||||
}
|
||||
|
||||
static void rose_window_class_init(RoseWindowClass *class)
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user