Commit graph

1592 commits

Author SHA1 Message Date
Mikkel Oscar Lyderik
39df452dc1 Document include command 2016-03-26 16:37:56 +01:00
Mikkel Oscar Lyderik
71a5350b68 Implement include command
The include command (`include <path>`) makes it possible to include sub
config files from the main config file (or from within other sub config
files).

The include command uses the following rules for including config files:

* the `path` can be either a full path or a path that is relative to the
  parent config. Shell expansion is supported, so it's possible to do
  `include ~/.config/sway.d/*`.
* The same config file can only be included once (to prevent include
  cycles). If a config is included multiple times it will just be
  ignored after it has been included once.
* Including a sub config file is the same as inserting the content of
  that file into the parent config, thus rules about overwriting
  bindsyms etc. works the same as for a single config.

Implement #542
2016-03-26 16:37:50 +01:00
Drew DeVault
3da269b78a Update README.md 2016-03-25 15:54:24 -04:00
Drew DeVault
dbaeae11ce Update README.md packaging info 2016-03-25 15:53:02 -04:00
Drew DeVault
838db8e5db Fix link to PGP key 2016-03-25 11:21:21 -04:00
Drew DeVault
9a86490a38 Merge pull request #543 from fluxchief/master
Add graphical feedback to swaylock (#526)
2016-03-25 11:10:22 -04:00
Kevin Hamacher
fb6dcce2ad Add graphical feedback to swaylock (#526) 2016-03-25 15:24:41 +01:00
Drew DeVault
56838587e1 Merge pull request #538 from nuew/display-images
Add choice of display to --image.
2016-03-24 20:06:43 -04:00
Nuew
328e031095 Replace with in swaylock 2016-03-24 19:55:00 -04:00
Ethan
df57d1b702 Merge branch 'master' into display-images 2016-03-24 18:57:31 -04:00
Nuew
34009205e9 Change 'display' to 'output' in swaylock error messages where necessary 2016-03-24 18:52:57 -04:00
Nuew
644c13de77 Change 'display' to 'output' in swaylock docs where necessary 2016-03-24 18:49:58 -04:00
Dominique Martinet
234932723c CMake: add missing wlc include dir for common and swaygrab 2016-03-24 18:26:01 -04:00
Nuew
0aa4383c9a Add choice of display to --image.
Additionally
  - Made background colors display when an image is enabled if
a --color is specified.
  - Link CJson to swaylock.
  - Add the --socket option to swaylock.
2016-03-24 18:02:34 -04:00
Drew DeVault
dcf5c67681 Merge pull request #537 from mikkeloscar/exit-on-config-missing
Gracefully exit when config is not found
2016-03-24 17:27:03 -04:00
Mikkel Oscar Lyderik
938ff29b7b Gracefully exit when config is not found
This makes sure that sway will gracefully exit if the config is not
found or sway is unable to read it.
2016-03-24 22:20:25 +01:00
Drew DeVault
06107bb44e Make the nvidia warning louder 2016-03-24 16:48:53 -04:00
Drew DeVault
f590acc84c Merge pull request #536 from jcaesar/master
swaylock: Interpret XKB_KEY_BackSpace as a deletion instead of a normal key.
2016-03-24 14:51:02 -04:00
Julius Michaelis
956ca66d2c swaylock: Interpret XKB_KEY_BackSpace as a deletion instead of a normal key. 2016-03-24 19:41:33 +01:00
Drew DeVault
fb4fdf5336 Update README 2016-03-24 14:24:43 -04:00
Drew DeVault
fd061d4dc4 Don't set WLC_DIM on startup 2016-03-24 14:09:18 -04:00
Drew DeVault
5c85c018b4 Update to new WLC API 2016-03-24 14:08:53 -04:00
Drew DeVault
686530d5e8 Merge pull request #535 from mikkeloscar/fix-swaylock-crash
swaylock: Fix crash when unable to connect to sway
2016-03-23 09:44:22 -04:00
Mikkel Oscar Lyderik
a8f989c651 swaylock: Fix crash when unable to connect to wl
Prevent swaylock from crashing when it can't connect to wayland for
whatever reason. i.e. XDG_RUNTIME_DIR not set.

Fix #534
2016-03-23 14:37:56 +01:00
Drew DeVault
a99970d7a3 Merge pull request #530 from mikkeloscar/swaybar-kill-on-sway-crash
swaybar: Abort when receiving 0 bytes in IPC call
2016-03-22 06:53:29 -04:00
Mikkel Oscar Lyderik
1d010afbf7 Abort when receiving 0 bytes in IPC call
When sway crashes a swaybar process is sometimes left behind running at
100% CPU. This was caused by the swaybar trying to retrieve an IPC
response from the closed sway socket.

This patch fixes the problem by aborting when the socket has been closed
(recv return 0).

Fix #528
2016-03-22 11:27:39 +01:00
Drew DeVault
4ce1ab8a26 Merge pull request #527 from gkbrk/swaylock_password_grow
swaylock: Grow the password buffer
2016-03-21 16:23:49 -04:00
Gökberk Yaltıraklı
50c052e2f3 swaylock: Grow the password buffer 2016-03-21 22:17:48 +02:00
Drew DeVault
ca400e84f5 Merge pull request #525 from mikkeloscar/fix-clang-warning
Use correct type for keycode
2016-03-20 07:46:06 -04:00
Drew DeVault
599d6ab651 Merge pull request #524 from mikkeloscar/smart-gaps
Implement 'smart_gaps' feature from i3-gaps
2016-03-20 07:45:51 -04:00
Mikkel Oscar Lyderik
c1f91c4f5e Use correct type for keycode 2016-03-20 12:41:26 +01:00
Mikkel Oscar Lyderik
2935e24cf5 Implement 'smart_gaps' feature from i3-gaps 2016-03-20 12:29:47 +01:00
Drew DeVault
00c1ce4fda Merge pull request #523 from mikkeloscar/slack-key-handler
Make key handling less strict
2016-03-19 09:10:42 -04:00
Mikkel Oscar Lyderik
bb32cba795 Make key handling less strict
Sway has been very strict when it comes to key handling. Only on an
exact match would a bindsym be triggered.

This patch makes it less strict by for instance allowing the key combo
`$mod+1+2` to act as `$mod+2` if 2 was the last pressed key and `$mod+1`
if 1 was the last pressed key.

The new key handling uses the following algorithm:

1. List of bindings sorted by number of keys in binding (already the
default)
2. Find all bindings covered by the current keyboard state and list them
by same order as in 1.
3. Select the first binding from the list where the last pressed key is
part of the binding.

Addresses #452
2016-03-19 14:06:46 +01:00
Mikkel Oscar Lyderik
8c7bdfc004 Allow legal non-x11 keycodes 2016-03-19 13:36:37 +01:00
Drew DeVault
91192e3c65 Merge pull request #522 from mikkeloscar/workspace-layout
Add config option workspace_layout
2016-03-18 20:00:17 -04:00
Mikkel Oscar Lyderik
9a04f9d8d6 Add config option workspace_layout
This implements the config parsing of
`workspace_layout <default|stacking|tabbed>`

http://i3wm.org/docs/userguide.html#_layout_mode_for_new_containers
2016-03-19 00:54:33 +01:00
Drew DeVault
a8e1ca75d0 New default wallpaper! 2016-03-18 18:23:30 -04:00
Drew DeVault
7fb2a16275 Merge pull request #520 from aouelete/swaylock
Add a manpage for swaylock
2016-03-18 17:15:19 -04:00
Aaron Ouellette
8af6a419ec Merge branch 'master' of git://github.com/SirCmpwn/sway into swaylock 2016-03-18 17:09:11 -04:00
Drew DeVault
378a45cec2 Merge pull request #519 from mikkeloscar/maintain-exec-quotes
Don't strip quotes from exec args
2016-03-18 06:52:51 -04:00
Mikkel Oscar Lyderik
99f26c61a5 Don't strip quotes from exec args
Before passing a command to a command handler the quotes are stripped
from each argument in the command. This is usually the wanted behavior
but causes a problem in the case of `exec` where quoted arguments can be
required when passing the exec command to `/bin/sh -c`.

This patch makes `exec` a special case and doesn't strip quotes from the
arguments. It will just pass the exec command verbatim to the exec
command handler.

Fix #518
2016-03-18 10:02:18 +01:00
Drew DeVault
e7e1081a93 Merge pull request #516 from mikkeloscar/remove-panel_size
Remove unused panel_size (and fix rearrange)
2016-03-17 18:52:47 -04:00
Mikkel Oscar Lyderik
f63512480c Remove unused panel_size (and fix rearrange)
desktop_shell.panel_size was only used to determine if sway should
rearrange the output when rendering the panel in the output_pre_render
hook. This is not needed since the output will have been arranged at
that point.
It also caused sway to rearrange all the time when running with two
or more different monitors/resolutions because panel_size kept changing
with every output_pre_render callback.

Should fix #514
2016-03-17 23:47:42 +01:00
Drew DeVault
50b9a4e8a6 Merge pull request #515 from mikkeloscar/focus-correct-swaylock-view
Focus correct swaylock view in multimonitor setup
2016-03-17 13:47:58 -04:00
Mikkel Oscar Lyderik
c1d5791482 Focus correct swaylock view in multimonitor setup
Swaylock spawns and focuses a view for each output in sway. This can
sometimes move the focus to a new output after locking and unlocking the
screens.

This patch makes sure that the output which had focus when swaylock
was invoked, will regain focus once swaylock is closed/unlocked.

Fix #499
2016-03-17 17:02:17 +01:00
Drew DeVault
bb67a3d809 Merge pull request #513 from mikkeloscar/sway-bar-manpage
Document swaybar commands
2016-03-17 10:45:57 -04:00
Mikkel Oscar Lyderik
db7697b830 Document swaybar commands
Documents most of the bar commands in sway-bar(5) manpage.

The following command has not been document because they haven't been
fully implemented yet:
 * mode
 * hidden_state
 * modifier
 * tray_output
 * tray_padding

Close #375
2016-03-17 15:41:24 +01:00
Drew DeVault
93109674d0 Merge pull request #512 from mikkeloscar/bg-panel-render
Schedule render when adding bg and panel
2016-03-17 08:33:11 -04:00
Mikkel Oscar Lyderik
9faa4ba0a0 Schedule render when adding bg and panel.
This should be a real fix for #509

This schedules a render when a background or panel is added to sway
through the desktop shell interface, that makes sure the render isn't
scheduled before the bg or panel is ready and you don't end up with a
black screen until the cursor is moved.
2016-03-17 12:05:54 +01:00