d3efa73dd7
Merge branch 'master' into next
2011-08-11 22:22:44 +02:00
79479617c7
Merge branch 'warp-pointer'
2011-08-11 22:22:36 +02:00
bf0c67b2af
Warp cursor when changing workspace.
2011-08-11 22:13:50 +02:00
9ccb3987ad
Merge branch 'master' into next
2011-08-10 23:56:16 +02:00
318dfce42f
Merge branch 'i3bar_warning_fix'
2011-08-10 23:55:20 +02:00
94d55f34e1
i3bar: Fix prototypes (thx sECuRE)
2011-08-10 23:54:27 +02:00
3af7692a92
Merge branch 'tests-optimize' into next
2011-08-10 15:57:28 +02:00
5524785877
testsuite: eliminate sleep, wait until i3 replies via IPC
2011-08-10 15:56:39 +02:00
10f871b57b
implement "socket activation": passing IPC sockets to i3
2011-08-10 15:55:27 +02:00
016ecb65fb
Merge branch 'master' into next
2011-08-09 10:02:55 +02:00
6b1dce27f7
Merge branch 'fix-moving-focus'
2011-08-09 10:02:51 +02:00
d8cf36ce83
Fix two focus issues when switching/moving workspaces
...
1. Fix focus when moving to same workspace.
If we have a single window on a workspace and we switch to the same
worksapce, focus_next will be the workspace container, rather than the
current window, so simply call con_descend_focused to ensure we set the
focus to a window.
2. Fix focus when moving a container to a visible workspace.
Call workspace_show before we attaching to new visible workspace, so we
don't get in the weird situation where target workspace has focused
window, but it isn't considered focused.
2011-08-09 10:01:08 +02:00
f8d834c62d
Merge branch 'master' into next
2011-08-09 09:47:10 +02:00
042b10e068
Merge branch 'fix-resize'
2011-08-09 09:47:06 +02:00
98cc37e223
swap up/down, also modify the testcase
2011-08-09 09:46:02 +02:00
3316d8b8ba
Resize uses up and down, not bottom and top
...
- Fix userguide resize example
- Update migration script
2011-08-09 09:42:36 +02:00
639a4baf7b
Merge branch 'new-new_float' into next
2011-08-09 09:30:12 +02:00
74687fa97c
tests: add t/74-border-config which checks new_window and new_float
2011-08-09 09:29:59 +02:00
42db9de7ec
Add new_float config option.
...
This option sets the default border style for containers automatically put into floating mode.
Fixes #264
2011-08-09 09:29:53 +02:00
cd5ebc2dca
src/manage.c: properly set automatic flag when calling floating_enable()
2011-08-09 09:29:47 +02:00
eb0a56fad1
Merge branch 'get-marks' into next
2011-08-09 09:28:06 +02:00
4253aa4ba2
Merge branch 'master' into next
2011-08-09 09:27:55 +02:00
5dcbb341d1
Merge branch 'new-fix-leaks'
2011-08-09 09:27:40 +02:00
cd1add1f3c
Bugfix: don’t free the old json_output, the caller does that
2011-08-09 09:27:28 +02:00
95416175cd
Bugfix: use FREE to correctly handle NULL replies
2011-08-09 09:27:24 +02:00
5e06b1b21d
Fix some potential memory leaks
2011-08-09 09:27:15 +02:00
fadf9088db
docs/ipc: make the GET_MARKS docs a little more precise
2011-08-09 08:22:58 +02:00
dab3a0b85a
tests: add testcase for the GET_MARKS ipc request
2011-08-09 08:19:48 +02:00
3cc22dcbe4
Preserve marks between restarts.
2011-08-09 08:19:31 +02:00
96ed68de16
Add support for get_marks in i3-msg
2011-08-09 08:19:11 +02:00
35d7ef0ddd
Feature: implement GET_MARKS
2011-08-09 08:04:33 +02:00
e304902874
Merge branch 'master' into next
2011-08-07 20:45:20 +02:00
6fb5d6e313
initialize most to NULL, fixes warning
2011-08-07 20:45:06 +02:00
8b9ba5fd0b
Merge branch 'master' into next
2011-08-07 18:15:10 +02:00
b0f0a045bc
update changelog (no, we are not releasing)
2011-08-07 18:15:01 +02:00
091b72f3a9
Merge branch 'master' into next
2011-08-07 18:03:56 +02:00
503f318b53
Merge branch 'fix-split-docs'
2011-08-07 18:03:51 +02:00
0ec208bd75
docs/userguide: use bindsym for the 'split' example (Thanks Jan)
2011-08-07 18:03:29 +02:00
9260cd7e12
Merge branch 'master' into next
2011-08-07 17:56:37 +02:00
e17d49e6a4
Merge branch 'fix-ws-direction'
2011-08-07 17:56:32 +02:00
d39261a1f0
rewrite con_descend_orientation
...
It now uses the container orientation (if it is appropriate, the last focused
one otherwise) to recurse. This works better if the target workspace is in
vertical orientation when you use right/left or if it is in horizontal
orientation but you use up/down.
2011-08-07 15:57:36 +02:00
99ba193ce7
Bugfix: the up/down directions were swapped
...
Also compare 'output' and 'current' in the same order in both parts of the
condition to make the comparison more clear.
2011-08-07 15:46:24 +02:00
692d65b0fd
little style fixes
2011-08-07 15:24:51 +02:00
a547365a88
Implement switching focus across screens.
...
Modify _tree_next() so that when we reach the workspace container:
1. Find the next corresponding output (screen) using the added
get_output_next().
2. If there is another output, find the visible workspace.
3. Call workspace_show on found workspace.
4. Find the appropriate window to focus (leftmost/rightmost, etc.) using
con_descend_direction, and then focus it.
I've only tested on horizontal monitors (left/right).
2011-08-07 14:33:07 +02:00
94ba655794
Merge branch 'master' into next
2011-08-06 18:54:50 +02:00
865c193971
Merge branch 'fix-floating-raise'
2011-08-06 18:54:44 +02:00
cd5e74bd8e
Bugfix: Call tree_render() before starting the dragging when dragging a floating window (Thanks eeemsi)
...
Fixes #462
2011-08-06 18:53:39 +02:00
2631ad4c07
Merge branch 'master' into next
2011-08-05 01:04:28 +02:00
863b3898a6
Merge branch 'fix-border-rendering'
2011-08-05 01:04:24 +02:00
ec0d67410a
Fix border rendering (Thanks Paride Legovini)
2011-08-05 01:03:56 +02:00
Michael Stapelberg