]> git.sur5r.net Git - i3/i3/log
i3/i3
9 years agoMake center coordinates relative to current workspace
Deiz [Thu, 26 Mar 2015 02:40:59 +0000 (22:40 -0400)]
Make center coordinates relative to current workspace

Fixes #1211

9 years agoMerge pull request #1578 from Airblader/feature-custom-separator
Michael Stapelberg [Wed, 25 Mar 2015 21:49:09 +0000 (22:49 +0100)]
Merge pull request #1578 from Airblader/feature-custom-separator

Add support for a custom separator symbol

9 years agoDon’t focus placeholder windows.
Michael Stapelberg [Wed, 25 Mar 2015 21:47:23 +0000 (22:47 +0100)]
Don’t focus placeholder windows.

9 years agoAdd support for a custom separator symbol 1578/head
Ingo Bürk [Tue, 24 Mar 2015 22:07:25 +0000 (23:07 +0100)]
Add support for a custom separator symbol

This introduces a "separator_symbol" property for the i3bar configuration.
If set, the specified string will be used as a separator instead of a vertical line. Since it is an optional configuration, complete backwards compatibility is given.

fixes #1472

9 years agoBugfix: skip restart_mode swallow specifications
Michael Stapelberg [Wed, 25 Mar 2015 19:49:19 +0000 (20:49 +0100)]
Bugfix: skip restart_mode swallow specifications

Otherwise, placeholder windows would accumulate these over restarts. The
worst part is that they don’t get dumped properly, meaning an empty
swallows specification ends up in the state, which matches any window,
so other random windows would be matched into the placeholder (e.g.
i3bar).

fixes #1502

9 years agoRestore placeholder windows after restarting (Thanks Airblader).
Michael Stapelberg [Wed, 25 Mar 2015 19:48:51 +0000 (20:48 +0100)]
Restore placeholder windows after restarting (Thanks Airblader).

fixes #1502

9 years agoMerge pull request #1583 from shdown/next
Michael Stapelberg [Wed, 25 Mar 2015 19:16:00 +0000 (20:16 +0100)]
Merge pull request #1583 from shdown/next

i3bar: spelling fixes (2)

9 years agoi3bar: spelling fixes (2) 1583/head
shdown [Tue, 24 Mar 2015 12:41:16 +0000 (15:41 +0300)]
i3bar: spelling fixes (2)

9 years agoMerge pull request #1574 from acrisci/bug/bar-text-null-check
Michael Stapelberg [Tue, 24 Mar 2015 10:08:57 +0000 (11:08 +0100)]
Merge pull request #1574 from acrisci/bug/bar-text-null-check

i3bar: check block text for NULL

9 years agoi3bar: check `short_text` for NULL on dump 1574/head
Tony Crisci [Tue, 24 Mar 2015 10:00:26 +0000 (06:00 -0400)]
i3bar: check `short_text` for NULL on dump

Check `short_text` for NULL on statusline dump, since this value can be
NULL when not given. Fixes a segfault in that case.

9 years agoi3bar: check block text for NULL
Tony Crisci [Tue, 24 Mar 2015 09:45:20 +0000 (05:45 -0400)]
i3bar: check block text for NULL

Add a null check to `full_text` and `short_text` for a block before
setting the markup property to avoid a segfault.

9 years agoRevert "Workspace command number selection"
Michael Stapelberg [Tue, 24 Mar 2015 08:27:42 +0000 (09:27 +0100)]
Revert "Workspace command number selection"

This reverts commit cbd51ce6642be4e1163a64dce8ec20a454f1bf05.

If you’ve started using this feature, I’m very sorry, but I think it’s
better to revert it entirely, as it will only cause more problems in the
future as more and more people upgrade and get bitten by this if we
didn’t revert it…

fixes #1536

9 years agoMerge pull request #1564 from acrisci/feature/i3bar-markup-per-block
Michael Stapelberg [Tue, 24 Mar 2015 07:57:36 +0000 (08:57 +0100)]
Merge pull request #1564 from acrisci/feature/i3bar-markup-per-block

i3bar: set markup per block

9 years agoi3bar: set markup per block 1564/head
Tony Crisci [Tue, 24 Mar 2015 06:27:38 +0000 (02:27 -0400)]
i3bar: set markup per block

Add `markup` to the i3bar protocol as a block member.

This is a string that determines how the block should be parsed as
markup. "pango" indicates the block should be parsed as Pango markup.
"none" indicates the block should not be parsed as markup.

