From 7ecc9290115d106c75b1ac19e5a8fe54569c06ed Mon Sep 17 00:00:00 2001 From: Fierelier Date: Sun, 21 Apr 2024 14:59:04 +0200 Subject: [PATCH] Remove multi-line typedefs --- src/main.h | 55 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 22 deletions(-) diff --git a/src/main.h b/src/main.h index 5e379a6..baa63b4 100644 --- a/src/main.h +++ b/src/main.h @@ -23,10 +23,11 @@ typedef unigi_type_uint8 unigi_type_event_enum; typedef unigi_type_int16 unigi_type_input_joypad_analog; // Event -typedef struct unigi_type_event { +struct unigi_type_event { unigi_type_event_enum id; void * data; -} unigi_type_event; +}; +typedef struct unigi_type_event unigi_type_event; #define unigi_enum_event_unknown 0 #define unigi_enum_event_none 1 #define unigi_enum_event_window_exit 2 @@ -42,59 +43,69 @@ typedef struct unigi_type_event { #include unigi_flag_platform_main_h // Misc -typedef struct unigi_type_event_data_unknown { +struct unigi_type_event_data_unknown { unigi_type_bool none; -} unigi_type_event_data_unknown; +}; +typedef struct unigi_type_event_data_unknown unigi_type_event_data_unknown; typedef unigi_type_event_data_unknown unigi_type_event_data_none; // Window typedef unigi_type_event_data_none unigi_type_event_data_window_exit; -typedef struct unigi_type_event_data_window_focus { +struct unigi_type_event_data_window_focus { unigi_type_bool focused; -} unigi_type_event_data_window_focus; +}; +typedef struct unigi_type_event_data_window_focus unigi_type_event_data_window_focus; // Input -typedef struct unigi_type_event_data_input_keyboard_button { +struct unigi_type_event_data_input_keyboard_button { unigi_type_input_keyboard_button button; unigi_type_bool pressed; -} unigi_type_event_data_input_keyboard_button; +}; +typedef struct unigi_type_event_data_input_keyboard_button unigi_type_event_data_input_keyboard_button; -typedef struct unigi_type_event_data_input_mouse_button { +struct unigi_type_event_data_input_mouse_button { unigi_type_input_mouse_button button; unigi_type_bool pressed; -} unigi_type_event_data_input_mouse_button; +}; +typedef struct unigi_type_event_data_input_mouse_button unigi_type_event_data_input_mouse_button; -typedef struct unigi_type_event_data_input_mouse_wheel { +struct unigi_type_event_data_input_mouse_wheel { unigi_type_int8 scroll; -} unigi_type_event_data_input_mouse_wheel; +}; +typedef struct unigi_type_event_data_input_mouse_wheel unigi_type_event_data_input_mouse_wheel; -typedef struct unigi_type_event_data_input_mouse_move { +struct unigi_type_event_data_input_mouse_move { unigi_type_resolution_pixel_axis x; unigi_type_resolution_pixel_axis y; -} unigi_type_event_data_input_mouse_move; +}; +typedef struct unigi_type_event_data_input_mouse_move unigi_type_event_data_input_mouse_move; -typedef struct unigi_type_event_data_input_joypad_button { +struct unigi_type_event_data_input_joypad_button { unigi_type_input_mouse_button button; unigi_type_bool pressed; -} unigi_type_event_data_input_joypad_button; +}; +typedef struct unigi_type_event_data_input_joypad_button unigi_type_event_data_input_joypad_button; -typedef struct unigi_type_event_data_input_joypad_analog { +struct unigi_type_event_data_input_joypad_analog { unigi_type_input_joypad_button axis; unigi_type_input_joypad_analog analog; -} unigi_type_event_data_input_joypad_analog; +}; +typedef struct unigi_type_event_data_input_joypad_analog unigi_type_event_data_input_joypad_analog; // Resolution -typedef struct unigi_type_resolution { +struct unigi_type_resolution { unigi_type_resolution_pixel_axis width; unigi_type_resolution_pixel_axis height; unigi_type_color_depth depth; unigi_type_bool fullscreen; -} unigi_type_resolution; +}; +typedef struct unigi_type_resolution unigi_type_resolution; -typedef struct unigi_type_resolution_range { +struct unigi_type_resolution_range { unigi_type_resolution * min; unigi_type_resolution * max; -} unigi_type_resolution_range; +}; +typedef struct unigi_type_resolution_range unigi_type_resolution_range; unigi_type_resolution_range * unigi_status_resolutions; unigi_type_resolution unigi_status_resolution;