]> git.sur5r.net Git - i3/i3/log
i3/i3
9 years agoMerge pull request #1626 from acrisci/feature/remove-tests-dir
Michael Stapelberg [Wed, 1 Apr 2015 18:27:35 +0000 (11:27 -0700)]
Merge pull request #1626 from acrisci/feature/remove-tests-dir

Remove unused `tests` dir

9 years agoRemove unused `tests` dir 1626/head
Tony Crisci [Wed, 1 Apr 2015 16:31:32 +0000 (12:31 -0400)]
Remove unused `tests` dir

9 years agoMerge pull request #1618 from Deiz/fix-1603
Michael Stapelberg [Wed, 1 Apr 2015 07:08:22 +0000 (09:08 +0200)]
Merge pull request #1618 from Deiz/fix-1603

Allow single-child non-default layout cons to be moved between outputs

9 years agoAllow single-child non-default layout cons to be moved between outputs 1618/head
Deiz [Tue, 31 Mar 2015 17:29:43 +0000 (13:29 -0400)]
Allow single-child non-default layout cons to be moved between outputs

Includes a test case to verify the behaviour of 'move <direction>'.
Fixes #1603.

9 years agoMerge pull request #1601 from Airblader/feature-titlebar-marks
Michael Stapelberg [Mon, 30 Mar 2015 21:53:42 +0000 (23:53 +0200)]
Merge pull request #1601 from Airblader/feature-titlebar-marks

Show marks in the titlebar

9 years agoChanged the default for show_marks from "no" to "yes" 1601/head
Ingo Bürk [Mon, 30 Mar 2015 20:16:05 +0000 (22:16 +0200)]
Changed the default for show_marks from "no" to "yes"

9 years agoMake show_marks configurable
Ingo Bürk [Sat, 28 Mar 2015 23:26:49 +0000 (00:26 +0100)]
Make show_marks configurable

Introduce a config directive "show_marks [yes|no]" to en- or disable drawing marks on window decorations.
To not change the look & feel of existing configurations, the default is "no".

9 years agoIntroduce a cached boolean for changes to the mark of a window.
Ingo Bürk [Sat, 28 Mar 2015 23:13:44 +0000 (00:13 +0100)]
Introduce a cached boolean for changes to the mark of a window.
This is necessary to correctly redraw window decorations when the mark of
a window is added or removed.

9 years agoDraw marks in window decoration
Ingo Bürk [Sat, 28 Mar 2015 23:09:10 +0000 (00:09 +0100)]
Draw marks in window decoration

If a window has a mark set, e.g., "example", it will be printed on the right side of the window decorations.
The format is "[example]" and the name of the window is truncated if necessary.

Marks starting with an underscore ("_") will be ignored.

9 years agoMerge pull request #1613 from Airblader/feature-1426
Michael Stapelberg [Mon, 30 Mar 2015 20:58:16 +0000 (22:58 +0200)]
Merge pull request #1613 from Airblader/feature-1426

Added focus_on_window_activation directive

9 years agoMerge pull request #1609 from Deiz/consistent-center
Michael Stapelberg [Mon, 30 Mar 2015 20:54:56 +0000 (22:54 +0200)]
Merge pull request #1609 from Deiz/consistent-center

Handle floating centering in one function and test for consistency

9 years agoUpdated userguide for the directive focus_on_window_activation introduced in #1426. 1613/head
Ingo Bürk [Mon, 30 Mar 2015 20:05:51 +0000 (22:05 +0200)]
Updated userguide for the directive focus_on_window_activation introduced in #1426.

9 years agoAdded testcases for #1426
Ingo Bürk [Mon, 30 Mar 2015 20:08:02 +0000 (22:08 +0200)]
Added testcases for #1426

9 years agoAdded 'focus_on_window_activation' directive
Ingo Bürk [Mon, 30 Mar 2015 20:07:48 +0000 (22:07 +0200)]
Added 'focus_on_window_activation' directive

When a window receives a _NET_ACTIVE_WINDOW message, it can steal the focus. This may not be preferable to all users.
With this directive, the user can choose from one of the following:
1) 'smart' - focus the container if its workspace is visible, otherwise set the urgency flag (default)
2) 'urgent' - always set the urgency flag, do not steal focus
3) 'focus' - always switch focus, never set the urgency hint
4) 'none' - ignore the request entirely (do not switch focus, nor set the urgency hint)

fixes #1426

9 years agoHandle floating centering in one function and test for consistency 1609/head
Deiz [Mon, 30 Mar 2015 07:10:40 +0000 (03:10 -0400)]
Handle floating centering in one function and test for consistency