9 years agoMerge pull request #1570 from shdown/next
Michael Stapelberg [Mon, 23 Mar 2015 21:10:17 +0000 (22:10 +0100)]
Merge pull request #1570 from shdown/next

i3bar: spelling fixes

9 years agoi3bar: spelling fixes 1570/head
shdown [Mon, 23 Mar 2015 19:56:49 +0000 (22:56 +0300)]
i3bar: spelling fixes

9 years agoMerge pull request #1562 from Airblader/feature-short-text
Michael Stapelberg [Mon, 23 Mar 2015 19:29:40 +0000 (20:29 +0100)]
Merge pull request #1562 from Airblader/feature-short-text

Add support for the short_text property

9 years agoMerge pull request #1568 from acrisci/feature/valgrind-no-verbose
Michael Stapelberg [Mon, 23 Mar 2015 19:27:35 +0000 (20:27 +0100)]
Merge pull request #1568 from acrisci/feature/valgrind-no-verbose

testcases: dont run valgrind verbose

9 years agotestcases: dont run valgrind verbose 1568/head
Tony Crisci [Mon, 23 Mar 2015 17:03:57 +0000 (13:03 -0400)]
testcases: dont run valgrind verbose

9 years agoAdd support for short_text 1562/head
Ingo Bürk [Sat, 21 Mar 2015 20:36:15 +0000 (21:36 +0100)]
Add support for short_text

When the statusline is too long, try to use the short_text property of each status block before falling back to truncating it.
fixes #1092

9 years agoIntroduce a function to copy i3strings
Ingo Bürk [Sat, 21 Mar 2015 20:33:53 +0000 (21:33 +0100)]
Introduce a function to copy i3strings

9 years agoIntroduce the short_text property on blocks and parse it according to the documentation.
Ingo Bürk [Sat, 21 Mar 2015 20:33:38 +0000 (21:33 +0100)]
Introduce the short_text property on blocks and parse it according to the documentation.

9 years agoclang-format and rearrange comments in i3bar/src/xcb.c
Michael Stapelberg [Mon, 23 Mar 2015 08:23:01 +0000 (09:23 +0100)]
clang-format and rearrange comments in i3bar/src/xcb.c

9 years agofix travis config with regards to clang-format
Michael Stapelberg [Mon, 23 Mar 2015 08:21:06 +0000 (09:21 +0100)]
fix travis config with regards to clang-format

9 years agoMerge pull request #1560 from shdown/refactoring
Michael Stapelberg [Sun, 22 Mar 2015 20:29:03 +0000 (21:29 +0100)]
Merge pull request #1560 from shdown/refactoring

i3bar: refactoring

9 years agoMerge pull request #1557 from acrisci/bug/fix-validation-segfault
Michael Stapelberg [Sun, 22 Mar 2015 13:32:36 +0000 (14:32 +0100)]
Merge pull request #1557 from acrisci/bug/fix-validation-segfault

Bugfix: validation segfault

9 years agoi3bar: introduce get_tray_width() function to reduce duplication 1560/head
shdown [Sun, 22 Mar 2015 10:08:31 +0000 (13:08 +0300)]
i3bar: introduce get_tray_width() function to reduce duplication

9 years agoi3bar: refactor magic numbers to *_px constants
shdown [Sat, 21 Mar 2015 17:46:36 +0000 (20:46 +0300)]
i3bar: refactor magic numbers to *_px constants

9 years agoBugfix: validation segfault 1557/head
Tony Crisci [Sun, 22 Mar 2015 09:46:52 +0000 (05:46 -0400)]
Bugfix: validation segfault

When `new_window` is given in the config, config validation with `i3 -C`
would segfault.

Add a NULL check in logical_px() to check for the case when the config
is being validated without an X server to prevent this.

9 years agoDon’t overwrite border width when already set (placeholders).
Michael Stapelberg [Sat, 21 Mar 2015 22:02:35 +0000 (23:02 +0100)]
Don’t overwrite border width when already set (placeholders).

fixes #1501

9 years agoi3bar: set correct initial position when reconfiguring
Michael Stapelberg [Sat, 21 Mar 2015 21:50:48 +0000 (22:50 +0100)]
i3bar: set correct initial position when reconfiguring

fixes #1542

9 years agoMerge pull request #1556 from Airblader/feature-i3-save-tree-by-number
Michael Stapelberg [Sat, 21 Mar 2015 21:37:42 +0000 (22:37 +0100)]
Merge pull request #1556 from Airblader/feature-i3-save-tree-by-number

