summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /x11-misc/dunst/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'x11-misc/dunst/files')
-rw-r--r--x11-misc/dunst/files/dunst-1.0.0-correctly_handle_num_lock.patch149
-rw-r--r--x11-misc/dunst/files/dunst-1.0.0-fix_pause_resume.patch60
2 files changed, 209 insertions, 0 deletions
diff --git a/x11-misc/dunst/files/dunst-1.0.0-correctly_handle_num_lock.patch b/x11-misc/dunst/files/dunst-1.0.0-correctly_handle_num_lock.patch
new file mode 100644
index 000000000000..fc784fb8fc66
--- /dev/null
+++ b/x11-misc/dunst/files/dunst-1.0.0-correctly_handle_num_lock.patch
@@ -0,0 +1,149 @@
+https://github.com/knopwob/dunst/commit/be7d2b351
+
+From be7d2b3511dc528b135e5dc6d5358c700fefaa30 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ren=C3=A9=20=27Necoro=27=20Neumann?= <necoro@necoro.net>
+Date: Mon, 3 Jun 2013 14:39:24 +0200
+Subject: [PATCH] Correctly handle Num_Lock.
+
+Find out which modifier key is used by Num_Lock (`x_numlock_mod()`) and
+register grabs for both variants: modifier present/not present.
+---
+ x.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------
+ 1 file changed, 67 insertions(+), 6 deletions(-)
+
+--- a/x.c
++++ b/x.c
+@@ -485,6 +485,58 @@ static void setopacity(Window win, unsigned long opacity)
+
+
+
++ /*
++ * Returns the modifier which is NumLock.
++ */
++static KeySym x_numlock_mod()
++{
++ static KeyCode nl = 0;
++ KeySym sym = 0;
++ XModifierKeymap * map = XGetModifierMapping(xctx.dpy);
++
++ if (!nl)
++ nl = XKeysymToKeycode(xctx.dpy, XStringToKeysym("Num_Lock"));
++
++ for (int mod = 0; mod < 8; mod++) {
++ for (int j = 0; j < map->max_keypermod; j++) {
++ if (map->modifiermap[mod*map->max_keypermod+j] == nl) {
++ /* In theory, one could use `1 << mod`, but this
++ * could count as 'using implementation details',
++ * so use this large switch. */
++ switch (mod) {
++ case ShiftMapIndex:
++ sym = ShiftMask;
++ goto end;
++ case LockMapIndex:
++ sym = LockMask;
++ goto end;
++ case ControlMapIndex:
++ sym = ControlMask;
++ goto end;
++ case Mod1MapIndex:
++ sym = Mod1Mask;
++ goto end;
++ case Mod2MapIndex:
++ sym = Mod2Mask;
++ goto end;
++ case Mod3MapIndex:
++ sym = Mod3Mask;
++ goto end;
++ case Mod4MapIndex:
++ sym = Mod4Mask;
++ goto end;
++ case Mod5MapIndex:
++ sym = Mod5Mask;
++ goto end;
++ }
++ }
++ }
++ }
++
++end:
++ XFreeModifiermap(map);
++ return sym;
++}
+
+ /*
+ * Helper function to use glib's mainloop mechanic
+@@ -515,6 +567,7 @@ gboolean x_mainloop_fd_dispatch(GSource * source, GSourceFunc callback,
+ gpointer user_data)
+ {
+ XEvent ev;
++ unsigned int state;
+ while (XPending(xctx.dpy) > 0) {
+ XNextEvent(xctx.dpy, &ev);
+ switch (ev.type) {
+@@ -535,10 +588,13 @@ gboolean x_mainloop_fd_dispatch(GSource * source, GSourceFunc callback,
+ }
+ break;
+ case KeyPress:
++ state = ev.xkey.state;
++ /* NumLock is also encoded in the state. Remove it. */
++ state &= ~x_numlock_mod();
+ if (settings.close_ks.str
+ && XLookupKeysym(&ev.xkey,
+ 0) == settings.close_ks.sym
+- && settings.close_ks.mask == ev.xkey.state) {
++ && settings.close_ks.mask == state) {
+ if (displayed) {
+ notification *n = g_queue_peek_head(displayed);
+ if (n)
+@@ -548,19 +604,19 @@ gboolean x_mainloop_fd_dispatch(GSource * source, GSourceFunc callback,
+ if (settings.history_ks.str
+ && XLookupKeysym(&ev.xkey,
+ 0) == settings.history_ks.sym
+- && settings.history_ks.mask == ev.xkey.state) {
++ && settings.history_ks.mask == state) {
+ history_pop();
+ }
+ if (settings.close_all_ks.str
+ && XLookupKeysym(&ev.xkey,
+ 0) == settings.close_all_ks.sym
+- && settings.close_all_ks.mask == ev.xkey.state) {
++ && settings.close_all_ks.mask == state) {
+ move_all_to_history();
+ }
+ if (settings.context_ks.str
+ && XLookupKeysym(&ev.xkey,
+ 0) == settings.context_ks.sym
+- && settings.context_ks.mask == ev.xkey.state) {
++ && settings.context_ks.mask == state) {
+ context_menu();
+ }
+ break;
+@@ -953,9 +1009,12 @@ int x_shortcut_grab(keyboard_shortcut * ks)
+
+ x_shortcut_setup_error_handler();
+
+- if (ks->is_valid)
++ if (ks->is_valid) {
+ XGrabKey(xctx.dpy, ks->code, ks->mask, root,
+ true, GrabModeAsync, GrabModeAsync);
++ XGrabKey(xctx.dpy, ks->code, ks->mask | x_numlock_mod() , root,
++ true, GrabModeAsync, GrabModeAsync);
++ }
+
+ if (x_shortcut_tear_down_error_handler()) {
+ fprintf(stderr, "Unable to grab key \"%s\"\n", ks->str);
+@@ -972,8 +1031,10 @@ void x_shortcut_ungrab(keyboard_shortcut * ks)
+ {
+ Window root;
+ root = RootWindow(xctx.dpy, DefaultScreen(xctx.dpy));
+- if (ks->is_valid)
++ if (ks->is_valid) {
+ XUngrabKey(xctx.dpy, ks->code, ks->mask, root);
++ XUngrabKey(xctx.dpy, ks->code, ks->mask | x_numlock_mod(), root);
++ }
+ }
+
+ /*
+--
+1.9.1
+
diff --git a/x11-misc/dunst/files/dunst-1.0.0-fix_pause_resume.patch b/x11-misc/dunst/files/dunst-1.0.0-fix_pause_resume.patch
new file mode 100644
index 000000000000..f95cc310b373
--- /dev/null
+++ b/x11-misc/dunst/files/dunst-1.0.0-fix_pause_resume.patch
@@ -0,0 +1,60 @@
+https://github.com/knopwob/dunst/commit/04248fd4
+
+From 04248fd49ef6769c7dc7e246fc505ad9c70afe27 Mon Sep 17 00:00:00 2001
+From: Sascha Kruse <knopwob@googlemail.com>
+Date: Mon, 22 Apr 2013 20:07:35 +0000
+Subject: [PATCH] fix pause/resume
+
+this fixes github issue #98
+---
+ dunst.c | 14 ++++++++------
+ 1 file changed, 8 insertions(+), 6 deletions(-)
+
+--- a/dunst.c
++++ b/dunst.c
+@@ -105,7 +105,7 @@ void update_lists()
+
+ if (pause_display) {
+ while (displayed->length > 0) {
+- g_queue_insert_sorted(queue, g_queue_pop_head(queue),
++ g_queue_insert_sorted(queue, g_queue_pop_head(displayed),
+ notification_cmp_data, NULL);
+ }
+ return;
+@@ -240,16 +240,16 @@ gboolean run(void *data)
+ timeout_cnt--;
+ }
+
+- if (displayed->length > 0 && !xctx.visible) {
+- x_win_show();
++ if (displayed->length > 0 && !xctx.visible && !pause_display) {
++ x_win_show();
+ }
+
+- if (displayed->length == 0 && xctx.visible) {
+- x_win_hide();
++ if (xctx.visible && (pause_display || displayed->length == 0)) {
++ x_win_hide();
+ }
+
+ if (xctx.visible) {
+- x_win_draw();
++ x_win_draw();
+ }
+
+ if (xctx.visible) {
+@@ -355,9 +355,11 @@ void pause_signal_handler(int sig)
+ {
+ if (sig == SIGUSR1) {
+ pause_display = true;
++ wake_up();
+ }
+ if (sig == SIGUSR2) {
+ pause_display = false;
++ wake_up();
+ }
+
+ signal(sig, pause_signal_handler);
+--
+1.9.1
+