diff options
| -rw-r--r-- | .SRCINFO | 14 | ||||
| -rw-r--r-- | PKGBUILD | 17 | ||||
| -rw-r--r-- | add_arandr_whitelist.patch | 11 | ||||
| -rw-r--r-- | libwinmenu.install | 6 | ||||
| -rw-r--r-- | update_to_gtk3.patch | 4 | ||||
| -rw-r--r-- | use_ctrl_right.patch | 12 | ||||
| -rwxr-xr-x | winmenu.sh | 15 |
7 files changed, 59 insertions, 20 deletions
@@ -1,21 +1,23 @@ pkgbase = gtk3-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 arch = x86_64 license = custom depends = gtk3 source = libwinmenu.c source = Makefile - source = use_alt_left.patch + source = winmenu.sh + source = use_ctrl_right.patch + source = add_arandr_whitelist.patch source = update_to_gtk3.patch md5sums = 20a2e4823e8d2baf1e33de97335a040b md5sums = f90fd2c86b796a0c9d9e4a646539ec31 - md5sums = d43683a6001d8032881f95ccf8dda5f4 - md5sums = f2bc0a86ed0d394a6e6725fc26010b44 + md5sums = 5e28dd91b09c3503759c3c960b8f2322 + md5sums = eb9d4660537a95689066f84b0563dbb9 + md5sums = effe0ea4178afb25d9d98538855b0a18 + md5sums = 74be862c8c78489fa5b03c80f35792dc pkgname = gtk3-libwinmenu - @@ -1,22 +1,26 @@ pkgname=gtk3-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=('gtk3') source=('libwinmenu.c' 'Makefile' - use_alt_left.patch + winmenu.sh + use_ctrl_right.patch + add_arandr_whitelist.patch update_to_gtk3.patch) md5sums=('20a2e4823e8d2baf1e33de97335a040b' 'f90fd2c86b796a0c9d9e4a646539ec31' - d43683a6001d8032881f95ccf8dda5f4 - f2bc0a86ed0d394a6e6725fc26010b44) -install='libwinmenu.install' + 5e28dd91b09c3503759c3c960b8f2322 + eb9d4660537a95689066f84b0563dbb9 + effe0ea4178afb25d9d98538855b0a18 + 74be862c8c78489fa5b03c80f35792dc) 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 add_arandr_whitelist.patch patch -Np1 --follow-symlinks -i update_to_gtk3.patch } @@ -28,4 +32,5 @@ build() { package() { cd "$srcdir" install -Dm755 libwinmenu.so "$pkgdir/usr/lib/gtk-3.0/modules/libwinmenu.so" + install -Dm755 winmenu.sh "$pkgdir/etc/X11/xinit/xinitrc.d/35-winmenu.sh" } diff --git a/add_arandr_whitelist.patch b/add_arandr_whitelist.patch new file mode 100644 index 000000000000..6b9f33c8c30a --- /dev/null +++ b/add_arandr_whitelist.patch @@ -0,0 +1,11 @@ +--- a/libwinmenu.c ++++ b/libwinmenu.c +@@ -53,7 +53,7 @@ + { + GtkWidget *fc; + GObjectClass *klass; +- const gchar *app_whitelist = "gnome-terminal, gimp, mousepad"; ++ const gchar *app_whitelist = "gnome-terminal, arandr, mousepad"; + + if (strstr (app_whitelist, g_get_prgname()) != NULL) + return; diff --git a/libwinmenu.install b/libwinmenu.install deleted file mode 100644 index a488da1d6d99..000000000000 --- a/libwinmenu.install +++ /dev/null @@ -1,6 +0,0 @@ -post_install() { - echo "Set the following environment variable for changes to take place" - echo "GTK_MODULES=winmenu" - echo "----------------------------------------------------------------" - echo "Menu is toggled with Alt" -} diff --git a/update_to_gtk3.patch b/update_to_gtk3.patch index 99964b7c7582..fb40d8271622 100644 --- a/update_to_gtk3.patch +++ b/update_to_gtk3.patch @@ -28,7 +28,7 @@ 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_Alt_L, 0, -+ gtk_binding_entry_add_signal (gtk_binding_set_by_class (klass), GDK_KEY_Alt_L, 0, +- gtk_binding_entry_add_signal (gtk_binding_set_by_class (klass), GDK_Control_R, 0, ++ gtk_binding_entry_add_signal (gtk_binding_set_by_class (klass), GDK_KEY_Control_R, 0, "toggle-menu-bar", 0); } 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); + } diff --git a/winmenu.sh b/winmenu.sh new file mode 100755 index 000000000000..766228c3ff22 --- /dev/null +++ b/winmenu.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +# based on /etc/X11/xinit/xinitrc.d/40-libcanberra-gtk-module.sh + +case "${DESKTOP_SESSION-}" in + gnome*) # Done by gnome-settings-daemon + ;; + *) + # Extra check in case DESKTOP_SESSION is not set correctly + if [ -z "${GNOME_DESKTOP_SESSION_ID-}" ]; then + GTK_MODULES="winmenu${GTK_MODULES:+:$GTK_MODULES}" + export GTK_MODULES + fi + ;; +esac |