]> git.sur5r.net Git - i3/i3/commitdiff
projects / i3 / i3 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: 74a6c75)
Merge branch 'next'
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 19 Aug 2009 13:13:27 +0000 (15:13 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 19 Aug 2009 13:13:27 +0000 (15:13 +0200)
Conflicts:
src/manage.c
src/util.c
src/xinerama.c

src/config.c patch | blob | history
website/contact/index.html patch | blob | history
website/docs/index.html patch | blob | history
website/downloads/index.html patch | blob | history
website/index.html patch | blob | history
website/screenshots/index.html patch | blob | history

diff --git a/src/config.c b/src/config.c
index a5f635dc5920eaf4c6a07591078cd5d39e5e9c6d..bc7edeab408080bc34b6683f229d98cef75a3b75 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -418,6 +418,10 @@ void load_configuration(xcb_connection_t *conn, const char *override_configpath,
                                 die("Malformed assignment, couldn't find terminating quote\n");
                         *end = '\0';
 
+                        /* Strip trailing whitespace */
+                        while (strlen(value) > 0 && value[strlen(value)-1] == ' ')
+                                value[strlen(value)-1] = '\0';
+
                         /* Strip trailing whitespace */
                         while (strlen(value) > 0 && value[strlen(value)-1] == ' ')
                                 value[strlen(value)-1] = '\0';
diff --git a/website/contact/index.html b/website/contact/index.html
index 583d4fe09ece79224b4b4253b9ba0ce89e6c7da0..5317cd512073736f0cf5ac2316dd763642d5380a 100644 (file)
--- a/website/contact/index.html
+++ b/website/contact/index.html
@@ -10,52 +10,70 @@
 <style type="text/css">
 body {
        text-align: justify;
-       max-width: 800px;
+       max-width: 900px;
+       background-color: #1e1e1e;
+       color: #c0c0c0;
 }
 
-li {
+ol li {
        margin-bottom: 10px;
 }
+
 #menu {
+       margin-left: -15px;
        overflow: hidden;
        list-style-type: none;
 }
+
 #menu li {
        margin-left: 30px;
        margin-right: 30px;
        float: left;
 }
 
+a {
+        color: #c0c0c0;
+       text-decoration: underline;
+}
+
 </style>
 </head>
 <body>
 
-<h1>i3 - an improved dynamic tiling window manager</h1>
+<img width="131" height="125" src="http://i3.zekjur.net/logo.png" style="margin-right: 15px" alt="logo" id="logo" align="left">
+
+<h1 style="color: red; font-family: georgia; font-size: 3em;margin-bottom: 0;">i3</h1>
+<h1 style="font-family: georgia; font-size: 2em;margin-bottom: 0;">improved tiling wm</h1>
+
+<br style="height: 0; clear: both;">
+<hr style="border: 1px solid black; clear: both; margin-top: 5px;">
 
 <ul id="menu">
   <li>
     <a href="/">Goals</a>
   </li>
   <li>
-    <a href="/docs/">Documentation</a>
+    <a href="/docs/">Docs</a>
   </li>
   <li>
     <a href="/downloads/">Downloads</a>
   </li>
   <li>
-    <a href="/screenshots/">Screenshots</a>
+    <a href="/screenshots/">Screens</a>
   </li>
   <li>
     <a href="/bugs">Bugtracker</a>
   </li>
   <li>
-    <strong><a href="/contact/">Contact</a></strong>
+    <a href="/contact/">Contact</a>
   </li>
   <li>
-    <a href="/impress.html">Impressum/Imprint</a>
+    <a href="/impress.html">Impressum</a>
   </li>
 </ul>
 
+<hr style="border: 1px solid black; clear: both; margin-top: 15px;">
+
 <p>
 
 <h2>Contact</h2>
diff --git a/website/docs/index.html b/website/docs/index.html
index d64949027ff6b7e85643dac4e2f102f3b79b3cc8..ff16432325181fc0fd2a68c24c173733ca3f4ee7 100644 (file)
--- a/website/docs/index.html
+++ b/website/docs/index.html
@@ -10,40 +10,56 @@
 <style type="text/css">
 body {
        text-align: justify;
-       max-width: 800px;
+       max-width: 900px;
+       background-color: #1e1e1e;
+       color: #c0c0c0;
 }
 
-li {
+ol li {
        margin-bottom: 10px;
 }
+
 #menu {
+       margin-left: -15px;
        overflow: hidden;
        list-style-type: none;
 }
+
 #menu li {
        margin-left: 30px;
        margin-right: 30px;
        float: left;
 }
 
