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

Bump after libev update.

Browse Source 
While here, add two patches from upstream:

"Don't setup event handler when RandR base event is not set"
"Properly call init_workspaces() when RandR is known but not present"

I've found that they are needed (the hard way) when tried to run i3
under Xnest.
This commit is contained in:
dcoppa 2010-11-18 12:20:54 +00:00
parent c27a386735
commit 35c222ff4a
3 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
x11/i3/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.7 2010/10/24 21:15:32 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.8 2010/11/18 12:20:54 dcoppa Exp $
COMMENT = improved dynamic tiling window manager
DISTNAME = i3-3.e-bf1
PKGNAME = i3-3.5.1
REVISION = 0
CATEGORIES = x11

27
x11/i3/patches/patch-src_mainx_c Normal file
View File

@ -0,0 +1,27 @@
$OpenBSD: patch-src_mainx_c,v 1.1 2010/11/18 12:20:54 dcoppa Exp $
--- src/mainx.c.orig Wed Jun 9 09:58:15 2010
+++ src/mainx.c Thu Nov 18 12:16:59 2010
@@ -526,17 +526,18 @@ int main(int argc, char *argv[], char *env[]) {
translate_keysyms();
grab_all_keys(conn, false);
- int randr_base;
+ int randr_base = -1;
if (force_xinerama) {
initialize_xinerama(conn);
} else {
DLOG("Checking for XRandR...\n");
initialize_randr(conn, &randr_base);
- xcb_event_set_handler(&evenths,
- randr_base + XCB_RANDR_SCREEN_CHANGE_NOTIFY,
- handle_screen_change,
- NULL);
+ if (randr_base != -1)
+ xcb_event_set_handler(&evenths,
+ randr_base + XCB_RANDR_SCREEN_CHANGE_NOTIFY,
+ handle_screen_change,
+ NULL);
}
xcb_flush(conn);

19
x11/i3/patches/patch-src_randr_c Normal file
View File

@ -0,0 +1,19 @@
$OpenBSD: patch-src_randr_c,v 1.1 2010/11/18 12:20:54 dcoppa Exp $
--- src/randr.c.orig Wed Jun 9 09:58:15 2010
+++ src/randr.c Thu Nov 18 12:16:53 2010
@@ -523,9 +523,13 @@ void initialize_randr(xcb_connection_t *conn, int *eve
const xcb_query_extension_reply_t *extreply;
extreply = xcb_get_extension_data(conn, &xcb_randr_id);
- if (!extreply->present)
+ if (!extreply->present) {
disable_randr(conn);
- else randr_query_outputs(conn);
+ init_workspaces();
+ return;
+ }
+
+ randr_query_outputs(conn);
if (event_base != NULL)
*event_base = extreply->first_event;