daebe28b09
Merge branch 'master' into next
2011-09-22 23:11:14 +01:00
30dea1fda6
Merge branch 'fix-dragging-fullscreen'
2011-09-22 23:11:11 +01:00
0c367f9e4c
Skip dragging of floating cons in fullscreen mode
2011-09-22 23:10:48 +01:00
1717b88174
Merge branch 'master' into next
2011-09-22 20:11:44 +01:00
ef0f4e7299
Merge branch 'fix-close-focus'
2011-09-22 20:10:59 +01:00
4dbda73114
Bugfix: Correctly revert focus to other floating windows when closing a floating window
...
Uncovered by the testsuite \o/
2011-09-22 20:10:51 +01:00
143663f031
Merge branch 'master' into next
2011-09-20 22:37:08 +01:00
67aab7c8bd
Merge branch 'fix-variables-cfg'
2011-09-20 22:37:00 +01:00
77ae3cd8f7
Bugfix: use bufcopy instead of buf when boundary checking (Thanks thomasba)
...
Also replace the useless (bufcopy + (next - bufcopy)) with next
2011-09-20 22:36:23 +01:00
de7c2841ed
Merge branch 'master' into next
2011-09-20 21:42:51 +01:00
06177223e2
Merge branch 'fix-variables-cfg'
2011-09-20 21:42:48 +01:00
cd6c3fedcb
A bit more boundary-checking when replacing variables.
...
Makes valgrind happy
2011-09-20 21:42:26 +01:00
e1949aa694
Bugfix: Correctly split key/value when parsing variables (Thanks xeen)
2011-09-20 21:42:09 +01:00
3073fe0bc8
update docs/multi-monitor to include the output names and refer to the force_xinerama config directive
2011-09-19 23:21:38 +01:00
ab04526aa1
mention the force_xinerama configfile directive in the userguide
2011-09-19 23:18:40 +01:00
5aa43d61f8
Add force_xinerama configuration option
...
The configuration option does the same as the commandline parameter, except
it can be easily set by the user (e.g. you are using KDM and can't start a
session through ~/.xsession).
Signed-off-by: Michael Walle <michael@walle.cc>
2011-09-19 23:10:38 +01:00
0c51b57b99
Merge branch 'master' into next
2011-09-19 19:20:18 +01:00
181bd6008d
Merge branch 'fix-i3bar-x11'
2011-09-19 19:20:16 +01:00
7064cfc2a0
i3bar: Bugfix: Check if the X11 connection is unavailable
...
This fixes the condition where the i3 socket for some reason did not produce an
error, but the X server exited (earlier than i3?) and the left-over i3bar
process would consume 100% CPU.
How to reproduce the problem:
1) Start ./testcases/Xdummy :8
2) Start DISPLAY=:8 i3bar -s <socket path to i3 on :0>
3) Kill the Xdummy
2011-09-19 19:17:25 +01:00
05c0a8985b
Merge branch 'master' into next
2011-09-18 17:44:00 +01:00
11ab7cf32a
Merge branch 'fix-focus'
2011-09-18 17:43:57 +01:00
2fe0949abd
Bugfix: Only change focus in tree_close() when the container was focused before
...
Fixes : #441
I’m not sure if that’s really all there is to it. Seems a bit too simple :).
We’ll see if I missed some corner cases in the next few days…
2011-09-18 17:43:02 +01:00
46409ad656
Merge branch 'master' into next
2011-09-18 17:02:52 +01:00
1f95fbfa3e
Merge branch 'fix-floating-move'
2011-09-18 17:02:49 +01:00
a82f5750de
Bugfix: Avoid out of bounds coordinates when moving floating windows (Thanks eeemsi)
...
This commit makes the coordinates proportional when moving floating windows.
That is, if you have a window at the bottom of your 1920 px monitor and move it
to your 800 px monitor, it will be at the bottom of the 800 px monitor (and not
out of bounds).
2011-09-18 17:00:29 +01:00
14dd830270
Merge branch 'role-criterion' into next
2011-09-18 16:10:05 +01:00
9a76887a28
docs/userguide: document the window_role criterion
2011-09-18 16:06:52 +01:00
5542af316f
t/65-for_window: add tests for window_role
2011-09-18 16:05:54 +01:00
b3adaa2983
Implement the window_role criterion (checks WM_WINDOW_ROLE)
...
Closes : #446
This is handy for matching specific windows of a multi-window application, for
example only Pidgin’s buddy list window.
2011-09-18 16:05:10 +01:00
99168a84a9
tests: also make launch_with_config() log to LOGPATH
2011-09-18 15:35:04 +01:00
c88425147e
Merge branch 'master' into next
2011-09-18 14:39:33 +01:00
254299b4cd
Merge branch 'fix-output-focus'
2011-09-18 14:39:30 +01:00
7a2e92a116
Bugfix: Use con_orientation(). Fixes switching between different outputs
...
Fixes : #518
For stacking containers, direct access using con->orientation is wrong, we need
to use con_orientation().
2011-09-18 14:38:39 +01:00
5c57e205f0
Merge branch 'i3-input-fmt' into next
2011-09-18 13:58:08 +01:00
12e096cf73
i3-input: update manpage
2011-09-18 13:57:39 +01:00
1737a78fcd
i3-input: implement -F (format) option, deprecate -p (prefix)
...
This introduces the '-F format' parameter, which takes a format and replaces %s
in it with the user input. An example: The user should enter the target
workspace name. The appropriate i3-input invocation looks like this:
i3-input -F 'workspace "%s"' -P 'Switch to workspace: '
2011-09-18 13:51:11 +01:00
fddee471e8
i3-input: add missing \n in --help
2011-09-18 13:21:45 +01:00
46ab86b88d
i3-input: reformat main.c
2011-09-18 13:20:59 +01:00
0bc44ffc37
Merge branch 'master' into next
2011-09-18 00:40:42 +01:00
b9053c6f8f
Merge branch 'fix-floating-move'
2011-09-18 00:40:39 +01:00
a5012f6021
fix-bug-515: always adjust floating position when moving to another output
...
Floating con position needs to be adjusted when moving to another
output, regardless of whether or not the target workspace is visible.
2011-09-18 00:38:32 +01:00
b4ab4703c9
Merge branch 'master' into next
2011-09-17 20:55:13 +01:00
1fbe070f03
Merge branch 'fix-warp-same'
2011-09-17 20:55:10 +01:00
755c618cd4
Bugfix: Don’t warp the pointer if it already is on the target output (Thanks cls, pnutzh4x0r)
...
My testcase was putting a floating window on the left output, but overlapping a
little to the right output. Then switch to a workspace on the right output.
2011-09-17 20:53:24 +01:00
4dc0a86faf
Merge branch 'floating-focus' into next
2011-09-17 19:29:52 +01:00
c8c95030ad
tests: extend t/35-floating-focus to use focus left/right on floating windows
2011-09-17 19:29:23 +01:00
e6a854a742
Remove obsolete code for floating focus
2011-09-17 19:29:06 +01:00
172f3563f7
Implement focus switching (focus left/right) for floating windows
...
Fixes : #475
2011-09-17 19:28:41 +01:00
fe35c80741
Also make compilation possible on systems with libev 3
...
From the source:
We need ev >= 4 for the following code. Since it is not *that* important
(it only makes sure that there are no i3-nagbar instances left behind) we
still support old systems with libev 3.
2011-09-17 17:55:36 +01:00
85063124a1
document the dependency on libev >=4.0 for ev_cleanup (Thanks phnom)
...
libev 4.00 was released 2010-10-25, so nearly a year ago.
2011-09-17 17:49:12 +01:00
Michael Stapelberg