]> git.sur5r.net Git - i3/i3/log
i3/i3
13 years agoMerge branch 'master' into next
Michael Stapelberg [Wed, 17 Aug 2011 10:29:15 +0000 (12:29 +0200)]
Merge branch 'master' into next

13 years agoMerge branch 'fix-wsnext'
Michael Stapelberg [Wed, 17 Aug 2011 10:29:12 +0000 (12:29 +0200)]
Merge branch 'fix-wsnext'

13 years agoBugfix: Don’t consider the workspace next/prev command when looking for named workspaces
Michael Stapelberg [Wed, 17 Aug 2011 10:28:45 +0000 (12:28 +0200)]
Bugfix: Don’t consider the workspace next/prev command when looking for named workspaces

Fixes #469

13 years agoMerge branch 'master' into next
Michael Stapelberg [Wed, 17 Aug 2011 10:17:29 +0000 (12:17 +0200)]
Merge branch 'master' into next

13 years agoMerge branch 'fix-verbose'
Michael Stapelberg [Wed, 17 Aug 2011 10:17:26 +0000 (12:17 +0200)]
Merge branch 'fix-verbose'

13 years agoBugfix: Initialize verbose to 'false' (Thanks tilman)
Michael Stapelberg [Wed, 17 Aug 2011 10:16:32 +0000 (12:16 +0200)]
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' :-).

13 years agoMerge branch 'master' into next
Michael Stapelberg [Wed, 17 Aug 2011 10:14:17 +0000 (12:14 +0200)]
Merge branch 'master' into next

13 years agoMerge branch 'fix-warping'
Michael Stapelberg [Wed, 17 Aug 2011 10:14:03 +0000 (12:14 +0200)]
Merge branch 'fix-warping'

13 years agoOnly warp pointer once during x_push_changes()
Peter Bui [Fri, 12 Aug 2011 01:54:59 +0000 (21:54 -0400)]
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.

13 years agoMerge branch 'master' into next
Michael Stapelberg [Tue, 16 Aug 2011 23:52:45 +0000 (01:52 +0200)]
Merge branch 'master' into next

13 years agoMerge branch 'use-xcb-atoms'
Michael Stapelberg [Tue, 16 Aug 2011 23:52:41 +0000 (01:52 +0200)]
Merge branch 'use-xcb-atoms'

13 years agoxcb: use predefined XCB_ATOM_ atoms, don’t request them
Michael Stapelberg [Tue, 16 Aug 2011 23:41:19 +0000 (01:41 +0200)]
xcb: use predefined XCB_ATOM_ atoms, don’t request them

13 years agoMerge branch 'master' into next
Michael Stapelberg [Fri, 12 Aug 2011 21:11:13 +0000 (23:11 +0200)]
Merge branch 'master' into next

13 years agoMerge branch 'i3bar-fixes'
Michael Stapelberg [Fri, 12 Aug 2011 21:10:21 +0000 (23:10 +0200)]
Merge branch 'i3bar-fixes'

13 years agolittle comment spelling fixes
Michael Stapelberg [Fri, 12 Aug 2011 21:09:59 +0000 (23:09 +0200)]
little comment spelling fixes

13 years agoPass NULL to XkbOpenDisplay, it will read $DISPLAY itself
Michael Stapelberg [Fri, 12 Aug 2011 21:09:36 +0000 (23:09 +0200)]
Pass NULL to XkbOpenDisplay, it will read $DISPLAY itself

13 years agoBugfix: Use correct buffer size, quote workspace names
Michael Stapelberg [Fri, 12 Aug 2011 20:53:49 +0000 (22:53 +0200)]
Bugfix: Use correct buffer size, quote workspace names

This fixes problems with the workspace 'next' and workspace names longer than
40 characters

13 years agoMerge branch 'i3bar_fix_tabs' into next
Axel Wagner [Fri, 12 Aug 2011 16:44:36 +0000 (18:44 +0200)]
Merge branch 'i3bar_fix_tabs' into next

13 years agoi3bar: Fixup indentions
Axel Wagner [Fri, 12 Aug 2011 16:43:09 +0000 (18:43 +0200)]
i3bar: Fixup indentions

13 years agoMerge branch 'master' into next
Michael Stapelberg [Thu, 11 Aug 2011 20:22:44 +0000 (22:22 +0200)]
Merge branch 'master' into next