Allow referencing the workspace by number.

9 years agoincrease timeouts for travis
Michael Stapelberg [Sat, 21 Mar 2015 21:22:37 +0000 (22:22 +0100)]
increase timeouts for travis

See https://travis-ci.org/i3/i3/jobs/55319961 (line 4064) for a job
where the window could not be mapped within 2 seconds.

9 years agoMerge pull request #1561 from Airblader/feature-append-layout-docs
Michael Stapelberg [Sat, 21 Mar 2015 21:08:58 +0000 (22:08 +0100)]
Merge pull request #1561 from Airblader/feature-append-layout-docs

Added a troubleshooting section to the restoring layout docs

9 years agoAdded a troubleshooting section to the restoring layout docs and described solution... 1561/head
Ingo Bürk [Sat, 21 Mar 2015 18:32:40 +0000 (19:32 +0100)]
Added a troubleshooting section to the restoring layout docs and described solution for vertically split containers

9 years agoMerge pull request #1559 from shdown/next
Michael Stapelberg [Sat, 21 Mar 2015 17:44:02 +0000 (18:44 +0100)]
Merge pull request #1559 from shdown/next

various i3bar bugfixes

9 years agoi3bar: fix click events for workspace buttons with long statusline 1559/head
shdown [Sat, 21 Mar 2015 16:41:38 +0000 (19:41 +0300)]
i3bar: fix click events for workspace buttons with long statusline

This combines detecting of current and clicked workspaces into one cycle
and then checks if the x coordinate of the clicked point is greater than
the workspace buttons width.

9 years agoi3bar: fix spelling is messages
shdown [Sat, 21 Mar 2015 16:22:31 +0000 (19:22 +0300)]
i3bar: fix spelling is messages

9 years agoi3bar: rename a variable
shdown [Sat, 21 Mar 2015 16:17:05 +0000 (19:17 +0300)]
i3bar: rename a variable

Give it a more meaningful name.

9 years agoi3bar: add binding indicator width to workspace buttons width
shdown [Sat, 21 Mar 2015 16:12:29 +0000 (19:12 +0300)]
i3bar: add binding indicator width to workspace buttons width

Just to prevent the indicator from being overlapped by the statusline.

9 years agoAllow referencing the workspace by number. 1556/head
Ingo Bürk [Sat, 21 Mar 2015 16:10:20 +0000 (17:10 +0100)]
Allow referencing the workspace by number.

This allows "--workspace 3" for numbered workspaces, e.g., if the name is actually
"3:foo". This introduces the same functionality the IPC already offers in many places.

9 years agoi3bar: cut long statuslines from the left
shdown [Sat, 21 Mar 2015 16:08:40 +0000 (19:08 +0300)]
i3bar: cut long statuslines from the left

This draws the statusline after drawing (and calculating width of) the
workspace buttons and fixes calculation of its maximum visible width.
This (hopefully) guarantees that these two will never overlap.

9 years agoi3bar: fix clearing of the statusline pixmap
shdown [Sat, 21 Mar 2015 16:00:11 +0000 (19:00 +0300)]
i3bar: fix clearing of the statusline pixmap

This fixes the bug when statusline pixmap wasn't entirely cleared that
caused random artifacts to appear when the statusline width is greater
than the screen width.

9 years agoMerge pull request #1555 from Airblader/feature-i3-save-tree-current-ws
Michael Stapelberg [Sat, 21 Mar 2015 15:38:46 +0000 (16:38 +0100)]
Merge pull request #1555 from Airblader/feature-i3-save-tree-current-ws

Make the --workspace optional by defaulting to the focused workspace.

9 years agoMerge pull request #1549 from shdown/y-offset-fix
Michael Stapelberg [Sat, 21 Mar 2015 15:32:19 +0000 (16:32 +0100)]
Merge pull request #1549 from shdown/y-offset-fix

Fix incorrect y-offset for text in i3bar (2)

9 years agoadapted usage text 1555/head
Ingo Bürk [Thu, 19 Mar 2015 17:59:25 +0000 (18:59 +0100)]
adapted usage text

9 years agoMake the --workspace optional by defaulting to the focused workspace.
Ingo Bürk [Wed, 18 Mar 2015 20:37:37 +0000 (21:37 +0100)]
Make the --workspace optional by defaulting to the focused workspace.

If no option is given, i3-save-tree should default to the currently focused workspace.
Specifying both --workspace and --output will still yield an error.

