]> git.sur5r.net Git - i3/i3/log
i3/i3
11 years agoMerge branch 'master' into next
Michael Stapelberg [Mon, 15 Apr 2013 19:01:27 +0000 (21:01 +0200)]
Merge branch 'master' into next

11 years agoMerge branch 'fix-resize'
Michael Stapelberg [Mon, 15 Apr 2013 19:01:27 +0000 (21:01 +0200)]
Merge branch 'fix-resize'

11 years agoEnsure that resize will take place even if pixel is smaller than size increments.
oblique [Mon, 15 Apr 2013 18:30:22 +0000 (21:30 +0300)]
Ensure that resize will take place even if pixel is smaller than size increments.

fixes #1011

11 years agoMerge branch 'master' into next
Michael Stapelberg [Sun, 14 Apr 2013 20:54:36 +0000 (22:54 +0200)]
Merge branch 'master' into next

11 years agoMerge branch 'fix-tray-output'
Michael Stapelberg [Sun, 14 Apr 2013 20:54:36 +0000 (22:54 +0200)]
Merge branch 'fix-tray-output'

11 years agoBugfix: fix crash when not having tray_output configured (Thanks Layus)
Michael Stapelberg [Sun, 14 Apr 2013 20:54:15 +0000 (22:54 +0200)]
Bugfix: fix crash when not having tray_output configured (Thanks Layus)

11 years agoMerge branch 'master' into next
Michael Stapelberg [Sun, 14 Apr 2013 08:14:51 +0000 (10:14 +0200)]
Merge branch 'master' into next

11 years agoMerge branch 'fix-ipc-fd'
Michael Stapelberg [Sun, 14 Apr 2013 08:14:51 +0000 (10:14 +0200)]
Merge branch 'fix-ipc-fd'

11 years agoBugfix: mark IPC fd CLOEXEC (Thanks Layus)
Michael Stapelberg [Sun, 14 Apr 2013 08:12:21 +0000 (10:12 +0200)]
Bugfix: mark IPC fd CLOEXEC (Thanks Layus)

Without this fix, children of i3bar would inherit the file descriptor of
the IPC connection to i3. Therefore, even if i3bar exits with SIGSEGV,
the connection to i3 stays open. Because nobody actually reads any
messages by i3, the buffer will fill up and i3 can’t deliver any more
messages, and thus busy-loops at that point.

fixes #995

11 years agofix font display height in i3bar
haptix@web.de [Sat, 13 Apr 2013 10:28:01 +0000 (12:28 +0200)]
fix font display height in i3bar

Increase the drawing area height, in order to prevent the font from being cut off.

fixes #992

11 years agounhide hidden i3bar when mode is active
haptix@web.de [Thu, 11 Apr 2013 22:09:40 +0000 (00:09 +0200)]
unhide hidden i3bar when mode is active

This patch also handles unhiding of i3bar in case the i3bar modifier key is
pressed for activating a new binding mode.

11 years agoDocument fixes and workarounds for test failures.
Eric S. Raymond [Sun, 7 Apr 2013 21:02:28 +0000 (17:02 -0400)]
Document fixes and workarounds for test failures.

11 years agoTypo and usage fixes in documentation and comments.
Eric S. Raymond [Sun, 7 Apr 2013 14:56:20 +0000 (10:56 -0400)]
Typo and usage fixes in documentation and comments.

11 years agounhide hidden i3bar when mode is active
haptix@web.de [Sun, 7 Apr 2013 14:24:21 +0000 (16:24 +0200)]
unhide hidden i3bar when mode is active

fixes #961

11 years agorestore i3bar compatibility with libyajl version 1
haptix@web.de [Sat, 6 Apr 2013 12:50:46 +0000 (14:50 +0200)]
restore i3bar compatibility with libyajl version 1

fixes #1004

11 years agoraise fullscreen windows on top of all other X11 windows
Michael Stapelberg [Sun, 7 Apr 2013 13:38:00 +0000 (15:38 +0200)]
raise fullscreen windows on top of all other X11 windows

Note that this is ineffective for dunst’s notifications because dunst
re-raises them as soon as they get obscured. It does work for dzen2
however, which was the original use-case.

fixes #569

11 years agodocs/wsbar: update (we have i3bar now, i3-wsbar is just an example)
Michael Stapelberg [Sun, 7 Apr 2013 08:23:49 +0000 (10:23 +0200)]
docs/wsbar: update (we have i3bar now, i3-wsbar is just an example)

