aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* 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 #3179 from baloo/baloo/title_format-pango_markupLibravatar emersion2018-11-24
|\ | | | | fixes pango_markup support with title_format
| * fixes pango_markup support with title_formatLibravatar Arthur Gautier2018-11-24
| | | | | | | | | | | | | | 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
* | Merge pull request #3145 from fdlamotte/masterLibravatar emersion2018-11-24
|\ \ | | | | | | Adding commands for configuring titlebar borders and padding
| * | Adding commands for configuring titlebar borders and paddingLibravatar Florent de Lamotte2018-11-22
| |/
* | Merge pull request #3178 from progandy/sysconfdirLibravatar emersion2018-11-24
|\ \ | |/ |/| Meson: Fix SYSCONFDIR definition
| * Meson: Fix SYSCONFDIR definition.Libravatar progandy2018-11-23
|/ | | | | | | | | | | | | SYSCONFDIR was set to the wrong path if prefix is not '/usr' and sysconfdir is an absolute path. Use join_paths() to fix it. Also remove the special case for prefix '/usr'. In that case Meson already sets sysconfdir to the absolute path '/etc', so just using join_paths() will return the correct value. join_paths('/usr/local', 'etc') => '/usr/local/etc' join_paths('/usr/local', '/etc') => '/etc' join_paths('/usr', '/etc') => '/etc'
* Merge pull request #3158 from emersion/get-outputs-focusedLibravatar emersion2018-11-22
|\ | | | | ipc: fix focused in get_outputs reply
| * ipc: fix focused in get_outputs replyLibravatar emersion2018-11-19
| | | | | | | | It's set even if a child of the output is focused.
* | Merge pull request #3171 from camoz/masterLibravatar emersion2018-11-22
|\ \ | | | | | | fix typo in swayidle(1)
| * | fix typo in swayidle(1)Libravatar camoz2018-11-21
|/ /
* | Merge pull request #3160 from camoz/masterLibravatar emersion2018-11-20
|\ \ | | | | | | fix typo in config.in
| * | fix typo in config.inLibravatar camoz2018-11-19
|/ /
* | Merge pull request #3083 from c-edw/feature/StripWorkspaceNameLibravatar emersion2018-11-19
|\ \ | |/ |/| Implement strip_workspace_name.
| * Implement strip_workspace_name.Libravatar Connor E2018-11-17
| |
* | Merge pull request #3152 from camoz/masterLibravatar Drew DeVault2018-11-18
|\ \ | | | | | | fix typo in config.in
| * | fix typo in config.inLibravatar camoz2018-11-19
|/ /
* | Merge pull request #3018 from sxmichaels/add-scroll-factorLibravatar Brian Ashworth2018-11-18
|\ \ | | | | | | Add scroll factor input command.
| * | Add scroll factor config option.Libravatar Spencer Michaels2018-11-18
|/ /
* | Merge pull request #3147 from emersion/set10Libravatar Drew DeVault2018-11-18
|\ \ | | | | | | Use #if instead of #ifdef
| * | Use #if instead of #ifdefLibravatar emersion2018-11-18
|/ /
* | Merge pull request #3142 from RyanDwyer/move-view-propertiesLibravatar Drew DeVault2018-11-17
|\ \ | | | | | | Move view {x,y,width,height} into container struct
| * | Move view {x,y,width,height} into container structLibravatar Ryan Dwyer2018-11-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge pull request #3143 from colemickens/growLibravatar Drew DeVault2018-11-17
|\ \ \ | |/ / |/| | commands/resize: fix grow vars uninitialized
| * | commands/resize: fix grow vars uninitializedLibravatar Cole Mickens2018-11-17
|/ /
* | Merge pull request #3132 from emersion/dispatch-cursor-btn-segfaultLibravatar Ryan Dwyer2018-11-17
|\ \ | | | | | | Fix segfault in dispatch_cursor_button
| * | Fix segfault in dispatch_cursor_buttonLibravatar emersion2018-11-15
| | |
* | | Merge pull request #3141 from tslocum/resize-set-floating-pptLibravatar emersion2018-11-17
|\ \ \ | |/ / |/| | resize set: convert ppt to px for floating containers
| * | resize set: convert ppt to px for floating containersLibravatar Trevor Slocum2018-11-16
|/ /
* | Merge pull request #3130 from RyanDwyer/fix-mode-double-freeLibravatar Drew DeVault2018-11-15
|\ \ | | | | | | Fix double free of mode
| * | Fix double free of modeLibravatar Ryan Dwyer2018-11-15
|/ / | | | | | | | | | | | | config->current_mode is a pointer into the config->modes list, and each mode has already been freed. Same with bars.
* | Merge pull request #3128 from RyanDwyer/fix-unmap-crashLibravatar Brian Ashworth2018-11-15
|\ \ | | | | | | Fix double free when unmapping any view
| * | Fix double free when unmapping any viewLibravatar Ryan Dwyer2018-11-15
|/ /
* | Merge pull request #3126 from emersion/swap-unused-functionLibravatar Drew DeVault2018-11-14
|\ \ | | | | | | Fix unused function in swap command
| * | Fix unused function in swap commandLibravatar emersion2018-11-14
| | | | | | | | | | | | Also fixes a size_t cast to void *.
* | | Merge pull request #3121 from c-edw/feature/MissingFreesLibravatar Drew DeVault2018-11-14
|\ \ \ | |/ / |/| | [WIP] Free unfreed resources.
| * | More frees.Libravatar Connor E2018-11-13
| | |
| * | Add some missing frees.Libravatar Connor E2018-11-13
| | |
* | | Merge pull request #3102 from emersion/render-software-cursorsLibravatar Drew DeVault2018-11-13
|\ \ \ | | | | | | | | Render software cursors with wlr_output_render_software_cursors
| * | | Render software cursors with wlr_output_render_software_cursorsLibravatar emersion2018-11-10
| | | |
* | | | Merge pull request #3117 from emersion/wlroots-config10Libravatar Drew DeVault2018-11-12
|\ \ \ \ | | | | | | | | | | Use #if instead of #ifdef for WLR_HAS_*
| * | | | Use #if instead of #ifdef for WLR_HAS_*Libravatar emersion2018-11-12
|/ / / /
* | | | Merge pull request #3116 from harishkrupo/masterLibravatar emersion2018-11-12
|\ \ \ \ | | | | | | | | | | IPC: Send keyboard layout info in IPC_GET_INPUTS
| * | | | IPC: Send keyboard layout info in IPC_GET_INPUTSLibravatar Harish Krupo2018-11-12
| | |/ / | |/| | | | | | | | | | Signed-off-by: Harish Krupo <harishkrupo@gmail.com>
* | | | Merge pull request #2979 from RedSoxFan/config-var-replLibravatar Drew DeVault2018-11-12
|\ \ \ \ | |/ / / |/| | | Alter config variable replacement process
| * | | Alter config variable replacement processLibravatar Brian Ashworth2018-11-10
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ```
* | | Merge pull request #3113 from RedSoxFan/fix-ws-auto-back-and-forthLibravatar Drew DeVault2018-11-11
|\ \ \ | | | | | | | | cmd_ws_auto_back_and_forth: fix negation
| * | | cmd_ws_auto_back_and_forth: fix negationLibravatar Brian Ashworth2018-11-11
|/ / / | | | | | | | | | | | | | | | 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.
* | | Merge pull request #3108 from RedSoxFan/workspace-output-improvedLibravatar Drew DeVault2018-11-11
|\ \ \ | |/ / |/| | Allow multiple outputs for workspace output
| * | Allow multiple outputs for workspace outputLibravatar Brian Ashworth2018-11-11
|/ / | | | | | | | | | | | | | | | | | | | | | | `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.