9 years agoMerge pull request #1551 from acrisci/bug/rename-workspace-mismatch
Michael Stapelberg [Mon, 16 Mar 2015 21:49:38 +0000 (22:49 +0100)]
Merge pull request #1551 from acrisci/bug/rename-workspace-mismatch

bugfix: workspace rename focus mismatch

9 years agoMerge pull request #1553 from Airblader/feature-remove-output-assignment
Michael Stapelberg [Mon, 16 Mar 2015 21:40:25 +0000 (22:40 +0100)]
Merge pull request #1553 from Airblader/feature-remove-output-assignment

Remove the A_TO_OUTPUT option

9 years agofix warnings when CONTINUOUS_INTEGRATION env var is unset
Michael Stapelberg [Mon, 16 Mar 2015 21:38:39 +0000 (22:38 +0100)]
fix warnings when CONTINUOUS_INTEGRATION env var is unset

9 years agorelax timings of t/200-urgency-timer.t to reduce flakiness
Michael Stapelberg [Mon, 16 Mar 2015 21:37:45 +0000 (22:37 +0100)]
relax timings of t/200-urgency-timer.t to reduce flakiness

9 years agoRemove the A_TO_OUTPUT option as it is not needed anymore and will not be implemented... 1553/head
Ingo Bürk [Mon, 16 Mar 2015 19:18:03 +0000 (20:18 +0100)]
Remove the A_TO_OUTPUT option as it is not needed anymore and will not be implemented in favor of normal assignments.

9 years agobugfix: workspace rename focus mismatch 1551/head
Tony Crisci [Mon, 16 Mar 2015 03:30:00 +0000 (23:30 -0400)]
bugfix: workspace rename focus mismatch

When renaming a workspace on another output that moves the workspace to
the current output, the renamed workspace would be shown even though it
does not contain the focused container.

Explicitly show the focused workspace after the move. This is necessary
because `workspace_move_to_output` will show the workspace that is
moved.

9 years agoFix incorrect y-offset for text in i3bar (2) 1549/head
shdown [Sun, 15 Mar 2015 07:32:17 +0000 (10:32 +0300)]
Fix incorrect y-offset for text in i3bar (2)

014aa7ff7441a8a2bb53bd0956aff61faaf6f37f fixed incorrect align of small
symbols, but also introduced a problem with texts with mixed large and
normal symbols. Fix it by centering the text vertically only if its
height is smaller that the saved font height.
Fixes #1543.

9 years agotravis: verify code was formatted using clang-format
Michael Stapelberg [Sat, 14 Mar 2015 21:32:03 +0000 (22:32 +0100)]
travis: verify code was formatted using clang-format

9 years agoclang-format src/commands.c
Michael Stapelberg [Sat, 14 Mar 2015 21:31:58 +0000 (22:31 +0100)]
clang-format src/commands.c

9 years agoMerge pull request #1539 from mh21/wsrename-1527
Michael Stapelberg [Sat, 14 Mar 2015 11:56:19 +0000 (04:56 -0700)]
Merge pull request #1539 from mh21/wsrename-1527

Rename workspaces in startup sequences

9 years agotravis: cat complete-run.log on failures
Michael Stapelberg [Sat, 14 Mar 2015 11:35:01 +0000 (12:35 +0100)]
travis: cat complete-run.log on failures

9 years agotests: exit with status 1 when tests fail
Michael Stapelberg [Sat, 14 Mar 2015 11:34:34 +0000 (12:34 +0100)]
tests: exit with status 1 when tests fail

9 years agotests: don’t print interactive status when running on travis
Michael Stapelberg [Sat, 14 Mar 2015 11:33:54 +0000 (12:33 +0100)]
tests: don’t print interactive status when running on travis

(or without a tty)

9 years agotravis: run tests serialized, install latest AnyEvent::I3
Michael Stapelberg [Fri, 13 Mar 2015 22:38:56 +0000 (23:38 +0100)]
travis: run tests serialized, install latest AnyEvent::I3

9 years agotravis: install as many perl pkgs as possible via apt instead of cpanm
Michael Stapelberg [Fri, 13 Mar 2015 22:38:33 +0000 (23:38 +0100)]
travis: install as many perl pkgs as possible via apt instead of cpanm

9 years agotravis: fix pinning setup (newlines and YAML are complicated)
Michael Stapelberg [Fri, 13 Mar 2015 22:38:13 +0000 (23:38 +0100)]
travis: fix pinning setup (newlines and YAML are complicated)

