35c222ff4a
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.
28 lines
1.1 KiB
Plaintext
28 lines
1.1 KiB
Plaintext
$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);
|