7eacf8dd04
Merge branch 'master' into next
2011-08-17 12:17:29 +02:00
13ecbf43c9
Merge branch 'fix-verbose'
2011-08-17 12:17:26 +02:00
22882f4e89
Bugfix: Initialize verbose to 'false' (Thanks tilman)
...
Verbosity was set to 'true' when we started the tree branch.
We forgot to set it back to 'false' :-).
2011-08-17 12:16:32 +02:00
7a22bd1cf3
Merge branch 'master' into next
2011-08-17 12:14:17 +02:00
336ce56cf3
Merge branch 'fix-warping'
2011-08-17 12:14:03 +02:00
36224f86d1
Only warp pointer once during x_push_changes()
...
- Introduce warp_to static variable in x.c that stores the coordinates
to warp to as a Rect.
- Add x_set_warp_to function to set this variable. Use in _tree_next,
workspace_show, and con_move_to_workspace.
- In x_push_chanages, if warp_to is set, then call xcb_warp_pointer_rect
and then reset it to NULL.
This fixes all know bugs for pointer warping for me.
2011-08-17 12:12:40 +02:00
2abe23d6ff
Merge branch 'master' into next
2011-08-17 01:52:45 +02:00
637d2a3d62
Merge branch 'use-xcb-atoms'
2011-08-17 01:52:41 +02:00
7951445849
xcb: use predefined XCB_ATOM_ atoms, don’t request them
2011-08-17 01:41:19 +02:00
2f116df901
Merge branch 'master' into next
2011-08-12 23:11:13 +02:00
c8e6de1382
Merge branch 'i3bar-fixes'
2011-08-12 23:10:21 +02:00
dddce72bd7
little comment spelling fixes
2011-08-12 23:09:59 +02:00
72ef8a7c19
Pass NULL to XkbOpenDisplay, it will read $DISPLAY itself
2011-08-12 23:09:36 +02:00
3892d616cf
Bugfix: Use correct buffer size, quote workspace names
...
This fixes problems with the workspace 'next' and workspace names longer than
40 characters
2011-08-12 22:57:02 +02:00
4e0ccbf57b
Merge branch 'i3bar_fix_tabs' into next
2011-08-12 18:44:36 +02:00
7cb7700b02
i3bar: Fixup indentions
2011-08-12 18:43:09 +02:00
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
Michael Stapelberg