From 670848e924f8c0502a23dd8040fb2e83ed7ce834 Mon Sep 17 00:00:00 2001 From: Slendi Date: Tue, 30 Sep 2025 23:29:33 +0300 Subject: [PATCH] format Signed-off-by: Slendi --- src/LunarWM.h | 2 +- src/LunarWM_types.h | 3 +- src/vec.h | 67 +++++++++++++++++++++++---------------------- tools/format.sh | 2 +- 4 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/LunarWM.h b/src/LunarWM.h index de19e24..9d1dd61 100644 --- a/src/LunarWM.h +++ b/src/LunarWM.h @@ -1,7 +1,7 @@ #ifndef LUNAR_WM_H #define LUNAR_WM_H -#include "LunarWM_types.h" #include "LunarWM_core.h" +#include "LunarWM_types.h" #endif diff --git a/src/LunarWM_types.h b/src/LunarWM_types.h index 1792239..3f73015 100644 --- a/src/LunarWM_types.h +++ b/src/LunarWM_types.h @@ -22,8 +22,8 @@ #include #include #include -#include #include +#include #include #include #include @@ -112,7 +112,6 @@ typedef struct { struct wl_listener destroy; } LunarWM_Output; - typedef struct { uint32_t id; diff --git a/src/vec.h b/src/vec.h index 8011a05..b4756c5 100644 --- a/src/vec.h +++ b/src/vec.h @@ -34,8 +34,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define vec_h #ifdef __cpp_decltype -#include -#define typeof(T) std::remove_reference::type>::type +# include +# define typeof(T) \ + std::remove_reference< \ + std::add_lvalue_reference::type>::type #endif #ifdef __cplusplus @@ -46,7 +48,7 @@ extern "C" { #include // generic type for internal use -typedef void* vector; +typedef void *vector; // number of elements in a vector typedef size_t vec_size_t; // number of bytes for a type @@ -58,60 +60,59 @@ typedef size_t vec_type_t; // shortcut defines // vec_addr is a vector* (aka type**) -#define vector_add_dst(vec_addr)\ - ((typeof(*vec_addr))(\ - _vector_add_dst((vector*)vec_addr, sizeof(**vec_addr))\ - )) -#define vector_insert_dst(vec_addr, pos)\ - ((typeof(*vec_addr))(\ - _vector_insert_dst((vector*)vec_addr, sizeof(**vec_addr), pos))) +# define vector_add_dst(vec_addr) \ + ((typeof(*vec_addr))(_vector_add_dst( \ + (vector *)vec_addr, sizeof(**vec_addr)))) +# define vector_insert_dst(vec_addr, pos) \ + ((typeof(*vec_addr))(_vector_insert_dst( \ + (vector *)vec_addr, sizeof(**vec_addr), pos))) -#define vector_add(vec_addr, value)\ - (*vector_add_dst(vec_addr) = value) -#define vector_insert(vec_addr, pos, value)\ - (*vector_insert_dst(vec_addr, pos) = value) +# define vector_add(vec_addr, value) (*vector_add_dst(vec_addr) = value) +# define vector_insert(vec_addr, pos, value) \ + (*vector_insert_dst(vec_addr, pos) = value) #else -#define vector_add_dst(vec_addr, type)\ - ((type*)_vector_add_dst((vector*)vec_addr, sizeof(type))) -#define vector_insert_dst(vec_addr, type, pos)\ - ((type*)_vector_insert_dst((vector*)vec_addr, sizeof(type), pos)) +# define vector_add_dst(vec_addr, type) \ + ((type *)_vector_add_dst((vector *)vec_addr, sizeof(type))) +# define vector_insert_dst(vec_addr, type, pos) \ + ((type *)_vector_insert_dst((vector *)vec_addr, sizeof(type), pos)) -#define vector_add(vec_addr, type, value)\ - (*vector_add_dst(vec_addr, type) = value) -#define vector_insert(vec_addr, type, pos, value)\ - (*vector_insert_dst(vec_addr, type, pos) = value) +# define vector_add(vec_addr, type, value) \ + (*vector_add_dst(vec_addr, type) = value) +# define vector_insert(vec_addr, type, pos, value) \ + (*vector_insert_dst(vec_addr, type, pos) = value) #endif // vec is a vector (aka type*) -#define vector_erase(vec, pos, len)\ +#define vector_erase(vec, pos, len) \ (_vector_erase((vector)vec, sizeof(*vec), pos, len)) -#define vector_remove(vec, pos)\ - (_vector_remove((vector)vec, sizeof(*vec), pos)) +#define vector_remove(vec, pos) (_vector_remove((vector)vec, sizeof(*vec), pos)) -#define vector_reserve(vec_addr, capacity)\ - (_vector_reserve((vector*)vec_addr, sizeof(**vec_addr), capacity)) +#define vector_reserve(vec_addr, capacity) \ + (_vector_reserve((vector *)vec_addr, sizeof(**vec_addr), capacity)) -#define vector_copy(vec)\ - (_vector_copy((vector)vec, sizeof(*vec))) +#define vector_copy(vec) (_vector_copy((vector)vec, sizeof(*vec))) vector vector_create(void); void vector_free(vector vec); -void* _vector_add_dst(vector* vec_addr, vec_type_t type_size); +void *_vector_add_dst(vector *vec_addr, vec_type_t type_size); -void* _vector_insert_dst(vector* vec_addr, vec_type_t type_size, vec_size_t pos); +void *_vector_insert_dst( + vector *vec_addr, vec_type_t type_size, vec_size_t pos); -void _vector_erase(vector vec_addr, vec_type_t type_size, vec_size_t pos, vec_size_t len); +void _vector_erase( + vector vec_addr, vec_type_t type_size, vec_size_t pos, vec_size_t len); void _vector_remove(vector vec_addr, vec_type_t type_size, vec_size_t pos); void vector_pop(vector vec); -void _vector_reserve(vector* vec_addr, vec_type_t type_size, vec_size_t capacity); +void _vector_reserve( + vector *vec_addr, vec_type_t type_size, vec_size_t capacity); vector _vector_copy(vector vec, vec_type_t type_size); diff --git a/tools/format.sh b/tools/format.sh index c12b955..8cae0fc 100755 --- a/tools/format.sh +++ b/tools/format.sh @@ -3,6 +3,6 @@ set -euo pipefail ROOT="$(git rev-parse --show-toplevel)" -find "$ROOT/src" -type f -name '*.cppm' -print0 | while IFS= read -r -d '' f; do +find "$ROOT/src" -type f -name '*.c' -o -name '*.h' -print0 | while IFS= read -r -d '' f; do clang-format -i --style=file "$f" done