9 years agotravis: escape strings for YAML
Michael Stapelberg [Fri, 13 Mar 2015 20:04:03 +0000 (21:04 +0100)]
travis: escape strings for YAML

9 years agotravis: install more perl dependencies, pull in trusty packages
Michael Stapelberg [Fri, 13 Mar 2015 19:52:53 +0000 (20:52 +0100)]
travis: install more perl dependencies, pull in trusty packages

9 years agotravis: also cat cpanm build logs after failure
Michael Stapelberg [Fri, 13 Mar 2015 12:24:02 +0000 (13:24 +0100)]
travis: also cat cpanm build logs after failure

9 years agotravis: cpanm: set -v so that we get error messages in the travis output
Michael Stapelberg [Fri, 13 Mar 2015 10:39:59 +0000 (11:39 +0100)]
travis: cpanm: set -v so that we get error messages in the travis output

9 years agoRename workspaces in startup sequences. 1539/head
Michael Hofmann [Fri, 6 Mar 2015 23:13:54 +0000 (00:13 +0100)]
Rename workspaces in startup sequences.

When renaming workspaces, any workspace names in pending startup
sequences also need to be renamed.

9 years agoTest: startup workspaces updating on rename.
Michael Hofmann [Fri, 6 Mar 2015 23:14:47 +0000 (00:14 +0100)]
Test: startup workspaces updating on rename.

9 years agotravis: directly use cpanm -n to skip tests
Michael Stapelberg [Fri, 13 Mar 2015 09:21:02 +0000 (10:21 +0100)]
travis: directly use cpanm -n to skip tests

X11::XCB currently fails its tests

9 years agotravis runs on ubuntu 12.04, so use libinline-perl
Michael Stapelberg [Fri, 13 Mar 2015 09:12:00 +0000 (10:12 +0100)]
travis runs on ubuntu 12.04, so use libinline-perl

9 years agotravis: mk-build-deps needs equivs
Michael Stapelberg [Fri, 13 Mar 2015 09:09:21 +0000 (10:09 +0100)]
travis: mk-build-deps needs equivs

9 years agoadd configuration for travis-ci.com
Michael Stapelberg [Fri, 13 Mar 2015 09:06:57 +0000 (10:06 +0100)]
add configuration for travis-ci.com

9 years agoMerge pull request #1521 from Airblader/feature-use-refactored-function
Michael Stapelberg [Fri, 13 Mar 2015 07:54:52 +0000 (00:54 -0700)]
Merge pull request #1521 from Airblader/feature-use-refactored-function

Use the already existing function to get rid of some code duplication

9 years agoMerge pull request #1513 from Airblader/defect-1473
Michael Stapelberg [Fri, 13 Mar 2015 07:52:52 +0000 (00:52 -0700)]
Merge pull request #1513 from Airblader/defect-1473

Move workspace to assigned output when renaming it

9 years agoMerge pull request #1512 from mdtipton/unclutter_scroll
Michael Stapelberg [Fri, 13 Mar 2015 07:46:16 +0000 (00:46 -0700)]
Merge pull request #1512 from mdtipton/unclutter_scroll

Fix scrolling in window decoration with hidden cursor.

9 years agoMerge pull request #1546 from rosetree/next
Michael Stapelberg [Fri, 13 Mar 2015 07:36:29 +0000 (00:36 -0700)]
Merge pull request #1546 from rosetree/next

Fix comment box

9 years agoFix comment box 1546/head
Micha Rosenbaum [Thu, 12 Mar 2015 10:18:12 +0000 (11:18 +0100)]
Fix comment box

9 years agoMerge pull request #1545 from garbados/gendered-terms-in-docs
Michael Stapelberg [Thu, 12 Mar 2015 07:38:35 +0000 (00:38 -0700)]
Merge pull request #1545 from garbados/gendered-terms-in-docs

degendered terms

9 years agodegendered terms 1545/head
Diana Thayer [Thu, 12 Mar 2015 04:41:43 +0000 (21:41 -0700)]
degendered terms

9 years agoadd release.sh, a script to prepare a new i3 release
Michael Stapelberg [Sat, 7 Mar 2015 19:37:34 +0000 (20:37 +0100)]
add release.sh, a script to prepare a new i3 release

9 years agoupdate debian/changelog for the new release
Michael Stapelberg [Sat, 7 Mar 2015 19:31:38 +0000 (20:31 +0100)]
update debian/changelog for the new release

