Michael Stapelberg
dc790cfa32
Bugfix: Correctly free old assignments when reloading
...
Fixes #516
2011-09-11 23:41:46 +01:00
Michael Stapelberg
f3716e45cf
re-indent load_configuration()
2011-09-11 23:31:06 +01:00
Michael Stapelberg
2c7148c46e
Same bugfix as 2a215fd
, but for assignments with invalid criteria
2011-09-11 22:54:41 +01:00
Michael Stapelberg
717ae819c5
Merge branch 'master' into next
2011-09-11 22:52:44 +01:00
Michael Stapelberg
2a215fd7e2
Bugfix: Ignore for_window commands with empty (invalid) criteria (+test) (Thanks aksr)
2011-09-11 22:52:33 +01:00
Michael Stapelberg
a41bfba47a
finally remove the deprecated 'screen' keyword from cfgparse.l
2011-09-11 22:27:31 +01:00
Michael Stapelberg
d82698efa7
make the old assign syntax trigger an i3-nagbar warning (it’s deprecated), adjust test
2011-09-11 22:01:36 +01:00
Michael Stapelberg
e47e100819
Introduce a new syntax for the 'assign' command:
...
Instead of using a quoted string to specify the class / title, the assign
command now uses criteria, just like the for_window command or the command
scopes.
An example comes here:
# Assign all Chromium windows (including popups) to workspace 1: www
assign [class="^Chromium$"] → 1: www
# Make the main browser window borderless
for_window [class="^Chromium$" title=" - Chromium$"] border none
This gives you more control over the matching process due to various reasons:
1) Criteria work case-sensitive by default. Use the (?i) option if you want a
case-insensitive match, like this:
assign [class="(?i)^ChroMIUM$"] → 1
2) class and instance of WM_CLASS can now be matched separately. For example,
when starting urxvt -name irssi, xprop will report this:
WM_CLASS(STRING) = "irssi", "URxvt"
The first part of this is the instance ("irssi"), the second part is the
class ("URxvt").
An appropriate assignment looks like this:
assign [class="^URxvt$" instance="irssi"] → 2
3) You can now freely use a forward slash (/) in all strings since that is no
longer used to separate class from title (in-band signaling is bad, mhkay?).
2011-09-11 21:54:13 +01:00
Michael Stapelberg
d03dffe012
Kill left-over i3-nagbar processes on 'exit'
2011-09-11 21:49:35 +01:00
Michael Stapelberg
b3e1fb1f3b
Make the old 'assign' case-insensitive again (+test) (Thanks aksr)
2011-09-11 21:16:45 +01:00
Michael Stapelberg
c1c1730516
pcre: enable UCP, UTF-8 (if available), extend t/19-match
2011-09-11 11:40:51 +01:00
Michael Stapelberg
2fc54aadf1
Implement support for PCRE regular expressions for all criteria (for_window, commands, assignments)
2011-09-10 23:53:11 +01:00
Michael Stapelberg
77ae771476
Restrict 'resize' command to left/right for horizontal cons, up/down for vertical cons
...
This makes the interface much clearer and avoids confusion about which key to
press in which situation.
2011-09-05 22:36:04 +02:00
Michael Stapelberg
8928b5f55d
Bugfix: Correctly handle workspace names which do not start with a zero
2011-09-05 22:21:10 +02:00
Michael Stapelberg
b4809e9ba7
Merge branch 'master' into next
2011-08-31 14:45:14 +02:00
Michael Stapelberg
e1631d6320
properly free memory/close fd upon errors (Thanks xeen)
...
Found with the static analyzer cppcheck
2011-08-31 14:44:48 +02:00
Michael Stapelberg
dfda878272
Bugfix: Correctly assign a number to workspaces starting with '0: ' (Thanks SardemFF7)
2011-08-28 18:17:02 +02:00
Michael Stapelberg
57e7266da4
Merge branch 'master' into next
2011-08-28 17:41:23 +02:00
Peter Bui
6e59d693d2
Use name_json if available, rather than non-descriptive name.
2011-08-28 17:36:16 +02:00
Michael Stapelberg
16188af8bf
Merge branch 'master' into next
2011-08-28 15:47:35 +02:00
Michael Stapelberg
5618875df8
Bugfix: Make 'floating enable' check for dock windows (Thanks edelkind)
...
Fixes #501
2011-08-28 15:46:50 +02:00
Michael Stapelberg
8114ecda47
Merge branch 'master' into next
2011-08-27 13:47:57 +02:00
Michael Stapelberg
e97a7e34f7
Bugfix: Re-implement reconfiguring height of dock windows (+test) (Thanks thomasba)
2011-08-27 13:47:10 +02:00
Michael Stapelberg
6c42a179ec
Merge branch 'master' into next
2011-08-27 13:03:20 +02:00
Michael Stapelberg
4c01dbd726
Bugfix: Don’t always focus floating windows (fixes focus stealing with assignments) (+test) (Thanks aksr)
2011-08-27 13:02:44 +02:00
stfn
8e8b9b93f4
ipc.c: Fix warning
2011-08-26 23:33:11 +02:00
Michael Stapelberg
7d2978ead4
Merge branch 'master' into next
2011-08-26 19:18:16 +02:00
Michael Stapelberg
f53f954a33
Bugfix: Re-enable X11 Eventmask *after* pushing all the X11 changes
...
This should fix focus problems where EnterNotify events were generated while
moving windows. Hopefully it does not trigger any regressions :).
Fixes #500
2011-08-26 19:17:52 +02:00
Michael Stapelberg
afff328c59
Merge branch 'master' into next
2011-08-26 12:37:04 +02:00
Michael Stapelberg
12e15609ef
Bugfix: Correctly recognize duplicate workspace assignments (Thanks Moredread)
...
Example of a faulty config:
workspace 5 VGA1
workspace 5 LVDS1
Fixes #498 , #499
2011-08-26 12:35:42 +02:00
Michael Stapelberg
53a9ace3a6
Merge branch 'master' into next
2011-08-26 03:24:14 +02:00
Michael Stapelberg
7bf465af9f
Fix prototype of con_inside_focused
2011-08-26 03:23:57 +02:00
Michael Stapelberg
a57a2b9ccb
Merge branch 'master' into next
2011-08-26 03:18:16 +02:00
Michael Stapelberg
7fca7f029f
Correctly render containers when a split container is focused
2011-08-26 03:17:41 +02:00
Michael Stapelberg
6d91a6248e
Merge branch 'master' into next
2011-08-26 02:02:50 +02:00
Michael Stapelberg
7741608a9d
Bugfix: Only consider tiling windows when attaching tiling windows to workspaces (Thanks Tucos)
...
Fixes #436
2011-08-26 02:01:06 +02:00
Michael Stapelberg
4984b81282
Merge branch 'master' into next
2011-08-25 21:59:19 +02:00
Michael Stapelberg
f06059ec94
Bugfix: Accept '\t' in the 'set' command, don’t die but ELOG in case of errors (Thanks atsutane)
2011-08-25 21:58:03 +02:00
Michael Stapelberg
4fcca74e2b
Merge branch 'master' into next
2011-08-25 00:24:12 +02:00
Michael Stapelberg
4f22e12c5c
Bugfix: Correctly render non-leaf containers (Thanks eeemsi, mseed)
...
Fixes #465
2011-08-25 00:23:33 +02:00
Michael Stapelberg
2acbf4d4a4
Compilation fix: Add dont_warp=false
2011-08-24 23:06:49 +02:00
Michael Stapelberg
75c11cb894
Merge branch 'master' into next
2011-08-24 23:00:12 +02:00
Michael Stapelberg
698d97cd02
Bugfix: Correctly warp floating windows when using the 'move' command
2011-08-24 22:59:46 +02:00
Michael Stapelberg
cd2d7ef484
Bugfix: Correctly keep focus when moving non-leaf windows
2011-08-24 22:55:56 +02:00
Michael Stapelberg
1d9a2abc05
Bugfix: Fix coordinates when moving a floating window to a different output
2011-08-24 22:54:10 +02:00
Michael Stapelberg
37a40671c9
Merge branch 'master' into next
2011-08-24 22:43:31 +02:00
Michael Stapelberg
62e9eab4e5
Merge branch 'master' into next
...
Conflicts:
src/floating.c
2011-08-24 22:43:15 +02:00
Michael Stapelberg
7558c1ddbd
Bugfix: Correctly handle current_output == NULL
...
Fixes t/66-assign.t
2011-08-24 22:41:17 +02:00
Peter Bui
a33bfa81d2
Move centering code to before sanity check
2011-08-24 22:27:15 +02:00
Michael Stapelberg
c527497a4b
Merge branch 'master' into next
2011-08-24 16:58:47 +02:00
Michael Stapelberg
247e115835
Bugfix: Correctly place floating windows on their appropriate output (Thanks kraM)
...
Fixes #452
This might also fix problems with Firefox where Firefox only displays a white
window (my guess is that it mapped a floating window outside of the actually
visible area for some reason).
2011-08-24 16:57:35 +02:00
Michael Stapelberg
ff85023b08
Merge branch 'master' into next
2011-08-24 15:14:53 +02:00
Michael Stapelberg
0d35feb71b
Bugfix: Make the 'resize' command work inside tabbed/stacked cons (+test) (Thanks sbedivere)
...
Fixes #461
2011-08-24 15:14:04 +02:00
Michael Stapelberg
642a745004
Merge branch 'master' into next
2011-08-24 00:57:36 +02:00
Michael Stapelberg
0848844f2d
Bugfix: Fix 'focus mode_toggle' on an empty workspace (Thanks BeF)
...
Fixes #487
2011-08-24 00:55:11 +02:00
Michael Stapelberg
2cd8231fce
Merge branch 'master' into next
2011-08-20 17:48:49 +02:00
Michael Stapelberg
f15559eb1f
Don’t die, but ELOG and fallback when the pointer cannot be queried (Thanks Niklas)
2011-08-20 17:48:07 +02:00
Michael Stapelberg
22e30061f3
Merge branch 'master' into next
2011-08-17 16:37:09 +02:00
Michael Stapelberg
f172359ba5
Bugfix: Don’t change focus when assigned windows start on invisible workspaces (+test) (Thanks ioflag)
...
Fixes #468
2011-08-17 16:36:19 +02:00
Michael Stapelberg
ec317e78c1
use 'break' instead of 'return', the generated code will end up in a switch statement
2011-08-17 16:12:48 +02:00
Peter Bui
7ddba4995f
BUG-396: Implement move output <RANDR-OUTPUT> command
...
Also add support for move output <up|down|left|right> and update
userguide about the new command.
2011-08-17 16:10:11 +02:00
Michael Stapelberg
4cf2cab626
Merge branch 'master' into next
2011-08-17 13:37:33 +02:00
Michael Stapelberg
09ad9808f6
Bugfix: Set focus to where the mouse pointer is when starting (Thanks nutron)
...
Fixes #477
2011-08-17 13:37:08 +02:00
Michael Stapelberg
2eab8d7f20
Merge branch 'master' into next
2011-08-17 12:29:15 +02:00
Michael Stapelberg
7c6f693c8a
Bugfix: Don’t consider the workspace next/prev command when looking for named workspaces
...
Fixes #469
2011-08-17 12:28:45 +02:00
Michael Stapelberg
7eacf8dd04
Merge branch 'master' into next
2011-08-17 12:17:29 +02:00
Michael Stapelberg
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
Michael Stapelberg
7a22bd1cf3
Merge branch 'master' into next
2011-08-17 12:14:17 +02:00
Peter Bui
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
Michael Stapelberg
2abe23d6ff
Merge branch 'master' into next
2011-08-17 01:52:45 +02:00
Michael Stapelberg
7951445849
xcb: use predefined XCB_ATOM_ atoms, don’t request them
2011-08-17 01:41:19 +02:00
Michael Stapelberg
d3efa73dd7
Merge branch 'master' into next
2011-08-11 22:22:44 +02:00
Valentin Voigt
bf0c67b2af
Warp cursor when changing workspace.
2011-08-11 22:13:50 +02:00
Michael Stapelberg
3af7692a92
Merge branch 'tests-optimize' into next
2011-08-10 15:57:28 +02:00
Michael Stapelberg
10f871b57b
implement "socket activation": passing IPC sockets to i3
2011-08-10 15:55:27 +02:00
Michael Stapelberg
016ecb65fb
Merge branch 'master' into next
2011-08-09 10:02:55 +02:00
Peter Bui
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
Mateusz Poszwa
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
Mateusz Poszwa
cd5ebc2dca
src/manage.c: properly set automatic flag when calling floating_enable()
2011-08-09 09:29:47 +02:00
Michael Stapelberg
eb0a56fad1
Merge branch 'get-marks' into next
2011-08-09 09:28:06 +02:00
Michael Stapelberg
4253aa4ba2
Merge branch 'master' into next
2011-08-09 09:27:55 +02:00
Michael Stapelberg
cd1add1f3c
Bugfix: don’t free the old json_output, the caller does that
2011-08-09 09:27:28 +02:00
Michael Stapelberg
95416175cd
Bugfix: use FREE to correctly handle NULL replies
2011-08-09 09:27:24 +02:00
Peter Bui
5e06b1b21d
Fix some potential memory leaks
2011-08-09 09:27:15 +02:00
Helgi Kristvin Sigurbjarnarson
3cc22dcbe4
Preserve marks between restarts.
2011-08-09 08:19:31 +02:00
Helgi Kristvin Sigurbjarnarson
35d7ef0ddd
Feature: implement GET_MARKS
2011-08-09 08:04:33 +02:00
Michael Stapelberg
e304902874
Merge branch 'master' into next
2011-08-07 20:45:20 +02:00
Michael Stapelberg
6fb5d6e313
initialize most to NULL, fixes warning
2011-08-07 20:45:06 +02:00
Michael Stapelberg
9260cd7e12
Merge branch 'master' into next
2011-08-07 17:56:37 +02:00
Michael Stapelberg
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
Michael Stapelberg
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
Michael Stapelberg
692d65b0fd
little style fixes
2011-08-07 15:24:51 +02:00
Peter Bui
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
Michael Stapelberg
94ba655794
Merge branch 'master' into next
2011-08-06 18:54:50 +02:00
Michael Stapelberg
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
Michael Stapelberg
2631ad4c07
Merge branch 'master' into next
2011-08-05 01:04:28 +02:00
Michael Stapelberg
ec0d67410a
Fix border rendering (Thanks Paride Legovini)
2011-08-05 01:03:56 +02:00
Michael Stapelberg
6e95004d6c
Merge branch 'master' into next
2011-08-04 23:37:40 +02:00
Michael Stapelberg
f2e1e220a4
Bugfix: Use the right format string (Thanks pnutzh4x0r)
2011-08-04 23:34:23 +02:00
Michael Stapelberg
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