fixes #735

11 years agoMerge branch 'fix-tab-width'
Michael Stapelberg [Sun, 7 Apr 2013 08:00:42 +0000 (10:00 +0200)]
Merge branch 'fix-tab-width'

11 years agoMerge branch 'master' into next
Michael Stapelberg [Sun, 7 Apr 2013 08:00:42 +0000 (10:00 +0200)]
Merge branch 'master' into next

11 years agotabbed: floor(), put extra pixels into the last tab (Thanks xeen)
Michael Stapelberg [Sun, 7 Apr 2013 07:58:34 +0000 (09:58 +0200)]
tabbed: floor(), put extra pixels into the last tab (Thanks xeen)

This is the only sane way I can think of to deal with the problem that
the screen size may not be dividable by the amount of tabbed children
(e.g. 1280 / 41 = 31.219512…).

fixes #645
fixes #791

11 years agodocs/multi-monitor: nVidia ≥ 302.17 works just fine (Thanks HedgeMage)
Michael Stapelberg [Sat, 6 Apr 2013 20:49:14 +0000 (22:49 +0200)]
docs/multi-monitor: nVidia ≥ 302.17 works just fine (Thanks HedgeMage)

11 years agoMerge branch 'fix-floating-size'
Michael Stapelberg [Tue, 2 Apr 2013 21:59:48 +0000 (23:59 +0200)]
Merge branch 'fix-floating-size'

11 years agoMerge branch 'master' into next
Michael Stapelberg [Tue, 2 Apr 2013 21:59:48 +0000 (23:59 +0200)]
Merge branch 'master' into next

11 years agoBugfix: fix floating window size with hide_edge_borders (+test)
Michael Stapelberg [Tue, 2 Apr 2013 21:59:26 +0000 (23:59 +0200)]
Bugfix: fix floating window size with hide_edge_borders (+test)

fixes #998

11 years agoipc: use correct workspace in workspace change event
haptix@web.de [Sat, 30 Mar 2013 15:00:39 +0000 (16:00 +0100)]
ipc: use correct workspace in workspace change event

fixes #990

11 years agoadd testcase for the workspace-focus ipc event
haptix@web.de [Tue, 2 Apr 2013 13:19:55 +0000 (15:19 +0200)]
add testcase for the workspace-focus ipc event

11 years agot/201-config-parser: add test for quotes in comments
Michael Stapelberg [Tue, 2 Apr 2013 20:24:52 +0000 (22:24 +0200)]
t/201-config-parser: add test for quotes in comments

11 years agoAdd 'line' as a configuration parsing primitive
Eelis van der Weegen [Mon, 1 Apr 2013 12:42:41 +0000 (14:42 +0200)]
Add 'line' as a configuration parsing primitive

…and use it for ignoring comment lines, so that quotes in them
doesn't cause problems anymore.

11 years agouserguide: mention forgotten layout splitv/splith (Thanks Eelis)
Michael Stapelberg [Sat, 30 Mar 2013 12:03:35 +0000 (13:03 +0100)]
userguide: mention forgotten layout splitv/splith (Thanks Eelis)

11 years agoi3bar: fix usage description, make -b happen
Simon Elsbrock [Thu, 28 Mar 2013 19:11:05 +0000 (20:11 +0100)]
i3bar: fix usage description, make -b happen

11 years agoFix scratchpad_show
Philippe Virouleau [Tue, 26 Mar 2013 17:59:32 +0000 (18:59 +0100)]
Fix scratchpad_show

    Test if window is in scratchpad
    Test if function is called without criteria
    Updated testcase

11 years agoDon't dup2() the parent's stdout to child's stdin.
Yuxuan Shui [Sun, 24 Mar 2013 08:30:05 +0000 (16:30 +0800)]
Don't dup2() the parent's stdout to child's stdin.

There're DLOG()s, seriously.

11 years agoAdd click events to i3bar
enkore [Thu, 21 Mar 2013 10:48:27 +0000 (11:48 +0100)]
Add click events to i3bar

If the statusline generator (i.e. i3status) specifies click_events:true
in the protocol header, i3bar will write a JSON array on it's stdin
notifying it if the user clicks on a block.

The exact protocol is documented in docs/i3bar-protocol.

11 years agoUse a saner sanity check for floating_reposition.
Yuxuan Shui [Thu, 21 Mar 2013 17:36:40 +0000 (01:36 +0800)]
Use a saner sanity check for floating_reposition.

