6e95004d6c
Merge branch 'master' into next
2011-08-04 23:37:40 +02:00
d4f32382c9
Merge branch 'fix-restart'
2011-08-04 23:37:34 +02:00
f2e1e220a4
Bugfix: Use the right format string (Thanks pnutzh4x0r)
2011-08-04 23:34:23 +02:00
7e0cbf18f9
Bugfix: Correctly parse the 'focused' (it’s a bool, no longer int) when restoring layout (Thanks andi)
2011-08-04 22:58:19 +02:00
93c3596619
Merge branch 'master' into next
2011-08-04 22:21:42 +02:00
93f475778f
Merge branch 'fix-stacking'
2011-08-04 22:21:27 +02:00
1d50cff7ca
Bugfix: Fix stacking order
...
The commit 192dbdabd6
2011-08-04 22:19:30 +02:00
31724a9a92
Merge branch 'check-duplicate' into next
2011-08-04 21:45:58 +02:00
ecc2cae3f7
Bugfix: use ELOG to actually get the error message into the logfile shown by i3-nagbar
2011-08-04 21:43:55 +02:00
4e350664ae
Bugfix: Check that ->symbol != NULL before using strcasecmp()
2011-08-04 21:38:13 +02:00
787dd4059f
little style fixes for the previous patch
2011-08-04 21:25:47 +02:00
9d101d8473
check_for_duplicate_bindings
2011-08-04 20:37:01 +02:00
e9395149b9
Merge branch 'master' into next
2011-08-04 20:11:44 +02:00
8510a4e322
Merge branch 'fix-instance-criterion'
2011-08-04 20:11:40 +02:00
51119c75c1
extend t/65-for_window to check for the 'instance' criterion
2011-08-04 20:11:01 +02:00
1913bf0e5c
Add "instance" to matching criteria
2011-08-04 20:10:31 +02:00
65ce6fe264
Merge branch 'master' into next
2011-08-04 00:41:11 +02:00
3d7f0f4ce3
Merge branch 'i3-wsbar-fixes'
2011-08-04 00:40:48 +02:00
6ad00b1dff
i3-wsbar: display a separator between workspaces for every output when --show-all is used (Thanks marforio)
...
Fixes #417
2011-08-04 00:40:40 +02:00
9d3c99ee38
i3-wsbar: correctly handle EOF on stdin
2011-08-04 00:40:40 +02:00
3038ad6c26
i3-wsbar: make workspace names clickable (Thanks marforio)
2011-08-04 00:40:40 +02:00
926ca651ef
Merge branch 'wsnum' into next
2011-08-04 00:34:43 +02:00
837bb50826
Parsing workspace name so if the first part is a number, the workspace will get this number. If no number is found it will default to -1.
2011-08-04 00:30:07 +02:00
0330e868bc
Merge branch 'master' into next
2011-08-04 00:16:13 +02:00
4fd877608d
Merge branch 'ws-nextprev'
2011-08-04 00:16:08 +02:00
1750192f63
Modify workspace next/prev to account for workspaces on all outputs.
...
Generally, the traversal goes: numbered workspaces in order, and then
named workspaces in the order in which they appear in the tree.
Example:
Output 1: Output 2:
1 3 D C 2 4 B A
Traversal: 1, 2, 3, 4, D, C, B, A, 1, ...
Note, after the numbered workspaces, we traverse the named workspaces
from output 1, and then output 2, etc.
2011-08-04 00:12:09 +02:00
2e0f5335f4
Merge branch 'master' into next
2011-08-04 00:11:00 +02:00
8287a94292
Merge branch 'fix-wsnum'
2011-08-04 00:10:56 +02:00
d0741975f1
Bugfix: Use the appropriate number when assigning numbered workspaces in randr.c
2011-08-04 00:10:23 +02:00
c883e7050a
Include <limits.h> in all.h
2011-08-04 00:10:04 +02:00
4c3a8957ee
Merge branch 'master' into next
2011-08-03 20:49:01 +02:00
d0f1d8aa71
Merge branch 'doc-floating'
2011-08-03 20:48:57 +02:00
92481b133c
docs/userguide: the correct command is 'floating enable', not 'mode floating' (Thanks Sander)
...
Fixes : #453
2011-08-03 20:48:28 +02:00
2d155efa07
Merge branch 'master' into next
2011-08-03 20:44:18 +02:00
b4882dc2b8
Merge branch 'fix-chromium-tabbar'
2011-08-03 20:44:10 +02:00
e616b45c83
Bugfix: realloc() with size == 0 works like free() and returns NULL, so don’t die()
2011-08-03 20:43:08 +02:00
192dbdabd6
Bugfix: Correctly set the _NET_CLIENT_LIST_STACKING hint (fixes chromium tabbar)
...
Fixes #287
2011-08-03 20:07:03 +02:00
583fd93aef
Merge branch 'master' into next
2011-08-03 14:49:33 +02:00
04a4d7c44a
Merge branch 'fix-floating-resize'
2011-08-03 14:49:23 +02:00
cc5f3ce95a
Bugfix: Fix 'resize' with direction != 'up' for floating windows
...
Fixes #447
2011-08-03 14:48:52 +02:00
3ef7e3cee4
t/41-resize: also verify resize for floating windows
2011-08-03 14:48:33 +02:00
746472e5e4
Merge branch 'master' into next
2011-08-03 13:01:41 +02:00
521cc544f6
Merge branch 'workspace-order-fix' into next
2011-08-03 12:18:42 +02:00
cdae1b7f74
Merge branch 'workspace-order-fix'
2011-08-03 12:18:40 +02:00
9800d5286f
Bugfix: Correctly check if the workspace already exists
2011-08-03 12:18:30 +02:00
903747fa14
Merge branch 'fix-dpkg-build' into next
2011-08-03 04:10:27 +02:00
3e077a0a31
Merge branch 'fix-dpkg-build'
2011-08-03 04:10:24 +02:00
4e87d6af30
debian: fix debian/rules for multiple builds (Thanks ccount)
2011-08-03 04:09:59 +02:00
4760f721e6
Merge branch 'workspace-startup-order'
2011-08-03 03:33:34 +02:00
dfbed047c8
Merge branch 'workspace-startup-order' into next
2011-08-03 03:33:31 +02:00
Michael Stapelberg