mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-14 06:24:20 +01:00
Code Issues Packages Projects Releases Wiki Activity
5,423 Commits 11 Branches 96 Tags 44 MiB
688f4137a5
Commit Graph

5423 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
emersion
b84bf3585c
Fix pango title escaping 
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]: caee2dff03
 2018-11-25 09:09:32 +01:00
emersion
9b88ee0143
swayidle: fix dbus_event not to block 2018-11-24 23:26:57 +01:00
emersion
41ffb5b4d5
swayidle: listen when display becomes writable 2018-11-24 23:18:44 +01:00
Ian Fan
6358de3827
swaylock: fix display_event to not block 2018-11-24 23:10:05 +01:00
Ian Fan
6e2dccc2e9
swayidle: when acquiring sleep lock, initialize and free variables properly 2018-11-24 23:10:05 +01:00
emersion
827e5513e0
Merge pull request #3179 from baloo/baloo/title_format-pango_markup 
fixes pango_markup support with title_format
 2018-11-24 23:07:13 +01:00
Arthur Gautier
caee2dff03 fixes pango_markup support with title_format 
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 789a877b37
 2018-11-24 08:26:43 -08:00
emersion
d440468d2d
Merge pull request #3145 from fdlamotte/master 
Adding commands for configuring titlebar borders and padding
 2018-11-24 08:59:01 +01:00
emersion
d9ed1f080b
Merge pull request #3178 from progandy/sysconfdir 
Meson: Fix SYSCONFDIR definition
 2018-11-24 08:06:25 +01:00
progandy
c4bbd0d3c6 Meson: Fix SYSCONFDIR definition. 
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-23 23:30:46 +01:00
emersion
cc28f9712e
Update for swaywm/wlroots#1387 2018-11-23 12:07:46 +01:00
Florent de Lamotte
7555c7efdc Adding commands for configuring titlebar borders and padding 2018-11-22 10:30:04 +01:00
emersion
77554f545e
Merge pull request #3158 from emersion/get-outputs-focused 
ipc: fix focused in get_outputs reply
 2018-11-22 09:16:14 +01:00
emersion
d63f9028d7
Merge pull request #3171 from camoz/master 
fix typo in swayidle(1)
 2018-11-22 08:53:48 +01:00
camoz
075b080f54 fix typo in swayidle(1) 2018-11-21 23:13:23 +01:00
emersion
cecf00b924
Merge pull request #3160 from camoz/master 
fix typo in config.in
 2018-11-20 22:53:29 +01:00
camoz
101e4e55a2 fix typo in config.in 2018-11-19 22:32:08 +01:00
emersion
2f1050796c
ipc: fix focused in get_outputs reply 
It's set even if a child of the output is focused.
 2018-11-19 19:57:41 +01:00
emersion
bf7af9c690
Merge pull request #3083 from c-edw/feature/StripWorkspaceName 
Implement strip_workspace_name.
 2018-11-19 17:56:18 +01:00
Drew DeVault
67d24e8fc5
Merge pull request #3152 from camoz/master 
fix typo in config.in
 2018-11-18 21:57:54 -05:00
camoz
a476efc5a6 fix typo in config.in 2018-11-19 02:45:59 +01:00
Brian Ashworth
b2c5248ad3
Merge pull request #3018 from sxmichaels/add-scroll-factor 
Add scroll factor input command.
 2018-11-18 14:05:03 -05:00
Spencer Michaels
70bc4c3ab6 Add scroll factor config option. 2018-11-18 13:49:30 -05:00
Drew DeVault
b87250425f
Merge pull request #3147 from emersion/set10 
Use #if instead of #ifdef
 2018-11-18 08:22:25 -05:00
emersion
cad851805b
Use #if instead of #ifdef 2018-11-18 00:33:06 +01:00
Connor E
4bd46fb079 Implement strip_workspace_name. 2018-11-17 16:11:28 +00:00
Drew DeVault
eda3bfeed5
Merge pull request #3142 from RyanDwyer/move-view-properties 
Move view {x,y,width,height} into container struct
 2018-11-17 11:04:34 -05:00