The function contained_by_output checks whether any output contains any
parts of a give rect. Rather than relying on the central point of the rect.

11 years agoFix restarting with 32bit depth windows (v5)
Yuxuan Shui [Fri, 15 Mar 2013 14:40:26 +0000 (22:40 +0800)]
Fix restarting with 32bit depth windows (v5)

What I do in this patch is:

1. Split the con_new() function, so I can create a Con without actually
create a window.
2. Store the depth of Cons in the layout file when i3 is restarting.

Fix typos and mis-staged files in previous patch.

11 years agoi3-dmenu-desktop: run commands when they don’t match a .desktop file
Michael Stapelberg [Thu, 21 Mar 2013 22:32:46 +0000 (23:32 +0100)]
i3-dmenu-desktop: run commands when they don’t match a .desktop file

This allows you to enter e.g. "i3 layout stacking" (provided you don’t
have an i3 .desktop file)

11 years agoFreeBSD expect a real path on the filesystem for shm_open
Baptiste Daroussin [Wed, 20 Mar 2013 16:01:12 +0000 (17:01 +0100)]
FreeBSD expect a real path on the filesystem for shm_open

11 years agoshm_unlink the created/open shm
Baptiste Daroussin [Wed, 20 Mar 2013 15:59:55 +0000 (16:59 +0100)]
shm_unlink the created/open shm

11 years agoDo not use ELOG while logwalk is not initialized
Baptiste Daroussin [Wed, 20 Mar 2013 15:58:30 +0000 (16:58 +0100)]
Do not use ELOG while logwalk is not initialized

11 years agoAll supported FreeBSD version has getline now
Baptiste Daroussin [Tue, 19 Mar 2013 23:36:50 +0000 (00:36 +0100)]
All supported FreeBSD version has getline now

11 years agoupdate debian/
Michael Stapelberg [Mon, 18 Mar 2013 22:01:36 +0000 (23:01 +0100)]
update debian/

11 years agoMerge branch 'master' into next
Michael Stapelberg [Mon, 18 Mar 2013 21:45:55 +0000 (22:45 +0100)]
Merge branch 'master' into next

11 years agoMerge branch 'release-4.5.1'
Michael Stapelberg [Mon, 18 Mar 2013 21:45:50 +0000 (22:45 +0100)]
Merge branch 'release-4.5.1'

11 years agoadd release notes for v4.5.1 4.5.1
Michael Stapelberg [Mon, 18 Mar 2013 21:42:33 +0000 (22:42 +0100)]
add release notes for v4.5.1

11 years agoMerge branch 'master' into next
Michael Stapelberg [Sun, 17 Mar 2013 00:01:11 +0000 (01:01 +0100)]
Merge branch 'master' into next

11 years agoMerge branch 'bump-copyrights'
Michael Stapelberg [Sun, 17 Mar 2013 00:01:11 +0000 (01:01 +0100)]
Merge branch 'bump-copyrights'

11 years agobump copyright years to 2013
Michael Stapelberg [Sun, 17 Mar 2013 00:01:04 +0000 (01:01 +0100)]
bump copyright years to 2013

11 years agoMerge branch 'master' into next
Michael Stapelberg [Sat, 16 Mar 2013 23:59:52 +0000 (00:59 +0100)]
Merge branch 'master' into next

11 years agoMerge branch 'i3dd-error'
Michael Stapelberg [Sat, 16 Mar 2013 23:59:52 +0000 (00:59 +0100)]
Merge branch 'i3dd-error'

11 years agoi3-dmenu-desktop: improve error message when dmenu cannot be found
Michael Stapelberg [Sat, 16 Mar 2013 23:59:18 +0000 (00:59 +0100)]
i3-dmenu-desktop: improve error message when dmenu cannot be found

fixes #984

11 years agoMerge branch 'master' into next
Michael Stapelberg [Fri, 15 Mar 2013 18:27:23 +0000 (19:27 +0100)]
Merge branch 'master' into next

11 years agoMerge branch 'fix-floating-move'
Michael Stapelberg [Fri, 15 Mar 2013 18:27:23 +0000 (19:27 +0100)]
Merge branch 'fix-floating-move'

11 years agoBugfix: Don’t warp the pointer when dragging floating windows
Michael Stapelberg [Fri, 15 Mar 2013 18:27:08 +0000 (19:27 +0100)]
Bugfix: Don’t warp the pointer when dragging floating windows

fixes #951