13 years agoMerge branch 'warp-pointer'
Michael Stapelberg [Thu, 11 Aug 2011 20:22:36 +0000 (22:22 +0200)]
Merge branch 'warp-pointer'

13 years agoWarp cursor when changing workspace.
Valentin Voigt [Thu, 11 Aug 2011 19:57:22 +0000 (21:57 +0200)]
Warp cursor when changing workspace.

13 years agoMerge branch 'master' into next
Axel Wagner [Wed, 10 Aug 2011 21:56:16 +0000 (23:56 +0200)]
Merge branch 'master' into next

13 years agoMerge branch 'i3bar_warning_fix'
Axel Wagner [Wed, 10 Aug 2011 21:55:20 +0000 (23:55 +0200)]
Merge branch 'i3bar_warning_fix'

13 years agoi3bar: Fix prototypes (thx sECuRE)
Axel Wagner [Wed, 10 Aug 2011 21:54:27 +0000 (23:54 +0200)]
i3bar: Fix prototypes (thx sECuRE)

13 years agoMerge branch 'tests-optimize' into next
Michael Stapelberg [Wed, 10 Aug 2011 13:57:28 +0000 (15:57 +0200)]
Merge branch 'tests-optimize' into next

13 years agotestsuite: eliminate sleep, wait until i3 replies via IPC
Michael Stapelberg [Wed, 10 Aug 2011 13:56:39 +0000 (15:56 +0200)]
testsuite: eliminate sleep, wait until i3 replies via IPC

13 years agoimplement "socket activation": passing IPC sockets to i3
Michael Stapelberg [Wed, 10 Aug 2011 13:55:27 +0000 (15:55 +0200)]
implement "socket activation": passing IPC sockets to i3

13 years agoMerge branch 'master' into next
Michael Stapelberg [Tue, 9 Aug 2011 08:02:55 +0000 (10:02 +0200)]
Merge branch 'master' into next

13 years agoMerge branch 'fix-moving-focus'
Michael Stapelberg [Tue, 9 Aug 2011 08:02:51 +0000 (10:02 +0200)]
Merge branch 'fix-moving-focus'

13 years agoFix two focus issues when switching/moving workspaces
Peter Bui [Mon, 8 Aug 2011 21:55:37 +0000 (17:55 -0400)]
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.

13 years agoMerge branch 'master' into next
Michael Stapelberg [Tue, 9 Aug 2011 07:47:10 +0000 (09:47 +0200)]
Merge branch 'master' into next

13 years agoMerge branch 'fix-resize'
Michael Stapelberg [Tue, 9 Aug 2011 07:47:06 +0000 (09:47 +0200)]
Merge branch 'fix-resize'

13 years agoswap up/down, also modify the testcase
Michael Stapelberg [Tue, 9 Aug 2011 07:46:02 +0000 (09:46 +0200)]
swap up/down, also modify the testcase

13 years agoResize uses up and down, not bottom and top
Peter Bui [Mon, 8 Aug 2011 20:18:55 +0000 (16:18 -0400)]
Resize uses up and down, not bottom and top

- Fix userguide resize example
- Update migration script

13 years agoMerge branch 'new-new_float' into next
Michael Stapelberg [Tue, 9 Aug 2011 07:30:12 +0000 (09:30 +0200)]
Merge branch 'new-new_float' into next

13 years agotests: add t/74-border-config which checks new_window and new_float
Michael Stapelberg [Tue, 9 Aug 2011 07:12:44 +0000 (09:12 +0200)]
tests: add t/74-border-config which checks new_window and new_float

13 years agoAdd new_float config option.
Mateusz Poszwa [Mon, 8 Aug 2011 19:51:21 +0000 (21:51 +0200)]
Add new_float config option.

This option sets the default border style for containers automatically put into floating mode.

Fixes #264

13 years agosrc/manage.c: properly set automatic flag when calling floating_enable()
Mateusz Poszwa [Mon, 8 Aug 2011 18:49:49 +0000 (20:49 +0200)]
src/manage.c: properly set automatic flag when calling floating_enable()

13 years agoMerge branch 'get-marks' into next
Michael Stapelberg [Tue, 9 Aug 2011 07:28:06 +0000 (09:28 +0200)]
Merge branch 'get-marks' into next

