From ce012289990c8cd4ae92559425bb7583c3d449ee Mon Sep 17 00:00:00 2001 From: Jacalz Date: Wed, 9 Dec 2020 16:28:09 +0100 Subject: [PATCH 1/2] Add a way of running in embedded X window using make I am tired of copy-and-pasting the lines from the README whenever I want to do this. Now we can just run `make run -j2` to do it :) --- Makefile | 5 +++++ README.md | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b76792ed..5c848c6b 100644 --- a/Makefile +++ b/Makefile @@ -18,3 +18,8 @@ uninstall: -rm $(DESTDIR)$(PREFIX)/bin/fynedesk_runner -rm $(DESTDIR)$(PREFIX)/bin/fynedesk -rm $(DESTDIR)$(PREFIX)/share/xsessions/fynedesk.desktop + +run: + // This needs to run with -j2 (make run -j2) to run concurrently + DISPLAY=:0 Xephyr :1 -screen 1280x720 & + DISPLAY=:1 fynedesk diff --git a/README.md b/README.md index 0d48dd81..ed412625 100644 --- a/README.md +++ b/README.md @@ -33,8 +33,7 @@ Once installed you could set `$GOPATH/fynedesk` as your window manager (usually using .xinitrc). You can also run it in an embedded X window for testing using: - DISPLAY=:0 Xephyr :1 -screen 1280x720 & - DISPLAY=:1 fynedesk + make run -j2 It should look like this: From 86408364ccba191816aa68aeda1a31928ff4bf47 Mon Sep 17 00:00:00 2001 From: Jacalz Date: Wed, 9 Dec 2020 16:44:25 +0100 Subject: [PATCH 2/2] Change to new naming and fix issue with comment --- Makefile | 3 +-- README.md | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 5c848c6b..2853d9a2 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,6 @@ uninstall: -rm $(DESTDIR)$(PREFIX)/bin/fynedesk -rm $(DESTDIR)$(PREFIX)/share/xsessions/fynedesk.desktop -run: - // This needs to run with -j2 (make run -j2) to run concurrently +embed: DISPLAY=:0 Xephyr :1 -screen 1280x720 & DISPLAY=:1 fynedesk diff --git a/README.md b/README.md index ed412625..b2ce025f 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ Once installed you could set `$GOPATH/fynedesk` as your window manager (usually using .xinitrc). You can also run it in an embedded X window for testing using: - make run -j2 + make embed It should look like this: