db33da2258
Merge branch 'master' into next
2011-09-26 20:12:07 +01:00
abaa8c2356
Bugfix: IPC: Correctly dump the 'focus' array
2011-09-26 20:11:47 +01:00
6420b2b102
Introduce the i3-sensible-{pager,editor,terminal} scripts
...
The former two provide fallbacks in case $PAGER or $EDITOR is not set (which
might be more common than you think, because they have to be set in
~/.xsession, not in the shell configuration!) while the latter tries to launch
a terminal emulator. The scripts are most prominently used in i3-nagbar, which
alerts the user when the configuration is broken for some reason. Also,
i3-sensible-terminal is used in the default configuration.
This commit does not rely on the shell supporting ${PAGER:-less} anymore, which
is not the case for 'fish'.
2011-09-25 18:46:37 +01:00
1481cd95c9
Implement the I3_SYNC client protocol
...
This is mainly useful for the testsuite. The tests can wait until i3 processed
all X11 events and then continue. This eliminates sleep() calls which leads to
a more robust and faster testsuite.
2011-09-22 23:13:12 +01:00
daebe28b09
Merge branch 'master' into next
2011-09-22 23:11:14 +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
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
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
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
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
05c0a8985b
Merge branch 'master' into next
2011-09-18 17:44:00 +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
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
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
c88425147e
Merge branch 'master' into next
2011-09-18 14:39:33 +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
0bc44ffc37
Merge branch 'master' into next
2011-09-18 00:40:42 +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
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
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
7a38d8ac56
Merge branch 'master' into next
2011-09-17 14:13:05 +01:00
deab3ac338
Send the correct X11 border_width in faked ConfigureNotifys
2011-09-17 14:11:55 +01:00
f2f636f9e7
Bugfix: Honor the X11 window border in ConfigureRequests
2011-09-17 14:11:01 +01:00
983a679537
Bugfix: Honor the X11 window border when calculating dimensions for floating windows
2011-09-17 14:10:35 +01:00
f6eaa8a580
Bugfix: Don’t use top border height twice when calculating dimensions for floating windows
2011-09-17 14:09:57 +01:00
5a85c9efd2
fix build in 'next' (Thanks thomasba)
2011-09-14 23:16:23 +01:00
ad568aa8c1
Merge branch 'master' into next
2011-09-14 23:00:02 +01:00
b1aa8107b3
Bugfix: Correctly handle ConfigureRequests for floating windows in multi-monitor setups (Thanks thomasba)
...
Fixes #519
2011-09-14 22:59:19 +01:00
6b541d382b
Bugfix: Don’t fix floating coordinates when reassigning (fixes flickering)
...
This fixes flickering when moving floating windows between different monitors.
2011-09-14 22:58:51 +01:00
dc790cfa32
Bugfix: Correctly free old assignments when reloading
...
Fixes #516
2011-09-11 23:41:46 +01:00
f3716e45cf
re-indent load_configuration()
2011-09-11 23:31:06 +01:00
2c7148c46e
Same bugfix as 2a215fd, but for assignments with invalid criteria
2011-09-11 22:54:41 +01:00
717ae819c5
Merge branch 'master' into next
2011-09-11 22:52:44 +01:00
2a215fd7e2
Bugfix: Ignore for_window commands with empty (invalid) criteria (+test) (Thanks aksr)
2011-09-11 22:52:33 +01:00
a41bfba47a
finally remove the deprecated 'screen' keyword from cfgparse.l
2011-09-11 22:27:31 +01:00
d82698efa7
make the old assign syntax trigger an i3-nagbar warning (it’s deprecated), adjust test
2011-09-11 22:01:36 +01:00
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
d03dffe012
Kill left-over i3-nagbar processes on 'exit'
2011-09-11 21:49:35 +01:00
b3e1fb1f3b
Make the old 'assign' case-insensitive again (+test) (Thanks aksr)
2011-09-11 21:16:45 +01:00
c1c1730516
pcre: enable UCP, UTF-8 (if available), extend t/19-match
2011-09-11 11:40:51 +01:00
2fc54aadf1
Implement support for PCRE regular expressions for all criteria (for_window, commands, assignments)
2011-09-10 23:53:11 +01:00
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
8928b5f55d
Bugfix: Correctly handle workspace names which do not start with a zero
2011-09-05 22:21:10 +02:00
b4809e9ba7
Merge branch 'master' into next
2011-08-31 14:45:14 +02:00
e1631d6320
properly free memory/close fd upon errors (Thanks xeen)
...
Found with the static analyzer cppcheck
2011-08-31 14:44:48 +02:00
dfda878272
Bugfix: Correctly assign a number to workspaces starting with '0: ' (Thanks SardemFF7)
2011-08-28 18:17:02 +02:00
57e7266da4
Merge branch 'master' into next
2011-08-28 17:41:23 +02:00
6e59d693d2
Use name_json if available, rather than non-descriptive name.
2011-08-28 17:36:16 +02:00
16188af8bf
Merge branch 'master' into next
2011-08-28 15:47:35 +02:00
5618875df8
Bugfix: Make 'floating enable' check for dock windows (Thanks edelkind)
...
Fixes #501
2011-08-28 15:46:50 +02:00
8114ecda47
Merge branch 'master' into next
2011-08-27 13:47:57 +02:00
e97a7e34f7
Bugfix: Re-implement reconfiguring height of dock windows (+test) (Thanks thomasba)
2011-08-27 13:47:10 +02:00
6c42a179ec
Merge branch 'master' into next
2011-08-27 13:03:20 +02:00
4c01dbd726
Bugfix: Don’t always focus floating windows (fixes focus stealing with assignments) (+test) (Thanks aksr)
2011-08-27 13:02:44 +02:00
8e8b9b93f4
ipc.c: Fix warning
2011-08-26 23:33:11 +02:00
7d2978ead4
Merge branch 'master' into next
2011-08-26 19:18:16 +02:00
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
afff328c59
Merge branch 'master' into next
2011-08-26 12:37:04 +02:00
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
53a9ace3a6
Merge branch 'master' into next
2011-08-26 03:24:14 +02:00
7bf465af9f
Fix prototype of con_inside_focused
2011-08-26 03:23:57 +02:00
a57a2b9ccb
Merge branch 'master' into next
2011-08-26 03:18:16 +02:00
7fca7f029f
Correctly render containers when a split container is focused
2011-08-26 03:17:41 +02:00
6d91a6248e
Merge branch 'master' into next
2011-08-26 02:02:50 +02:00
7741608a9d
Bugfix: Only consider tiling windows when attaching tiling windows to workspaces (Thanks Tucos)
...
Fixes #436
2011-08-26 02:01:06 +02:00
4984b81282
Merge branch 'master' into next
2011-08-25 21:59:19 +02:00
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
4fcca74e2b
Merge branch 'master' into next
2011-08-25 00:24:12 +02:00
4f22e12c5c
Bugfix: Correctly render non-leaf containers (Thanks eeemsi, mseed)
...
Fixes #465
2011-08-25 00:23:33 +02:00
2acbf4d4a4
Compilation fix: Add dont_warp=false
2011-08-24 23:06:49 +02:00
75c11cb894
Merge branch 'master' into next
2011-08-24 23:00:12 +02:00
698d97cd02
Bugfix: Correctly warp floating windows when using the 'move' command
2011-08-24 22:59:46 +02:00
cd2d7ef484
Bugfix: Correctly keep focus when moving non-leaf windows
2011-08-24 22:55:56 +02:00
1d9a2abc05
Bugfix: Fix coordinates when moving a floating window to a different output
2011-08-24 22:54:10 +02:00
37a40671c9
Merge branch 'master' into next
2011-08-24 22:43:31 +02:00
62e9eab4e5
Merge branch 'master' into next
...
Conflicts:
src/floating.c
2011-08-24 22:43:15 +02:00
7558c1ddbd
Bugfix: Correctly handle current_output == NULL
...
Fixes t/66-assign.t
2011-08-24 22:41:17 +02:00
a33bfa81d2
Move centering code to before sanity check
2011-08-24 22:27:15 +02:00
c527497a4b
Merge branch 'master' into next
2011-08-24 16:58:47 +02:00
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
ff85023b08
Merge branch 'master' into next
2011-08-24 15:14:53 +02:00
0d35feb71b
Bugfix: Make the 'resize' command work inside tabbed/stacked cons (+test) (Thanks sbedivere)
...
Fixes #461
2011-08-24 15:14:04 +02:00
642a745004
Merge branch 'master' into next
2011-08-24 00:57:36 +02:00
0848844f2d
Bugfix: Fix 'focus mode_toggle' on an empty workspace (Thanks BeF)
...
Fixes #487
2011-08-24 00:55:11 +02:00
2cd8231fce
Merge branch 'master' into next
2011-08-20 17:48:49 +02:00
f15559eb1f
Don’t die, but ELOG and fallback when the pointer cannot be queried (Thanks Niklas)
2011-08-20 17:48:07 +02:00
22e30061f3
Merge branch 'master' into next
2011-08-17 16:37:09 +02:00
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
ec317e78c1
use 'break' instead of 'return', the generated code will end up in a switch statement
2011-08-17 16:12:48 +02:00
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
4cf2cab626
Merge branch 'master' into next
2011-08-17 13:37:33 +02:00
09ad9808f6
Bugfix: Set focus to where the mouse pointer is when starting (Thanks nutron)
...
Fixes #477
2011-08-17 13:37:08 +02:00
2eab8d7f20
Merge branch 'master' into next
2011-08-17 12:29:15 +02:00
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
7eacf8dd04
Merge branch 'master' into next
2011-08-17 12:17:29 +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
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
7951445849
xcb: use predefined XCB_ATOM_ atoms, don’t request them
2011-08-17 01:41:19 +02:00
d3efa73dd7
Merge branch 'master' into next
2011-08-11 22:22:44 +02:00
bf0c67b2af
Warp cursor when changing workspace.
2011-08-11 22:13:50 +02:00
3af7692a92
Merge branch 'tests-optimize' into next
2011-08-10 15:57:28 +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
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
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
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
3cc22dcbe4
Preserve marks between restarts.
2011-08-09 08:19:31 +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
9260cd7e12
Merge branch 'master' into next
2011-08-07 17:56:37 +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
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
ec0d67410a
Fix border rendering (Thanks Paride Legovini)
2011-08-05 01:03:56 +02:00
6e95004d6c
Merge branch 'master' into next
2011-08-04 23:37:40 +02:00
f2e1e220a4
Bugfix: Use the right format string (Thanks pnutzh4x0r)
2011-08-04 23:34:23 +02:00
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
93c3596619
Merge branch 'master' into next
2011-08-04 22:21:42 +02:00
1d50cff7ca
Bugfix: Fix stacking order
...
The commit 192dbdabd6
2011-08-04 22:19:30 +02:00
ecc2cae3f7
Bugfix: use ELOG to actually get the error message into the logfile shown by i3-nagbar
2011-08-04 21:43:55 +02:00
4e350664ae
Bugfix: Check that ->symbol != NULL before using strcasecmp()
2011-08-04 21:38:13 +02:00
787dd4059f
little style fixes for the previous patch
2011-08-04 21:25:47 +02:00
9d101d8473
check_for_duplicate_bindings
2011-08-04 20:37:01 +02:00
e9395149b9
Merge branch 'master' into next
2011-08-04 20:11:44 +02:00
1913bf0e5c
Add "instance" to matching criteria
2011-08-04 20:10:31 +02:00
837bb50826
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.
2011-08-04 00:30:07 +02:00
1750192f63
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.
2011-08-04 00:12:09 +02:00
d0741975f1
Bugfix: Use the appropriate number when assigning numbered workspaces in randr.c
2011-08-04 00:10:23 +02:00
c883e7050a
Include <limits.h> in all.h
2011-08-04 00:10:04 +02:00
92481b133c
docs/userguide: the correct command is 'floating enable', not 'mode floating' (Thanks Sander)
...
Fixes : #453
2011-08-03 20:48:28 +02:00
Michael Stapelberg