13 years agoMerge branch 'master' into next
Michael Stapelberg [Tue, 9 Aug 2011 07:27:55 +0000 (09:27 +0200)]
Merge branch 'master' into next

13 years agoMerge branch 'new-fix-leaks'
Michael Stapelberg [Tue, 9 Aug 2011 07:27:40 +0000 (09:27 +0200)]
Merge branch 'new-fix-leaks'

13 years agoBugfix: don’t free the old json_output, the caller does that
Michael Stapelberg [Tue, 9 Aug 2011 06:41:42 +0000 (08:41 +0200)]
Bugfix: don’t free the old json_output, the caller does that

13 years agoBugfix: use FREE to correctly handle NULL replies
Michael Stapelberg [Tue, 9 Aug 2011 06:41:14 +0000 (08:41 +0200)]
Bugfix: use FREE to correctly handle NULL replies

13 years agoFix some potential memory leaks
Peter Bui [Tue, 9 Aug 2011 01:44:39 +0000 (21:44 -0400)]
Fix some potential memory leaks

13 years agodocs/ipc: make the GET_MARKS docs a little more precise
Michael Stapelberg [Tue, 9 Aug 2011 06:22:58 +0000 (08:22 +0200)]
docs/ipc: make the GET_MARKS docs a little more precise

13 years agotests: add testcase for the GET_MARKS ipc request
Michael Stapelberg [Tue, 9 Aug 2011 06:19:48 +0000 (08:19 +0200)]
tests: add testcase for the GET_MARKS ipc request

13 years agoPreserve marks between restarts.
Helgi Kristvin Sigurbjarnarson [Sun, 7 Aug 2011 16:42:23 +0000 (16:42 +0000)]
Preserve marks between restarts.

13 years agoAdd support for get_marks in i3-msg
Helgi Kristvin Sigurbjarnarson [Sun, 7 Aug 2011 17:03:10 +0000 (17:03 +0000)]
Add support for get_marks in i3-msg

13 years agoFeature: implement GET_MARKS
Helgi Kristvin Sigurbjarnarson [Sat, 6 Aug 2011 18:23:18 +0000 (18:23 +0000)]
Feature: implement GET_MARKS

13 years agoMerge branch 'master' into next
Michael Stapelberg [Sun, 7 Aug 2011 18:45:20 +0000 (20:45 +0200)]
Merge branch 'master' into next

13 years agoinitialize most to NULL, fixes warning
Michael Stapelberg [Sun, 7 Aug 2011 18:45:06 +0000 (20:45 +0200)]
initialize most to NULL, fixes warning

13 years agoMerge branch 'master' into next
Michael Stapelberg [Sun, 7 Aug 2011 16:15:10 +0000 (18:15 +0200)]
Merge branch 'master' into next

13 years agoupdate changelog (no, we are not releasing)
Michael Stapelberg [Sun, 7 Aug 2011 16:15:01 +0000 (18:15 +0200)]
update changelog (no, we are not releasing)

13 years agoMerge branch 'master' into next
Michael Stapelberg [Sun, 7 Aug 2011 16:03:56 +0000 (18:03 +0200)]
Merge branch 'master' into next

13 years agoMerge branch 'fix-split-docs'
Michael Stapelberg [Sun, 7 Aug 2011 16:03:51 +0000 (18:03 +0200)]
Merge branch 'fix-split-docs'

13 years agodocs/userguide: use bindsym for the 'split' example (Thanks Jan)
Michael Stapelberg [Sun, 7 Aug 2011 16:03:29 +0000 (18:03 +0200)]
docs/userguide: use bindsym for the 'split' example (Thanks Jan)

13 years agoMerge branch 'master' into next
Michael Stapelberg [Sun, 7 Aug 2011 15:56:37 +0000 (17:56 +0200)]
Merge branch 'master' into next

13 years agoMerge branch 'fix-ws-direction'
Michael Stapelberg [Sun, 7 Aug 2011 15:56:32 +0000 (17:56 +0200)]
Merge branch 'fix-ws-direction'

13 years agorewrite con_descend_orientation
Michael Stapelberg [Sun, 7 Aug 2011 13:57:36 +0000 (15:57 +0200)]
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.

13 years agoBugfix: the up/down directions were swapped
Michael Stapelberg [Sun, 7 Aug 2011 13:46:24 +0000 (15:46 +0200)]
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.