9 years agoMerge pull request #1608 from mh21/renaming-empty-ws-startup
Michael Stapelberg [Mon, 30 Mar 2015 20:01:18 +0000 (22:01 +0200)]
Merge pull request #1608 from mh21/renaming-empty-ws-startup

Update old_name when renaming current workspace

9 years agoMerge pull request #1611 from acrisci/bug/complete-run-pod-errors
Michael Stapelberg [Mon, 30 Mar 2015 19:24:48 +0000 (21:24 +0200)]
Merge pull request #1611 from acrisci/bug/complete-run-pod-errors

complete-run: fix pod errors

9 years agocomplete-run: fix pod errors 1611/head
Tony Crisci [Mon, 30 Mar 2015 15:04:45 +0000 (11:04 -0400)]
complete-run: fix pod errors

Close `=over` with `=back` and use ascii apostrophe for "don't" to avoid
pod errors on `complete-run` docs.

9 years agoMerge pull request #1604 from mh21/wm-class-garbage
Michael Stapelberg [Mon, 30 Mar 2015 07:12:25 +0000 (09:12 +0200)]
Merge pull request #1604 from mh21/wm-class-garbage

Cope with non-null-terminated x class properties.

9 years agoCope with non-null-terminated x class properties. 1604/head
Michael Hofmann [Sun, 29 Mar 2015 13:15:12 +0000 (15:15 +0200)]
Cope with non-null-terminated x class properties.

- fixes #1605

9 years agoTestcase for non-null-terminated WM_CLASS.
Michael Hofmann [Sun, 29 Mar 2015 16:52:03 +0000 (18:52 +0200)]
Testcase for non-null-terminated WM_CLASS.

- fails most of the time

9 years agoMerge pull request #1589 from Deiz/fix-center
Michael Stapelberg [Mon, 30 Mar 2015 06:47:04 +0000 (08:47 +0200)]
Merge pull request #1589 from Deiz/fix-center

Make center coordinates relative to current workspace

9 years agoMerge pull request #1588 from Deiz/xdg-wizard
Michael Stapelberg [Mon, 30 Mar 2015 06:38:58 +0000 (08:38 +0200)]
Merge pull request #1588 from Deiz/xdg-wizard

Respect XDG config directories in i3-config-wizard

9 years agoGet workspace name when renaming current workspace. 1608/head
Michael Hofmann [Mon, 30 Mar 2015 06:23:00 +0000 (08:23 +0200)]
Get workspace name when renaming current workspace.

- fixes #1607

9 years agoTestcase for #1607.
Michael Hofmann [Mon, 30 Mar 2015 06:22:03 +0000 (08:22 +0200)]
Testcase for #1607.

- crash in startup_sequence_rename_workspace because of NULL old_name

9 years agoRespect XDG config directories in i3-config-wizard 1588/head
Deiz [Thu, 26 Mar 2015 01:00:18 +0000 (21:00 -0400)]
Respect XDG config directories in i3-config-wizard

$XDG_CONFIG_HOME is used for the config's write path, and the wizard
terminates if a config is found in ~/.i3 or $XDG_CONFIG_HOME/i3

9 years agoMerge pull request #1606 from Deiz/libi3-mkdirp
Michael Stapelberg [Sun, 29 Mar 2015 21:36:28 +0000 (23:36 +0200)]
Merge pull request #1606 from Deiz/libi3-mkdirp

Move mkdirp into libi3

9 years agoMove mkdirp into libi3 1606/head
Deiz [Sun, 29 Mar 2015 21:18:00 +0000 (17:18 -0400)]
Move mkdirp into libi3

9 years agoMerge pull request #1595 from Deiz/fix-1484
Michael Stapelberg [Sun, 29 Mar 2015 21:14:37 +0000 (23:14 +0200)]
Merge pull request #1595 from Deiz/fix-1484

Fix percents when attaching a window to a ws creates a new split con

9 years agoMerge pull request #1599 from Airblader/feature-toggle-mark
Michael Stapelberg [Sun, 29 Mar 2015 21:02:27 +0000 (23:02 +0200)]
Merge pull request #1599 from Airblader/feature-toggle-mark

Added a --toggle switch to the mark command

