Commit 6b6952f0add33e31f8dcab11167b0a011f27e0e4 Parent: e2a3df6207b354f9b92aeaa686a59d484680a019 Author: mcol <mcol@posteo.net> Date: 2020-11-06 22:47:03 +0000 Committer: mcol <mcol@posteo.net> Committed: 2020-11-06 22:47:03 +0000 replace pragma once with ifdefs
src/types.h Modified
@@ -1,4 +1,5 @@ -#pragma once +#ifndef DESKWM_TYPES_H +#define DESKWM_TYPES_H #include <stdlib.h> #include <unistd.h> @@ -10,14 +11,12 @@ #include <wlr/types/wlr_xdg_shell.h> #include <wlr/util/log.h> - enum cursor_mode { CURSOR_PASSTHROUGH, CURSOR_MOVE, CURSOR_RESIZE, }; - struct server { struct wl_display *display; struct wlr_backend *backend; @@ -52,7 +51,6 @@ uint32_t resize_edges; }; - struct view { struct wl_list link; struct server *server; @@ -66,7 +64,6 @@ int x, y; }; - struct keyboard { struct wl_list link; struct server *server; @@ -74,3 +71,5 @@ struct wl_listener modifier_listener; struct wl_listener key_listener; }; + +#endif
src/shell.h Modified
@@ -1,4 +1,5 @@ -#pragma once +#ifndef DESKWM_SHELL_H +#define DESKWM_SHELL_H #include "types.h" @@ -12,3 +13,5 @@ void on_request_resize(struct wl_listener *listener, void *data); void on_new_xdg_surface(struct wl_listener *listener, void *data); void set_up_shell(struct server *server); + +#endif
src/output.h Modified
@@ -1,9 +1,10 @@ -#pragma once +#ifndef DESKWM_OUTPUT_H +#define DESKWM_OUTPUT_H + #include <wlr/types/wlr_output_layout.h> #include "types.h" - struct output { struct wl_list link; struct server *server; @@ -11,7 +12,6 @@ struct wl_listener frame_listener; }; - struct render_data { struct wlr_output *output; struct wlr_renderer *renderer; @@ -19,10 +19,11 @@ struct timespec *when; }; - void render_surface( struct wlr_surface *surface, int sx, int sy, void *data ); void on_frame(struct wl_listener *listener, void *data); void on_new_output(struct wl_listener *listener, void *data); void set_up_outputs(struct server *server); + +#endif
src/input.h Modified
@@ -1,8 +1,8 @@ -#pragma once +#ifndef DESKWM_INPUT_H +#define DESKWM_INPUT_H #include "types.h" - void process_cursor_move(struct server *server, uint32_t time); void process_cursor_resize(struct server *server, uint32_t time); void process_cursor_motion(struct server *server, uint32_t time); @@ -29,3 +29,5 @@ void on_request_set_selection(struct wl_listener *listener, void *data); void set_up_cursor(struct server *server); void set_up_keyboard(struct server *server); + +#endif
src/deskwm.h Modified
@@ -1,6 +1,8 @@ -#pragma once +#ifndef DESKWM_DESKWM_H +#define DESKWM_DESKWM_H #include "types.h" - struct server create_server(); + +#endif
src/config.h Modified
@@ -1,6 +1,9 @@ -#pragma once +#ifndef DESKWM_CONFIG_H +#define DESKWM_CONFIG_H #include "types.h" void load_config(struct server *server); + +#endif