From 99e91c804989990d977ee69c5ff4fcf6964c9f2d Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Wed, 19 Sep 2012 17:52:56 +0200 Subject: [PATCH 1/4] =?UTF-8?q?--help:=20note=20that=20nVidia=E2=80=99s=20?= =?UTF-8?q?driver=20supports=20RandR=20from=20302.17=20on?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main.c b/src/main.c index 7936e758..8bae9957 100644 --- a/src/main.c +++ b/src/main.c @@ -391,7 +391,8 @@ int main(int argc, char *argv[]) { fprintf(stderr, "\t--force-xinerama\n" "\tUse Xinerama instead of RandR.\n" "\tThis option should only be used if you are stuck with the\n" - "\tnvidia closed source driver which does not support RandR.\n"); + "\told nVidia closed source driver (older than 302.17), which does\n" + "\tnot support RandR.\n"); fprintf(stderr, "\n"); fprintf(stderr, "\t--get-socketpath\n" "\tRetrieve the i3 IPC socket path from X11, print it, then exit.\n"); From 156bd24f23e6bf6439d986782a4066521d9b13b0 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Wed, 19 Sep 2012 17:53:17 +0200 Subject: [PATCH 2/4] man: update i3(1) --- man/i3.man | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/man/i3.man b/man/i3.man index 096a359b..4358463b 100644 --- a/man/i3.man +++ b/man/i3.man @@ -1,7 +1,7 @@ i3(1) ===== Michael Stapelberg -v4.2, August 2012 +v4.3, September 2012 == NAME @@ -32,6 +32,18 @@ Display version number (and date of the last commit). -V:: Be verbose. +--force-xinerama:: +Use Xinerama instead of RandR. This option should only be used if you are stuck +with the old nVidia closed source driver (older than 302.17) which does not +support RandR. + +--get-socketpath:: +Retrieve the i3 IPC socket path from X11, print it, then exit. + +--shmlog-size :: +Limits the size of the i3 SHM log to bytes. Setting this to 0 disables +SHM logging entirely. The default is 0 bytes. + == DESCRIPTION === INTRODUCTION @@ -316,7 +328,7 @@ and the "how to hack" guide. If you are building from source, run: You can also access these documents online at http://i3wm.org/ -i3-input(1), i3-msg(1), i3-wsbar(1), i3-nagbar(1), i3-config-wizard(1), +i3-input(1), i3-msg(1), i3bar(1), i3-nagbar(1), i3-config-wizard(1), i3-migrate-config-to-v4(1) == AUTHOR From c808a39fb2b02ba2c32be99edc818765cfd259be Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Wed, 19 Sep 2012 17:53:27 +0200 Subject: [PATCH 3/4] man: set version to 4.3 --- man/asciidoc.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/asciidoc.conf b/man/asciidoc.conf index 79cf2b41..32d2186f 100644 --- a/man/asciidoc.conf +++ b/man/asciidoc.conf @@ -7,7 +7,7 @@ template::[header-declarations] {mantitle} {manvolnum} i3 -4.1.2 +4.3 i3 Manual From b9fde552d0c4605cadca96a23642366b032d08de Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Wed, 19 Sep 2012 18:05:51 +0200 Subject: [PATCH 4/4] fix make clean targets --- i3-config-wizard/i3-config-wizard.mk | 2 +- libi3/libi3.mk | 2 +- src/i3.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/i3-config-wizard/i3-config-wizard.mk b/i3-config-wizard/i3-config-wizard.mk index 1598cfed..3847786e 100644 --- a/i3-config-wizard/i3-config-wizard.mk +++ b/i3-config-wizard/i3-config-wizard.mk @@ -34,4 +34,4 @@ install-i3-config-wizard: i3-config-wizard/i3-config-wizard clean-i3-config-wizard: echo "[i3-config-wizard] Clean" - rm -f $(i3_config_wizard_OBJECTS) $(i3_config_wizard_SOURCES_GENERATED) i3-config-wizard/i3-config-wizard i3-config-wizard/cfgparse.{output,dot} + rm -f $(i3_config_wizard_OBJECTS) $(i3_config_wizard_SOURCES_GENERATED) i3-config-wizard/i3-config-wizard i3-config-wizard/cfgparse.{output,dot,tab.h,y.o} diff --git a/libi3/libi3.mk b/libi3/libi3.mk index d99bacf4..70521073 100644 --- a/libi3/libi3.mk +++ b/libi3/libi3.mk @@ -18,4 +18,4 @@ libi3.a: $(libi3_OBJECTS) clean-libi3: echo "[libi3] Clean" - rm -f $(libi3_OBJECTS) libi3.a + rm -f $(libi3_OBJECTS) libi3/libi3.a diff --git a/src/i3.mk b/src/i3.mk index a93cc4c4..78e19890 100644 --- a/src/i3.mk +++ b/src/i3.mk @@ -82,4 +82,4 @@ install-i3: i3 clean-i3: echo "[i3] Clean" - rm -f $(i3_OBJECTS) $(i3_SOURCES_GENERATED) $(i3_HEADERS_CMDPARSER) include/loglevels.h loglevels.tmp include/all.h.pch i3-command-parser.stamp i3 src/*.gcno src/cfgparse.{output,dot} src/cmdparse.* + rm -f $(i3_OBJECTS) $(i3_SOURCES_GENERATED) $(i3_HEADERS_CMDPARSER) include/loglevels.h loglevels.tmp include/all.h.pch i3-command-parser.stamp i3 src/*.gcno src/cfgparse.{output,dot,tab.h,y.o} src/cmdparse.*