+a {
+        color: #c0c0c0;
+       text-decoration: underline;
+}
+
 </style>
 </head>
 <body>
 
-<h1>i3 - an improved dynamic tiling window manager</h1>
+<img width="131" height="125" src="http://i3.zekjur.net/logo.png" style="margin-right: 15px" alt="logo" id="logo" align="left">
+
+<h1 style="color: red; font-family: georgia; font-size: 3em;margin-bottom: 0;">i3</h1>
+<h1 style="font-family: georgia; font-size: 2em;margin-bottom: 0;">improved tiling wm</h1>
+
+<br style="height: 0; clear: both;">
+<hr style="border: 1px solid black; clear: both; margin-top: 5px;">
 
 <ul id="menu">
   <li>
     <a href="/">Goals</a>
   </li>
   <li>
-    <strong><a href="/docs/">Documentation</a></strong>
+    <a href="/docs/">Docs</a>
   </li>
   <li>
     <a href="/downloads/">Downloads</a>
   </li>
   <li>
-    <a href="/screenshots/">Screenshots</a>
+    <a href="/screenshots/">Screens</a>
   </li>
   <li>
     <a href="/bugs">Bugtracker</a>
@@ -52,10 +68,13 @@ li {
     <a href="/contact/">Contact</a>
   </li>
   <li>
-    <a href="/impress.html">Impressum/Imprint</a>
+    <a href="/impress.html">Impressum</a>
   </li>
 </ul>
 
+<hr style="border: 1px solid black; clear: both; margin-top: 15px;">
+
+
 <h2>Documentation</h2>
 
 <p>
diff --git a/website/downloads/index.html b/website/downloads/index.html
index 5e1f2045b3980e5aae440638b83b6193ae1cd679..360413a7f206105724856b9108b68b079dd87149 100644 (file)
--- a/website/downloads/index.html
+++ b/website/downloads/index.html
@@ -10,40 +10,56 @@
 <style type="text/css">
 body {
        text-align: justify;
-       max-width: 800px;
+       max-width: 900px;
+       background-color: #1e1e1e;
+       color: #c0c0c0;
 }
 
-li {
+ol li {
        margin-bottom: 10px;
 }
+
 #menu {
+       margin-left: -15px;
        overflow: hidden;
        list-style-type: none;
 }
+
 #menu li {
        margin-left: 30px;
        margin-right: 30px;
        float: left;
 }
 
+a {
+        color: #c0c0c0;
+       text-decoration: underline;
+}
+
 </style>
 </head>
 <body>
 
-<h1>i3 - an improved dynamic tiling window manager</h1>
+<img width="131" height="125" src="http://i3.zekjur.net/logo.png" style="margin-right: 15px" alt="logo" id="logo" align="left">
+
+<h1 style="color: red; font-family: georgia; font-size: 3em;margin-bottom: 0;">i3</h1>
+<h1 style="font-family: georgia; font-size: 2em;margin-bottom: 0;">improved tiling wm</h1>
+
+<br style="height: 0; clear: both;">
+<hr style="border: 1px solid black; clear: both; margin-top: 5px;">
 
 <ul id="menu">
   <li>
     <a href="/">Goals</a>
   </li>
   <li>
-    <a href="/docs/">Documentation</a>
+    <a href="/docs/">Docs</a>
   </li>
   <li>
-    <strong><a href="/downloads/">Downloads</a></strong>
+    <a href="/downloads/">Downloads</a>
   </li>
   <li>
