aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-11-24Merge pull request #3178 from progandy/sysconfdiremersion
Meson: Fix SYSCONFDIR definition
2018-11-23Meson: Fix SYSCONFDIR definition.progandy
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'
2018-11-22Merge pull request #3158 from emersion/get-outputs-focusedemersion
ipc: fix focused in get_outputs reply
2018-11-22Merge pull request #3171 from camoz/masteremersion
fix typo in swayidle(1)
2018-11-21fix typo in swayidle(1)camoz
2018-11-20Merge pull request #3160 from camoz/masteremersion
fix typo in config.in
2018-11-19fix typo in config.incamoz
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-18Merge pull request #3152 from camoz/masterDrew DeVault
fix typo in config.in
2018-11-19fix typo in config.incamoz
2018-11-18Merge pull request #3018 from sxmichaels/add-scroll-factorBrian Ashworth
Add scroll factor input command.
2018-11-18Add scroll factor config option.Spencer Michaels
2018-11-18Merge pull request #3147 from emersion/set10Drew DeVault
Use #if instead of #ifdef
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-17Merge pull request #3143 from colemickens/growDrew DeVault
commands/resize: fix grow vars uninitialized
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-17Merge pull request #3141 from tslocum/resize-set-floating-pptemersion
resize set: convert ppt to px for floating containers
2018-11-16resize set: convert ppt to px for floating containersTrevor Slocum
2018-11-15Fix segfault in dispatch_cursor_buttonemersion
2018-11-15Merge pull request #3130 from RyanDwyer/fix-mode-double-freeDrew DeVault
Fix double free of mode
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-15Merge pull request #3128 from RyanDwyer/fix-unmap-crashBrian Ashworth
Fix double free when unmapping any view
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-12Merge pull request #3117 from emersion/wlroots-config10Drew DeVault
Use #if instead of #ifdef for WLR_HAS_*
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-11Merge pull request #3113 from RedSoxFan/fix-ws-auto-back-and-forthDrew DeVault
cmd_ws_auto_back_and_forth: fix negation
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-11Merge pull request #3108 from RedSoxFan/workspace-output-improvedDrew DeVault
Allow multiple outputs for workspace output
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-10Merge pull request #3098 from c-edw/feature/RefactorArgParseDrew DeVault
Use parse_boolean where possible.
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-08Merge pull request #3091 from c-edw/feature/FocusFollowsMouseDocBrian Ashworth
Update documentation for focus_follows_mouse.