summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* Merge pull request #3219 from RedSoxFan/swaymsg-object-success1.0-beta.2Libravatar emersion2018-11-29
|\ | | | | swaymsg: parse success of single object
| * swaymsg: parse success of single objectLibravatar Brian Ashworth2018-11-28
| | | | | | | | | | Allows swaymsg to parse the success attribute of a single object response. This is needed for the subscribe event.
* | Merge pull request #3218 from johnae/masterLibravatar Brian Ashworth2018-11-29
|\ \ | |/ |/| Fix json object ipc success return
| * Fix json object ipc returnLibravatar John Axel Eriksson2018-11-29
|/
* Merge pull request #3216 from RedSoxFan/fix-empty-titlebarsLibravatar emersion2018-11-28
|\ | | | | Fix titlebar when no title or marks
| * Fix titlebar when no title or marksLibravatar Brian Ashworth2018-11-28
| | | | | | | | This fixes the rendering of the titlebar when there is no title or marks.
* | Merge pull request #3214 from RedSoxFan/fix-3156Libravatar emersion2018-11-28
|\ \ | |/ |/| Fix default_orientation auto
| * Fix default_orientation autoLibravatar Brian Ashworth2018-11-28
|/ | | | | | | | Since the output config is no longer applied before creating the default workspace, the layout for default workspaces on an output may not be correct. Due to the ordering of calls in output_enable being changed in several bug fix PRs, this just fixes the layout after the call to apply_output_config.
* Merge pull request #3213 from RedSoxFan/fix-3203Libravatar emersion2018-11-28
|\ | | | | Fix scratchpad segfault - NULL focused workspace
| * Fix scratchpad segfault - NULL focused workspaceLibravatar Brian Ashworth2018-11-28
| | | | | | | | | | | | | | | | When adding a container to the scratchpad, it was possible for focus to be removed from the seat. This occurred when a single child was moved from it's parent to the scratchpad due to the focus_inactive for the parent being NULL. If the focus_inactive for the parent is NULL, the focus_inactive for the workspace should be focused.
* | Merge pull request #3206 from RedSoxFan/ipc-subscribeLibravatar emersion2018-11-28
|\ \ | | | | | | Implement support for swaymsg -t SUBSCRIBE [-m]
| * | Implement support for swaymsg -t SUBSCRIBE [-m]Libravatar Brian Ashworth2018-11-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In `i3 4.16`, `i3-msg` can be used with the message type `subscribe` and has the ability to monitor for responses until killed. This adds support for both to swaymsg. If the JSON array of event types is malformed or contains an invalid event, sway will send a response with `success` set to `false`. If swaymsg sees this, it will not display the failure and exit. If the `subscribe` event is successful, swaymsg will wait for the first response and display that instead of the success message. If `-m/--monitor` is given, swaymsg will continue monitor for responses until killed or a malformed response is received. For the `subscribe` event, the responses will always be printed as JSON. If `-r/--raw` is given, the JSON will not be pretty printed, which may be preferred when monitoring due to there being multiple responses. Example: `swaymsg -t SUBSCRIBE -m "['window']"`
* | | Merge pull request #3208 from RedSoxFan/bar-gapsLibravatar emersion2018-11-28
|\ \ \ | |_|/ |/| | Implement bar gaps
| * | Implement bar gapsLibravatar Brian Ashworth2018-11-28
|/ / | | | | | | | | | | | | | | | | Adds the bar subcommand `gaps <amount>|<horizontal> <vertical>|<top> <right> <bottom> <left>` to set gaps for swaybar. Due to restrictions on margins for a layer_surface, only the sides that are anchored to an edge of the screen can have gaps. Since there is support for per-side outer gaps for workspaces, those should be able to be used instead for the last side.
* | Merge pull request #3212 from martinetd/move_floatingLibravatar Brian Ashworth2018-11-28
|\ \ | | | | | | move to workspace: fix moving floating container to non-empty workspace
| * | move to workspace: fix moving floating container to non-empty workspaceLibravatar Dominique Martinet2018-11-29
| | | | | | | | | | | | | | | | | | moving a container to a non-empty workspace will find a container to move to in the destination workspace and call container_move_to_container, which must not just skip floating containers
* | | Merge pull request #3202 from RedSoxFan/swaynag-config-warningsLibravatar emersion2018-11-28
|\ \ \ | |_|/ |/| | Introduce a way to show config warnings in swaynag
| * | Introduce a way to show config warnings in swaynagLibravatar Brian Ashworth2018-11-28
|/ / | | | | | | | | | | | | | | | | | | Adds the function `config_add_swaynag_warning(char *fmt, ...)` so that handlers can add warnings to the swaynag config log in a uniform way. The formatting is identical to errors and include the line number, line, and config path. This also alters the background file access warning to use the function and introduces a warning for duplicate bindings.
* | Merge pull request #3211 from emersion/child-view-unmapped-segfaultLibravatar Ryan Dwyer2018-11-28
|\ \ | |/ |/| Fix segfault when destroying unmapped child view
| * Fix segfault when destroying unmapped child viewLibravatar emersion2018-11-28
|/
* Merge pull request #3199 from emersion/handle-subsurface-destroyLibravatar Ryan Dwyer2018-11-28
|\ | | | | Handle destroyed subsurfaces
| * Damage view child when destroyedLibravatar emersion2018-11-27
| |
| * Handle destroyed subsurfacesLibravatar emersion2018-11-27
| | | | | | | | | | | | | | | | | | | | Damage subsurfaces when they are destroyed. Since subsurfaces don't have an unmap event we need to do that on destroy. We also don't want to keep a sway_view_child when the wlr_subsurface has been destroyed. Fixes https://github.com/swaywm/sway/issues/3197
* | Merge pull request #3207 from RedSoxFan/swaynag-no-term-buttonsLibravatar emersion2018-11-28
|\ \ | | | | | | Implement swaynag -B/--button-no-terminal
| * | Implement swaynag -B/--button-no-terminalLibravatar Brian Ashworth2018-11-27
| |/ | | | | | | | | | | | | | | | | | | In `i3 4.16`, `i3-nagbar` introduces the flags `-B/--button-no-terminal` to run the action directly instead of inside a terminal. This implements the flags for swaynag for compatibility. Since swaynag does not use an equivalent to `i3-sensible-terminal`, the flags `-b/--button` only uses a terminal when the environment variable `TERMINAL` is set, otherwise it acts the same as these new flags.
* | Merge pull request #3204 from RedSoxFan/cmd-res-listLibravatar emersion2018-11-28
|\ \ | | | | | | Change execute_command to return a list of results
| * | Change execute_command to return a list of resultsLibravatar Brian Ashworth2018-11-27
| |/ | | | | | | | | | | This matches i3's behavior of returning a list of results that contain the result of each command that was executed. Additionally, the `parse_error` attribute has been added to the IPC JSON reply.
* | Merge pull request #3209 from RedSoxFan/fix-3146Libravatar emersion2018-11-28
|\ \ | |/ |/| Do not strip quotes for cmd_mode
| * Do not strip quotes for cmd_modeLibravatar Brian Ashworth2018-11-28
|/ | | | | | Like with cmd_bindsym and cmd_bindcode, the quotes should not be stripped for cmd_mode. cmd_mode performs its own stripping for the mode name and the only valid subcommands are cmd_bindsym and cmd_bindcode.
* Merge pull request #3175 from emersion/rename-gtk-primary-selectionLibravatar Drew DeVault2018-11-26
|\ | | | | Update for swaywm/wlroots#1387
| * Update for swaywm/wlroots#1387Libravatar emersion2018-11-23
| |
* | Merge pull request #3168 from mihaicmn/scratchpad-eventsLibravatar Brian Ashworth2018-11-26
|\ \ | | | | | | Fix missing IPC scratchpad replies/move events
| * | IPC: Use consistent function names across ipc-jsonLibravatar Mihai Coman2018-11-26
| | |
| * | IPC: Add scratchpad containers to get_tree replyLibravatar Mihai Coman2018-11-26
| | | | | | | | | | | | | | | This patch lists all hidden scratchpad containers as floating nodes on "__i3_scratch" workspace. This workspace resides on "__i3" output.
| * | IPC: Trigger move events for scratchpad containersLibravatar Mihai Coman2018-11-26
| | | | | | | | | | | | | | | | | | This patch allows IPC clients to receive window::move events when containers are moved to scratchpad or when hidden containers are shown via "scratchpad show" command.
* | | Merge pull request #3185 from emersion/remove-xopen-sourceLibravatar Ryan Dwyer2018-11-26
|\ \ \ | | | | | | | | Replace _XOPEN_SOURCE with _POSIX_C_SOURCE
| * | | Replace _XOPEN_SOURCE with _POSIX_C_SOURCELibravatar emersion2018-11-25
| | | | | | | | | | | | | | | | And make sure we don't define both in the same source file.
* | | | Merge pull request #3191 from emersion/fix-swayidle-busy-dispatchLibravatar Ian Fan2018-11-26
|\ \ \ \ | |_|/ / |/| | | swayidle: fix busy loop on writable FD
| * | | swayidle: fix busy loop on writable FDLibravatar emersion2018-11-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The wl_event_source_fd_update docs say: > File descriptors are usually writable to begin with, so they do not need to > be polled for writable until a write actually fails. When a write fails, > the event mask can be changed to poll for readable and writable, delivering > a dispatch callback when it is possible to write more. Once all data has > been written, the mask can be changed to poll only for readable to avoid > busy-looping on dispatch. So we should only poll for WL_EVENT_WRITABLE if a write fails. I'm not yet sure how to do this properly and Weston doesn't do it, so in the meantime I'll just fix the busy loop. I'll ask them too. Fixes https://github.com/swaywm/sway/issues/3190
* | | | Merge pull request #3169 from RedSoxFan/title-alignLibravatar emersion2018-11-26
|\ \ \ \ | | | | | | | | | | Implement title alignment
| * | | | Implement title alignmentLibravatar Brian Ashworth2018-11-25
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds support for `i3 4.16`'s ability to set the title alignment. The command is `title_align left|center|right`. When the title is on the right, marks are moved to the left. Otherwise, they are on the right.
* | | | Merge pull request #3183 from emersion/fix-escape-pangoLibravatar Brian Ashworth2018-11-25
|\ \ \ \ | |/ / / |/| | | Fix pango title escaping
| * | | Fix pango title escapingLibravatar emersion2018-11-25
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes two bugs. First, commit [1] has inverted the condition when we escape pango markup. We need to escape client-provided strings when markup is enabled. Second, parse_title_format has a shortcut when title_format is set to `%title`, and escape_pango_markup wasn't used anymore there. Fixes https://github.com/swaywm/sway/issues/3181 [1]: https://github.com/swaywm/sway/pull/3179/commits/caee2dff03fc007dc46cf121e013f5347ac46ba9
* | | Merge pull request #3184 from kupospelov/fix-resizeLibravatar emersion2018-11-25
|\ \ \ | | | | | | | | resize set: fix units for floating containers
| * | | resize set: add assertion for an invalid unitLibravatar Konstantin Pospelov2018-11-25
| | | |
| * | | resize set: fix units for floating containersLibravatar Konstantin Pospelov2018-11-25
| | | | | | | | | | | | | | | | | | | | This commit fixes the default size units for floating containers, so that pixels are used if the units are not specified.
* | | | Merge pull request #3049 from ianyfan/swayidleLibravatar emersion2018-11-25
|\ \ \ \ | |_|/ / |/| | | Swayidle fixes
| * | | swayidle: fix dbus_event not to blockLibravatar emersion2018-11-24
| | | |
| * | | swayidle: listen when display becomes writableLibravatar emersion2018-11-24
| | | |
| * | | swaylock: fix display_event to not blockLibravatar Ian Fan2018-11-24
| | | |