11 years agoMerge branch 'master' into next
Michael Stapelberg [Thu, 14 Mar 2013 14:20:34 +0000 (15:20 +0100)]
Merge branch 'master' into next

11 years agoMerge branch 'fix-make'
Michael Stapelberg [Thu, 14 Mar 2013 14:20:34 +0000 (15:20 +0100)]
Merge branch 'fix-make'

11 years agoAdd YAJL_CFLAGS to i3-msg.mk.
Marcus Crestani [Thu, 14 Mar 2013 09:10:38 +0000 (10:10 +0100)]
Add YAJL_CFLAGS to i3-msg.mk.

11 years agodocs/hacking-howto: explain our different branches
Michael Stapelberg [Thu, 14 Mar 2013 13:44:01 +0000 (14:44 +0100)]
docs/hacking-howto: explain our different branches

11 years agodocs/hacking-howto: fix the link to the git introduction
Michael Stapelberg [Thu, 14 Mar 2013 13:43:51 +0000 (14:43 +0100)]
docs/hacking-howto: fix the link to the git introduction

11 years agoadd dummy entry to debian/changelog
Michael Stapelberg [Tue, 12 Mar 2013 14:12:03 +0000 (15:12 +0100)]
add dummy entry to debian/changelog

11 years agoupdate debian/
Michael Stapelberg [Tue, 12 Mar 2013 14:11:35 +0000 (15:11 +0100)]
update debian/

11 years agoMerge branch 'next'
Michael Stapelberg [Tue, 12 Mar 2013 13:05:47 +0000 (14:05 +0100)]
Merge branch 'next'

11 years agoMerge branch 'release-4.5' into next
Michael Stapelberg [Tue, 12 Mar 2013 13:05:41 +0000 (14:05 +0100)]
Merge branch 'release-4.5' into next

11 years agomakefile: delete test.{config_parser,commands_parser} in distclean 4.5
Michael Stapelberg [Tue, 12 Mar 2013 13:03:22 +0000 (14:03 +0100)]
makefile: delete test.{config_parser,commands_parser} in distclean

11 years agoadd release notes for i3 v4.5
Michael Stapelberg [Tue, 12 Mar 2013 12:40:52 +0000 (13:40 +0100)]
add release notes for i3 v4.5

11 years agoi3-dmenu-desktop: bump version to 1.4
Michael Stapelberg [Tue, 12 Mar 2013 12:38:14 +0000 (13:38 +0100)]
i3-dmenu-desktop: bump version to 1.4

11 years agoAdd support for _NET_WM_STATE_DEMANDS_ATTENTION.
oblique [Tue, 26 Feb 2013 00:37:35 +0000 (02:37 +0200)]
Add support for _NET_WM_STATE_DEMANDS_ATTENTION.

_NET_WM_STATE_DEMANDS_ATTENTION indicates that some action in or with
the window happened. It's a weaker hint than urgency flag of WM_HINTS,
but some applications and almost all Qt applications use it instead of
WM_HINTS' urgency flag (one example is Skype).

11 years agoi3-dmenu-desktop: remove %i from commandline
Michael Stapelberg [Sun, 3 Mar 2013 20:27:56 +0000 (21:27 +0100)]
i3-dmenu-desktop: remove %i from commandline

We don’t currently support the icon argument, but entirely not handling
%i leads to e.g. “digikam” not starting.

11 years agoBugfix: Set separator color properly when drawing
András Mohari [Mon, 25 Feb 2013 16:09:10 +0000 (17:09 +0100)]
Bugfix: Set separator color properly when drawing

Set the colors in the GC directly since set_font_colors() does not do it
when using a Pango font, resulting in i3bar drawing separators in the
wrong color.

11 years agoAllow min_width of a block in i3bar to be a string
András Mohari [Mon, 25 Feb 2013 10:41:02 +0000 (11:41 +0100)]
Allow min_width of a block in i3bar to be a string

With this change, min_width can either be an integer (as usual), or a
string. In the latter case, the width of the text given by min_width
determines the minimum width of the block. This way one does not have to
figure out a minimum width by trial and error, only to do it again every
time the font is changed.

11 years agoconfig: accept “smart” as popup_during_fullscreen parameter (Thanks supplantr)
Michael Stapelberg [Sun, 24 Feb 2013 16:23:37 +0000 (17:23 +0100)]
config: accept “smart” as popup_during_fullscreen parameter (Thanks supplantr)

This was the default, so explicitly setting it is not really necessary,
but of course it should be possible.

