Commit graph

2080 commits

Author SHA1 Message Date
Zandr Martin e07b8c8d7c Merge branch 'master' into get-tree-command 2016-07-04 13:53:49 -05:00
Zandr Martin f8a94f2f4b
fix typo in ipc-json.c 2016-07-04 13:46:19 -05:00
Zandr Martin 15a324b0d3
implement get_tree command 2016-07-04 13:34:44 -05:00
Drew DeVault 33abcd9573 Merge pull request #734 from jplatte/patch-1
Create .editorconfig
2016-07-04 08:56:51 -04:00
Jonas Platte e55e5cc6b4 Create .editorconfig 2016-07-04 14:12:32 +02:00
Drew DeVault b658b464ec Merge pull request #732 from zandrmartin/set-size-command
Set size command
2016-07-03 21:53:28 -04:00
Zandr Martin a7b94f1324
typo in focus.h 2016-07-03 12:22:10 -05:00
Zandr Martin d5e4fff345
resize command updates (#713) 2016-07-03 12:11:21 -05:00
Zandr Martin aced6daa19
match i3 syntax for resize set 2016-07-03 07:05:10 -05:00
Zandr Martin 034410819d
Merge remote-tracking branch 'upstream/master' into set-size-command 2016-07-02 08:14:40 -05:00
Drew DeVault 7144fb9fc3 Spawn windows as floating if they have a parent
Fixes #604
2016-06-30 08:30:03 -04:00
Drew DeVault b5d778dd82 Merge pull request #728 from deklov/master
Add get_log_level() to encapsulate v (current log level)
2016-06-27 20:05:11 -04:00
David Eklov 26842ff383 Add get_log_level() to encapsulate v (current log level)
This patch also makes all global variable in log.c static.
2016-06-27 18:56:50 -05:00
Drew DeVault 8f67903909 Merge pull request #723 from deklov/master
Bug fix: Add missing header file, unistd.h
2016-06-27 00:34:04 -04:00
David Eklov d3c947676d Bug fix: Add missing header file, unistd.h
Without unistd.h the following functions getuid, alarm and
close are implicitly declared causing compilation to fail due to
-Werror=implicit-function-declaration
2016-06-26 23:25:56 -05:00
Zandr Martin cbbeeb2cc3
Merge branch 'set-size-command' of github.com:zandrmartin/sway into set-size-command 2016-06-25 08:02:14 -05:00
Drew DeVault b5818150b9 Merge pull request #720 from Hummer12007/exec_fix
Check if found ws is focused in new view handler
2016-06-21 14:14:16 -04:00
Mykyta Holubakha bfdda1505e Check if found ws is focused in new view handler
Fixes #714, by preventing change of focus from a window to the whole ws
2016-06-21 20:38:06 +03:00
Drew DeVault 71f710cf0f Minor fix to warning messages 2016-06-19 10:01:15 -04:00
Drew DeVault cdb6a9e948 Merge pull request #716 from Hummer12007/patch-1
Added a null check in tabbed_stacked_parent
2016-06-18 13:45:39 -04:00
Hummer12007 7870a197fc Added a null check in tabbed_stacked_parent
This fixes a segfault, when trying to get parent of the workspace/root container/(?), as it is not assuered that the view's parent node is not null in the loop
2016-06-18 20:40:39 +03:00
Drew DeVault 3ce8cc8077 Merge pull request #709 from zandrmartin/set-size-command
implement resize command for absolute dimensions
2016-06-11 19:39:39 -04:00
Zandr Martin a6f4bf60f2 Merge branch 'master' into set-size-command 2016-06-11 17:10:38 -05:00
Zandr Martin 54914260ed
Merge branch 'master' of git://github.com/SirCmpwn/sway into set-size-command 2016-06-11 17:10:01 -05:00
Zandr Martin 889618d3ee
implement resize command for absolute dimensions 2016-06-11 17:02:16 -05:00
Drew DeVault f1268053a6 Merge pull request #708 from zandrmartin/assign-command
couple small fixes
2016-06-11 17:47:26 -04:00
Zandr Martin 9ecb43ea3b
couple small fixes 2016-06-11 15:29:04 -05:00
Drew DeVault 6388e1e288 Merge pull request #701 from zandrmartin/assign-command
messy start of a fix for #462
2016-06-11 15:02:26 -04:00
Zandr Martin 2298143d09
cleanup + add timeouts for pid_workspace list 2016-06-11 12:43:34 -05:00
Zandr Martin 66caee645c Merge branch 'master' into assign-command 2016-06-11 09:33:24 -05:00
Zandr Martin beaa03344e
clean up pid/workspace stuff 2016-06-11 09:20:09 -05:00
Drew DeVault cb0cc32265 Many improvements to man pages 2016-06-10 09:32:14 -04:00
Drew DeVault 318cef3c48 Merge pull request #706 from zandrmartin/swaybg-reload
trigger bg change on config reload
2016-06-10 08:20:25 -04:00
Zandr Martin b00feb25ea
trigger bg change on config reload 2016-06-10 07:12:25 -05:00
Zandr Martin 03d79b41c7
semi-working (only non-client/server wayland apps) 2016-06-10 06:08:59 -05: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
Zandr Martin 0f1859ed25 messy, unfinished version 2016-06-06 06:58:53 -05: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 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