From 45757d0fb1f8536ddc70a303e9f9455e741ac462 Mon Sep 17 00:00:00 2001
From: fenze <contact@fenze.dev>
Date: Mon, 16 May 2022 11:02:50 +0200
Subject: [PATCH] fixup! Merge branch 'master' of github.com:mini-rose/rose

---
 config.def.h | 35 -----------------------------------
 keyconf.h    |  8 +-------
 window.c     |  2 --
 3 files changed, 1 insertion(+), 44 deletions(-)
 delete mode 100644 config.def.h

diff --git a/config.def.h b/config.def.h
deleted file mode 100644
index acd6497..0000000
--- a/config.def.h
+++ /dev/null
@@ -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    }
-};
diff --git a/keyconf.h b/keyconf.h
index 2b11dcc..cd4a7c3 100644
--- a/keyconf.h
+++ b/keyconf.h
@@ -4,6 +4,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <stdbool.h>
 
+#define CTRLKEY
 #define MODKEY GDK_CONTROL_MASK
 #define MODSFT   5
 #define NOMODK   0
@@ -18,13 +19,6 @@
 #define DARKMODE   2
 #define SCROLLBARS 3
 
-<<<<<<< HEAD
-#define KEYBINDS   static Key keys[]
-#define APPERANCE  static int appearance[]
-#define OPTIONS    static char *options[]
-=======
->>>>>>> 1d622de7971b8439866dfb2873d0b33004437431
-
 typedef struct {
 	unsigned modkey;
 	unsigned keycod;
diff --git a/window.c b/window.c
index 15693a7..6e608be 100644
--- a/window.c
+++ b/window.c
@@ -4,7 +4,6 @@
 
 struct _RoseWindow {
 	GtkApplicationWindow parent_instance;
-
 	guint xid;
 	GtkWindow *window;
 	WebKitWebView *webview;
@@ -208,7 +207,6 @@ static void rose_window_init(RoseWindow *window)
 
 static void destroy()
 {
-	(void) window;
 	exit(0);
 }