Commit graph

2535 commits

Author SHA1 Message Date
Drew DeVault
ccf7e5ad7e
Merge pull request #1441 from ptMuta/master
Removed trailing comma from swaybar click event json
2017-10-28 10:45:39 -04:00
Joona Romppanen
675e4b7de7 Removed trailing comma from swaybar click event json 2017-10-28 17:35:48 +03:00
Drew DeVault
c57f68566a Merge pull request #1436 from dlrobertson/add_asan_build
Add Address Sanitized build type
2017-10-27 08:46:29 -04:00
Drew DeVault
ee6ed89e36 Merge pull request #1438 from mariusor/explicit_json-c_version
Explicitly setting the version of json-c required
2017-10-27 08:18:00 -04:00
Marius Orcsik
69e9b1386f
Explicitly setting the version of json-c required
to 0.12.1. This is needed because the development

 version breaks the existing API of json_object_array_length()

 by moving the return from int to size_t.

This would fix #1355
2017-10-27 12:17:02 +02:00
Dan Robertson
3d209be3d6
Add Address Sanitized build type
- Add -DCMAKE_BUILD_TYPE=ASAN to possible builds
2017-10-27 03:25:30 +00:00
Drew DeVault
d75ee3f9ce Merge pull request #1430 from dlrobertson/nvidia_drm
nvidia: Validate the nvidia_drm module options
2017-10-24 20:29:06 -04:00
Dan Robertson
88d042ec49
nvidia: Validate the nvidia_drm module options
When the proprietary nvidia driver is used, ensure the modeset option is
set instead of checking /proc/cmdline for nvidia-drm.modeset=1.
2017-10-24 22:35:31 +00:00
Drew DeVault
5551bf92a9 Merge pull request #1427 from ranisalt/patch-1
Use add_compile_options instead of interpolation
2017-10-23 21:48:31 -04:00
Ranieri Althoff
0d2baa1c89 Use add_compile_options instead of interpolation
Uses CMake's `add_compile_options` directive instead of interpolating  `CMAKE_C_FLAGS` for adding compilation flags.
2017-10-24 01:43:11 +00:00
Drew DeVault
b31b11f139 Merge pull request #1425 from ggreer/grab-error
swaygrab: Add some error handling.
2017-10-22 21:15:43 -04:00
Geoff Greer
29f27c7cdc swaygrab: Add some error handling.
- If IPC response contains `success: false`, abort and print error message.
- If tree has no nodes, abort with error msg instead of segfaulting.
2017-10-22 18:09:36 -07:00
Drew DeVault
d10e723183 Merge pull request #1424 from ggreer/swaygrab-json
swaygrab: Prevent segfault if IPC response can't be parsed.
2017-10-22 19:50:43 -04:00
Geoff Greer
98875443ea swaygrab: Increase max depth of JSON parsing to 256. Prevent segfault if IPC response can't be parsed.
The default max nesting depth of json-c is 32, which can cause some valid trees to fail to be parsed, so increase that. Also instead of segfaulting, just abort and print the error returned by json-c.
2017-10-22 14:09:50 -07:00
Drew DeVault
66d3777c14 Merge pull request #1419 from 4e554c4c/better_logs
Print log level even if STDERR is not a tty
2017-10-20 18:35:32 -04:00
Calvin Lee
016261fd64 Print log level even if STDERR is not a tty
Makes reading debug logs much easier, debug lines will start with `E`,
info lines with `I` and error lines with `E`.
2017-10-20 15:12:28 -06:00
Drew DeVault
b930003008 Remove broken link to Spanish translation
Fixes #1417
2017-10-20 13:07:59 -04:00
Drew DeVault
4ded091491 Merge pull request #1412 from Hummer12007/rcfix
handlers: preserve parent pointer value
2017-10-17 16:56:06 -04:00
Mykyta Holubakha
22906f7fce
handlers: preserve parent pointer value 2017-10-17 23:45:57 +03:00
Drew DeVault
a996ee485d Add feature freeze notice to readme 2017-10-16 21:12:18 -04:00
Drew DeVault
b16dbf6d64 Fix crash closing fullscreen windows in container 2017-10-16 21:07:55 -04:00
Drew DeVault
67f9b7fe5b Merge pull request #1402 from johalun/event-codes-include-fix
Fix include path to input-event-codes.h for FreeBSD.
2017-10-15 09:30:27 -04:00
Johannes Lundberg
44e72573cb Fix include path to input-event-codes.h for FreeBSD. 2017-10-15 10:54:47 +02:00
Drew DeVault
ea0f1f3a7e Merge pull request #1401 from sideshowdave7/config/add_scale_to_merge_output_config
Fixes to changing scale factor with output command
2017-10-14 21:39:39 -04:00
David Hurst
ee15068a8f Add scale to merge_output_config 2017-10-14 17:50:31 -07:00
Drew DeVault
2216e830be Merge pull request #1398 from johalun/freebsd-fix
Fix build on FreeBSD adjusting/removing _XOPEN_SOURCE declaration.
2017-10-14 16:32:50 -04:00
Drew DeVault
e91058509e Merge pull request #1400 from madblobfish/manpages
Various manpage edits
2017-10-14 15:50:35 -04:00
madblobfish
93fe8ae705 Various manpage edits
Fix some spelling mistakes, missing punctuation and made some paragraphs more clear.
2017-10-14 21:41:49 +02:00
Drew DeVault
55d8a77dd8 Merge branch 'master' into freebsd-fix 2017-10-14 15:16:15 -04:00
Johannes Lundberg
5a63f0f57b Fix build on FreeBSD adjusting/removing _XOPEN_SOURCE declaration. 2017-10-14 20:38:33 +02:00
Drew DeVault
d1e7ac89c4 Merge pull request #1397 from johalun/manpages
Change install folder for man pages
2017-10-14 14:30:20 -04:00
Johannes Lundberg
2588dede77 Change install folder for man pages 2017-10-14 19:09:48 +02:00
Drew DeVault
45ec4de36a Merge pull request #1395 from Zer0-One/master
Update man 5 page
2017-10-13 23:42:02 -04:00
David Zero
03f8a8ae05 Update man 5 page
Changes 'orientation' to 'default_orientation' to match commands.c
2017-10-13 18:53:03 -07:00
Drew DeVault
6f794131eb Merge pull request #1394 from madblobfish/patch-1
Interlink swaymsg to sway(5) and hint that command is interchargeable
2017-10-12 19:12:12 -04:00
madblobfish
758c60e836 fintune swaymsg manpage
Added a hint where to find the commands.
Also indicate that command is itself not a command,
2017-10-13 01:10:32 +02:00
Drew DeVault
a82aa2a20d Fix use-after free introduced by cbe7364 2017-10-09 12:04:06 -04:00
Drew DeVault
6271abd644 Fix #1291 2017-10-08 11:26:45 -04:00
Drew DeVault
eb7b920303 Document new criteria
Via #1387
2017-10-08 11:09:24 -04:00
Drew DeVault
a6d5cad309 Document swaylock -f, scratchpad show 2017-10-08 11:09:24 -04:00
Drew DeVault
6d83a59b46 Merge pull request #1263 from nyorain/master
Implement get_clipboard ipc message
2017-10-08 11:05:54 -04:00
Drew DeVault
5ecedc7199 Remove destroyed views from scratchpad
Fixes #1363
2017-10-08 10:57:41 -04:00
Drew DeVault
46e5aeac50 Fix crash on swaygrab with scratchpad populated
Fixes #1217
2017-10-08 10:48:33 -04:00
Drew DeVault
43161a7e17 Merge pull request #1387 from lbonn/ipc-work
ipc: various fixes for i3 compat
2017-10-08 10:02:52 -04:00
lbonn
61005c3bda ipc/window-event: fill "container" on close events
Also use the recursive description to include children as well

Careful: send the event before deleting the parent
2017-10-08 11:54:46 +02:00
lbonn
b2d4caf6c3 commands: fail when criteria match nothing
For whatever command, this probably was not intended by the user
2017-10-08 11:54:46 +02:00
lbonn
514eed7e4b commands: allow criterion values to be unquoted
Sometimes it doesn't really make sense to quote them (numeric values for
example)

In that case, the value is parsed until the next space or the end of the
whole criteria expression
2017-10-08 11:54:46 +02:00
lbonn
d879e5b15d commands: implement 3 missing criteria from i3
* con_id
* floating
* tiling
2017-10-08 11:51:03 +02:00
lbonn
fd7c4bacbd ipc/tree: populate focus fields
Ids of children, by order of focus
2017-10-08 11:51:03 +02:00
lbonn
661625b29e ipc/tree: output mandatory fields for all nodes
Still missing: focus
2017-10-08 11:51:03 +02:00