Commit graph

2303 commits

Author SHA1 Message Date
Drew DeVault dff1e7f91b Merge pull request #749 from Hummer12007/patch-2
Enable using non-annotated tags in git-describe
2016-07-12 09:49:45 -04:00
Hummer12007 8fc9f503f9 Enable using non-annotated tags in git-describe
This fixes the version string
2016-07-12 13:44:19 +00:00
Drew DeVault 614aa28a7b Merge pull request #747 from deklov/clang-format-01
clang-format configuration for Sway's style as detailed in CONTRIBUTI…
2016-07-12 08:14:03 -04:00
Drew DeVault e0e5d4a37e Merge pull request #748 from Hummer12007/x86fix
Fix build on x86
2016-07-12 08:13:43 -04:00
Mykyta Holubakha ea7917784d Fix build on x86 2016-07-12 09:43:48 +00:00
David Eklov 6fb985b767 clang-format configuration for Sway's style as detailed in CONTRIBUTING.md
CONTRIBUTING.md says use kernel style, "but all braces go on the same line". The
kernel uses a column limit of 80 characters. The de facto syle in Sway is to
allow for wider lines so this format file does not enforce an 80 column limit.
2016-07-11 22:33:58 -05:00
Drew DeVault 0374154749 Merge pull request #744 from thejan2009/tabbed-stacked-layout-fixes
Fix tabbed/stacked corner case #742
2016-07-07 21:41:32 -04:00
D.B ee67cd0ba1 Fix tabbed/stacked corner case #742
Tabbed/stacked containers are now created only if a view is present on
the workspace. If a view is created on previously empty tabbed/stacked
workspace, it gets wrapped in a container.
2016-07-07 22:28:57 +02:00
Drew DeVault 378149b59c Merge pull request #739 from deklov/swaybar-pointer-01
Enable windows to register to get notified of pointer button events
2016-07-06 08:45:05 -04:00
David Eklov b9d8cbabdd Fix formatting guide violations (spaces instead of tabs) 2016-07-06 01:08:54 -05:00
David Eklov c8a64305fd Enable windows to register to get notified of pointer button events 2016-07-06 01:03:04 -05:00
David Eklov 9889b14511 Check capabilities before using pointer and keyboard 2016-07-06 01:03:00 -05:00
Drew DeVault 840b0c1bcd Merge pull request #740 from zandrmartin/json-fixes
get_tree json fixes
2016-07-05 08:32:10 -04:00
Zandr Martin c65d6e6e95
get_tree json fixes
- null pointer check against container names
- use actual json null values instead of "null" strings
- add "visible" property to all containers
2016-07-05 07:23:44 -05:00
Drew DeVault 58804a044f Merge pull request #738 from deklov/panel-as-shell-02
Make swaybar and swaybg shell surfaces, take 2
2016-07-05 08:09:22 -04:00
David Eklov d9bcea381a Fix formatting guide violations (spaces instead of tabs) 2016-07-04 22:18:56 -05:00
David Eklov 99bda4afe2 swaybg: Make swaybg a shell surface 2016-07-04 21:59:47 -05:00
David Eklov d3752b4140 swaybar: Make swaybar a shell surface 2016-07-04 21:59:47 -05:00
David Eklov bb35960e65 Move code to make a window a shell surface into seperate function 2016-07-04 21:58:41 -05:00
David Eklov 51204b33c1 Enable backgrounds and panels to be shell surfaces
Prior to this commit all windows (e.g. shell surfaces) were handled the same
way in handle_view_created. Since backgrounds and panels have to be treated
differently, they could not be shell surfaces. This changes checks whether
a client is a background or a panel in handle_view_created and exists to
let them be dealt with elsewhere.
2016-07-04 21:58:07 -05:00
Drew DeVault c3373c6815 Merge pull request #737 from zandrmartin/fix-bar-on-reload
I think this fixes #678
2016-07-04 20:43:22 -04:00
Zandr Martin 2f54057623
I think this fixes #678 2016-07-04 17:45:37 -05:00
Drew DeVault 33c923be73 Merge pull request #735 from zandrmartin/get-tree-command
implement `get_tree` command
2016-07-04 16:03:23 -04:00
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