-    <a href="/screenshots/">Screenshots</a>
+    <a href="/screenshots/">Screens</a>
   </li>
   <li>
     <a href="/bugs">Bugtracker</a>
@@ -52,10 +68,13 @@ li {
     <a href="/contact/">Contact</a>
   </li>
   <li>
-    <a href="/impress.html">Impressum/Imprint</a>
+    <a href="/impress.html">Impressum</a>
   </li>
 </ul>
 
+<hr style="border: 1px solid black; clear: both; margin-top: 15px;">
+
+
 <h2>Distribution</h2>
 
 <p>
@@ -64,7 +83,7 @@ li {
 
 <ul>
   <li>
-    <a href="http://packages.debian.org/sid/i3">Debian GNU/Linux</a> (in unstable currently)
+    <a href="http://packages.debian.org/sid/i3">Debian GNU/Linux</a>
   </li>
   <li>
     <a href="http://aur.archlinux.org/packages.php?ID=24720">Arch Linux</a>
@@ -89,11 +108,17 @@ li {
 <h2>Downloads</h2>
 
 <p>
-  The current stable version is 3.β (transcribed 3.b because many systems still can’t
+  The current stable version is 3.γ (transcribed 3.c because many systems still can’t
   handle UTF-8 in version numbers).
 </p>
 
 <ul>
+  <li>
+    <a href="/downloads/i3-3.c.tar.bz2">i3-3.c.tar.bz2</a>
+    (<a href="/downloads/i3-3.c.tar.bz2.asc">GPG signature</a>), Version 3.γ, 107 KiB, 2009-08-19,
+    <a href="/downloads/RELEASE-NOTES-3.c.txt">release notes</a>
+
+  </li>
   <li>
     <a href="/downloads/i3-3.b.tar.bz2">i3-3.b.tar.bz2</a>
     (<a href="/downloads/i3-3.b.tar.bz2.asc">GPG signature</a>), Version 3.β, 96 KiB, 2009-06-26,
diff --git a/website/index.html b/website/index.html
index d72bc92e2ee01aff06bf47fda86734cfb19fc378..9528ac3232660b49e3ed211ddf2e27f48cb44948 100644 (file)
--- a/website/index.html
+++ b/website/index.html
@@ -10,40 +10,56 @@
 <style type="text/css">
 body {
        text-align: justify;
-       max-width: 800px;
+       max-width: 900px;
+       background-color: #1e1e1e;
+       color: #c0c0c0;
 }
 
-li {
+ol li {
        margin-bottom: 10px;
 }
+
 #menu {
+       margin-left: -15px;
        overflow: hidden;
        list-style-type: none;
 }
+
 #menu li {
        margin-left: 30px;
        margin-right: 30px;
        float: left;
 }
 
+a {
+        color: #c0c0c0;
+       text-decoration: underline;
+}
+
 </style>
 </head>
 <body>
 
-<h1>i3 - an improved dynamic tiling window manager</h1>
+<img width="131" height="125" src="http://i3.zekjur.net/logo.png" style="margin-right: 15px" alt="logo" id="logo" align="left">
+
+<h1 style="color: red; font-family: georgia; font-size: 3em;margin-bottom: 0;">i3</h1>
+<h1 style="font-family: georgia; font-size: 2em;margin-bottom: 0;">improved tiling wm</h1>
+
+<br style="height: 0; clear: both;">
+<hr style="border: 1px solid black; clear: both; margin-top: 5px;">
 
 <ul id="menu">
   <li>
     <a href="/">Goals</a>
   </li>
   <li>
-    <a href="/docs/">Documentation</a>
+    <a href="/docs/">Docs</a>
   </li>
   <li>
     <a href="/downloads/">Downloads</a>
   </li>
   <li>
-    <a href="/screenshots/">Screenshots</a>
+    <a href="/screenshots/">Screens</a>
   </li>
   <li>
     <a href="/bugs">Bugtracker</a>
@@ -52,10 +68,16 @@ li {
     <a href="/contact/">Contact</a>
   </li>
   <li>
-    <a href="/impress.html">Impressum/Imprint</a>
+    <a href="/impress.html">Impressum</a>
   </li>
 </ul>
 
+<hr style="border: 1px solid black; clear: both; margin-top: 15px;">
+
+<p>
+  i3 is a tiling window manager, completely written from scratch.
+</p>
+
 <p>
   i3 was created because wmii, our favorite window manager at the time, didn’t
   provide some features we wanted (Xinerama done right, for example), had some
diff --git a/website/screenshots/index.html b/website/screenshots/index.html
index a46ea8ebab6d2d943803a64dbea99f7f29760d39..c43e03cbec366ba032e482f2e4e5510ec7daa5ff 100644 (file)
--- a/website/screenshots/index.html
+++ b/website/screenshots/index.html
@@ -10,40 +10,56 @@
 <style type="text/css">
 body {
        text-align: justify;
-       max-width: 800px;
+       max-width: 900px;
+       background-color: #1e1e1e;
+       color: #c0c0c0;
 }
 
-li {
+ol li {
        margin-bottom: 10px;
 }
+
 #menu {
+       margin-left: -15px;
        overflow: hidden;
        list-style-type: none;
 }
+
 #menu li {
        margin-left: 30px;
        margin-right: 30px;
        float: left;
 }
 
+a {
+        color: #c0c0c0;
+       text-decoration: underline;
+}
+
 </style>
 </head>
 <body>
 
-<h1>i3 - an improved dynamic tiling window manager</h1>
+<img width="131" height="125" src="http://i3.zekjur.net/logo.png" style="margin-right: 15px" alt="logo" id="logo" align="left">
+
+<h1 style="color: red; font-family: georgia; font-size: 3em;margin-bottom: 0;">i3</h1>
+<h1 style="font-family: georgia; font-size: 2em;margin-bottom: 0;">improved tiling wm</h1>
+
+<br style="height: 0; clear: both;">
+<hr style="border: 1px solid black; clear: both; margin-top: 5px;">
 
 <ul id="menu">
   <li>
     <a href="/">Goals</a>
   </li>
   <li>
-    <a href="/docs/">Documentation</a>
+    <a href="/docs/">Docs</a>
   </li>
   <li>
     <a href="/downloads/">Downloads</a>
   </li>
   <li>
-    <strong><a href="/screenshots/">Screenshots</a></strong>
+    <a href="/screenshots/">Screens</a>
   </li>
   <li>
     <a href="/bugs">Bugtracker</a>
@@ -52,10 +68,12 @@ li {
     <a href="/contact/">Contact</a>
   </li>
   <li>
-    <a href="/impress.html">Impressum/Imprint</a>
+    <a href="/impress.html">Impressum</a>
   </li>
 </ul>
 
+<hr style="border: 1px solid black; clear: both; margin-top: 15px;">
+
 <h2>Screenshots</h2>
 
 <p>
@@ -73,11 +91,17 @@ li {
     <a href="/screenshots/i3-3.png">i3 v3.α-bf1</a>, PCManFM, ROXTerm, evince, i3status + dzen2
   </li>
   <li>
-    <a href="/screenshots/i3-4.png">i3 v3.b (not yet released)</a>, Atsutane had too much free time and formed an i3 logo out of terminals :-)
+    <a href="/screenshots/i3-4.png">i3 v3.β</a>, Atsutane had too much free time and formed an i3 logo out of terminals :-)
   </li>
   <li>
     <a href="/screenshots/i3-5.png">i3 v3.α-bf2</a>, mc, vim, xosview, mplayer, irssi, gajim, i3status
   </li>
+  <li>
+    <a href="/screenshots/i3-6.png">i3 v3.β</a>, vim, zsh, i3status running on FreeBSD
+  </li>
+  <li>
+    <a href="/screenshots/i3-7.png">i3 v3.β</a>, GIMP (with floating toolbars), urxvt (also floating)
+  </li>
 </ul>
 
 <h2>Screencasts</h2>
A better tiling and dynamic window manager