Drew DeVault
a5cdc293dc
Merge pull request #3143 from colemickens/grow 
commands/resize: fix grow vars uninitialized
 2018-11-17 11:03:42 -05:00
Ryan Dwyer
be9348d25c Move view {x,y,width,height} into container struct 
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-17 21:29:42 +10:00
Cole Mickens
fb6ef83b16 commands/resize: fix grow vars uninitialized 2018-11-17 03:23:06 -08:00
Ryan Dwyer
cb63321de6
Merge pull request #3132 from emersion/dispatch-cursor-btn-segfault 
Fix segfault in dispatch_cursor_button
 2018-11-17 20:24:01 +10:00
emersion
b67baf5108
Merge pull request #3141 from tslocum/resize-set-floating-ppt 
resize set: convert ppt to px for floating containers
 2018-11-17 11:20:08 +01:00
Trevor Slocum
f4ccc51da0 resize set: convert ppt to px for floating containers 2018-11-16 07:30:46 -08:00
emersion
4ce18d2744
Fix segfault in dispatch_cursor_button 2018-11-15 16:35:19 +01:00
Drew DeVault
c36665bc17
Merge pull request #3130 from RyanDwyer/fix-mode-double-free 
Fix double free of mode
 2018-11-15 09:35:51 -05:00
Ryan Dwyer
4e8bf5b328 Fix double free of mode 
config->current_mode is a pointer into the config->modes list, and each
mode has already been freed.

Same with bars.
 2018-11-15 23:48:11 +10:00
Brian Ashworth
0451acfb75
Merge pull request #3128 from RyanDwyer/fix-unmap-crash 
Fix double free when unmapping any view
 2018-11-15 00:38:42 -05:00
Ryan Dwyer
2115ebe39d Fix double free when unmapping any view 2018-11-15 15:22:09 +10:00
Drew DeVault
932d6ee0d4
Merge pull request #3126 from emersion/swap-unused-function 
Fix unused function in swap command
 2018-11-14 21:43:40 -05:00
Drew DeVault
484bf591be
Merge pull request #3121 from c-edw/feature/MissingFrees 
[WIP] Free unfreed resources.
 2018-11-14 21:25:26 -05:00
emersion
98a953a872
Fix unused function in swap command 
Also fixes a size_t cast to void *.
 2018-11-14 19:31:43 +01:00
Drew DeVault
47cca240e2
Merge pull request #3102 from emersion/render-software-cursors 
Render software cursors with wlr_output_render_software_cursors
 2018-11-13 14:59:48 -05:00
Connor E
eda1bf769f More frees. 2018-11-13 14:42:00 +00:00
Connor E
b5d95f264d Add some missing frees. 2018-11-13 13:45:01 +00:00
Drew DeVault
27b930df24
Merge pull request #3117 from emersion/wlroots-config10 
Use #if instead of #ifdef for WLR_HAS_*
 2018-11-12 20:35:27 -05:00
emersion
2afd930914
Use #if instead of #ifdef for WLR_HAS_* 2018-11-12 22:23:06 +01:00
emersion
3b8d4a9212
Merge pull request #3116 from harishkrupo/master 
IPC: Send keyboard layout info in IPC_GET_INPUTS
 2018-11-12 21:26:00 +01:00
Harish Krupo
d8ad429e39 IPC: Send keyboard layout info in IPC_GET_INPUTS 
Signed-off-by: Harish Krupo <harishkrupo@gmail.com>
 2018-11-12 22:00:22 +05:30
Drew DeVault
2e43f02427
Merge pull request #2979 from RedSoxFan/config-var-repl 
Alter config variable replacement process
 2018-11-12 11:13:59 -05:00
Drew DeVault
ee6b0ce24a
Merge pull request #3113 from RedSoxFan/fix-ws-auto-back-and-forth 
cmd_ws_auto_back_and_forth: fix negation
 2018-11-11 16:16:28 -05:00