@@ -1,7 +1,7 @@
|
|||||||
#ifndef LUNAR_WM_H
|
#ifndef LUNAR_WM_H
|
||||||
#define LUNAR_WM_H
|
#define LUNAR_WM_H
|
||||||
|
|
||||||
#include "LunarWM_types.h"
|
|
||||||
#include "LunarWM_core.h"
|
#include "LunarWM_core.h"
|
||||||
|
#include "LunarWM_types.h"
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -22,8 +22,8 @@
|
|||||||
#include <wlr/types/wlr_compositor.h>
|
#include <wlr/types/wlr_compositor.h>
|
||||||
#include <wlr/types/wlr_cursor.h>
|
#include <wlr/types/wlr_cursor.h>
|
||||||
#include <wlr/types/wlr_data_device.h>
|
#include <wlr/types/wlr_data_device.h>
|
||||||
#include <wlr/types/wlr_pointer.h>
|
|
||||||
#include <wlr/types/wlr_output.h>
|
#include <wlr/types/wlr_output.h>
|
||||||
|
#include <wlr/types/wlr_pointer.h>
|
||||||
#include <wlr/types/wlr_subcompositor.h>
|
#include <wlr/types/wlr_subcompositor.h>
|
||||||
#include <wlr/types/wlr_xdg_shell.h>
|
#include <wlr/types/wlr_xdg_shell.h>
|
||||||
#include <wlr/util/box.h>
|
#include <wlr/util/box.h>
|
||||||
@@ -112,7 +112,6 @@ typedef struct {
|
|||||||
struct wl_listener destroy;
|
struct wl_listener destroy;
|
||||||
} LunarWM_Output;
|
} LunarWM_Output;
|
||||||
|
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
uint32_t id;
|
uint32_t id;
|
||||||
|
|
||||||
|
|||||||
31
src/vec.h
31
src/vec.h
@@ -35,7 +35,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|||||||
|
|
||||||
#ifdef __cpp_decltype
|
#ifdef __cpp_decltype
|
||||||
# include <type_traits>
|
# include <type_traits>
|
||||||
#define typeof(T) std::remove_reference<std::add_lvalue_reference<decltype(T)>::type>::type
|
# define typeof(T) \
|
||||||
|
std::remove_reference< \
|
||||||
|
std::add_lvalue_reference<decltype(T)>::type>::type
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
@@ -59,15 +61,13 @@ typedef size_t vec_type_t;
|
|||||||
|
|
||||||
// vec_addr is a vector* (aka type**)
|
// vec_addr is a vector* (aka type**)
|
||||||
# define vector_add_dst(vec_addr) \
|
# define vector_add_dst(vec_addr) \
|
||||||
((typeof(*vec_addr))(\
|
((typeof(*vec_addr))(_vector_add_dst( \
|
||||||
_vector_add_dst((vector*)vec_addr, sizeof(**vec_addr))\
|
(vector *)vec_addr, sizeof(**vec_addr))))
|
||||||
))
|
|
||||||
# define vector_insert_dst(vec_addr, pos) \
|
# define vector_insert_dst(vec_addr, pos) \
|
||||||
((typeof(*vec_addr))(\
|
((typeof(*vec_addr))(_vector_insert_dst( \
|
||||||
_vector_insert_dst((vector*)vec_addr, sizeof(**vec_addr), pos)))
|
(vector *)vec_addr, sizeof(**vec_addr), pos)))
|
||||||
|
|
||||||
#define vector_add(vec_addr, value)\
|
# define vector_add(vec_addr, value) (*vector_add_dst(vec_addr) = value)
|
||||||
(*vector_add_dst(vec_addr) = value)
|
|
||||||
# define vector_insert(vec_addr, pos, value) \
|
# define vector_insert(vec_addr, pos, value) \
|
||||||
(*vector_insert_dst(vec_addr, pos) = value)
|
(*vector_insert_dst(vec_addr, pos) = value)
|
||||||
|
|
||||||
@@ -88,14 +88,12 @@ typedef size_t vec_type_t;
|
|||||||
// vec is a vector (aka type*)
|
// 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))
|
(_vector_erase((vector)vec, sizeof(*vec), pos, len))
|
||||||
#define vector_remove(vec, pos)\
|
#define vector_remove(vec, pos) (_vector_remove((vector)vec, sizeof(*vec), pos))
|
||||||
(_vector_remove((vector)vec, sizeof(*vec), pos))
|
|
||||||
|
|
||||||
#define vector_reserve(vec_addr, capacity) \
|
#define vector_reserve(vec_addr, capacity) \
|
||||||
(_vector_reserve((vector *)vec_addr, sizeof(**vec_addr), capacity))
|
(_vector_reserve((vector *)vec_addr, sizeof(**vec_addr), capacity))
|
||||||
|
|
||||||
#define vector_copy(vec)\
|
#define vector_copy(vec) (_vector_copy((vector)vec, sizeof(*vec)))
|
||||||
(_vector_copy((vector)vec, sizeof(*vec)))
|
|
||||||
|
|
||||||
vector vector_create(void);
|
vector vector_create(void);
|
||||||
|
|
||||||
@@ -103,15 +101,18 @@ 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_remove(vector vec_addr, vec_type_t type_size, vec_size_t pos);
|
||||||
|
|
||||||
void vector_pop(vector vec);
|
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);
|
vector _vector_copy(vector vec, vec_type_t type_size);
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,6 @@ set -euo pipefail
|
|||||||
|
|
||||||
ROOT="$(git rev-parse --show-toplevel)"
|
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"
|
clang-format -i --style=file "$f"
|
||||||
done
|
done
|
||||||
|
|||||||
Reference in New Issue
Block a user