gtk2-libwinmenu: use Ctrl right instead of Alt left, update usage instructions

4 files changed, 25 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0543fd706e65..791e03b16fb7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gtk2-libwinmenu
 	pkgdesc = Gtk+ module to hide menubar by default
 	pkgver = 1
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.linux.org.ru/jump-message.jsp?msgid=5606544&cid=5617512
 	install = libwinmenu.install
 	arch = i686
@@ -10,12 +10,11 @@ pkgbase = gtk2-libwinmenu
 	depends = gtk2
 	source = libwinmenu.c
 	source = Makefile
-	source = use_alt_left.patch
+	source = use_ctrl_right.patch
 	source = fix_gimp_whitelist.patch
 	md5sums = 20a2e4823e8d2baf1e33de97335a040b
 	md5sums = f90fd2c86b796a0c9d9e4a646539ec31
-	md5sums = d43683a6001d8032881f95ccf8dda5f4
+	md5sums = eb9d4660537a95689066f84b0563dbb9
 	md5sums = 9ed28c17363baffb317566877f7c8315
 
 pkgname = gtk2-libwinmenu
-
diff --git a/PKGBUILD b/PKGBUILD
index f689f7702474..0110936f612f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,22 @@
 pkgname=gtk2-libwinmenu
 pkgver=1
-pkgrel=1
+pkgrel=2
 pkgdesc="Gtk+ module to hide menubar by default"
 arch=('i686' 'x86_64')
 url='http://www.linux.org.ru/jump-message.jsp?msgid=5606544&cid=5617512'
 license=('custom')
 depends=('gtk2')
 source=('libwinmenu.c' 'Makefile'
-        use_alt_left.patch
+        use_ctrl_right.patch
         fix_gimp_whitelist.patch)
 md5sums=('20a2e4823e8d2baf1e33de97335a040b' 'f90fd2c86b796a0c9d9e4a646539ec31'
-         d43683a6001d8032881f95ccf8dda5f4
+         eb9d4660537a95689066f84b0563dbb9
          9ed28c17363baffb317566877f7c8315)
 install='libwinmenu.install'
 
 prepare() {
 	cd "$srcdir"
-	patch -Np1 --follow-symlinks -i use_alt_left.patch
+	patch -Np1 --follow-symlinks -i use_ctrl_right.patch
 	patch -Np1 --follow-symlinks -i fix_gimp_whitelist.patch
 }
 
diff --git a/libwinmenu.install b/libwinmenu.install
index a488da1d6d99..90cc69b5fa58 100644
--- a/libwinmenu.install
+++ b/libwinmenu.install
@@ -1,6 +1,8 @@
 post_install() {
-	echo "Set the following environment variable for changes to take place"
-	echo "GTK_MODULES=winmenu"
-	echo "----------------------------------------------------------------"
-	echo "Menu is toggled with Alt"
+	echo 'To use it, the different options are:'
+	echo '1/ add inside your ~/.xprofile: export GTK_MODULES="winmenu${GTK_MODULES:+:$GTK_MODULES}"'
+	echo '2/ install gtk3-libwinmenu'
+	echo '3/ copy gtk3-libwinmenu > winmenu.sh to "/etc/X11/xinit/xinitrc.d"'
+	echo '------------------------------------------------------------------'
+	echo 'Menu is toggled with Right Control'
 }
diff --git a/use_ctrl_right.patch b/use_ctrl_right.patch
new file mode 100644
index 000000000000..fdac5947ff6c
--- /dev/null
+++ b/use_ctrl_right.patch
@@ -0,0 +1,12 @@
+--- a/libwinmenu.c
++++ b/libwinmenu.c
+@@ -77,8 +77,6 @@ gtk_module_init (gint * argc, gchar *** argv)
+    fc = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+    klass = GTK_WINDOW_GET_CLASS(fc);
+ 
+-   gtk_binding_entry_add_signal (gtk_binding_set_by_class (klass), GDK_m, GDK_CONTROL_MASK,
+-                                "toggle-menu-bar", 0);
+-   gtk_binding_entry_add_signal (gtk_binding_set_by_class (klass), GDK_m, GDK_MOD1_MASK,
++   gtk_binding_entry_add_signal (gtk_binding_set_by_class (klass), GDK_Control_R, 0,
+                                 "toggle-menu-bar", 0);
+ }