aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-02-12Merge pull request #3667 from emersion/fix-meson-versionDrew DeVault
Fix --version when building from tarball
2019-02-12Fix --version when building from tarballemersion
2019-02-11workspace_get_initial_output: handle focused layerBrian Ashworth
When a layer surface is focused, `seat_get_focused_workspace` will be NULL. This changes `workspace_get_initial_output` to use output of the focus inactive. If the focus inactive is also NULL, then either the first output or the noop output will be used as fallbacks.
2019-02-11Abort early when XDG_RUNTIME_DIR is not setBrian Ashworth
This aborts sway and displays an error message about XDG_RUNTIME_DIR not being set without initializing the wl_display or logging any other information.
2019-02-11fix misc memory leaksBrian Ashworth
This fixes a few misc memory leaks reported by asan: - Items of `config->config_chain` are now freed instead of just the list itself - `bar->swaybar_command` is now freed - The result returned by a seat subcommand is now returned instead of leaked
2019-02-11ipc: handle unnamed xkb_active_layout_nameBrian Ashworth
If the active xkb_layout does not have a name, use `NULL` instead of `json_object_new_string(NULL)`. This also makes it so swaymsg will pretty print this as `(unnamed)`.
2019-02-10view: remove pointer constraints on unmapBrian Ashworth
If the view has any pointer constraints, ensure they are removed before the view is unmapped and the surface is no longer tied to the view.
2019-02-10input/keyboard: respect solo repeat_{rate,delay}Brian Ashworth
If `repeat_rate` or `repeat_delay` is set without the other being set, the default was being used for both. This changes the logic to respect the value given and use the default for the other when only one is set.
2019-02-10fix double free for mode toggle if bar was invisibleRouven Czerwinski
If the bar was set to "invisible" and subsequently "toggle" was send twice, the new mode was never set and the bar->mode was double freed. Fix this by not requiring the bar->mode to be "hide" and instead show it unconditionally, because it was either hidden or invisible. Fixes #3637
2019-02-09container_at_stacked: skip titles when zero pixelsBrian Ashworth
It is possible to make the title bars have a zero pixel height while stacked, by using a blank font and no padding. This causes a division by zero when attempting to calculate the child index in container_at_stacked, which then results in a segfault when attempting to access the child at that bad index (INT_MIN). This just skips the check to see if the cursor is over a title bar of a child of a stacked container when the title bar height is zero since there will be no title bars.
2019-02-08bar_cmd_modifier: add support for noneBrian Ashworth
sway-bar(5) documents `modifier none`, which comes from i3. This implements the functionality for `modifier none` since it was not previously implemented. The bar modifier toggles visibility of the bar when the bar mode is set to hide. When the bar modifier is set to `none`, the ability to toggle visibility of the bar will be disabled.
2019-02-08Merge pull request #3619 from swaywm/revert-3595-ErrorIfConfigNotExistDrew DeVault
Revert "Return false if config could not be loaded."
2019-02-07Revert "Return false if config could not be loaded."Drew DeVault
This reverts commit 855368b67e8b7d0b1dd035bde7f9119d37b35e5d.
2019-02-07Revert "Restore CWD if returning early."Drew DeVault
This reverts commit 921e42c6c06212a61d899d6335d95eb4c781e2e8.
2019-02-07seat_configure_tablet_tool: configure xcursorBrian Ashworth
Since a tablet tool provides the WL_SEAT_CAPABILITY_POINTER capability, sway will attempt to use the xcursor manager to set a cursor image. If the tablet tool was the first (and possibly only) device to provide the capability for the seat, the xcursor manager was not being configured before attempting to set a cursor image. This was due to `seat_configure_xcursor` only being called in `seat_configure_pointer`. Since the xcursor manager was NULL in this case, it would cause a segfault when attempting to set a cursor image. This adds a call to `seat_configure_xcursor` in `seat_configure_tablet_tool` to ensure that the seat has a xcursor manager.
2019-02-07load_main_config: use given path, store realpathBrian Ashworth
Since `load_include_config` compares against the realpath of a config file when checking if a config has already been added, the main config's realpath has to be added to the config_chain. However, includes from the main config should be processed relative to the path given to allow for symbolic links. This stores the realpath in `config->config_chain`, but uses the given path for all other operations.
2019-02-06Clarify error for options and positional argsBrian Ashworth
When both options and positional arguments are given, sway would print the error `Don't use options with the IPC client`. Over the past several months, it seems like users are including this error message in issues instead of a debug log due to not understanding that the error message means there is an issue with their command. This makes the error message more verbose and will hopefully make it so more users understand that the message is not a bug in sway, but with the command used.
2019-02-06Restore CWD if returning early.Connor E
2019-02-06Return false if config could not be loaded.Connor E
2019-02-06Merge pull request #3597 from ↵Drew DeVault
dnkl/fix-inverted-bitmask-check-in-ipc-has-event-listeners ipc_has_event_listeners: fix inverted check of subscribed_events
2019-02-06ipc_has_event_listeners: fix inverted check of subscribed_eventsDaniel Eklöf
subscribed_events is a bit mask, with each *set* bit representing an event the client has subscribed to.
2019-02-06load_main_config: add realpath to config_chainBrian Ashworth
Since `load_include_config` compares against the realpath of a config file when checking if a config has already been added, the main config's realpath has to be added to the config_chain.
2019-02-05Fix close_popups for xdg-shellemersion
wlr_xdg_popup_destroy will destroy popups, so we need to walk the tree carefully. It's enough to just destroy all direct children, since destroying the parent will also destroy all children.
2019-02-05Merge pull request #3587 from RedSoxFan/fix-background-missing-fileDrew DeVault
output_cmd_background: fix no file + valid mode
2019-02-05output_cmd_background: fix no file + valid modeBrian Ashworth
If output_cmd_background is given a valid mode as the first argument, then there is no file given and an error should be returned. join_args should not be called with an argc of zero since it sets the last character to the null terminator. With an argc of zero, the length is zero causing a heap buffer overflow when setting the byte before the start of argv to '\0'. This probably will not ever generate a segfault, but may cause data corruption to whatever is directly before it in memory. To make other such cases easier to detect, this also adds a sway_assert in join_args when argc is zero.
2019-02-05Merge pull request #3582 from c-edw/FixUninitializedInputManagerDrew DeVault
Initialize server so input manager is available.
2019-02-05Initialize server so input manager is available.Connor E
2019-02-05Merge pull request #3581 from c-edw/ValidateConfigNoInitializeDrew DeVault
If validating the config, do it as early as possible.
2019-02-05If validating the config, do it as early as possible.Connor E
2019-02-05Merge pull request #3579 from RedSoxFan/fix-workspace-gaps-double-freeDrew DeVault
cmd_workspace_gaps: fix double free on bad amount
2019-02-05Merge pull request #3573 from RedSoxFan/ipc-newlinesDrew DeVault
IPC_COMMAND: split on newline
2019-02-05Merge pull request #3578 from jubalh/versionDrew DeVault
Set version in project file
2019-02-05cmd_workspace_gaps: fix double free on bad amountBrian Ashworth
This fixes a double free in cmd_workspace_gaps when the amount given is invalid. The end pointer from strtol is part of the argument and should not be freed. Freeing the end pointer could result in a double free or bad free depending on whether or not the end pointer was at the start of the argument
2019-02-05Set version in project fileMichael Vetter
Let's set the version in the meson file instead of declaring it outside. In case git is installed we use the git hash as version. Instead it isn't (like on a clean build system), let's use the version defined in the project.
2019-02-05IPC_COMMAND: split on newlineBrian Ashworth
This splits commands given in IPC_COMMAND on newline to match i3's behavior.
2019-02-05Fix quote strippingemersion
Let's not use !strcmp(…) anymore.
2019-02-05execute_command: dont strip quotes for exec_alwaysBrian Ashworth
This removes quote stripping for `exec_always` in `execute_command`. Since `exec_always` commands will be deferred in the config and processed by `execute_command`, the quotes need to be left intact like they are for `exec`.
2019-02-05swaynag: remove trailing newlines in configBrian Ashworth
Now that swaynag uses getline (instead of the old readline), the trailing newline characters have to be removed when reading the config
2019-02-05load_include_configs: fix wordexp fail conditionBrian Ashworth
This fixes the failure condition for the wordexp call in load_include_configs. The only success value is zero. Since the error codes are positive, having the check be less than zero was causing segfaults on failure when accessing the words.
2019-02-03Merge pull request #3562 from ↵Drew DeVault
vilhalmer/focus_follows_mouse-workspace-last-inactive Focus workspace inactive node with focus_follows_mouse
2019-02-03Merge pull request #3564 from RedSoxFan/seat-cursor-do-not-createDrew DeVault
seat_cmd_cursor: do not create non-existing seat
2019-02-03seat_cmd_cursor: do not create non-existing seatBrian Ashworth
If a seat does not exist in seat_cmd_cursor, do not create it. A seat without any attachments is useless since it will have no capabilities. This changes `input_manager_get_seat` to have an additional argument that dictates whether or not to create the seat if it does not exist.
2019-02-03Merge pull request #3563 from ↵Brian Ashworth
vilhalmer/fix-wildcard-seat-constrain-crashes-during-reconfig Fix wildcard seat constrain crashes during reconfig
2019-02-03Fall back to wildcard in sway_cursor_constrainvilhalmer
2019-02-03Skip constraining cursor if no seat configvilhalmer
2019-02-03Skip wildcard seat config in destroy_removed_seatsvilhalmer
2019-02-03Focus ws inactive node with focus_follows_mousevilhalmer
2019-02-03Merge pull request #3551 from c-edw/RevertDoubleFreesDrew DeVault
Revert double frees.
2019-02-03Merge pull request #3554 from RedSoxFan/seat-current-aliasDrew DeVault
cmd_seat: allow - to be used as alias for current
2019-02-02cmd_seat: allow - to be used as alias for currentBrian Ashworth
This allows for `-` (hyphen) to be used as an alias for the current seat while sway is running. This alias was chosen since it is unlikely to interfere with any desirable seat identifier