Commit Graph

1408 Commits

Author SHA1 Message Date
Drew DeVault
a8e084433d Window borders proof of concept 2016-03-30 00:47:58 +02:00
Drew DeVault
4611bba3db Initial setup of window border rendering
Please don't complain to me about the performance of this
2016-03-30 00:47:58 +02:00
Drew DeVault
c3a5e00b6e Merge pull request #553 from Hummer12007/master
Fix a typo in swaygrab manual
2016-03-29 15:02:51 -04:00
Hummer12007
f648b33897 Fix a typo in swaygrab manual 2016-03-29 21:32:21 +03:00
Drew DeVault
b7b734f311 Merge pull request #549 from Hummer12007/patch-1
Add -R option to getopt opt_string
2016-03-28 16:15:40 -04:00
Hummer12007
24cc12e043 Added -R option to getopt opt_string 2016-03-28 22:26:41 +03:00
Drew DeVault
6f53322774 Update default config 2016-03-27 12:50:09 -04:00
Drew DeVault
eacf3d0396 Loosen restrictions on commands, update docs
Closes #531
2016-03-27 12:41:42 -04:00
Drew DeVault
59a1c5c28c Update sway(1) 2016-03-27 12:24:06 -04:00
Drew DeVault
84b4a057c3 Squash warning about uninitialized variable 2016-03-27 10:01:06 -04:00
Drew DeVault
8d5abac87d Update default config to suggest include 2016-03-26 13:24:46 -04:00
Drew DeVault
504a88434f Merge pull request #546 from mikkeloscar/include-handle-dir
Don't try to read config if not a file.
2016-03-26 12:58:19 -04:00
Mikkel Oscar Lyderik
cdc73fd95e Don't try to read config if not a file. 2016-03-26 17:54:50 +01:00
Drew DeVault
3b849ce5a6 Merge pull request #544 from mikkeloscar/add-include-command
Add include command
2016-03-26 11:51:59 -04:00
Mikkel Oscar Lyderik
44ea92ea60 Add config path to error msg 2016-03-26 16:50:47 +01:00
Mikkel Oscar Lyderik
b5f34cc27d Load correct config on reload 2016-03-26 16:37:56 +01:00
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