diff options
| author | taiyu <taiyu.len@gmail.com> | 2015-08-26 11:01:26 -0700 |
|---|---|---|
| committer | taiyu <taiyu.len@gmail.com> | 2015-08-26 11:01:26 -0700 |
| commit | 1fa7a91bfb4ccbd42a535787f3bb208913b4a7e9 (patch) | |
| tree | 067204ac10ae5f727c9bed71de9ad007aa80e023 /include | |
| parent | c4257055ebb74987b62833c0529ecfb9f9a1c47c (diff) | |
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); // Container information bool swayc_is_fullscreen(swayc_t *view); +bool swayc_is_active(swayc_t *view); // Mapping functions @@ -110,7 +111,6 @@ void container_map(swayc_t *, void (*f)(swayc_t *, void *), void *); void set_view_visibility(swayc_t *view, void *data); void reset_gaps(swayc_t *view, void *data); - void update_visibility(swayc_t *container); #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); void sway_log(log_importance_t verbosity, const char* format, ...) __attribute__((format(printf,2,3))); void sway_log_errno(log_importance_t verbosity, char* format, ...) __attribute__((format(printf,2,3))); void sway_abort(const char* format, ...) __attribute__((format(printf,1,2))); -bool sway_assert(bool condition, const char* format, ...) __attribute__((format(printf,2,3))); + +bool _sway_assert(bool condition, const char* format, ...) __attribute__((format(printf,2,3))); +#define sway_assert(COND, FMT, ...) \ + _sway_assert(COND, "%s:" FMT, __PRETTY_FUNCTION__, ##__VA_ARGS__) + void error_handler(int sig); void layout_log(const swayc_t *c, int depth); |