summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
...
* Merge pull request #3619 from swaywm/revert-3595-ErrorIfConfigNotExistLibravatar Drew DeVault2019-02-08
|\ | | | | Revert "Return false if config could not be loaded."
| * Revert "Return false if config could not be loaded."Libravatar Drew DeVault2019-02-07
| | | | | | | | This reverts commit 855368b67e8b7d0b1dd035bde7f9119d37b35e5d.
| * Revert "Restore CWD if returning early."Libravatar Drew DeVault2019-02-07
|/ | | | This reverts commit 921e42c6c06212a61d899d6335d95eb4c781e2e8.
* seat_configure_tablet_tool: configure xcursorLibravatar Brian Ashworth2019-02-07
| | | | | | | | | | | | | 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.
* load_main_config: use given path, store realpathLibravatar Brian Ashworth2019-02-07
| | | | | | | | | | | 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.
* Clarify error for options and positional argsLibravatar Brian Ashworth2019-02-06
| | | | | | | | | | | | 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.
* Restore CWD if returning early.Libravatar Connor E2019-02-06
|
* Return false if config could not be loaded.Libravatar Connor E2019-02-06
|
* Merge pull request #3597 from ↵Libravatar Drew DeVault2019-02-06
|\ | | | | | | | | dnkl/fix-inverted-bitmask-check-in-ipc-has-event-listeners ipc_has_event_listeners: fix inverted check of subscribed_events
| * ipc_has_event_listeners: fix inverted check of subscribed_eventsLibravatar Daniel Eklöf2019-02-06
|/ | | | | subscribed_events is a bit mask, with each *set* bit representing an event the client has subscribed to.
* load_main_config: add realpath to config_chainLibravatar Brian Ashworth2019-02-06
| | | | | | 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.
* Fix close_popups for xdg-shellLibravatar emersion2019-02-05
| | | | | | 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.
* Merge pull request #3587 from RedSoxFan/fix-background-missing-fileLibravatar Drew DeVault2019-02-05
|\ | | | | output_cmd_background: fix no file + valid mode
| * output_cmd_background: fix no file + valid modeLibravatar Brian Ashworth2019-02-05
|/ | | | | | | | | | | | | 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.
* Merge pull request #3582 from c-edw/FixUninitializedInputManagerLibravatar Drew DeVault2019-02-05
|\ | | | | Initialize server so input manager is available.
| * Initialize server so input manager is available.Libravatar Connor E2019-02-05
|/
* Merge pull request #3581 from c-edw/ValidateConfigNoInitializeLibravatar Drew DeVault2019-02-05
|\ | | | | If validating the config, do it as early as possible.
| * If validating the config, do it as early as possible.Libravatar Connor E2019-02-05
|/
* Merge pull request #3579 from RedSoxFan/fix-workspace-gaps-double-freeLibravatar Drew DeVault2019-02-05
|\ | | | | cmd_workspace_gaps: fix double free on bad amount
| * cmd_workspace_gaps: fix double free on bad amountLibravatar Brian Ashworth2019-02-05
| | | | | | | | | | | | | | | | 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
* | Merge pull request #3573 from RedSoxFan/ipc-newlinesLibravatar Drew DeVault2019-02-05
|\ \ | | | | | | IPC_COMMAND: split on newline
| * | IPC_COMMAND: split on newlineLibravatar Brian Ashworth2019-02-05
| |/ | | | | | | | | This splits commands given in IPC_COMMAND on newline to match i3's behavior.
* | Merge pull request #3578 from jubalh/versionLibravatar Drew DeVault2019-02-05
|\ \ | |/ |/| Set version in project file
| * Set version in project fileLibravatar Michael Vetter2019-02-05
|/ | | | | | | | 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.
* Fix quote strippingLibravatar emersion2019-02-05
| | | | Let's not use !strcmp(…) anymore.
* execute_command: dont strip quotes for exec_alwaysLibravatar Brian Ashworth2019-02-05
| | | | | | | 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`.
* swaynag: remove trailing newlines in configLibravatar Brian Ashworth2019-02-05
| | | | | Now that swaynag uses getline (instead of the old readline), the trailing newline characters have to be removed when reading the config
* load_include_configs: fix wordexp fail conditionLibravatar Brian Ashworth2019-02-05
| | | | | | | 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.
* Merge pull request #3562 from ↵Libravatar Drew DeVault2019-02-03
|\ | | | | | | | | vilhalmer/focus_follows_mouse-workspace-last-inactive Focus workspace inactive node with focus_follows_mouse
| * Focus ws inactive node with focus_follows_mouseLibravatar vilhalmer2019-02-03
| |
* | Merge pull request #3564 from RedSoxFan/seat-cursor-do-not-createLibravatar Drew DeVault2019-02-03
|\ \ | | | | | | seat_cmd_cursor: do not create non-existing seat
| * | seat_cmd_cursor: do not create non-existing seatLibravatar Brian Ashworth2019-02-03
|/ / | | | | | | | | | | | | | | 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.
* | Merge pull request #3563 from ↵Libravatar Brian Ashworth2019-02-03
|\ \ | |/ |/| | | | | vilhalmer/fix-wildcard-seat-constrain-crashes-during-reconfig Fix wildcard seat constrain crashes during reconfig
| * Fall back to wildcard in sway_cursor_constrainLibravatar vilhalmer2019-02-03
| |
| * Skip constraining cursor if no seat configLibravatar vilhalmer2019-02-03
| |
| * Skip wildcard seat config in destroy_removed_seatsLibravatar vilhalmer2019-02-03
|/
* Merge pull request #3551 from c-edw/RevertDoubleFrees1.0-rc1Libravatar Drew DeVault2019-02-03
|\ | | | | Revert double frees.
| * Revert "More frees."Libravatar Connor E2019-02-01
| | | | | | | | This reverts commit eda1bf769f239a9e8d5a9907255a330e3113a649.
| * Revert "Add some missing frees."Libravatar Connor E2019-02-01
| | | | | | | | This reverts commit b5d95f264d5b08f6228e05be680ee36fc06ca6d6.
* | Merge pull request #3554 from RedSoxFan/seat-current-aliasLibravatar Drew DeVault2019-02-03
|\ \ | | | | | | cmd_seat: allow - to be used as alias for current
| * | cmd_seat: allow - to be used as alias for currentLibravatar Brian Ashworth2019-02-02
|/ / | | | | | | | | | | 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
* | seat_cmd_attach: defer while readingLibravatar Brian Ashworth2019-02-03
| | | | | | | | | | Since the seats and inputs are not yet available while the config is being read, defer seat attachment requests
* | Fix #3445: swaybar tray inerited thems not processedLibravatar Stefan Schick2019-02-01
|/
* Merge pull request #3543 from emersion/relative-pointer-usecLibravatar Drew DeVault2019-02-01
|\ | | | | relative-pointer-v1: time is in usec, not msec
| * relative-pointer-v1: time is in usec, not msecLibravatar emersion2019-01-30
| |
* | Merge pull request #3550 from RedSoxFan/seat-pointer-constraintLibravatar Drew DeVault2019-02-01
|\ \ | | | | | | pointer_constraint: change to a seat subcommand
| * | pointer_constraint: change to a seat subcommandLibravatar Brian Ashworth2019-01-31
|/ / | | | | | | | | | | | | | | | | | | | | | | This changes the `pointer_constraint` command to be a subcommand of seat to allow for per-seat settings. The current implementation that is not a seat subcommand will only operate on the current seat and will segfault in the config due to `config->handler_context.seat` only being set at runtime. This also allows for the wildcard identifier to be used to alter the pointer constraint settings on all seats and allows for the setting to be merged with the rest of the seat config.
* | Rebase #1636 against current masterLibravatar v44r2019-01-31
| |
* | readme: scdoc 1.8.1 is now requiredLibravatar emersion2019-01-31
| |
* | Updates for scdoc 1.8.1Libravatar Drew DeVault2019-01-31
| |