fixup! Merge branch 'master' of github.com:mini-rose/rose

This commit is contained in:
fenze 2022-05-16 11:02:50 +02:00
parent 556da06eff
commit 45757d0fb1
3 changed files with 1 additions and 44 deletions

View File

@ -1,35 +0,0 @@
#include "keyconf.h"
static const char *options[] = {
[CACHE] = DEFAULT, /* DEFAULT = "~/.cache/rose" */
[HOMEPAGE] = DEFAULT, /* DEFAULT = "https://duckduckgo.com" */
};
static int appearance[] = {
[HEIGHT] = DEFAULT, /* DEFAULT = 720 */
[WIDTH] = DEFAULT, /* DEFAULT = 1280 */
[DARKMODE] = TRUE
};
static const Key keys[] = {
{ MODKEY, GDK_KEY_h, goback },
{ MODKEY, GDK_KEY_l, goforward },
{ MODKEY, GDK_KEY_y, copy_url },
{ MODKEY, GDK_KEY_p, paste_url },
{ MODKEY, GDK_KEY_e, search },
{ MODSFT, GDK_KEY_K, zoomin },
{ MODSFT, GDK_KEY_J, zoomout },
{ MODSFT, GDK_KEY_Q, zoomreset },
{ MODKEY, GDK_KEY_i, inspector },
{ MODKEY, GDK_KEY_j, down },
{ MODKEY, GDK_KEY_k, up },
{ MODKEY, GDK_KEY_f, find },
{ MODKEY, GDK_KEY_n, findnext },
{ MODSFT, GDK_KEY_N, findprev },
{ MODKEY, GDK_KEY_r, reload },
{ MODSFT, GDK_KEY_R, reloadforce },
{ NOMODK, GDK_KEY_F11, fullscreen },
{ MODSFT, GDK_KEY_H, history },
{ MODKEY, GDK_KEY_g, gotop },
{ MODSFT, GDK_KEY_G, gobottom }
};

View File

@ -4,6 +4,7 @@
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
#include <stdbool.h> #include <stdbool.h>
#define CTRLKEY
#define MODKEY GDK_CONTROL_MASK #define MODKEY GDK_CONTROL_MASK
#define MODSFT 5 #define MODSFT 5
#define NOMODK 0 #define NOMODK 0
@ -18,13 +19,6 @@
#define DARKMODE 2 #define DARKMODE 2
#define SCROLLBARS 3 #define SCROLLBARS 3
<<<<<<< HEAD
#define KEYBINDS static Key keys[]
#define APPERANCE static int appearance[]
#define OPTIONS static char *options[]
=======
>>>>>>> 1d622de7971b8439866dfb2873d0b33004437431
typedef struct { typedef struct {
unsigned modkey; unsigned modkey;
unsigned keycod; unsigned keycod;

View File

@ -4,7 +4,6 @@
struct _RoseWindow { struct _RoseWindow {
GtkApplicationWindow parent_instance; GtkApplicationWindow parent_instance;
guint xid; guint xid;
GtkWindow *window; GtkWindow *window;
WebKitWebView *webview; WebKitWebView *webview;
@ -208,7 +207,6 @@ static void rose_window_init(RoseWindow *window)
static void destroy() static void destroy()
{ {
(void) window;
exit(0); exit(0);
} }