9 years agoAdded test cases for 'mark --toggle' (#1463) 1599/head
Ingo Bürk [Sat, 28 Mar 2015 22:14:59 +0000 (23:14 +0100)]
Added test cases for 'mark --toggle' (#1463)

9 years agoUpdated docs for #1463
Ingo Bürk [Sat, 28 Mar 2015 18:12:31 +0000 (19:12 +0100)]
Updated docs for #1463

9 years agoAdded a --toggle switch to "mark [--toggle] <mark>"
Ingo Bürk [Sat, 28 Mar 2015 18:12:25 +0000 (19:12 +0100)]
Added a --toggle switch to "mark [--toggle] <mark>"

This option allows toggling marks on a window without knowing whether the mark is already set or not.
It behaves as follows:
1) If the matched window has no mark, the new mark is set.
2) If the matched window has another mark, the old mark is removed and the new mark is set.
3) If the matched window already has the mark, the mark is removed.

The behavior that all non-matched windows have this mark removed is kept.

fixes #1463

9 years agoinitialize variables to NULL to avoid invalid free() on error
Michael Stapelberg [Sun, 29 Mar 2015 18:57:20 +0000 (20:57 +0200)]
initialize variables to NULL to avoid invalid free() on error

9 years agoMerge pull request #1600 from Deiz/libi3
Michael Stapelberg [Sun, 29 Mar 2015 18:56:07 +0000 (20:56 +0200)]
Merge pull request #1600 from Deiz/libi3

Move resolve_tilde and get_config_path into libi3

9 years agoMove resolve_tilde and get_config_path into libi3 1600/head
Deiz [Sat, 28 Mar 2015 18:30:35 +0000 (14:30 -0400)]
Move resolve_tilde and get_config_path into libi3

9 years agoMerge pull request #1593 from Airblader/feature-nagbar-primary-output
Michael Stapelberg [Sun, 29 Mar 2015 17:54:32 +0000 (19:54 +0200)]
Merge pull request #1593 from Airblader/feature-nagbar-primary-output

Display i3-nagbar on primary output

9 years agoMerge pull request #1597 from Airblader/bug-1187
Michael Stapelberg [Sun, 29 Mar 2015 17:50:03 +0000 (19:50 +0200)]
Merge pull request #1597 from Airblader/bug-1187

Move urgency hint when moving container to another workspace

9 years agorelease.sh: add release announcement email to avoid mistakes
Michael Stapelberg [Sun, 29 Mar 2015 17:34:33 +0000 (19:34 +0200)]
release.sh: add release announcement email to avoid mistakes

9 years agorelease.sh: set up git remotes appropriately
Michael Stapelberg [Sun, 29 Mar 2015 17:22:29 +0000 (19:22 +0200)]
release.sh: set up git remotes appropriately

9 years agoupdate debian/changelog
Michael Stapelberg [Sun, 29 Mar 2015 17:10:41 +0000 (19:10 +0200)]
update debian/changelog

9 years agoMerge branch 'release-4.10.1'
Michael Stapelberg [Sun, 29 Mar 2015 17:07:24 +0000 (19:07 +0200)]
Merge branch 'release-4.10.1'

9 years agorelease i3 4.10.1 4.10.1
Michael Stapelberg [Sun, 29 Mar 2015 17:07:03 +0000 (19:07 +0200)]
release i3 4.10.1

9 years agoprepare release.sh for 4.10.1
Michael Stapelberg [Sun, 29 Mar 2015 16:51:04 +0000 (18:51 +0200)]
prepare release.sh for 4.10.1

9 years agorelease from “next”
Michael Stapelberg [Sun, 29 Mar 2015 16:50:00 +0000 (18:50 +0200)]
release from “next”

9 years agoMerge pull request #1592 from Deiz/xdg-wizard-font
Michael Stapelberg [Sun, 29 Mar 2015 16:53:31 +0000 (18:53 +0200)]
Merge pull request #1592 from Deiz/xdg-wizard-font

Make wizard window size and click coordinates dependent on font

9 years agoUpdate debian/changelog
Michael Stapelberg [Sun, 29 Mar 2015 16:08:59 +0000 (18:08 +0200)]
Update debian/changelog

9 years agoMerge branch 'master' into next
Michael Stapelberg [Sun, 29 Mar 2015 15:46:37 +0000 (17:46 +0200)]
Merge branch 'master' into next

9 years agoMerge branch 'release-4.10'
Michael Stapelberg [Sun, 29 Mar 2015 15:46:37 +0000 (17:46 +0200)]
Merge branch 'release-4.10'

9 years agorelease i3 4.10 4.10
Michael Stapelberg [Sun, 29 Mar 2015 15:46:16 +0000 (17:46 +0200)]
release i3 4.10

9 years agoupdate release.sh for the next version
Michael Stapelberg [Sun, 29 Mar 2015 15:45:46 +0000 (17:45 +0200)]
update release.sh for the next version

