style: start enforcing coding style
Previous .clang-format wasn't processed $ clang-format -style=webkit -dump-config > .clang-format $ clang-format -i rose.c
This commit is contained in:
parent
527d88efa6
commit
ec97a8f3f3
172
.clang-format
172
.clang-format
|
|
@ -1,37 +1,137 @@
|
|||
# vim:ft=yaml
|
||||
---
|
||||
Language: Cpp
|
||||
# BasedOnStyle: WebKit
|
||||
AccessModifierOffset: -4
|
||||
AlignAfterOpenBracket: DontAlign
|
||||
AlignConsecutiveMacros: false
|
||||
AlignConsecutiveAssignments: false
|
||||
AlignConsecutiveDeclarations: false
|
||||
AlignEscapedNewlines: Right
|
||||
AlignOperands: false
|
||||
AlignTrailingComments: false
|
||||
AllowAllArgumentsOnNextLine: true
|
||||
AllowAllConstructorInitializersOnNextLine: true
|
||||
AllowAllParametersOfDeclarationOnNextLine: true
|
||||
AllowShortBlocksOnASingleLine: Empty
|
||||
AllowShortCaseLabelsOnASingleLine: false
|
||||
AllowShortFunctionsOnASingleLine: All
|
||||
AllowShortLambdasOnASingleLine: All
|
||||
AllowShortIfStatementsOnASingleLine: Never
|
||||
AllowShortLoopsOnASingleLine: false
|
||||
AlwaysBreakAfterDefinitionReturnType: None
|
||||
AlwaysBreakAfterReturnType: None
|
||||
AlwaysBreakBeforeMultilineStrings: false
|
||||
AlwaysBreakTemplateDeclarations: MultiLine
|
||||
BinPackArguments: true
|
||||
BinPackParameters: true
|
||||
BraceWrapping:
|
||||
AfterCaseLabel: false
|
||||
AfterClass: false
|
||||
AfterControlStatement: false
|
||||
AfterEnum: false
|
||||
AfterFunction: true
|
||||
AfterNamespace: false
|
||||
AfterObjCDeclaration: false
|
||||
AfterStruct: false
|
||||
AfterUnion: false
|
||||
AfterExternBlock: false
|
||||
BeforeCatch: false
|
||||
BeforeElse: false
|
||||
IndentBraces: false
|
||||
SplitEmptyFunction: true
|
||||
SplitEmptyRecord: true
|
||||
SplitEmptyNamespace: true
|
||||
BreakBeforeBinaryOperators: All
|
||||
BreakBeforeBraces: WebKit
|
||||
BreakBeforeInheritanceComma: false
|
||||
BreakInheritanceList: BeforeColon
|
||||
BreakBeforeTernaryOperators: true
|
||||
BreakConstructorInitializersBeforeComma: false
|
||||
BreakConstructorInitializers: BeforeComma
|
||||
BreakAfterJavaFieldAnnotations: false
|
||||
BreakStringLiterals: true
|
||||
ColumnLimit: 0
|
||||
CommentPragmas: '^ IWYU pragma:'
|
||||
CompactNamespaces: false
|
||||
ConstructorInitializerAllOnOneLineOrOnePerLine: false
|
||||
ConstructorInitializerIndentWidth: 4
|
||||
ContinuationIndentWidth: 4
|
||||
Cpp11BracedListStyle: false
|
||||
DeriveLineEnding: true
|
||||
DerivePointerAlignment: false
|
||||
DisableFormat: false
|
||||
ExperimentalAutoDetectBinPacking: false
|
||||
FixNamespaceComments: false
|
||||
ForEachMacros:
|
||||
- foreach
|
||||
- Q_FOREACH
|
||||
- BOOST_FOREACH
|
||||
IncludeBlocks: Preserve
|
||||
IncludeCategories:
|
||||
- Regex: '^"(llvm|llvm-c|clang|clang-c)/'
|
||||
Priority: 2
|
||||
SortPriority: 0
|
||||
- Regex: '^(<|"(gtest|gmock|isl|json)/)'
|
||||
Priority: 3
|
||||
SortPriority: 0
|
||||
- Regex: '.*'
|
||||
Priority: 1
|
||||
SortPriority: 0
|
||||
IncludeIsMainRegex: '(Test)?$'
|
||||
IncludeIsMainSourceRegex: ''
|
||||
IndentCaseLabels: false
|
||||
IndentGotoLabels: true
|
||||
IndentPPDirectives: None
|
||||
IndentWidth: 4
|
||||
IndentWrappedFunctionNames: false
|
||||
JavaScriptQuotes: Leave
|
||||
JavaScriptWrapImports: true
|
||||
KeepEmptyLinesAtTheStartOfBlocks: true
|
||||
MacroBlockBegin: ''
|
||||
MacroBlockEnd: ''
|
||||
MaxEmptyLinesToKeep: 1
|
||||
NamespaceIndentation: Inner
|
||||
ObjCBinPackProtocolList: Auto
|
||||
ObjCBlockIndentWidth: 4
|
||||
ObjCSpaceAfterProperty: true
|
||||
ObjCSpaceBeforeProtocolList: true
|
||||
PenaltyBreakAssignment: 2
|
||||
PenaltyBreakBeforeFirstCallParameter: 19
|
||||
PenaltyBreakComment: 300
|
||||
PenaltyBreakFirstLessLess: 120
|
||||
PenaltyBreakString: 1000
|
||||
PenaltyBreakTemplateDeclaration: 10
|
||||
PenaltyExcessCharacter: 1000000
|
||||
PenaltyReturnTypeOnItsOwnLine: 60
|
||||
PointerAlignment: Left
|
||||
ReflowComments: true
|
||||
SortIncludes: true
|
||||
SortUsingDeclarations: true
|
||||
SpaceAfterCStyleCast: false
|
||||
SpaceAfterLogicalNot: false
|
||||
SpaceAfterTemplateKeyword: true
|
||||
SpaceBeforeAssignmentOperators: true
|
||||
SpaceBeforeCpp11BracedList: true
|
||||
SpaceBeforeCtorInitializerColon: true
|
||||
SpaceBeforeInheritanceColon: true
|
||||
SpaceBeforeParens: ControlStatements
|
||||
SpaceBeforeRangeBasedForLoopColon: true
|
||||
SpaceInEmptyBlock: true
|
||||
SpaceInEmptyParentheses: false
|
||||
SpacesBeforeTrailingComments: 1
|
||||
SpacesInAngles: false
|
||||
SpacesInConditionalStatement: false
|
||||
SpacesInContainerLiterals: true
|
||||
SpacesInCStyleCastParentheses: false
|
||||
SpacesInParentheses: false
|
||||
SpacesInSquareBrackets: false
|
||||
SpaceBeforeSquareBrackets: false
|
||||
Standard: Latest
|
||||
StatementMacros:
|
||||
- Q_UNUSED
|
||||
- QT_REQUIRE_VERSION
|
||||
TabWidth: 8
|
||||
UseCRLF: false
|
||||
UseTab: Never
|
||||
...
|
||||
|
||||
IndentWidth: 8
|
||||
BreakBeforeBraces: Linux
|
||||
UseTab: Always
|
||||
AlignArrayOfStructures: Left
|
||||
AllowShortFunctionsOnASingleLine: Empty
|
||||
AllowShortIfStatementsOnASingleLine: WithoutElse
|
||||
AllowShortLoopsOnASingleLine: True
|
||||
AlwaysBreakBeforeMultilineStrings: True
|
||||
BreakBeforeTernaryOperators: True
|
||||
BreakStringLiterals: True
|
||||
ColumnLimit: 100
|
||||
IncludeBlocks: Regroup
|
||||
KeepEmptyLinesAtTheStartOfBlocks: True
|
||||
RemoveBracesLLVM: True
|
||||
SortIncludes: CaseInsensitive
|
||||
SortUsingDeclarations: True
|
||||
SpaceAfterLogicalNot: True
|
||||
SpaceAfterCStyleCast: True
|
||||
SpaceAfterTemplateKeyword: False
|
||||
PointerAlignment: Right
|
||||
SpaceBeforeAssignmentOperators: True
|
||||
SpaceBeforeCaseColon: False
|
||||
SpaceBeforeCpp11BracedList: True
|
||||
SpaceBeforeCtorInitializerColon: False
|
||||
SpaceBeforeInheritanceColon: False
|
||||
SpaceBeforeParens: Custom
|
||||
SpaceBeforeParensOptions:
|
||||
AfterControlStatements: True
|
||||
AfterForeachMacros: True
|
||||
AfterFunctionDeclarationName: False
|
||||
AfterFunctionDefinitionName: False
|
||||
AfterIfMacros: True
|
||||
AfterOverloadedOperator: False
|
||||
BeforeNonEmptyParentheses: False
|
||||
SpaceBeforeRangeBasedForLoopColon: True
|
||||
|
|
|
|||
110
rose.c
110
rose.c
|
|
@ -8,9 +8,9 @@
|
|||
* This code does not come with any warranty.
|
||||
*
|
||||
*/
|
||||
#include <stdbool.h>
|
||||
#include <stdlib.h> // necessary for free, malloc.
|
||||
#include <string.h>
|
||||
#include <stdbool.h>
|
||||
#include <webkit2/webkit2.h>
|
||||
|
||||
#include "config.h"
|
||||
|
|
@ -32,22 +32,21 @@ int CUSTOM_USER_AGENT = true;
|
|||
// - set their variable to true
|
||||
// - in build.sh, uncomment: REQS= #./plugins/*/*.c
|
||||
// 2. Remove stand_in code;
|
||||
// - Comment out #include "plugins/stand_in/stand_in.h" line, or edit it together with stand_in.c so as to not include the plugin functions.
|
||||
// - Comment out #include "plugins/stand_in/stand_in.h" line, or edit it
|
||||
// together with stand_in.c so as to not include the plugin functions.
|
||||
// - In build.sh, comment out REQS=./plugins/stand_in/stand_in.c
|
||||
|
||||
#define CACHE \
|
||||
"base-cache-directory", CACHE_DIR, \
|
||||
"base-data-directory", CACHE_DIR, \
|
||||
"disk-cache-directory", CACHE_DIR, \
|
||||
"dom-cache-directory", CACHE_DIR, \
|
||||
"hsts-cache-directory", CACHE_DIR, \
|
||||
"indexeddb-directory", CACHE_DIR, \
|
||||
"itp-directory", CACHE_DIR, \
|
||||
"local-storage-directory", CACHE_DIR, \
|
||||
"base-cache-directory", CACHE_DIR, "base-data-directory", CACHE_DIR, \
|
||||
"disk-cache-directory", CACHE_DIR, "dom-cache-directory", CACHE_DIR, \
|
||||
"hsts-cache-directory", CACHE_DIR, "indexeddb-directory", CACHE_DIR, \
|
||||
"itp-directory", CACHE_DIR, "local-storage-directory", CACHE_DIR, \
|
||||
"offline-application-cache-directory", CACHE_DIR, \
|
||||
"service-worker-registrations-directory", CACHE_DIR
|
||||
|
||||
enum { _SEARCH, _FIND, _HIDDEN };
|
||||
enum { _SEARCH,
|
||||
_FIND,
|
||||
_HIDDEN };
|
||||
|
||||
static int entry_mode;
|
||||
static GtkWindow* window;
|
||||
|
|
@ -65,7 +64,10 @@ WebKitWebView *webview_new()
|
|||
|
||||
settings = webkit_settings_new_with_settings(WEBKIT, NULL);
|
||||
if (CUSTOM_USER_AGENT) {
|
||||
webkit_settings_set_user_agent (settings, "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 Safari/537.36");
|
||||
webkit_settings_set_user_agent(
|
||||
settings,
|
||||
"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, "
|
||||
"like Gecko) Chrome/110.0.0.0 Safari/537.36");
|
||||
// See: <https://www.useragents.me/> for some common user agents
|
||||
}
|
||||
web_context = webkit_web_context_new_with_website_data_manager(
|
||||
|
|
@ -73,34 +75,34 @@ WebKitWebView *webview_new()
|
|||
contentmanager = webkit_user_content_manager_new();
|
||||
cookiemanager = webkit_web_context_get_cookie_manager(web_context);
|
||||
|
||||
webkit_cookie_manager_set_persistent_storage(cookiemanager, CACHE_DIR "/cookies.sqlite",
|
||||
webkit_cookie_manager_set_persistent_storage(
|
||||
cookiemanager, CACHE_DIR "/cookies.sqlite",
|
||||
WEBKIT_COOKIE_PERSISTENT_STORAGE_SQLITE);
|
||||
|
||||
webkit_cookie_manager_set_accept_policy(cookiemanager, WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS);
|
||||
webkit_cookie_manager_set_accept_policy(cookiemanager,
|
||||
WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS);
|
||||
|
||||
webkit_web_context_set_process_model(web_context,
|
||||
WEBKIT_PROCESS_MODEL_MULTIPLE_SECONDARY_PROCESSES);
|
||||
webkit_web_context_set_process_model(
|
||||
web_context, WEBKIT_PROCESS_MODEL_MULTIPLE_SECONDARY_PROCESSES);
|
||||
|
||||
if (g_file_get_contents("~/.config/rose/style.css", &style, NULL, NULL))
|
||||
webkit_user_content_manager_add_style_sheet(
|
||||
contentmanager,
|
||||
webkit_user_style_sheet_new(style, WEBKIT_USER_CONTENT_INJECT_ALL_FRAMES,
|
||||
WEBKIT_USER_STYLE_LEVEL_USER, NULL, NULL));
|
||||
contentmanager, webkit_user_style_sheet_new(style, WEBKIT_USER_CONTENT_INJECT_ALL_FRAMES, WEBKIT_USER_STYLE_LEVEL_USER, NULL, NULL));
|
||||
|
||||
return g_object_new(WEBKIT_TYPE_WEB_VIEW, "settings", settings, "web-context", web_context,
|
||||
"user-content-manager", contentmanager, NULL);
|
||||
return g_object_new(WEBKIT_TYPE_WEB_VIEW, "settings", settings, "web-context",
|
||||
web_context, "user-content-manager", contentmanager,
|
||||
NULL);
|
||||
}
|
||||
|
||||
WebKitWebView* notebook_get_webview(GtkNotebook* notebook)
|
||||
{
|
||||
return WEBKIT_WEB_VIEW(
|
||||
gtk_notebook_get_nth_page(notebook, gtk_notebook_get_current_page(notebook)));
|
||||
return WEBKIT_WEB_VIEW(gtk_notebook_get_nth_page(
|
||||
notebook, gtk_notebook_get_current_page(notebook)));
|
||||
}
|
||||
|
||||
void load_uri(WebKitWebView* view, const char* uri)
|
||||
{
|
||||
if (g_str_has_prefix(uri, "http://") || g_str_has_prefix(uri, "https://") ||
|
||||
g_str_has_prefix(uri, "file://") || g_str_has_prefix(uri, "about:")) {
|
||||
if (g_str_has_prefix(uri, "http://") || g_str_has_prefix(uri, "https://") || g_str_has_prefix(uri, "file://") || g_str_has_prefix(uri, "about:")) {
|
||||
webkit_web_view_load_uri(view, uri);
|
||||
} else {
|
||||
// webkit_web_view_load_uri(view, uri);
|
||||
|
|
@ -110,7 +112,8 @@ void load_uri(WebKitWebView *view, const char *uri)
|
|||
}
|
||||
}
|
||||
|
||||
void redirect_if_annoying(WebKitWebView *view, const char *uri){
|
||||
void redirect_if_annoying(WebKitWebView* view, const char* uri)
|
||||
{
|
||||
int l = LIBRE_N + strlen(uri) + 1;
|
||||
char uri_filtered[l];
|
||||
str_init(uri_filtered, l);
|
||||
|
|
@ -120,19 +123,19 @@ void redirect_if_annoying(WebKitWebView *view, const char *uri){
|
|||
if (check == 2) {
|
||||
webkit_web_view_load_uri(view, uri_filtered);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void load_changed(WebKitWebView *self, WebKitLoadEvent load_event, GtkNotebook *notebook)
|
||||
void load_changed(WebKitWebView* self, WebKitLoadEvent load_event,
|
||||
GtkNotebook* notebook)
|
||||
{
|
||||
switch (load_event) {
|
||||
/* see <https://webkitgtk.org/reference/webkit2gtk/2.5.1/WebKitWebView.html> */
|
||||
/* see <https://webkitgtk.org/reference/webkit2gtk/2.5.1/WebKitWebView.html>
|
||||
*/
|
||||
case WEBKIT_LOAD_STARTED:
|
||||
if (CUSTOM_STYLE_ENABLED) {
|
||||
char* style_js = malloc(STYLE_N + 1);
|
||||
read_style_js(style_js);
|
||||
webkit_web_view_run_javascript(notebook_get_webview(notebook),
|
||||
style_js,
|
||||
webkit_web_view_run_javascript(notebook_get_webview(notebook), style_js,
|
||||
NULL, NULL, NULL);
|
||||
free(style_js);
|
||||
}
|
||||
|
|
@ -152,14 +155,12 @@ void load_changed(WebKitWebView *self, WebKitLoadEvent load_event, GtkNotebook *
|
|||
if (CUSTOM_STYLE_ENABLED) {
|
||||
char* style_js = malloc(STYLE_N + 1);
|
||||
read_style_js(style_js);
|
||||
webkit_web_view_run_javascript(notebook_get_webview(notebook),
|
||||
style_js,
|
||||
webkit_web_view_run_javascript(notebook_get_webview(notebook), style_js,
|
||||
NULL, NULL, NULL);
|
||||
free(style_js);
|
||||
}
|
||||
break;
|
||||
case WEBKIT_LOAD_FINISHED:
|
||||
{
|
||||
case WEBKIT_LOAD_FINISHED: {
|
||||
/* Add gtk tab title */
|
||||
const char* webpage_title = webkit_web_view_get_title(self);
|
||||
const int max_length = 25;
|
||||
|
|
@ -182,11 +183,15 @@ void load_changed(WebKitWebView *self, WebKitLoadEvent load_event, GtkNotebook *
|
|||
}
|
||||
|
||||
void notebook_append(GtkNotebook* notebook, const char* uri);
|
||||
/* notebook_append calls handle_create, but handle_create also calls notebook_append.
|
||||
* Therefore we need to declare notebook_append, so that handle_create_new_tab knows its type.
|
||||
/* notebook_append calls handle_create, but handle_create also calls
|
||||
* notebook_append. Therefore we need to declare notebook_append, so that
|
||||
* handle_create_new_tab knows its type.
|
||||
*/
|
||||
|
||||
GtkWidget* handle_create_new_tab(WebKitWebView *self, WebKitNavigationAction *navigation_action, GtkNotebook *notebook){
|
||||
GtkWidget* handle_create_new_tab(WebKitWebView* self,
|
||||
WebKitNavigationAction* navigation_action,
|
||||
GtkNotebook* notebook)
|
||||
{
|
||||
WebKitURIRequest* uri_request = webkit_navigation_action_get_request(navigation_action);
|
||||
const char* uri = webkit_uri_request_get_uri(uri_request);
|
||||
printf("Creating new window: %s\n", uri);
|
||||
|
|
@ -274,15 +279,18 @@ int handle_key(func id, GtkNotebook *notebook)
|
|||
break;
|
||||
|
||||
case zoomin:
|
||||
webkit_web_view_set_zoom_level(notebook_get_webview(notebook), (zoom += ZOOM_VAL));
|
||||
webkit_web_view_set_zoom_level(notebook_get_webview(notebook),
|
||||
(zoom += ZOOM_VAL));
|
||||
break;
|
||||
|
||||
case zoomout:
|
||||
webkit_web_view_set_zoom_level(notebook_get_webview(notebook), (zoom -= ZOOM_VAL));
|
||||
webkit_web_view_set_zoom_level(notebook_get_webview(notebook),
|
||||
(zoom -= ZOOM_VAL));
|
||||
break;
|
||||
|
||||
case zoom_reset:
|
||||
webkit_web_view_set_zoom_level(notebook_get_webview(notebook), (zoom = ZOOM));
|
||||
webkit_web_view_set_zoom_level(notebook_get_webview(notebook),
|
||||
(zoom = ZOOM));
|
||||
break;
|
||||
|
||||
case prev_tab:
|
||||
|
|
@ -296,8 +304,7 @@ int handle_key(func id, GtkNotebook *notebook)
|
|||
break;
|
||||
|
||||
case next_tab:
|
||||
if (gtk_notebook_get_current_page(notebook) ==
|
||||
gtk_notebook_get_n_pages(notebook) - 1) {
|
||||
if (gtk_notebook_get_current_page(notebook) == gtk_notebook_get_n_pages(notebook) - 1) {
|
||||
notebook_append(notebook, NULL);
|
||||
gtk_notebook_set_show_tabs(notebook, true);
|
||||
webkit_web_view_set_zoom_level(notebook_get_webview(notebook), zoom);
|
||||
|
|
@ -361,16 +368,13 @@ int handle_key(func id, GtkNotebook *notebook)
|
|||
show_bar(notebook);
|
||||
break;
|
||||
|
||||
case prettify:
|
||||
{
|
||||
case prettify: {
|
||||
if (READABILITY_ENABLED) {
|
||||
char* readability_js = malloc(READABILITY_N + 1);
|
||||
read_readability_js(readability_js);
|
||||
webkit_web_view_run_javascript(notebook_get_webview(notebook),
|
||||
readability_js,
|
||||
NULL, NULL, NULL);
|
||||
readability_js, NULL, NULL, NULL);
|
||||
free(readability_js);
|
||||
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
@ -393,7 +397,8 @@ int keypress(void *self, GdkEvent *e, GtkNotebook *notebook)
|
|||
void search_activate(GtkEntry* self, GtkNotebook* notebook)
|
||||
{
|
||||
if (entry_mode == _SEARCH)
|
||||
load_uri(notebook_get_webview(notebook), gtk_entry_buffer_get_text(search_buf));
|
||||
load_uri(notebook_get_webview(notebook),
|
||||
gtk_entry_buffer_get_text(search_buf));
|
||||
else if (entry_mode == _FIND)
|
||||
webkit_find_controller_search(
|
||||
webkit_web_view_get_find_controller(notebook_get_webview(notebook)),
|
||||
|
|
@ -407,9 +412,10 @@ void search_activate(GtkEntry *self, GtkNotebook *notebook)
|
|||
void window_init(GtkNotebook* notebook)
|
||||
{
|
||||
GtkCssProvider* css = gtk_css_provider_new();
|
||||
gtk_css_provider_load_from_path(css, "/usr/share/themes/rose/style.css", NULL);
|
||||
gtk_style_context_add_provider_for_screen(gdk_screen_get_default(), GTK_STYLE_PROVIDER(css),
|
||||
800);
|
||||
gtk_css_provider_load_from_path(css, "/usr/share/themes/rose/style.css",
|
||||
NULL);
|
||||
gtk_style_context_add_provider_for_screen(gdk_screen_get_default(),
|
||||
GTK_STYLE_PROVIDER(css), 800);
|
||||
gtk_entry_buffer_new("", 0);
|
||||
gtk_entry_set_alignment(search, 0.48);
|
||||
gtk_widget_set_size_request(GTK_WIDGET(search), 1200, -1);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user