]> git.sur5r.net Git - i3/i3/log
i3/i3
12 years agoProperly report errors in 'focus parent' (Thanks eeemsi)
Michael Stapelberg [Sun, 5 Aug 2012 18:56:33 +0000 (20:56 +0200)]
Properly report errors in 'focus parent' (Thanks eeemsi)

Also, make X11 errors debug log level only. They are harmless usually.

fixes #762

12 years agocorrectly store last_split_layout when we are dealing with a workspace-level layout...
Michael Stapelberg [Sun, 5 Aug 2012 18:52:42 +0000 (20:52 +0200)]
correctly store last_split_layout when we are dealing with a workspace-level layout change (Thanks aksr)

fixes #763

12 years agocreate hide_edge_borders option
Iakov Davydov [Sun, 22 Jul 2012 09:57:07 +0000 (13:57 +0400)]
create hide_edge_borders option

12 years agomakefile: canonicalize path when compiling
Michael Stapelberg [Sun, 5 Aug 2012 15:00:24 +0000 (17:00 +0200)]
makefile: canonicalize path when compiling

Compilers store the path with which they were called in the debug
symbols. Therefore, this will make backtraces show something like
../i3-4.2/src/main.c instead of src/main.c.

See also http://stackoverflow.com/questions/6473561/

12 years agopre-compile all.h, saves quite some build time
Michael Stapelberg [Sun, 5 Aug 2012 14:35:54 +0000 (16:35 +0200)]
pre-compile all.h, saves quite some build time

before:

$ time CC=clang make -j16
CC=clang make -j16  6,04s user 0,86s system 468% cpu 1,471 total
CC=clang make -j16  6,05s user 0,87s system 468% cpu 1,477 total
CC=clang make -j16  6,15s user 0,86s system 464% cpu 1,510 total
CC=clang make -j16  6,05s user 0,93s system 467% cpu 1,493 total
CC=clang make -j16  6,10s user 0,84s system 461% cpu 1,507 total

$ time CC=gcc make -j16
CC=gcc make -j16  9,91s user 1,43s system 508% cpu 2,231 total
CC=gcc make -j16  10,02s user 1,37s system 500% cpu 2,275 total
CC=gcc make -j16  9,80s user 1,60s system 507% cpu 2,245 total
CC=gcc make -j16  10,02s user 1,44s system 506% cpu 2,264 total
CC=gcc make -j16  9,99s user 1,45s system 505% cpu 2,261 total

after:

$ time CC=clang make -j16
CC=clang make -j16  3,41s user 0,83s system 375% cpu 1,131 total
CC=clang make -j16  3,29s user 0,90s system 373% cpu 1,122 total
CC=clang make -j16  3,35s user 0,77s system 369% cpu 1,116 total
CC=clang make -j16  3,36s user 0,78s system 374% cpu 1,105 total
CC=clang make -j16  3,46s user 0,75s system 373% cpu 1,126 total

$ time CC=gcc make -j16
CC=gcc make -j16  10,74s user 1,44s system 494% cpu 2,462 total
CC=gcc make -j16  10,68s user 1,54s system 497% cpu 2,453 total
CC=gcc make -j16  10,60s user 1,60s system 488% cpu 2,499 total
CC=gcc make -j16  10,63s user 1,51s system 485% cpu 2,502 total
CC=gcc make -j16  10,70s user 1,51s system 497% cpu 2,453 total

Therefore, we enable pre-compiled headers only when CC=clang.

12 years agofix a few warnings/places where the clang static analyzer complains
Michael Stapelberg [Sun, 5 Aug 2012 14:34:38 +0000 (16:34 +0200)]
fix a few warnings/places where the clang static analyzer complains

12 years agolog.h: include left-over slog() prototype
Michael Stapelberg [Sun, 5 Aug 2012 13:59:45 +0000 (15:59 +0200)]
log.h: include left-over slog() prototype

12 years agolog.h: tell the compiler these logging functions use printf-like formats
Michael Stapelberg [Sun, 5 Aug 2012 13:59:08 +0000 (15:59 +0200)]
log.h: tell the compiler these logging functions use printf-like formats