9 years agoMerge branch 'master' into next
Michael Stapelberg [Sat, 7 Mar 2015 19:26:29 +0000 (20:26 +0100)]
Merge branch 'master' into next

9 years agoMerge branch 'release-4.9.1'
Michael Stapelberg [Sat, 7 Mar 2015 19:26:29 +0000 (20:26 +0100)]
Merge branch 'release-4.9.1'

9 years agorelease i3 4.9.1 4.9.1
Michael Stapelberg [Sat, 7 Mar 2015 19:26:09 +0000 (20:26 +0100)]
release i3 4.9.1

9 years agoMerge branch 'master' into next
Michael Stapelberg [Sat, 7 Mar 2015 14:57:41 +0000 (15:57 +0100)]
Merge branch 'master' into next

Conflicts:
src/commands.c

9 years agoMerge branch 'fix-restore-errormsg'
Michael Stapelberg [Sat, 7 Mar 2015 14:57:13 +0000 (15:57 +0100)]
Merge branch 'fix-restore-errormsg'

9 years agoProperly error out when the layout file cannot be read.
Ingo Bürk [Wed, 4 Mar 2015 21:45:39 +0000 (22:45 +0100)]
Properly error out when the layout file cannot be read.
This will result in an actual error message for the user.
fixes #1499

9 years agoGlob filepath when calling append_layout
Ingo Bürk [Sat, 28 Feb 2015 23:13:37 +0000 (00:13 +0100)]
Glob filepath when calling append_layout
fixes #1500

9 years agoImprove error messages on failing commands
Ingo Bürk [Wed, 4 Mar 2015 13:01:42 +0000 (14:01 +0100)]
Improve error messages on failing commands

9 years agoMerge branch 'master' into next
Michael Stapelberg [Sat, 7 Mar 2015 14:40:59 +0000 (15:40 +0100)]
Merge branch 'master' into next

9 years agoMerge branch 'dont-match-placeholders'
Michael Stapelberg [Sat, 7 Mar 2015 14:40:59 +0000 (15:40 +0100)]
Merge branch 'dont-match-placeholders'

9 years agoBugfix: insert id-based match at HEAD, not TAIL.
Michael Stapelberg [Sat, 7 Mar 2015 14:38:10 +0000 (15:38 +0100)]
Bugfix: insert id-based match at HEAD, not TAIL.

Before this commit, placeholder windows had any matches that were
defined in the JSON file, _followed_ by an i3-internal match that
ensures the placeholder X11 window gets swallowed into the placeholder
i3 container.

The problem was that the first successful match was deleted, and if
users specified a criterion (title=IPython) that matched the placeholder
window itself (name=IPython), then that match is deleted and the
i3-internal match is kept. This results in the actual window the user
wants to match not being swallowed, and the placeholder window not
displaying any criteria.

fixes #1526

9 years agoMerge branch 'master' into next
Michael Stapelberg [Sat, 7 Mar 2015 13:52:39 +0000 (14:52 +0100)]
Merge branch 'master' into next

9 years agoMerge branch 'fix-mode-switch'
Michael Stapelberg [Sat, 7 Mar 2015 13:52:39 +0000 (14:52 +0100)]
Merge branch 'fix-mode-switch'

9 years agoFix bindings using Mode_switch
Michael Stapelberg [Sat, 7 Mar 2015 13:51:24 +0000 (14:51 +0100)]
Fix bindings using Mode_switch

fixes #1518

9 years agoMerge branch 'master' into next
Michael Stapelberg [Sat, 7 Mar 2015 10:47:59 +0000 (11:47 +0100)]
Merge branch 'master' into next

9 years agoMerge branch 'revert-iconic'
Michael Stapelberg [Sat, 7 Mar 2015 10:47:59 +0000 (11:47 +0100)]
Merge branch 'revert-iconic'

9 years agoRevert "Handle WM_CHANGE_STATE requests for iconic state"
Michael Stapelberg [Sat, 7 Mar 2015 10:46:43 +0000 (11:46 +0100)]
Revert "Handle WM_CHANGE_STATE requests for iconic state"

This reverts commit 136b3e345bfde637d3270eafaa2d8aa3555cc3d5.

fixes #1516

9 years agoUse the already existing function to get rid of some code duplication 1521/head
Ingo Bürk [Thu, 5 Mar 2015 13:00:24 +0000 (14:00 +0100)]
Use the already existing function to get rid of some code duplication