aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-10-27Merge pull request #1438 from mariusor/explicit_json-c_versionDrew DeVault
Explicitly setting the version of json-c required
2017-10-27Explicitly setting the version of json-c requiredMarius Orcsik
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-24Merge pull request #1430 from dlrobertson/nvidia_drmDrew DeVault
nvidia: Validate the nvidia_drm module options
2017-10-24nvidia: Validate the nvidia_drm module optionsDan Robertson
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-23Merge pull request #1427 from ranisalt/patch-1Drew DeVault
Use add_compile_options instead of interpolation
2017-10-24Use add_compile_options instead of interpolationRanieri Althoff
Uses CMake's `add_compile_options` directive instead of interpolating `CMAKE_C_FLAGS` for adding compilation flags.
2017-10-22Merge pull request #1425 from ggreer/grab-errorDrew DeVault
swaygrab: Add some error handling.
2017-10-22swaygrab: Add some error handling.Geoff Greer
- 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-22Merge pull request #1424 from ggreer/swaygrab-jsonDrew DeVault
swaygrab: Prevent segfault if IPC response can't be parsed.
2017-10-22swaygrab: Increase max depth of JSON parsing to 256. Prevent segfault if IPC ↵Geoff Greer
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-20Merge pull request #1419 from 4e554c4c/better_logsDrew DeVault
Print log level even if STDERR is not a tty
2017-10-20Print log level even if STDERR is not a ttyCalvin Lee
Makes reading debug logs much easier, debug lines will start with `E`, info lines with `I` and error lines with `E`.
2017-10-20Remove broken link to Spanish translationDrew DeVault
Fixes #1417
2017-10-17Merge pull request #1412 from Hummer12007/rcfixDrew DeVault
handlers: preserve parent pointer value
2017-10-17handlers: preserve parent pointer valueMykyta Holubakha
2017-10-16Add feature freeze notice to readmeDrew DeVault
2017-10-16Fix crash closing fullscreen windows in containerDrew DeVault
2017-10-15Merge pull request #1402 from johalun/event-codes-include-fixDrew DeVault
Fix include path to input-event-codes.h for FreeBSD.
2017-10-15Fix include path to input-event-codes.h for FreeBSD.Johannes Lundberg
2017-10-14Merge pull request #1401 from ↵Drew DeVault
sideshowdave7/config/add_scale_to_merge_output_config Fixes to changing scale factor with output command
2017-10-14Add scale to merge_output_configDavid Hurst
2017-10-14Merge pull request #1398 from johalun/freebsd-fixDrew DeVault
Fix build on FreeBSD adjusting/removing _XOPEN_SOURCE declaration.
2017-10-14Merge pull request #1400 from madblobfish/manpagesDrew DeVault
Various manpage edits
2017-10-14Various manpage editsmadblobfish
Fix some spelling mistakes, missing punctuation and made some paragraphs more clear.
2017-10-14Merge branch 'master' into freebsd-fixDrew DeVault
2017-10-14Fix build on FreeBSD adjusting/removing _XOPEN_SOURCE declaration.Johannes Lundberg
2017-10-14Merge pull request #1397 from johalun/manpagesDrew DeVault
Change install folder for man pages
2017-10-14Change install folder for man pagesJohannes Lundberg
2017-10-13Merge pull request #1395 from Zer0-One/masterDrew DeVault
Update man 5 page
2017-10-13Update man 5 pageDavid Zero
Changes 'orientation' to 'default_orientation' to match commands.c
2017-10-12Merge pull request #1394 from madblobfish/patch-1Drew DeVault
Interlink swaymsg to sway(5) and hint that command is interchargeable
2017-10-13fintune swaymsg manpagemadblobfish
Added a hint where to find the commands. Also indicate that command is itself not a command,
2017-10-09Fix use-after free introduced by cbe7364Drew DeVault
2017-10-08Fix #1291Drew DeVault
2017-10-08Document new criteriaDrew DeVault
Via #1387
2017-10-08Document swaylock -f, scratchpad showDrew DeVault
2017-10-08Merge pull request #1263 from nyorain/masterDrew DeVault
Implement get_clipboard ipc message
2017-10-08Remove destroyed views from scratchpadDrew DeVault
Fixes #1363
2017-10-08Fix crash on swaygrab with scratchpad populatedDrew DeVault
Fixes #1217
2017-10-08Merge pull request #1387 from lbonn/ipc-workDrew DeVault
ipc: various fixes for i3 compat
2017-10-08ipc/window-event: fill "container" on close eventslbonn
Also use the recursive description to include children as well Careful: send the event before deleting the parent
2017-10-08commands: fail when criteria match nothinglbonn
For whatever command, this probably was not intended by the user
2017-10-08commands: allow criterion values to be unquotedlbonn
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-08commands: implement 3 missing criteria from i3lbonn
* con_id * floating * tiling
2017-10-08ipc/tree: populate `focus` fieldslbonn
Ids of children, by order of focus
2017-10-08ipc/tree: output mandatory fields for all nodeslbonn
Still missing: focus
2017-10-06Merge pull request #1385 from lbonn/sec-no-hiddenDrew DeVault
Security config: skip hidden files
2017-10-06Security config: skip hidden fileslbonn
Also: fix a small memory leak
2017-10-06Merge pull request #1384 from lbonn/move-workspace-fullnameDrew DeVault
Fix two issues with spaces in workspace names
2017-10-06Make `workspace_next_name` work with spaceslbonn
`workspace_next_name` parses workspace commands to find the default workspace names. It handled " " as a separator, which prevents the use of workspace names with spaces.