Skip to content

Commit

Permalink
Remove WebKit From ThreadView Header
Browse files Browse the repository at this point in the history
  • Loading branch information
@c-alpha @gauteh
c-alpha authored and gauteh committed Aug 10, 2021
1 parent 4d6b06a commit 2daa6fa
Show file tree
Hide file tree
Showing 2 changed files with 114 additions and 116 deletions.
193 changes: 103 additions & 90 deletions src/modes/thread_view/thread_view.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,102 @@ using boost::property_tree::ptree;

namespace Astroid {

extern "C" bool ThreadView_on_load_changed (
WebKitWebView * w,
WebKitLoadEvent load_event,
gpointer user_data);

extern "C" gboolean ThreadView_decide_policy (
WebKitWebView * w,
WebKitPolicyDecision * decision,
WebKitPolicyDecisionType decision_type,
gpointer user_data);

struct ThreadView::Private {
WebKitWebView * webview;
WebKitSettings * websettings;
WebKitWebContext * context;

/* event wrappers */
bool on_load_changed (ThreadView & self,
WebKitWebView * /* w */,
WebKitLoadEvent load_event) {
LOG (debug) << "tv: on_load_changed: " << load_event;
switch (load_event) {
case WEBKIT_LOAD_FINISHED:
LOG (debug) << "tv: load finished.";
{
/* render */
self.wk_loaded = true;

// also called in page_client
if (self.page_client->ready) on_ready_to_render ();
}
default:
break;
}

return true;
}

gboolean decide_policy (ThreadView & self,
WebKitWebView * /* w */,
WebKitPolicyDecision * decision,
WebKitPolicyDecisionType decision_type) {
LOG (debug) << "tv: decide policy";

switch (decision_type) {
case WEBKIT_POLICY_DECISION_TYPE_NAVIGATION_ACTION: // navigate to {{{
{
WebKitNavigationPolicyDecision * navigation_decision = WEBKIT_NAVIGATION_POLICY_DECISION (decision);
WebKitNavigationAction * nav_action = webkit_navigation_policy_decision_get_navigation_action (navigation_decision);

if (webkit_navigation_action_get_navigation_type (nav_action)
== WEBKIT_NAVIGATION_TYPE_LINK_CLICKED) {

webkit_policy_decision_ignore (decision);

const gchar * uri_c =
webkit_uri_request_get_uri (webkit_navigation_action_get_request (nav_action));

ustring uri (uri_c);
LOG (info) << "tv: navigating to: " << uri;

ustring scheme = Glib::uri_parse_scheme (uri);

if (scheme == "mailto") {

uri = uri.substr (scheme.length ()+1, uri.length () - scheme.length()-1);
UstringUtils::trim(uri);

self.main_window->add_mode (new EditMessage (self.main_window, uri));

} else if (scheme == "id" || scheme == "mid" ) {
self.main_window->add_mode (new ThreadIndex (self.main_window, uri));

} else if (scheme == "http" || scheme == "https" || scheme == "ftp") {
self.open_link (uri);

} else {
LOG (error) << "tv: unknown uri scheme. not opening.";
}
}
} // }}}
break;

case WEBKIT_POLICY_DECISION_TYPE_NEW_WINDOW_ACTION:
webkit_policy_decision_ignore (decision);
break;

default:
webkit_policy_decision_ignore (decision);
return true; // stop event
}

return true; // stop event
}
}; // struct ThreadView::Private

ThreadView::ThreadView (MainWindow * mw, bool _edit_mode) : Mode (mw) { //
edit_mode = _edit_mode;
wk_loaded = false;
Expand All @@ -64,7 +160,7 @@ namespace Astroid {
/* WebKit: set up webkit web view */

/* create web context */
context = webkit_web_context_new_ephemeral ();
Private->context = webkit_web_context_new_ephemeral ();

/* set up this extension interface */
page_client = new PageClient (this);
Expand Down Expand Up @@ -165,68 +261,7 @@ namespace Astroid {
WebKitPolicyDecisionType decision_type,
gpointer user_data) {

return ((ThreadView *) user_data)->decide_policy (w, decision, decision_type);
}

gboolean ThreadView::decide_policy (
WebKitWebView * /* w */,
WebKitPolicyDecision * decision,
WebKitPolicyDecisionType decision_type)
{

LOG (debug) << "tv: decide policy";

switch (decision_type) {
case WEBKIT_POLICY_DECISION_TYPE_NAVIGATION_ACTION: // navigate to {{{
{
WebKitNavigationPolicyDecision * navigation_decision = WEBKIT_NAVIGATION_POLICY_DECISION (decision);
WebKitNavigationAction * nav_action = webkit_navigation_policy_decision_get_navigation_action (navigation_decision);

if (webkit_navigation_action_get_navigation_type (nav_action)
== WEBKIT_NAVIGATION_TYPE_LINK_CLICKED) {

webkit_policy_decision_ignore (decision);

const gchar * uri_c = webkit_uri_request_get_uri (
webkit_navigation_action_get_request (nav_action));


ustring uri (uri_c);
LOG (info) << "tv: navigating to: " << uri;

ustring scheme = Glib::uri_parse_scheme (uri);

if (scheme == "mailto") {

uri = uri.substr (scheme.length ()+1, uri.length () - scheme.length()-1);
UstringUtils::trim(uri);

main_window->add_mode (new EditMessage (main_window, uri));

} else if (scheme == "id" || scheme == "mid" ) {
main_window->add_mode (new ThreadIndex (main_window, uri));

} else if (scheme == "http" || scheme == "https" || scheme == "ftp") {
open_link (uri);

} else {

LOG (error) << "tv: unknown uri scheme. not opening.";
}
}
} // }}}
break;

case WEBKIT_POLICY_DECISION_TYPE_NEW_WINDOW_ACTION:
webkit_policy_decision_ignore (decision);
break;

default:
webkit_policy_decision_ignore (decision);
return true; // stop event
}

return true; // stop event
return ((ThreadView *) user_data)->Private::decide_policy (*user_data, w, decision, decision_type);
}

void ThreadView::open_link (ustring uri) {
Expand Down Expand Up @@ -296,29 +331,7 @@ namespace Astroid {
WebKitLoadEvent load_event,
gpointer user_data)
{
return ((ThreadView *) user_data)->on_load_changed (w, load_event);
}

bool ThreadView::on_load_changed (
WebKitWebView * /* w */,
WebKitLoadEvent load_event)
{
LOG (debug) << "tv: on_load_changed: " << load_event;
switch (load_event) {
case WEBKIT_LOAD_FINISHED:
LOG (debug) << "tv: load finished.";
{
/* render */
wk_loaded = true;

// also called in page_client
if (page_client->ready) on_ready_to_render ();
}
default:
break;
}

return true;
return ((ThreadView *) user_data)->Private::on_load_changed (*user_data, w, load_event);
}

void ThreadView::load_thread (refptr<NotmuchThread> _thread) {
Expand Down Expand Up @@ -929,9 +942,9 @@ namespace Astroid {
}
}
}
main_window->add_mode (new EditMessage (main_window, to.str (),
from.full_address (),
cc.str(), bcc.str()));
main_window->add_mode (new EditMessage (main_window, to.str (),
from.full_address (),
cc.str(), bcc.str()));
}
return true;
});
Expand Down Expand Up @@ -1077,7 +1090,7 @@ namespace Astroid {
});