fixes #967

11 years agoBugfix: Handle nested transient popups properly
Mats [Wed, 20 Feb 2013 15:56:03 +0000 (16:56 +0100)]
Bugfix: Handle nested transient popups properly

During smart popup fullscreen handling, display all transient popups
that belong to the respective fullscreen application. A popup window
belongs to another window if the latter is reachable via the path
induced by the WM_TRANSIENT_FOR hints.

fixes #881

11 years agoMerge branch 'fix-move-ws'
Michael Stapelberg [Mon, 18 Feb 2013 23:28:05 +0000 (00:28 +0100)]
Merge branch 'fix-move-ws'

11 years agoMerge branch 'master' into next
Michael Stapelberg [Mon, 18 Feb 2013 23:28:05 +0000 (00:28 +0100)]
Merge branch 'master' into next

11 years agoBugfix: Properly parse commands like “move workspace torrent” (Thanks rasi)
Michael Stapelberg [Mon, 18 Feb 2013 23:27:55 +0000 (00:27 +0100)]
Bugfix: Properly parse commands like “move workspace torrent” (Thanks rasi)

fixes #955

11 years agotests: correctly close stdout with IPC::Run
Michael Stapelberg [Mon, 18 Feb 2013 23:26:00 +0000 (00:26 +0100)]
tests: correctly close stdout with IPC::Run

while IPC::Run supports <&-, it does not support >&- apparently.

11 years agomake t/205-ipc-windows require AnyEvent::I3 >= 0.15
Michael Stapelberg [Mon, 18 Feb 2013 09:59:32 +0000 (10:59 +0100)]
make t/205-ipc-windows require AnyEvent::I3 >= 0.15

Necessary due to the new event type

11 years agoAdd a new IPC event for changes on windows.
Piotr S. Staszewski [Fri, 11 Jan 2013 18:58:32 +0000 (19:58 +0100)]
Add a new IPC event for changes on windows.

Added new event id (I3_IPC_EVENT_WINDOW) so that a an IPC client can
subscribe to events on windows. Added a basic window event that gets
triggered when a window gets successfully reparented. This new event
also dumps the container data, so that IPC clients can get the initial
window name. IPC clients wishing to see window events should subscribe
to 'window'.

11 years agoi3bar-protocol: update example, reword separator{,_block_width}
Michael Stapelberg [Mon, 18 Feb 2013 09:51:52 +0000 (10:51 +0100)]
i3bar-protocol: update example, reword separator{,_block_width}

11 years agoSeparator color via config; separator width and on/off via ipc
Artem Shinkarov [Sun, 27 Jan 2013 20:27:21 +0000 (20:27 +0000)]
Separator color via config; separator width and on/off via ipc

This patch adds the following features:
1) Configure a color of the separator via config.  It is done like
   bar {
      colors {
         separator #000000
      }
   }
2) A block can have an integer entry "separator_block_width" which
   sets the width of the gap which would follow after the current block.

3) A block can have a boolean entry "separator" and if it is set
   to false, then the drawing of the separating line would be disabled.

11 years agoinline comments for enum values
Michael Stapelberg [Mon, 18 Feb 2013 09:41:34 +0000 (10:41 +0100)]
inline comments for enum values

11 years agoAlways auto center on 'scratchpad show' if window hasn't been repositioned by the...
Sebastian Ullrich [Mon, 24 Sep 2012 19:14:40 +0000 (21:14 +0200)]
Always auto center on 'scratchpad show' if window hasn't been repositioned by the user

This change ensures a scratchpad window is still centered on the screen
if it has first been shown on another screen of a different
resolution. Moving or resizing the scratchpad manually disables this
behavior.

11 years agotests: unset $ENV{SHELL} to avoid breakage with fish (Thanks dRbiG)
Michael Stapelberg [Fri, 15 Feb 2013 15:41:28 +0000 (16:41 +0100)]
tests: unset $ENV{SHELL} to avoid breakage with fish (Thanks dRbiG)

11 years agoSplit workspace instead of changing orientation
Mats [Thu, 24 Jan 2013 16:56:03 +0000 (17:56 +0100)]
Split workspace instead of changing orientation

Move all children of the workspace into a new container if there is more
than one otherwise simply change the orientation.

fixes #922

11 years agouserguide: remove obsolete sentence about client.background (Thanks Tucos)
Michael Stapelberg [Thu, 14 Feb 2013 19:47:41 +0000 (20:47 +0100)]
userguide: remove obsolete sentence about client.background (Thanks Tucos)

