diff options
author | Drew DeVault <sir@cmpwn.com> | 2015-08-26 14:07:17 -0400 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2015-08-26 14:07:17 -0400 |
commit | 1e54490b71a7ccacb0d25dd1e2792125b9d71c06 (patch) | |
tree | 067204ac10ae5f727c9bed71de9ad007aa80e023 /include | |
parent | Merge pull request #135 from Luminarys/master (diff) | |
parent | move_container_to fixup (diff) | |
download | sway-1e54490b71a7ccacb0d25dd1e2792125b9d71c06.tar.gz sway-1e54490b71a7ccacb0d25dd1e2792125b9d71c06.tar.zst sway-1e54490b71a7ccacb0d25dd1e2792125b9d71c06.zip |
Merge pull request #136 from taiyu-len/master
move_container_to fixup
Diffstat (limited to 'include')
-rw-r--r-- | include/container.h | 2 | ||||
-rw-r--r-- | include/log.h | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/include/container.h b/include/container.h index 798a31a2..6c0de104 100644 --- a/include/container.h +++ b/include/container.h | |||
@@ -101,6 +101,7 @@ swayc_t *swayc_active_workspace_for(swayc_t *view); | |||
101 | // Container information | 101 | // Container information |
102 | 102 | ||
103 | bool swayc_is_fullscreen(swayc_t *view); | 103 | bool swayc_is_fullscreen(swayc_t *view); |
104 | bool swayc_is_active(swayc_t *view); | ||
104 | 105 | ||
105 | // Mapping functions | 106 | // Mapping functions |
106 | 107 | ||
@@ -110,7 +111,6 @@ void container_map(swayc_t *, void (*f)(swayc_t *, void *), void *); | |||
110 | void set_view_visibility(swayc_t *view, void *data); | 111 | void set_view_visibility(swayc_t *view, void *data); |
111 | void reset_gaps(swayc_t *view, void *data); | 112 | void reset_gaps(swayc_t *view, void *data); |
112 | 113 | ||
113 | |||
114 | void update_visibility(swayc_t *container); | 114 | void update_visibility(swayc_t *container); |
115 | 115 | ||
116 | #endif | 116 | #endif |
diff --git a/include/log.h b/include/log.h index 945ad239..f8deaf26 100644 --- a/include/log.h +++ b/include/log.h | |||
@@ -15,7 +15,11 @@ void sway_log_colors(int mode); | |||
15 | void sway_log(log_importance_t verbosity, const char* format, ...) __attribute__((format(printf,2,3))); | 15 | void sway_log(log_importance_t verbosity, const char* format, ...) __attribute__((format(printf,2,3))); |
16 | void sway_log_errno(log_importance_t verbosity, char* format, ...) __attribute__((format(printf,2,3))); | 16 | void sway_log_errno(log_importance_t verbosity, char* format, ...) __attribute__((format(printf,2,3))); |
17 | void sway_abort(const char* format, ...) __attribute__((format(printf,1,2))); | 17 | void sway_abort(const char* format, ...) __attribute__((format(printf,1,2))); |
18 | bool sway_assert(bool condition, const char* format, ...) __attribute__((format(printf,2,3))); | 18 | |
19 | bool _sway_assert(bool condition, const char* format, ...) __attribute__((format(printf,2,3))); | ||
20 | #define sway_assert(COND, FMT, ...) \ | ||
21 | _sway_assert(COND, "%s:" FMT, __PRETTY_FUNCTION__, ##__VA_ARGS__) | ||
22 | |||
19 | void error_handler(int sig); | 23 | void error_handler(int sig); |
20 | 24 | ||
21 | void layout_log(const swayc_t *c, int depth); | 25 | void layout_log(const swayc_t *c, int depth); |