This gives us additional warnings and is supported in gcc and clang.

12 years agodocs/ipc: make the reply sections consistent (they contain the reply type)
Michael Stapelberg [Sun, 5 Aug 2012 12:42:12 +0000 (14:42 +0200)]
docs/ipc: make the reply sections consistent (they contain the reply type)

12 years agoipc: clarify the patch version for sth like 4.2
Michael Stapelberg [Sun, 5 Aug 2012 12:39:45 +0000 (14:39 +0200)]
ipc: clarify the patch version for sth like 4.2

12 years agounbreak the build
Michael Stapelberg [Sun, 5 Aug 2012 12:38:52 +0000 (14:38 +0200)]
unbreak the build

12 years agoipc: implement GET_VERSION to find out the i3 version
Michael Stapelberg [Sun, 5 Aug 2012 12:29:19 +0000 (14:29 +0200)]
ipc: implement GET_VERSION to find out the i3 version

This is useful for third-party scripts which require certain features
and want to error out cleanly when they are run with an old i3 version.

Additionally, i3 --version might be different from what’s actually
running (an old version of the binary), so i3-msg -t get_version will be
the best way to figure out the i3 version you are actually running from
this commit on.

12 years agoman/i3bar: Reference j4status
Quentin Glidic [Sat, 4 Aug 2012 21:31:38 +0000 (23:31 +0200)]
man/i3bar: Reference j4status

12 years agocleanup i3 sync protocol messages
Michael Stapelberg [Sat, 4 Aug 2012 14:34:57 +0000 (16:34 +0200)]
cleanup i3 sync protocol messages

12 years agoparser: remove debug messages
Michael Stapelberg [Sat, 4 Aug 2012 14:31:57 +0000 (16:31 +0200)]
parser: remove debug messages

The new parser is proven by now (v4.2 was released 4 months ago), so
removing these messages will make the logfile more readable.

12 years agoMerge branch 'master' into next
Michael Stapelberg [Sat, 4 Aug 2012 14:10:37 +0000 (16:10 +0200)]
Merge branch 'master' into next

12 years agoMerge branch 'fix-coords'
Michael Stapelberg [Sat, 4 Aug 2012 14:09:46 +0000 (16:09 +0200)]
Merge branch 'fix-coords'

12 years agofloating_fix_coordinates: properly deal with negative positions
Michael Stapelberg [Sat, 4 Aug 2012 13:33:50 +0000 (15:33 +0200)]
floating_fix_coordinates: properly deal with negative positions

12 years agoBugfix: Properly fix floating coordinates when disabling outputs (Thanks Tucos)
Michael Stapelberg [Sat, 4 Aug 2012 13:21:16 +0000 (15:21 +0200)]
Bugfix: Properly fix floating coordinates when disabling outputs (Thanks Tucos)

Since the content containers are not yet updated (they will be when
rendering), we need to use the output containers’s rects instead.

12 years agoBugfix: fix floating coordinates when moving assigned workspaces
Michael Stapelberg [Sat, 4 Aug 2012 13:20:56 +0000 (15:20 +0200)]
Bugfix: fix floating coordinates when moving assigned workspaces

12 years agoFix a crash when the current output cannot be determined (Thanks Tucos)
Michael Stapelberg [Sat, 4 Aug 2012 13:19:11 +0000 (15:19 +0200)]
Fix a crash when the current output cannot be determined (Thanks Tucos)

This is only a cosmetical change though, the fix for the root cause can
be found in the commits following this one.

12 years agoi3-migrate-config-to-v4: use layout toggle split (Thanks eeemsi)
Michael Stapelberg [Sat, 4 Aug 2012 10:46:37 +0000 (12:46 +0200)]
i3-migrate-config-to-v4: use layout toggle split (Thanks eeemsi)

12 years agoensure the layout is not L_DEFAULT anymore, even if last_split_layout is not initiali...
Michael Stapelberg [Sat, 4 Aug 2012 01:43:12 +0000 (03:43 +0200)]
ensure the layout is not L_DEFAULT anymore, even if last_split_layout is not initialized (Thanks eeemsi)

