aboutsummaryrefslogtreecommitdiff
path: root/sway
AgeCommit message (Collapse)Author
2018-11-26Merge pull request #3169 from RedSoxFan/title-alignemersion
Implement title alignment
2018-11-25Merge pull request #3183 from emersion/fix-escape-pangoBrian Ashworth
Fix pango title escaping
2018-11-25Implement title alignmentBrian Ashworth
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.
2018-11-25Merge pull request #3184 from kupospelov/fix-resizeemersion
resize set: fix units for floating containers
2018-11-25resize set: add assertion for an invalid unitKonstantin Pospelov
2018-11-25resize set: fix units for floating containersKonstantin Pospelov
This commit fixes the default size units for floating containers, so that pixels are used if the units are not specified.
2018-11-25Fix pango title escapingemersion
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
2018-11-24Merge pull request #3179 from baloo/baloo/title_format-pango_markupemersion
fixes pango_markup support with title_format
2018-11-24fixes pango_markup support with title_formatArthur Gautier
The support for pango_markup was broken in title_format because the formated title was escaped. I think only the payload should be escaped. This commit fixes 789a877b379cd35c350610be62b971ae00feb542
2018-11-22Adding commands for configuring titlebar borders and paddingFlorent de Lamotte
2018-11-22Merge pull request #3158 from emersion/get-outputs-focusedemersion
ipc: fix focused in get_outputs reply
2018-11-19ipc: fix focused in get_outputs replyemersion
It's set even if a child of the output is focused.
2018-11-19Merge pull request #3083 from c-edw/feature/StripWorkspaceNameemersion
Implement strip_workspace_name.
2018-11-18Add scroll factor config option.Spencer Michaels
2018-11-18Use #if instead of #ifdefemersion
2018-11-17Implement strip_workspace_name.Connor E
2018-11-17Merge pull request #3142 from RyanDwyer/move-view-propertiesDrew DeVault
Move view {x,y,width,height} into container struct
2018-11-17Move view {x,y,width,height} into container structRyan Dwyer
This renames/moves the following properties: * sway_view.{x,y,width,height} -> sway_container.content_{x,y,width,height} * This is required to support placeholder containers as they don't have a view. * sway_container_state.view_{x,y,width,height} -> sway_container_state.content_{x,y,width,height} * To remain consistent with the above. * sway_container_state.con_{x,y,width,height} -> sway_container_state.{x,y,width,height} * The con prefix was there to give it contrast from the view properties, and is no longer useful. The function container_set_geometry_from_floating_view has also been renamed to container_set_geometry_from_content.
2018-11-17commands/resize: fix grow vars uninitializedCole Mickens
2018-11-17Merge pull request #3132 from emersion/dispatch-cursor-btn-segfaultRyan Dwyer
Fix segfault in dispatch_cursor_button
2018-11-16resize set: convert ppt to px for floating containersTrevor Slocum
2018-11-15Fix segfault in dispatch_cursor_buttonemersion
2018-11-15Fix double free of modeRyan Dwyer
config->current_mode is a pointer into the config->modes list, and each mode has already been freed. Same with bars.
2018-11-15Fix double free when unmapping any viewRyan Dwyer
2018-11-14Merge pull request #3126 from emersion/swap-unused-functionDrew DeVault
Fix unused function in swap command
2018-11-14Merge pull request #3121 from c-edw/feature/MissingFreesDrew DeVault
[WIP] Free unfreed resources.
2018-11-14Fix unused function in swap commandemersion
Also fixes a size_t cast to void *.
2018-11-13Merge pull request #3102 from emersion/render-software-cursorsDrew DeVault
Render software cursors with wlr_output_render_software_cursors
2018-11-13More frees.Connor E
2018-11-13Add some missing frees.Connor E
2018-11-12Use #if instead of #ifdef for WLR_HAS_*emersion
2018-11-12Merge pull request #3116 from harishkrupo/masteremersion
IPC: Send keyboard layout info in IPC_GET_INPUTS
2018-11-12IPC: Send keyboard layout info in IPC_GET_INPUTSHarish Krupo
Signed-off-by: Harish Krupo <harishkrupo@gmail.com>
2018-11-12Merge pull request #2979 from RedSoxFan/config-var-replDrew DeVault
Alter config variable replacement process
2018-11-11cmd_ws_auto_back_and_forth: fix negationBrian Ashworth
In the conversion to `parse_boolean` for `cmd_ws_auto_back_and_forth`, the `negation` was never removed causing the setting to be the opposite of what it should be.
2018-11-11Allow multiple outputs for workspace outputBrian Ashworth
`i3 4.16` allows users to list multiple outputs for a workspace and the first available will be used. The syntax is as follows: `workspace <workspace> output <outputs...>` Additionally when the workspace is created, the outputs get added to the output priority list in the order specified. This ensures that if a higher output gets connected, the workspace will move to the higher output. This works the same way as if the user had a workspace on an output, disconnected the output, and then later reconnected the output.
2018-11-10Alter config variable replacement processBrian Ashworth
Currently, variables cannot contain commands and cannot span more than one argument. This is due to variable replacement happening after determining the handler and after splitting the config line into arguments. This changes the process to: 0. Check for empty lines and block boundaries 1. Split the arguments as before 2. Verify that the first argument is not a variable. If needed the following occurs a. Perform variable replacement on just the first argument b. Join the arguments back together then split the arguments again. This is needed when the variable contains the command and arguments for the command. 3. Determine the handler 4. If the handler is cmd_set, escape the variable name so that it does not get replaced 5. Join the arguments back together, do variable replacement on the full command, and split the arguments again 6. Perform any needed quote stripping or unescaping on arguments 7. Run the command handler This allows for config snippets such as: ``` set $super bindsym Mod4 $super+a exec some-command ``` and ``` set $bg bg #ffffff solid_color output * $bg ```
2018-11-10Render software cursors with wlr_output_render_software_cursorsemersion
2018-11-10Use parse_boolean where possible.Connor E
2018-11-08Merge pull request #3085 from 7415963987456321/masterDrew DeVault
Remove extra line.
2018-11-09Remove extra line7415963987456321
2018-11-08Update documentation for focus_follows_mouse.Connor E
2018-11-08resize set: implement width and height keywordsBrian Ashworth
This implements the following syntaxes from `i3 4.16`: * `resize set [width] <width> [px|ppt]` * `resize set height <height> [px|ppt]` * `resize set [width] <width> [px|ppt] [height] <height> [px|ppt]` Additionally, a bug was fixed that caused setting the height of a tiled container to change the width instead due to a typo.
2018-11-08Fix building with clangsghctoma
The "struct sway_container *other" variable in swap.c was potentially used uninitialized, depending on an "if" statement.
2018-11-08Merge pull request #3087 from RedSoxFan/side-gapsRyan Dwyer
Implement per side and per direction outer gaps
2018-11-07Implement per side and per direction outer gapsBrian Ashworth
This introduces the following command extensions from `i3-gaps`: * `gaps horizontal|vertical|top|right|bottom|left <amount>` * `gaps horizontal|vertical|top|right|bottom|left all|current set|plus|minus <amount>` * `workspace <ws> gaps horizontal|vertical|top|right|bottom|left <amount>` `inner` and `outer` are also still available as options for all three of the above commands. `outer` now acts as a shorthand to set/alter all sides. Additionally, this fixes two bugs with the prevention of invalid gap configurations for workspace configs: 1. If outer gaps were not set and inner gaps were, the outer gaps would be snapped to the negation of the inner gaps due to `INT_MIN` being less than the negation. This took precedence over the default outer gaps. 2. Similarly, if inner gaps were not set and outer gaps were, inner gaps would be set to zero, which would take precedence over the default inner gaps. Fixing both of the above items also requires checking the gaps again when creating a workspace since the default outer gaps can be smaller than the negation of the workspace specific inner gaps.
2018-11-07gaps: remove duplicate inner gapsBrian Ashworth
2018-11-06Add focus_follows_mouse always. (#3081)Connor E
* Add focus_follows_mouse_mode. * Fail if focus_follows_mouse is invalid. * Fix indentation.
2018-11-05Add relative output transformRyan Walklin
This commit enhances the output transform command with options for a relative transform, i.e. the provided transform will be applied as an offset to the current transform. Append `clockwise` to rotate clockwise from the current rotation, or `anticlockwise` to rotate in the opposite direction. For example, if the output LVDS-1 is rotated 90 degrees clockwise, the command `output LVDS-1 transform 90 clockwise` will rotate the display to 180 degrees. All transform options are supported, including flipped transforms. Relative transforms can only be applied to a single output and cannot be used with a wildcard (*) output specifier.
2018-11-05Merge branch 'master' into effective-damageDrew DeVault