11 years agoObey WM_SIZE_HINTS's resize increments in floating
oblique [Fri, 8 Feb 2013 16:41:41 +0000 (18:41 +0200)]
Obey WM_SIZE_HINTS's resize increments in floating

11 years agoAdd render_deco_height()
oblique [Fri, 8 Feb 2013 13:23:50 +0000 (15:23 +0200)]
Add render_deco_height()

11 years agoBugfix: Do not move focus if a container is moved across outputs
Sebastian Rachuj [Sat, 9 Feb 2013 19:23:01 +0000 (20:23 +0100)]
Bugfix: Do not move focus if a container is moved across outputs

fixes #809

This makes the moving behavior more consistent. If you want to focus the
workspace you are moving to, just chain the keybinding in your config
file:

    bindsym $mod+Shift+1 move workspace 1; workspace 1

11 years agohacking-howto: refer people to cr.i3wm.org
Michael Stapelberg [Sun, 10 Feb 2013 14:10:13 +0000 (15:10 +0100)]
hacking-howto: refer people to cr.i3wm.org

11 years agoi3test: fix get_focused() docs (Thanks knopwob)
Michael Stapelberg [Thu, 7 Feb 2013 14:57:15 +0000 (15:57 +0100)]
i3test: fix get_focused() docs (Thanks knopwob)

11 years agouserguide: be explicit about assignment processing order (Thanks Donald)
Michael Stapelberg [Thu, 7 Feb 2013 14:49:35 +0000 (15:49 +0100)]
userguide: be explicit about assignment processing order (Thanks Donald)

11 years agoi3-nagbar: kludge to run the command shell script when inside a noexec mount
Michael Stapelberg [Thu, 7 Feb 2013 14:30:40 +0000 (15:30 +0100)]
i3-nagbar: kludge to run the command shell script when inside a noexec mount

See the comment inside the commit for more information on how this
works.

fixes #947

11 years agoput common part of error messages into variable
Sascha Kruse [Mon, 28 Jan 2013 15:36:38 +0000 (16:36 +0100)]
put common part of error messages into variable

This makes future changes easier when new tokens are added to the
parser.

11 years agoi3-dmenu-desktop: List filenames of .desktop files
Mats [Mon, 28 Jan 2013 16:43:42 +0000 (17:43 +0100)]
i3-dmenu-desktop: List filenames of .desktop files

In addition to 'name' and 'command', add a third entry type 'filename'
to list the filenames of the .desktop files (e.g., 'firefox.desktop'
would be display as 'firefox').

Command line option '--entry-type' can be specified multiple times.

fixes #930

11 years agoscratchpad_show focus unfocused scratchpad window
Sascha Kruse [Mon, 28 Jan 2013 09:11:53 +0000 (10:11 +0100)]
scratchpad_show focus unfocused scratchpad window

When there's an unfocused scratchpad window on the current workspace
scratchpad_show will focus that scratchpad window.

11 years agoadd testcase for "move workspace <output>"
Michael Stapelberg [Wed, 30 Jan 2013 12:31:20 +0000 (13:31 +0100)]
add testcase for "move workspace <output>"

11 years agoMerge branch 'fix-move-ws'
Michael Stapelberg [Wed, 30 Jan 2013 12:30:59 +0000 (13:30 +0100)]
Merge branch 'fix-move-ws'

11 years agoMerge branch 'master' into next
Michael Stapelberg [Wed, 30 Jan 2013 12:30:59 +0000 (13:30 +0100)]
Merge branch 'master' into next

11 years agoBugfix: Correctly parse `move ... workspace *_on_output`
Steven Allen [Tue, 29 Jan 2013 08:05:23 +0000 (03:05 -0500)]
Bugfix: Correctly parse `move ... workspace *_on_output`

The parse spec for `move ... workspace ...`  ordered next/prev before
next_on_output/prev_on_output causing the parser to match next/prev
before next_on_output/prev_on_output.

Ticket: http://bugs.i3wm.org/report/ticket/941

11 years agoMerge branch 'userguide-resize'
Michael Stapelberg [Sun, 27 Jan 2013 19:20:53 +0000 (20:20 +0100)]
Merge branch 'userguide-resize'

11 years agoMerge branch 'master' into next
Michael Stapelberg [Sun, 27 Jan 2013 19:20:53 +0000 (20:20 +0100)]
Merge branch 'master' into next