keys.register_run ("thread_view.run",
[&] (Key, ustring cmd, ustring undo_cmd) {
[&] (Key, ustring cmd, ustring undo_cmd) {
if (focused_message) {
cmd = ustring::compose (cmd, focused_message->tid, focused_message->mid);
undo_cmd = ustring::compose (undo_cmd, focused_message->tid, focused_message->mid);
Expand Down
37 changes: 11 additions & 26 deletions src/modes/thread_view/thread_view.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,18 @@
# include <condition_variable>
# include <functional>

// avoid conflicting YES/NO in stock.h
# ifndef GTKMM_DISABLE_DEPRECATED
# define GTKMM_DISABLE_DEPRECATED 1
# define UNDEF_GTKMM_DISABLE_DEPRECATED 1
# endif
# include <gtkmm.h>
# include <webkit2/webkit2.h>
# include <webkitdom/webkitdom.h>
# ifdef UNDEF_GTKMM_DISABLE_DEPRECATED
# undef GTKMM_DISABLE_DEPRECATED
# endif
# include <boost/property_tree/ptree.hpp>

# include "db.hh" // NotmuchThread
# include "proto.hh"
# include "modes/mode.hh"
# include "message_thread.hh"
Expand All @@ -25,16 +32,6 @@
using boost::property_tree::ptree;

namespace Astroid {
extern "C" bool ThreadView_on_load_changed (
WebKitWebView * w,
WebKitLoadEvent load_event,
gpointer user_data);

extern "C" gboolean ThreadView_decide_policy (
WebKitWebView * w,
WebKitPolicyDecision * decision,
WebKitPolicyDecisionType decision_type,
gpointer user_data);

class ThreadView : public Mode {
friend PageClient;
Expand Down Expand Up @@ -164,9 +161,7 @@ namespace Astroid {
bool element_action (ElementAction);

/* webkit */
WebKitWebView * webview;
WebKitSettings * websettings;
WebKitWebContext * context;
struct Private;

protected:
std::atomic<bool> wk_loaded;
Expand All @@ -184,18 +179,8 @@ namespace Astroid {
void update_all_indent_states ();

void save_all_attachments ();

public:

/* event wrappers */
bool on_load_changed (
WebKitWebView * w,
WebKitLoadEvent load_event);

gboolean decide_policy (
WebKitWebView * w,
WebKitPolicyDecision * decision,
WebKitPolicyDecisionType decision_type);

void grab_focus ();

/* mode */
Expand Down

0 comments on commit 2daa6fa

Please sign in to comment.