13 years agolittle style fixes
Michael Stapelberg [Sun, 7 Aug 2011 13:24:51 +0000 (15:24 +0200)]
little style fixes

13 years agoImplement switching focus across screens.
Peter Bui [Sat, 6 Aug 2011 16:28:05 +0000 (12:28 -0400)]
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).

13 years agoMerge branch 'master' into next
Michael Stapelberg [Sat, 6 Aug 2011 16:54:50 +0000 (18:54 +0200)]
Merge branch 'master' into next

13 years agoMerge branch 'fix-floating-raise'
Michael Stapelberg [Sat, 6 Aug 2011 16:54:44 +0000 (18:54 +0200)]
Merge branch 'fix-floating-raise'

13 years agoBugfix: Call tree_render() before starting the dragging when dragging a floating...
Michael Stapelberg [Sat, 6 Aug 2011 16:53:39 +0000 (18:53 +0200)]
Bugfix: Call tree_render() before starting the dragging when dragging a floating window (Thanks eeemsi)

Fixes #462

13 years agoMerge branch 'master' into next
Michael Stapelberg [Thu, 4 Aug 2011 23:04:28 +0000 (01:04 +0200)]
Merge branch 'master' into next

13 years agoMerge branch 'fix-border-rendering'
Michael Stapelberg [Thu, 4 Aug 2011 23:04:24 +0000 (01:04 +0200)]
Merge branch 'fix-border-rendering'

13 years agoFix border rendering (Thanks Paride Legovini)
Michael Stapelberg [Thu, 4 Aug 2011 23:03:56 +0000 (01:03 +0200)]
Fix border rendering (Thanks Paride Legovini)

13 years agoMerge branch 'master' into next
Michael Stapelberg [Thu, 4 Aug 2011 21:37:40 +0000 (23:37 +0200)]
Merge branch 'master' into next

13 years agoMerge branch 'fix-restart'
Michael Stapelberg [Thu, 4 Aug 2011 21:37:34 +0000 (23:37 +0200)]
Merge branch 'fix-restart'

13 years agoBugfix: Use the right format string (Thanks pnutzh4x0r)
Michael Stapelberg [Thu, 4 Aug 2011 21:34:23 +0000 (23:34 +0200)]
Bugfix: Use the right format string (Thanks pnutzh4x0r)

13 years agoBugfix: Correctly parse the 'focused' (it’s a bool, no longer int) when restoring...
Michael Stapelberg [Thu, 4 Aug 2011 20:58:19 +0000 (22:58 +0200)]
Bugfix: Correctly parse the 'focused' (it’s a bool, no longer int) when restoring layout (Thanks andi)

13 years agoMerge branch 'master' into next
Michael Stapelberg [Thu, 4 Aug 2011 20:21:42 +0000 (22:21 +0200)]
Merge branch 'master' into next

13 years agoMerge branch 'fix-stacking'
Michael Stapelberg [Thu, 4 Aug 2011 20:21:27 +0000 (22:21 +0200)]
Merge branch 'fix-stacking'

13 years agoBugfix: Fix stacking order
Michael Stapelberg [Thu, 4 Aug 2011 20:19:30 +0000 (22:19 +0200)]
Bugfix: Fix stacking order

The commit 192dbdabd6ab02d1afb994a73ba389eacaae8c95 introduced a regression
here (open three floating windows and try to raise them with clicking to see
what i mean)

13 years agoMerge branch 'check-duplicate' into next
Michael Stapelberg [Thu, 4 Aug 2011 19:45:58 +0000 (21:45 +0200)]
Merge branch 'check-duplicate' into next

13 years agoBugfix: use ELOG to actually get the error message into the logfile shown by i3-nagbar
Michael Stapelberg [Thu, 4 Aug 2011 19:43:55 +0000 (21:43 +0200)]
Bugfix: use ELOG to actually get the error message into the logfile shown by i3-nagbar

13 years agoBugfix: Check that ->symbol != NULL before using strcasecmp()
Michael Stapelberg [Thu, 4 Aug 2011 19:38:13 +0000 (21:38 +0200)]
Bugfix: Check that ->symbol != NULL before using strcasecmp()

13 years agolittle style fixes for the previous patch
Michael Stapelberg [Thu, 4 Aug 2011 19:25:47 +0000 (21:25 +0200)]
little style fixes for the previous patch