9 years agotravis: remove FORTIFY_SOURCE, causes trouble with clang
Michael Stapelberg [Sun, 29 Mar 2015 15:20:11 +0000 (17:20 +0200)]
travis: remove FORTIFY_SOURCE, causes trouble with clang

9 years agofix remaining warnings
Michael Stapelberg [Sun, 29 Mar 2015 15:12:20 +0000 (17:12 +0200)]
fix remaining warnings

9 years agotravis: enable more warnings, add -Werror
Michael Stapelberg [Sun, 29 Mar 2015 15:11:21 +0000 (17:11 +0200)]
travis: enable more warnings, add -Werror

This will ensure that our code stays free of warnings, at least for the
warnings that we have enabled. (Using _FORTIFY_SOURCE > 0 leads to more
warnings, some of them are harder to address.)

9 years agoMerge pull request #1575 from hwangcc23/next
Michael Stapelberg [Sun, 29 Mar 2015 14:53:14 +0000 (16:53 +0200)]
Merge pull request #1575 from hwangcc23/next

Fix warnings

9 years agoAdd a safe wrapper for write and fix some warnings 1575/head
hwangcc [Tue, 24 Mar 2015 12:57:06 +0000 (20:57 +0800)]
Add a safe wrapper for write and fix some warnings

1. Add a function writeall and make swrite wrap that function. Use either writeall or swrite, depending on whether we want to exit on errors or not.
2. Fix warnings when compiling with a higher optimisation level.
(CFLAGS ?= -pipe -O3 -march=native -mtune=native -freorder-blocks-and-partition)

Signed-off-by: hwangcc <hwangcc@csie.nctu.edu.tw>
9 years agoMake wizard window size and click coordinates dependent on font 1592/head
Deiz [Thu, 26 Mar 2015 19:34:37 +0000 (15:34 -0400)]
Make wizard window size and click coordinates dependent on font

This guarantees the whole visible area of the pixmap is reinitialized,
and ensures that the click bounding boxes are properly aligned with
the displayed text.

9 years agoOpen i3-nagbar on the primary screen 1593/head
Ingo Bürk [Fri, 27 Mar 2015 08:20:03 +0000 (09:20 +0100)]
Open i3-nagbar on the primary screen

If a primary screen is set and the CRTC information can be retrieved,
i3-nagbar will now open on the primary screen. Otherwise, the old (fixed)
position will be used as a fallback.

fixes #1405

9 years agoAdded a regression test for #1187 1597/head
Ingo Bürk [Sat, 28 Mar 2015 18:23:59 +0000 (19:23 +0100)]
Added a regression test for #1187

9 years agoMove urgency hint when moving container
Ingo Bürk [Sat, 28 Mar 2015 17:29:34 +0000 (18:29 +0100)]
Move urgency hint when moving container

When an urgent container is moved to another workspace, the urgency hint
1) is unset on the source workspace and
2) set on the target workspace

fixes #1187

9 years agoMerge pull request #1596 from Deiz/wizard-add-up-down
Michael Stapelberg [Sat, 28 Mar 2015 17:16:27 +0000 (18:16 +0100)]
Merge pull request #1596 from Deiz/wizard-add-up-down

Switch the wizard's modifier choice when up or down are pressed

9 years agoSwitch the wizard's modifier choice when up or down are pressed 1596/head
Deiz [Sat, 28 Mar 2015 16:56:36 +0000 (12:56 -0400)]
Switch the wizard's modifier choice when up or down are pressed

9 years agoMerge pull request #1590 from acrisci/bug/i3bar-no-markup-default
Michael Stapelberg [Sat, 28 Mar 2015 09:08:41 +0000 (10:08 +0100)]
Merge pull request #1590 from acrisci/bug/i3bar-no-markup-default

i3bar: don't parse markup on statusline by default

9 years agoFix percents when attaching a window to a ws creates a new split con 1595/head
Deiz [Sat, 28 Mar 2015 02:20:28 +0000 (22:20 -0400)]
Fix percents when attaching a window to a ws creates a new split con

Fixes #1484 and includes a test case.

9 years agoi3bar: don't parse markup on statusline by default 1590/head
Tony Crisci [Fri, 27 Mar 2015 23:00:32 +0000 (19:00 -0400)]
i3bar: don't parse markup on statusline by default

fixes #1565

9 years agoAdd a test case for #1211 1589/head
Deiz [Fri, 27 Mar 2015 18:29:53 +0000 (14:29 -0400)]
Add a test case for #1211

