Denis Doria
7267314ab1
Merge branch 'master' of https://github.com/SirCmpwn/sway
2016-06-07 10:06:06 +02:00
Drew DeVault
b63b01156a
Merge pull request #703 from thuck/variables_corner_cases
...
Fix segfault when using include with *
2016-06-06 16:40:10 -04:00
thuck
3710cd6963
Fix segfault when using include with *
...
This should fix the issue #681
2016-06-06 22:20:27 +02:00
Drew DeVault
2e10f0abbc
Merge pull request #693 from thuck/variables_corner_cases
...
Variables related fixes
2016-06-06 07:37:31 -04:00
Denis Doria
10ffb575b6
Sync master
...
Merge branch 'master' of https://github.com/SirCmpwn/sway
2016-06-06 09:57:16 +02:00
Denis Doria
cdd8664198
Merge branch 'master' into variables_corner_cases
2016-06-06 09:17:01 +02:00
Drew DeVault
cb14f5f576
Merge pull request #699 from roosemberth/master
...
Sway: Configuration: Support for escaping line breaks.
2016-06-05 18:24:12 -04:00
Roosembert Palacios
230591fa4e
Common: Readline: Ignore newline on '\' escaped line ends.
...
Escape line return when reading from a file with the '\' character.
Similar to shell scripts.
Signed-off-by: Roosembert Palacios <roosembert.palacios@epfl.ch>
2016-06-06 00:17:27 +02:00
Roosembert Palacios
e8c0ef98b1
Sway: Configuration: Support for escaping line breaks.
...
Escape line return in configuration file with the '\' character. Similar
to shell scripts.
Signed-off-by: Roosembert Palacios <roosembert.palacios@epfl.ch>
2016-06-05 23:36:27 +02:00
Drew DeVault
17dbcb40dc
Merge pull request #697 from zandrmartin/assign-command
...
document `assign` command
2016-06-05 10:09:44 -04:00
Zandr Martin
d4eb964fd1
document assign
command
2016-06-05 09:03:13 -05:00
Denis Doria
3c3e98b1a3
Merge branch 'master' into variables_corner_cases
2016-06-05 07:49:33 +02:00
Drew DeVault
d57714e802
Merge pull request #696 from zandrmartin/numpad-enter-swaylock-fix
...
make numpad enter key work in swaylock
2016-06-04 14:42:45 -04:00
Zandr Martin
6e7659ba13
make numpad enter key work in swaylock
...
see issue #647
2016-06-04 13:35:41 -05:00
Drew DeVault
fdefd17391
Merge pull request #695 from zandrmartin/document-client-commands
...
add documentation for client commands
2016-06-04 12:08:17 -04:00
Drew DeVault
8e0b218c9b
Merge pull request #694 from wdbw/man-page-fix
...
Add missing layout modes in sway(5)
2016-06-04 12:05:37 -04:00
Zandr Martin
3746542462
add documentation for client commands
2016-06-04 10:43:23 -05:00
wdbw
4f9af09f23
Add missing layout modes in sway(5)
2016-06-04 17:20:27 +02:00
Denis Doria
29eb3bf746
Put w to uppercase just to keep consistency between warnings
2016-06-03 11:28:10 +02:00
Denis Doria
bf2298e0a5
Includes $ for variables without it
2016-06-03 11:26:47 +02:00
thuck
f55b5a4982
Fix identation issue
2016-06-03 00:36:41 +02:00
thuck
8274efc7d2
Merge branch 'variables_corner_cases' of https://github.com/thuck/sway into variables_corner_cases
2016-06-03 00:35:37 +02:00
thuck
431013db72
Merge branch 'master' of https://github.com/SirCmpwn/sway into variables_corner_cases
2016-06-03 00:19:26 +02:00
Denis Doria
8a08e83194
Merge branch 'master' into variables_corner_cases
2016-06-03 00:17:51 +02:00
thuck
e4f80877be
Fix output command when varible not set
...
This should fix the corner case where a variable is not assigned, but used anyway.
This should solve partially the issue #681 .
2016-06-03 00:05:10 +02:00
thuck
1ab3e1023e
Including error message when variable do not start with $
2016-06-02 23:23:04 +02:00
Drew DeVault
68b517e1ae
Merge pull request #692 from zandrmartin/inplace-merge-sort
...
implement stable sort for lists
2016-06-02 17:05:41 -04:00
Zandr Martin
9ccc92705e
implement stable sort for lists
...
also change sort_workspaces() to use it
2016-06-02 15:48:14 -05:00
Drew DeVault
09670fc1a7
Merge pull request #691 from thuck/floating_size_conf
...
floating_maximum_size initial implementation
2016-06-02 11:46:25 -04:00
Denis Doria
2256a9b784
Sync master
...
Merge branch 'master' of https://github.com/SirCmpwn/sway into floating_size_conf
2016-06-02 17:36:51 +02:00
Denis Doria
b692a6d31a
Initial implementation for floating_maximum_size
2016-06-02 17:35:02 +02:00
Drew DeVault
5e395d6962
Merge pull request #690 from zandrmartin/smartgap-hide-borders
...
redo smart_gaps/hide_edge_borders fix
2016-06-02 10:23:43 -04:00
Zandr Martin
3fac9705b0
redo smart_gaps/hide_edge_borders fix
2016-06-02 09:16:47 -05:00
Drew DeVault
df16c2e7d1
Merge pull request #689 from thuck/floating_size_conf
...
Floating size conf
2016-06-01 08:50:36 -04:00
Denis Doria
009eaccd42
Clean up not used variables
2016-06-01 14:44:02 +02:00
Denis Doria
b6685da35b
Update man page with information about floating_maximum_size
2016-06-01 14:11:49 +02:00
Denis Doria
0ad7857f90
Included option floating_minimum_size
...
Values cannot be negative or 0; if so uses the default 75x50.
Uses the same syntax as i3: floating_minimum_size <width> x <height>, although the x can be anything.
2016-06-01 13:37:50 +02:00
Drew DeVault
4d6be1b640
Merge pull request #686 from zandrmartin/fix-swaybar-in-08bef67
...
fix swaybar problem in 08bef67
2016-05-31 10:35:11 -04:00
Zandr Martin
8a81f52450
Merge branch 'master' of github.com:SirCmpwn/sway into fix-swaybar-in-08bef67
2016-05-31 09:30:34 -05:00
Drew DeVault
df8caa29a7
Merge pull request #685 from thuck/floating_size
...
Initial work for floating view with sane values
2016-05-31 10:29:44 -04:00
Zandr Martin
1b4d61662c
fix swaybar problem in 08bef67
2016-05-31 09:25:54 -05:00
Denis Doria
3c4c623012
Merge branch 'master' into floating_size
2016-05-31 16:04:15 +02:00
Denis Doria
f1d5b89d3e
Initial work for floating view with sane values
2016-05-31 14:59:33 +02:00
Drew DeVault
7f6b3d1c1f
Merge pull request #637 from 1ace/fix/ipc-leak
...
Fix a few mem leaks in ipc-server
2016-05-30 20:10:08 -04:00
Eric Engestrom
08bef67f85
sway: refactor ipc_client_handle_command()
...
This fixes a few mem leaks, as well as remove a false-positive error msg
in IPC_GET_BAR_CONFIG
2016-05-31 00:44:07 +01:00
Eric Engestrom
9d7d73df7f
sway: fix IPC resource leak
2016-05-31 00:40:15 +01:00
Drew DeVault
ad942708a7
Update configuration info in readme
2016-05-29 12:13:15 -04:00
Drew DeVault
3b1c125e18
Remove bar position left:right from docs
...
And adds a warning about using them (currently these are not supported
by swaybar).
2016-05-29 11:53:13 -04:00
Drew DeVault
fc7132a3ba
Merge pull request #677 from zandrmartin/maintain-workspace-output-assignments
...
enforce workspace output assignents
2016-05-29 10:05:50 -04:00
Zandr Martin
d291a29f30
enforce workspace output assignents
...
when creating a new output, move to that output all extant workspaces
that are assigned to that output.
(unrelated) remove comment that was no longer applicable, fix spacing in
an assignment
2016-05-28 18:18:46 -05:00