13 years agocheck_for_duplicate_bindings
Radek Tříška [Thu, 4 Aug 2011 11:24:59 +0000 (13:24 +0200)]
check_for_duplicate_bindings

13 years agoMerge branch 'master' into next
Michael Stapelberg [Thu, 4 Aug 2011 18:11:44 +0000 (20:11 +0200)]
Merge branch 'master' into next

13 years agoMerge branch 'fix-instance-criterion'
Michael Stapelberg [Thu, 4 Aug 2011 18:11:40 +0000 (20:11 +0200)]
Merge branch 'fix-instance-criterion'

13 years agoextend t/65-for_window to check for the 'instance' criterion
Michael Stapelberg [Thu, 4 Aug 2011 18:11:01 +0000 (20:11 +0200)]
extend t/65-for_window to check for the 'instance' criterion

13 years agoAdd "instance" to matching criteria
Mateusz Poszwa [Thu, 4 Aug 2011 15:12:54 +0000 (17:12 +0200)]
Add "instance" to matching criteria

13 years agoMerge branch 'master' into next
Michael Stapelberg [Wed, 3 Aug 2011 22:41:11 +0000 (00:41 +0200)]
Merge branch 'master' into next

13 years agoMerge branch 'i3-wsbar-fixes'
Michael Stapelberg [Wed, 3 Aug 2011 22:40:48 +0000 (00:40 +0200)]
Merge branch 'i3-wsbar-fixes'

13 years agoi3-wsbar: display a separator between workspaces for every output when --show-all...
Michael Stapelberg [Wed, 3 Aug 2011 01:54:00 +0000 (03:54 +0200)]
i3-wsbar: display a separator between workspaces for every output when --show-all is used (Thanks marforio)

Fixes #417

13 years agoi3-wsbar: correctly handle EOF on stdin
Michael Stapelberg [Tue, 2 Aug 2011 21:31:03 +0000 (23:31 +0200)]
i3-wsbar: correctly handle EOF on stdin

13 years agoi3-wsbar: make workspace names clickable (Thanks marforio)
Michael Stapelberg [Tue, 2 Aug 2011 21:25:29 +0000 (23:25 +0200)]
i3-wsbar: make workspace names clickable (Thanks marforio)

13 years agoMerge branch 'wsnum' into next
Michael Stapelberg [Wed, 3 Aug 2011 22:34:43 +0000 (00:34 +0200)]
Merge branch 'wsnum' into next

13 years agoParsing workspace name so if the first part is a number, the workspace will get this...
Simon Kampe [Thu, 7 Apr 2011 10:58:45 +0000 (12:58 +0200)]
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.

13 years agoMerge branch 'master' into next
Michael Stapelberg [Wed, 3 Aug 2011 22:16:13 +0000 (00:16 +0200)]
Merge branch 'master' into next

13 years agoMerge branch 'ws-nextprev'
Michael Stapelberg [Wed, 3 Aug 2011 22:16:08 +0000 (00:16 +0200)]
Merge branch 'ws-nextprev'

13 years agoModify workspace next/prev to account for workspaces on all outputs.
Peter Bui [Wed, 3 Aug 2011 21:41:40 +0000 (17:41 -0400)]
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.

13 years agoMerge branch 'master' into next
Michael Stapelberg [Wed, 3 Aug 2011 22:11:00 +0000 (00:11 +0200)]
Merge branch 'master' into next

13 years agoMerge branch 'fix-wsnum'
Michael Stapelberg [Wed, 3 Aug 2011 22:10:56 +0000 (00:10 +0200)]
Merge branch 'fix-wsnum'

13 years agoBugfix: Use the appropriate number when assigning numbered workspaces in randr.c
Michael Stapelberg [Wed, 3 Aug 2011 22:10:23 +0000 (00:10 +0200)]
Bugfix: Use the appropriate number when assigning numbered workspaces in randr.c

13 years agoInclude <limits.h> in all.h
Michael Stapelberg [Wed, 3 Aug 2011 22:10:04 +0000 (00:10 +0200)]
Include <limits.h> in all.h

13 years agoMerge branch 'master' into next
Michael Stapelberg [Wed, 3 Aug 2011 18:49:01 +0000 (20:49 +0200)]
Merge branch 'master' into next