cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge from upstream:

Browse Source 
Fix focus handling with multiple awesome instances
(git commit 1c27a69131428e9e733374c2a3676ca4ecee45d2)
This commit is contained in:
dcoppa 2016-01-13 08:47:44 +00:00
parent f69d57029d
commit 2b0ca5a48a
2 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/awesome/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.94 2015/11/09 14:36:12 dcoppa Exp $
# $OpenBSD: Makefile,v 1.95 2016/01/13 08:47:44 dcoppa Exp $
COMMENT= highly configurable framework window manager
DISTNAME= awesome-3.5.6
REVISION= 4
REVISION= 5
EXTRACT_SUFX= .tar.xz
CATEGORIES= x11

30
x11/awesome/patches/patch-event_c
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-event_c,v 1.10 2015/11/09 14:36:12 dcoppa Exp $
$OpenBSD: patch-event_c,v 1.11 2016/01/13 08:47:44 dcoppa Exp $
commit bbf88211b4fe86288d1e918d1758681130438589
Author: Uli Schlachter <psychon@znc.in>
@ -39,6 +39,18 @@ we did not manage to figure out which titlebar was left.
Signed-off-by: Uli Schlachter <psychon@znc.in>
commit 1c27a69131428e9e733374c2a3676ca4ecee45d2
Author: Kimball Thurston <kdt3rd@gmail.com>
Date: Tue Dec 22 21:46:17 2015 -0800
Fix focus handling with multiple awesome instances
When there are multiple X11 screens (i.e. :0.0 and :0.1) for zaphod mode
style X setups, this triggers a refresh of focus when the instance
running on a particular root receives the mouse
Fixes https://github.com/awesomeWM/awesome/issues/599.
commit de8fd4ffd4998e51164e4bc734fe74d11d358a56
Author: Uli Schlachter <psychon@znc.in>
Date: Thu Sep 17 17:03:36 2015 +0200
@ -82,7 +94,7 @@ is decided... First come, first serve, the rest gets an error?
Signed-off-by: Uli Schlachter <psychon@znc.in>
--- event.c.orig Sat Jan 10 20:36:35 2015
+++ event.c Mon Nov 9 13:54:50 2015
+++ event.c Wed Jan 13 09:36:25 2016
@@ -296,27 +296,37 @@ event_handle_configurerequest(xcb_configure_request_ev
if((c = client_getbywin(ev->window)))
{
@ -247,7 +259,7 @@ Signed-off-by: Uli Schlachter <psychon@znc.in>
}
/** The enter notify event handler.
@@ -493,19 +532,24 @@ event_handle_enternotify(xcb_enter_notify_event_t *ev)
@@ -493,23 +532,34 @@ event_handle_enternotify(xcb_enter_notify_event_t *ev)
{
luaA_object_push(globalconf.L, drawin);
luaA_object_push_item(globalconf.L, -1, drawin->drawable);
@ -275,7 +287,17 @@ Signed-off-by: Uli Schlachter <psychon@znc.in>
lua_pop(globalconf.L, 1);
}
lua_pop(globalconf.L, 1);
@@ -594,7 +638,7 @@ event_handle_key(xcb_key_press_event_t *ev)
}
+ else if (ev->event == globalconf.screen->root) {
+ /* When there are multiple X screens with awesome running separate
+ * instances, reset focus.
+ */
+ globalconf.focus.need_update = true;
+ }
}
/** The focus in event handler.
@@ -594,7 +644,7 @@ event_handle_key(xcb_key_press_event_t *ev)
/* get keysym ignoring all modifiers */
xcb_keysym_t keysym = keyresolv_get_keysym(ev->detail, 0);
client_t *c;