12 years agoIntroduce splith/splitv layouts, remove orientation
Michael Stapelberg [Sat, 4 Aug 2012 01:04:00 +0000 (03:04 +0200)]
Introduce splith/splitv layouts, remove orientation

With this commit, the "default" layout is replaced by the splith and
splitv layouts. splith is equivalent to default with orientation
horizontal and splitv is equivalent to default with orientation
vertical.

The "split h" and "split v" commands continue to work as before, they
split the current container and you will end up in a split container
with layout splith (after "split h") or splitv (after "split v").

To change a splith container into a splitv container, use either "layout
splitv" or "layout toggle split". The latter command is used in the
default config as mod+l (previously "layout default"). In case you have
"layout default" in your config file, it is recommended to just replace
it by "layout toggle split", which will work as "layout default" did
before when pressing it once, but toggle between horizontal/vertical
when pressing it repeatedly.

The rationale behind this commit is that it’s cleaner to have all
parameters that influence how windows are rendered in the layout itself
rather than having a special parameter in combination with only one
layout. This enables us to change existing split containers in all cases
without breaking existing features (see ticket #464). Also, users should
feel more confident about whether they are actually splitting or just
changing an existing split container now.

As a nice side-effect, this commit brings back the "layout toggle"
feature we once had in i3 version 3 (see the userguide).

AFAIK, it is safe to use in-place restart to upgrade into versions
after this commit (switching to an older version will break your layout,
though).

Fixes #464

12 years agotests: implement --xtrace in complete-run.pl
Michael Stapelberg [Fri, 3 Aug 2012 22:51:41 +0000 (00:51 +0200)]
tests: implement --xtrace in complete-run.pl

12 years agoadd missing \n in debug message
Michael Stapelberg [Fri, 3 Aug 2012 21:58:02 +0000 (23:58 +0200)]
add missing \n in debug message

12 years agomakefile: store $I3_VERSION in dist tarballs
Michael Stapelberg [Fri, 3 Aug 2012 23:10:45 +0000 (01:10 +0200)]
makefile: store $I3_VERSION in dist tarballs

This is necessary because the autobuilder uses a dist tarball to build
i3 from. If we store $VERSION, the autobuiluder binaries will not run in
developer mode, thus defeating the purpose of developer mode.

12 years agoDisplay i3-nagbar when commands lead to an error
Michael Stapelberg [Thu, 2 Aug 2012 15:43:00 +0000 (17:43 +0200)]
Display i3-nagbar when commands lead to an error

e.g. pressing Mod1+x when having the following in your configfile:

    bindsym Mod1+x some invalid command

will lead to an i3-nagbar instance popping up, offering you to view the
error log (which will contain parser errors from this commit on).

12 years agoconfig: require confirmation when exiting i3 (Thanks Felicitus)
Michael Stapelberg [Thu, 2 Aug 2012 14:17:24 +0000 (16:17 +0200)]
config: require confirmation when exiting i3 (Thanks Felicitus)

Fixes #751

12 years agoAdd xfce4-terminal to i3-sensible-terminal
Michael Stapelberg [Thu, 2 Aug 2012 13:20:17 +0000 (15:20 +0200)]
Add xfce4-terminal to i3-sensible-terminal

Fixes #753

12 years agocfgparse: Write custom scripts for i3-sensible-terminal
Michael Stapelberg [Thu, 2 Aug 2012 13:17:10 +0000 (15:17 +0200)]
cfgparse: Write custom scripts for i3-sensible-terminal

This workaround is necessary for terminal emulators which parse -e in a
different way: some accept a list of arguments (-e command arg1 arg2 …),
some accept only one argument (-e "command arg1 arg2 …"). Therefore, we
just create a script and pass that as the one and only argument.

12 years agoconfig-wizard: use the level 0 keysym whenever it’s unambiguous
Michael Stapelberg [Thu, 2 Aug 2012 00:14:56 +0000 (02:14 +0200)]
config-wizard: use the level 0 keysym whenever it’s unambiguous

From the code:

    Try to use the keysym on the first level (lower-case). In case
    this doesn’t make it ambiguous (think of a keyboard layout
    having '1' on two different keys, but '!' only on keycode 10),
    we’ll stick with the keysym of the first level.

    This reduces a lot of confusion for users who switch keyboard
    layouts from qwerty to qwertz or other slight variations of
    qwerty (yes, that happens quite often).

12 years agoAutomatically hide i3bar when it's unneeded.
darkraven [Thu, 26 Jul 2012 18:53:32 +0000 (02:53 +0800)]
Automatically hide i3bar when it's unneeded.

When a workspace marked 'urgent', i3bar unhide
itself. if I want to hide it again, I must press the
modifier.This sometimes annoys me.

In this patch I change the above behavior to this:
If a urgent workspace occurs, i3bar will unhide itself;
and when you navigates away from the last urgent
workspace and there is no more urgent workspace, i3bar
will hide itself.

12 years agocommon.mk: Rework version usage
Quentin Glidic [Mon, 30 Jul 2012 15:24:31 +0000 (17:24 +0200)]
common.mk: Rework version usage

12 years agodocs/ipc: update links to libraries
Michael Stapelberg [Mon, 23 Jul 2012 09:03:16 +0000 (11:03 +0200)]
docs/ipc: update links to libraries

12 years agodocs/ipc: document the 'window' field (Thanks jh)
Michael Stapelberg [Mon, 23 Jul 2012 09:01:52 +0000 (11:01 +0200)]
docs/ipc: document the 'window' field (Thanks jh)

fixes #758

12 years agoFix linking by linking libi3 first and its dependencies afterwards
Michael Stapelberg [Mon, 23 Jul 2012 08:56:44 +0000 (10:56 +0200)]
Fix linking by linking libi3 first and its dependencies afterwards

Interestingly, compilation was only broken on some systems apparently

12 years agocommon.mk: Little reordering
Quentin Glidic [Sun, 22 Jul 2012 22:13:16 +0000 (00:13 +0200)]
common.mk: Little reordering

12 years agocommon.mk: Split XCB common flags
Quentin Glidic [Sun, 22 Jul 2012 22:10:42 +0000 (00:10 +0200)]
common.mk: Split XCB common flags

12 years agocommon.mk: Split XCB keyboard flags
Quentin Glidic [Sun, 22 Jul 2012 22:06:37 +0000 (00:06 +0200)]
common.mk: Split XCB keyboard flags

12 years agocommon.mk: Split WM XCB flags
Quentin Glidic [Sun, 22 Jul 2012 22:02:01 +0000 (00:02 +0200)]
common.mk: Split WM XCB flags

12 years agocommon.mk: Split Xlib flags
Quentin Glidic [Sun, 22 Jul 2012 21:57:39 +0000 (23:57 +0200)]
common.mk: Split Xlib flags

12 years agocommon.mk: Move -lm to i3_LIBS
Quentin Glidic [Sun, 22 Jul 2012 21:47:34 +0000 (23:47 +0200)]
common.mk: Move -lm to i3_LIBS

12 years agocommon.mk: Split Xcursor flags
Quentin Glidic [Sun, 22 Jul 2012 21:42:18 +0000 (23:42 +0200)]
common.mk: Split Xcursor flags

12 years agocommon.mk: Split yajl flags
Quentin Glidic [Sun, 22 Jul 2012 21:21:43 +0000 (23:21 +0200)]
common.mk: Split yajl flags

12 years agocommon.mk: Split libev flags
Quentin Glidic [Sun, 22 Jul 2012 21:20:29 +0000 (23:20 +0200)]
common.mk: Split libev flags

12 years agocommon.mk: Split libpcre flags
Quentin Glidic [Sun, 22 Jul 2012 21:07:10 +0000 (23:07 +0200)]
common.mk: Split libpcre flags

12 years agocommon.mk: Split libstartup-notification flags
Quentin Glidic [Sun, 22 Jul 2012 21:00:33 +0000 (23:00 +0200)]
common.mk: Split libstartup-notification flags

12 years agocommon.mk: Introduce I3_*FLAGS
Quentin Glidic [Sun, 22 Jul 2012 20:27:45 +0000 (22:27 +0200)]
common.mk: Introduce I3_*FLAGS

CPPFLGES, CFLAGS and LDFLAGS should be user variables
We now provide default flags but use I3_*FLAGS flags for our own needed
flags

Also reoder lib flags a bit

12 years ago*.mk: Support passing specific CFLAGS/LIBS
Quentin Glidic [Sun, 22 Jul 2012 20:04:14 +0000 (22:04 +0200)]
*.mk: Support passing specific CFLAGS/LIBS

12 years agoresizing: traverse containers up properly (+test) (Thanks oblique)
Michael Stapelberg [Sun, 22 Jul 2012 19:37:26 +0000 (21:37 +0200)]
resizing: traverse containers up properly (+test) (Thanks oblique)

In certain situations (when you have a h-split within a h-split) you
couldn’t properly resize previously. This commit makes the resize
command properly traverse up the containers.

fixes #754

12 years agoMerge branch 'master' into next
Michael Stapelberg [Sun, 22 Jul 2012 19:26:00 +0000 (21:26 +0200)]
Merge branch 'master' into next

12 years agoMerge branch 'fix-resize-retcode'
Michael Stapelberg [Sun, 22 Jul 2012 19:25:53 +0000 (21:25 +0200)]
Merge branch 'fix-resize-retcode'

12 years agoBugfix: Fix duplicate return value for 'resize' command
Michael Stapelberg [Sun, 22 Jul 2012 19:25:38 +0000 (21:25 +0200)]
Bugfix: Fix duplicate return value for 'resize' command

12 years agodebian: i3bar.1 has been moved to man/
Michael Stapelberg [Sun, 22 Jul 2012 19:07:32 +0000 (21:07 +0200)]
debian: i3bar.1 has been moved to man/

12 years agoBugfix: include i3-input/i3-input.mk in the dist tarballs
Michael Stapelberg [Sun, 22 Jul 2012 19:04:35 +0000 (21:04 +0200)]
Bugfix: include i3-input/i3-input.mk in the dist tarballs

12 years agoMove mans to the new Makefile layout
Quentin Glidic [Sun, 17 Jun 2012 12:52:41 +0000 (14:52 +0200)]
Move mans to the new Makefile layout

12 years agoAdd stub Makefiles to allow subdir make calls
Quentin Glidic [Sun, 17 Jun 2012 12:37:07 +0000 (14:37 +0200)]
Add stub Makefiles to allow subdir make calls

12 years agoMove docs to the new Makefile layout
Quentin Glidic [Sun, 17 Jun 2012 12:31:45 +0000 (14:31 +0200)]
Move docs to the new Makefile layout

12 years agoMakefile: Remove SUBDIRS
Quentin Glidic [Wed, 16 May 2012 15:32:25 +0000 (17:32 +0200)]
Makefile: Remove SUBDIRS

12 years agoUpdate .gitignore
Quentin Glidic [Wed, 16 May 2012 15:30:09 +0000 (17:30 +0200)]
Update .gitignore

12 years agoMove i3-dump-log to the new Makefile layout
Quentin Glidic [Wed, 16 May 2012 14:22:57 +0000 (16:22 +0200)]
Move i3-dump-log to the new Makefile layout

12 years agoMove i3bar to the new Makefile layout
Quentin Glidic [Wed, 16 May 2012 14:22:57 +0000 (16:22 +0200)]
Move i3bar to the new Makefile layout

12 years agoMove i3-nagbar to the new Makefile layout
Quentin Glidic [Wed, 16 May 2012 14:22:57 +0000 (16:22 +0200)]
Move i3-nagbar to the new Makefile layout

12 years agoMove i3-input to the new Makefile layout
Quentin Glidic [Wed, 16 May 2012 14:22:57 +0000 (16:22 +0200)]
Move i3-input to the new Makefile layout

12 years agoMove i3-msg to the new Makefile layout
Quentin Glidic [Wed, 16 May 2012 14:22:57 +0000 (16:22 +0200)]
Move i3-msg to the new Makefile layout

12 years agoMove i3-config-wizard to the new Makefile layout
Quentin Glidic [Wed, 16 May 2012 14:22:57 +0000 (16:22 +0200)]
Move i3-config-wizard to the new Makefile layout

12 years agoMove libi3 to the new Makefile layout
Quentin Glidic [Wed, 16 May 2012 14:22:57 +0000 (16:22 +0200)]
Move libi3 to the new Makefile layout

12 years agoNew Makefile layout, move i3 to it
Quentin Glidic [Wed, 16 May 2012 14:19:12 +0000 (16:19 +0200)]
New Makefile layout, move i3 to it

12 years agocommom.mk: Support V make variable (verbose build)
Quentin Glidic [Wed, 16 May 2012 14:47:15 +0000 (16:47 +0200)]
commom.mk: Support V make variable (verbose build)

12 years agoi3: Replace loglevels by a global debug logging
Quentin Glidic [Sat, 21 Jul 2012 22:16:52 +0000 (00:16 +0200)]
i3: Replace loglevels by a global debug logging

File-limited were not used nor really useful
Besides, they are painful to maintain in Makefile rules compared to the
benefit

12 years agoMerge branch 'master' into next
Michael Stapelberg [Mon, 16 Jul 2012 17:24:41 +0000 (19:24 +0200)]
Merge branch 'master' into next

12 years agoMerge branch 'fix-yajl1-warnings'
Michael Stapelberg [Mon, 16 Jul 2012 17:24:33 +0000 (19:24 +0200)]
Merge branch 'fix-yajl1-warnings'

12 years agoi3bar: Fix warnings with libyajl1 (Thanks prg)
Michael Stapelberg [Mon, 16 Jul 2012 17:23:37 +0000 (19:23 +0200)]
i3bar: Fix warnings with libyajl1 (Thanks prg)

yajl1 has the status yajl_status_insufficient_data, which in our stream
parsing context basically means "ok". Therefore, in yajl1, we no longer
print an error in this case.

12 years agoMerge branch 'master' into next
Michael Stapelberg [Wed, 11 Jul 2012 17:06:21 +0000 (19:06 +0200)]
Merge branch 'master' into next

12 years agoMerge branch 'fix-empty-strings'
Michael Stapelberg [Wed, 11 Jul 2012 17:06:17 +0000 (19:06 +0200)]
Merge branch 'fix-empty-strings'

12 years agoDon't display empty strings from i3status in i3bar
Marcel Hellwig [Sun, 8 Jul 2012 19:31:34 +0000 (21:31 +0200)]
Don't display empty strings from i3status in i3bar

12 years agoMerge branch 'master' into next
Michael Stapelberg [Tue, 10 Jul 2012 20:53:39 +0000 (22:53 +0200)]
Merge branch 'master' into next

12 years agoMerge branch 'i3bar-tray'
Michael Stapelberg [Tue, 10 Jul 2012 20:53:36 +0000 (22:53 +0200)]
Merge branch 'i3bar-tray'

12 years agoi3bar: inform _all_ clients of new tray selection owner
Michael Stapelberg [Tue, 10 Jul 2012 20:52:14 +0000 (22:52 +0200)]
i3bar: inform _all_ clients of new tray selection owner

This fixes a problem with X-chat (and possibly others).

Fixes: #745
12 years agotests: t/504: ensure cursor position
Michael Stapelberg [Fri, 29 Jun 2012 21:21:32 +0000 (23:21 +0200)]
tests: t/504: ensure cursor position

Otherwise, the cursor might be at (1025, 0) due to previous testcases
and we wouldn’t start up on the correct workspace.

12 years agotests: t/166-assign.t: use wait_for_window
Michael Stapelberg [Fri, 29 Jun 2012 21:20:46 +0000 (23:20 +0200)]
tests: t/166-assign.t: use wait_for_window

While it’s generally intended that wait_for_window is not called within
this testcase, in the first test instruction it was a mistake. The
window in fact gets mapped and therefore we should call wait_for_window.

12 years agoExplicitly disconnect in the 'exit' command
Michael Stapelberg [Fri, 29 Jun 2012 21:13:25 +0000 (23:13 +0200)]
Explicitly disconnect in the 'exit' command

This fixes a race condition when running the tests. I think that the X11
server has more time to clean up the resources when we do an explicit
disconnect. The symptom I was seeing was that sometimes, i3 couldn’t
become the window manager on one of the Xdummy instances.

12 years agotests: make t/166-assign.t more robust
Michael Stapelberg [Fri, 29 Jun 2012 19:28:10 +0000 (21:28 +0200)]
tests: make t/166-assign.t more robust

…by using the new syntax which will not trigger i3-nagbar. Checking for
i3-nagbar is inherently prone to race conditions since i3-nagbar does
not communicate in any way that it’s there.

12 years agotests: make t/159-socketpath more robust
Michael Stapelberg [Fri, 29 Jun 2012 19:21:07 +0000 (21:21 +0200)]
tests: make t/159-socketpath more robust

…by getting the socket path from i3 and then checking that it conforms
to what we expect. Previously we monitored /tmp, which can go wrong in
various ways, especially since i3’s directory within /tmp is not
predictable (by design).

12 years agoMerge branch 'master' into next
Michael Stapelberg [Wed, 27 Jun 2012 15:49:36 +0000 (17:49 +0200)]
Merge branch 'master' into next

12 years agoMerge branch 'fix-reload'
Michael Stapelberg [Wed, 27 Jun 2012 15:49:19 +0000 (17:49 +0200)]
Merge branch 'fix-reload'

12 years agoBugfix: fix reload crashes in rare cases (Thanks Tucos)
Michael Stapelberg [Wed, 27 Jun 2012 15:48:22 +0000 (17:48 +0200)]
Bugfix: fix reload crashes in rare cases (Thanks Tucos)

Depending on the memory layout, it could happen that bind->command was
exchanged with something else while the parser still accessed it.

Therefore, we now copy the command and let the parser use that copy.

12 years agoMerge branch 'master' into next
Michael Stapelberg [Mon, 25 Jun 2012 19:44:20 +0000 (21:44 +0200)]
Merge branch 'master' into next

12 years agoMerge branch 'fix-C'
Michael Stapelberg [Mon, 25 Jun 2012 19:44:07 +0000 (21:44 +0200)]
Merge branch 'fix-C'

12 years agowhen using i3 -C, don’t send remaining arguments via IPC (Thanks Somelauw)
Michael Stapelberg [Mon, 25 Jun 2012 19:43:41 +0000 (21:43 +0200)]
when using i3 -C, don’t send remaining arguments via IPC (Thanks Somelauw)

12 years agoMerge branch 'master' into next
Michael Stapelberg [Sun, 24 Jun 2012 19:22:44 +0000 (21:22 +0200)]
Merge branch 'master' into next

12 years agoMerge branch 'gitignore'
Michael Stapelberg [Sun, 24 Jun 2012 19:22:39 +0000 (21:22 +0200)]
Merge branch 'gitignore'

12 years agoFix up .gitignore
stfn [Sat, 23 Jun 2012 19:46:11 +0000 (21:46 +0200)]
Fix up .gitignore

12 years agoMerge branch 'master' into next
Michael Stapelberg [Sun, 24 Jun 2012 15:30:45 +0000 (17:30 +0200)]
Merge branch 'master' into next

12 years agoMerge branch 'userguide-containers'
Michael Stapelberg [Sun, 24 Jun 2012 15:30:39 +0000 (17:30 +0200)]
Merge branch 'userguide-containers'

12 years agoadd section about implicit containers to the userguide (Thanks mloskot)
Michael Stapelberg [Sun, 24 Jun 2012 15:30:18 +0000 (17:30 +0200)]
add section about implicit containers to the userguide (Thanks mloskot)

12 years agoMerge branch 'master' into next
Michael Stapelberg [Sun, 10 Jun 2012 19:30:36 +0000 (21:30 +0200)]
Merge branch 'master' into next

12 years agouserguide: make the default clear for focus_follows_mouse and new_window
Michael Stapelberg [Sun, 10 Jun 2012 19:30:14 +0000 (21:30 +0200)]
userguide: make the default clear for focus_follows_mouse and new_window

12 years agoMerge branch 'master' into next
Michael Stapelberg [Sun, 10 Jun 2012 19:05:58 +0000 (21:05 +0200)]
Merge branch 'master' into next