9 years agoMerge pull request #1591 from Airblader/feature-child-cleanup
Michael Stapelberg [Fri, 27 Mar 2015 08:51:00 +0000 (09:51 +0100)]
Merge pull request #1591 from Airblader/feature-child-cleanup

Return in child parsing as soon as the match was made.

9 years agoMerge pull request #1582 from shdown/allow-escaping-backslashes
Michael Stapelberg [Fri, 27 Mar 2015 08:40:09 +0000 (09:40 +0100)]
Merge pull request #1582 from shdown/allow-escaping-backslashes

Allow escaping backslashes

9 years agoMerge pull request #1580 from Airblader/feature-nop
Michael Stapelberg [Fri, 27 Mar 2015 08:39:28 +0000 (09:39 +0100)]
Merge pull request #1580 from Airblader/feature-nop

Allow nop command without argument

9 years agoAllow nop command without argument 1580/head
Ingo Bürk [Wed, 25 Mar 2015 16:50:06 +0000 (17:50 +0100)]
Allow nop command without argument

fixes #1318

9 years agoReturn in child parsing as soon as the match was made. 1591/head
Ingo Bürk [Thu, 26 Mar 2015 18:27:28 +0000 (19:27 +0100)]
Return in child parsing as soon as the match was made.

As soon as we found the current key for which the value should be handled we can return
from the function to save some string comparisons.

9 years agoMerge pull request #1454 from acrisci/feature/i3bar-update-strut-partial-reload
Michael Stapelberg [Fri, 27 Mar 2015 08:02:05 +0000 (09:02 +0100)]
Merge pull request #1454 from acrisci/feature/i3bar-update-strut-partial-reload

reconfigure dock clients on strut partial change

9 years agoCompile xcb-randr support into i3-nagbar
Ingo Bürk [Fri, 27 Mar 2015 07:44:00 +0000 (08:44 +0100)]
Compile xcb-randr support into i3-nagbar

9 years agoAdd tests for backslash unescaping 1582/head
shdown [Wed, 25 Mar 2015 19:55:26 +0000 (22:55 +0300)]
Add tests for backslash unescaping

9 years agoupdate default fonts for i3-{input,config-wizard,nagbar}
Michael Stapelberg [Thu, 26 Mar 2015 09:03:30 +0000 (10:03 +0100)]
update default fonts for i3-{input,config-wizard,nagbar}

We’ve done this a while ago in i3.config itself, but the tools in
question aren’t hooked up to that setting, so we need to do it here as
well.

9 years agomake i3-input work properly on hi-dpi displays
Michael Stapelberg [Thu, 26 Mar 2015 09:03:14 +0000 (10:03 +0100)]
make i3-input work properly on hi-dpi displays

9 years agomake i3-config-wizard work properly on hi-dpi displays
Michael Stapelberg [Thu, 26 Mar 2015 08:58:10 +0000 (09:58 +0100)]
make i3-config-wizard work properly on hi-dpi displays

9 years agomake i3-nagbar work properly on hi-dpi displays
Michael Stapelberg [Thu, 26 Mar 2015 08:44:46 +0000 (09:44 +0100)]
make i3-nagbar work properly on hi-dpi displays

9 years agoi3-sensible-terminal: launch i3-nagbar when no terminal is found
Michael Stapelberg [Thu, 26 Mar 2015 08:21:40 +0000 (09:21 +0100)]
i3-sensible-terminal: launch i3-nagbar when no terminal is found

fixes #1587

9 years agodebian: promote suggests to recommends to install a terminal emulator
Michael Stapelberg [Thu, 26 Mar 2015 08:19:15 +0000 (09:19 +0100)]
debian: promote suggests to recommends to install a terminal emulator

fixes #1587

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 agoHandle strut partial changes for dock clients 1454/head
Tony Crisci [Wed, 25 Mar 2015 23:45:42 +0000 (19:45 -0400)]
Handle strut partial changes for dock clients

Handle changes to the property _NET_WM_STRUT_PARTIAL by reallocating
screen space in the dock area when the dock client requests a new
position.

This will allow changes to the bar config directive `position` to be
effective on the `reload` command.

fixes #1294

9 years agoi3bar: reconfigure strut partial on reload
Tony Crisci [Wed, 25 Mar 2015 23:17:06 +0000 (19:17 -0400)]
i3bar: reconfigure strut partial on reload

Strut partial tells i3 where to reserve space for i3bar. It is affected
by the `position` bar config directive.

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 agoAllow escaping backslashes
shdown [Wed, 25 Mar 2015 18:30:38 +0000 (21:30 +0300)]
Allow escaping backslashes

Fixes #1577.

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