From 6e54abdbac5b0316b56cfec9815de800aae3dd01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Ankarstr=C3=B6m?= <john@ankarstrom.se>
Date: Mon, 14 Jun 2021 07:35:58 +0200
Subject: sysutils/rox: Split patch-keys into two patches

---
 sysutils/rox/patch-backspace | 27 +++++++++++++++++++++++++++
 sysutils/rox/patch-keys      | 38 --------------------------------------
 sysutils/rox/patch-q         | 15 +++++++++++++++
 3 files changed, 42 insertions(+), 38 deletions(-)
 create mode 100644 sysutils/rox/patch-backspace
 delete mode 100644 sysutils/rox/patch-keys
 create mode 100644 sysutils/rox/patch-q

diff --git a/sysutils/rox/patch-backspace b/sysutils/rox/patch-backspace
new file mode 100644
index 0000000..323ca7b
--- /dev/null
+++ b/sysutils/rox/patch-backspace
@@ -0,0 +1,27 @@
+$NetBSD
+
+Bind BackSpace to open parent (and not change to parent).
+
+--- ROX-Filer/src/filer.c.orig	2021-06-09 12:27:42.485755107 +0200
++++ ROX-Filer/src/filer.c
+@@ -1228,9 +1228,6 @@ gint filer_key_press_event(GtkWidget	*widget,
+ 		case GDK_Tab:
+ 			filer_next_selected(filer_window, 1);
+ 			break;
+-		case GDK_BackSpace:
+-			change_to_parent(filer_window);
+-			break;
+ 		case GDK_backslash:
+ 		{
+ 			ViewIter iter;
+--- ROX-Filer/src/menu.c.orig	2021-06-09 12:29:31.430071590 +0200
++++ ROX-Filer/src/menu.c
+@@ -238,7 +238,7 @@ static GtkItemFactoryEntry filer_menu_def[] = {
+ {">" N_("Blank file"),		NULL, new_file, 0, "<StockItem>", GTK_STOCK_NEW},
+ {">" N_("Customise Menu..."),	NULL, customise_new, 0, NULL},
+ {N_("Window"),			NULL, NULL, 0, "<Branch>"},
+-{">" N_("Parent, New Window"), 	NULL, open_parent, 0, "<StockItem>", GTK_STOCK_GO_UP},
++{">" N_("Parent, New Window"), 	"BackSpace", open_parent, 0, "<StockItem>", GTK_STOCK_GO_UP},
+ {">" N_("Parent, Same Window"), NULL, open_parent_same, 0, NULL},
+ {">" N_("New Window"),		NULL, new_window, 0, NULL},
+ {">" N_("Home Directory"),	"<Ctrl>Home", home_directory, 0, "<StockItem>", GTK_STOCK_HOME},
diff --git a/sysutils/rox/patch-keys b/sysutils/rox/patch-keys
deleted file mode 100644
index ddbf243..0000000
--- a/sysutils/rox/patch-keys
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD
-
-Change default key bindings.
-
---- ROX-Filer/src/filer.c.orig	2021-06-09 12:27:42.485755107 +0200
-+++ ROX-Filer/src/filer.c
-@@ -1228,9 +1228,6 @@ gint filer_key_press_event(GtkWidget	*widget,
- 		case GDK_Tab:
- 			filer_next_selected(filer_window, 1);
- 			break;
--		case GDK_BackSpace:
--			change_to_parent(filer_window);
--			break;
- 		case GDK_backslash:
- 		{
- 			ViewIter iter;
---- ROX-Filer/src/menu.c.orig	2021-06-09 12:29:31.430071590 +0200
-+++ ROX-Filer/src/menu.c
-@@ -238,7 +238,7 @@ static GtkItemFactoryEntry filer_menu_def[] = {
- {">" N_("Blank file"),		NULL, new_file, 0, "<StockItem>", GTK_STOCK_NEW},
- {">" N_("Customise Menu..."),	NULL, customise_new, 0, NULL},
- {N_("Window"),			NULL, NULL, 0, "<Branch>"},
--{">" N_("Parent, New Window"), 	NULL, open_parent, 0, "<StockItem>", GTK_STOCK_GO_UP},
-+{">" N_("Parent, New Window"), 	"BackSpace", open_parent, 0, "<StockItem>", GTK_STOCK_GO_UP},
- {">" N_("Parent, Same Window"), NULL, open_parent_same, 0, NULL},
- {">" N_("New Window"),		NULL, new_window, 0, NULL},
- {">" N_("Home Directory"),	"<Ctrl>Home", home_directory, 0, "<StockItem>", GTK_STOCK_HOME},
---- ROX-Filer/src/menu.c.orig	2021-06-09 12:44:32.990200434 +0200
-+++ ROX-Filer/src/menu.c
-@@ -248,7 +248,7 @@ static GtkItemFactoryEntry filer_menu_def[] = {
- {">" N_("Resize Window"),	"<Ctrl>E", resize, 0, NULL},
- /* {">" N_("New, As User..."),	NULL, new_user, 0, NULL}, */
- 
--{">" N_("Close Window"),	"<Ctrl>Q", close_window, 0, "<StockItem>", GTK_STOCK_CLOSE},
-+{">" N_("Close Window"),	"Q", close_window, 0, "<StockItem>", GTK_STOCK_CLOSE},
- {">",				NULL, NULL, 0, "<Separator>"},
- {">" N_("Enter Path..."),	"slash", mini_buffer, MINI_PATH, NULL},
- {">" N_("Shell Command..."),	"<Shift>exclam", mini_buffer, MINI_SHELL, NULL},
diff --git a/sysutils/rox/patch-q b/sysutils/rox/patch-q
new file mode 100644
index 0000000..ba3299f
--- /dev/null
+++ b/sysutils/rox/patch-q
@@ -0,0 +1,15 @@
+$NetBSD
+ 
+Bind Q to close window.
+
+--- ROX-Filer/src/menu.c.orig	2021-06-09 12:44:32.990200434 +0200
++++ ROX-Filer/src/menu.c
+@@ -248,7 +248,7 @@ static GtkItemFactoryEntry filer_menu_def[] = {
+ {">" N_("Resize Window"),	"<Ctrl>E", resize, 0, NULL},
+ /* {">" N_("New, As User..."),	NULL, new_user, 0, NULL}, */
+ 
+-{">" N_("Close Window"),	"<Ctrl>Q", close_window, 0, "<StockItem>", GTK_STOCK_CLOSE},
++{">" N_("Close Window"),	"Q", close_window, 0, "<StockItem>", GTK_STOCK_CLOSE},
+ {">",				NULL, NULL, 0, "<Separator>"},
+ {">" N_("Enter Path..."),	"slash", mini_buffer, MINI_PATH, NULL},
+ {">" N_("Shell Command..."),	"<Shift>exclam", mini_buffer, MINI_SHELL, NULL},
-- 
cgit v1.2.3