touch up the clang format and format all files

2 files changed, 132 insertions, 139 deletions

diff --git a/src/protocols/ToplevelExport.hpp b/src/protocols/ToplevelExport.hpp
index 30c2d33f..e1c526db 100644
--- a/src/protocols/ToplevelExport.hpp
+++ b/src/protocols/ToplevelExport.hpp
@@ -45,11 +45,11 @@ class CToplevelExportProtocolManager {
   public:
     CToplevelExportProtocolManager();
 
-    void                        bindManager(wl_client* client, void* data, uint32_t version, uint32_t id);
-    void                        captureToplevel(wl_client* client, wl_resource* resource, uint32_t frame, int32_t overlay_cursor, CWindow* handle);
-    void                        removeClient(SToplevelClient* client, bool force = false);
-    void                        removeFrame(SToplevelFrame* frame, bool force = false);
-    void                        copyFrame(wl_client* client, wl_resource* resource, wl_resource* buffer, int32_t ignore_damage);
+    void bindManager(wl_client* client, void* data, uint32_t version, uint32_t id);
+    void captureToplevel(wl_client* client, wl_resource* resource, uint32_t frame, int32_t overlay_cursor, CWindow* handle);
+    void removeClient(SToplevelClient* client, bool force = false);
+    void removeFrame(SToplevelFrame* frame, bool force = false);
+    void copyFrame(wl_client* client, wl_resource* resource, wl_resource* buffer, int32_t ignore_damage);
 
     void onMonitorRender(CMonitor* pMonitor);
     void displayDestroy();
diff --git a/src/protocols/ToplevelExportWlrFuncs.hpp b/src/protocols/ToplevelExportWlrFuncs.hpp
index 1423f617..39e2961b 100644
--- a/src/protocols/ToplevelExportWlrFuncs.hpp
+++ b/src/protocols/ToplevelExportWlrFuncs.hpp
@@ -17,147 +17,146 @@ struct wlr_pixel_format_info {
 
 static const struct wlr_pixel_format_info pixel_format_info[] = {
     {
-        .drm_format = DRM_FORMAT_XRGB8888,
+        .drm_format        = DRM_FORMAT_XRGB8888,
         .opaque_substitute = DRM_FORMAT_INVALID,
-        .bpp = 32,
-        .has_alpha = false,
+        .bpp               = 32,
+        .has_alpha         = false,
     },
     {
-        .drm_format = DRM_FORMAT_ARGB8888,
+        .drm_format        = DRM_FORMAT_ARGB8888,
         .opaque_substitute = DRM_FORMAT_XRGB8888,
-        .bpp = 32,
-        .has_alpha = true,
+        .bpp               = 32,
+        .has_alpha         = true,
     },
     {
-        .drm_format = DRM_FORMAT_XBGR8888,
+        .drm_format        = DRM_FORMAT_XBGR8888,
         .opaque_substitute = DRM_FORMAT_INVALID,
-        .bpp = 32,
-        .has_alpha = false,
+        .bpp               = 32,
+        .has_alpha         = false,
     },
     {
-        .drm_format = DRM_FORMAT_ABGR8888,
+        .drm_format        = DRM_FORMAT_ABGR8888,
         .opaque_substitute = DRM_FORMAT_XBGR8888,
-        .bpp = 32,
-        .has_alpha = true,
+        .bpp               = 32,
+        .has_alpha         = true,
     },
     {
-        .drm_format = DRM_FORMAT_RGBX8888,
+        .drm_format        = DRM_FORMAT_RGBX8888,
         .opaque_substitute = DRM_FORMAT_INVALID,
-        .bpp = 32,
-        .has_alpha = false,
+        .bpp               = 32,
+        .has_alpha         = false,
     },
     {
-        .drm_format = DRM_FORMAT_RGBA8888,
+        .drm_format        = DRM_FORMAT_RGBA8888,
         .opaque_substitute = DRM_FORMAT_RGBX8888,
-        .bpp = 32,
-        .has_alpha = true,
+        .bpp               = 32,
+        .has_alpha         = true,
     },
     {
-        .drm_format = DRM_FORMAT_BGRX8888,
+        .drm_format        = DRM_FORMAT_BGRX8888,
         .opaque_substitute = DRM_FORMAT_INVALID,
-        .bpp = 32,
-        .has_alpha = false,
+        .bpp               = 32,
+        .has_alpha         = false,
     },
     {
-        .drm_format = DRM_FORMAT_BGRA8888,
+        .drm_format        = DRM_FORMAT_BGRA8888,
         .opaque_substitute = DRM_FORMAT_BGRX8888,
-        .bpp = 32,
-        .has_alpha = true,
+        .bpp               = 32,
+        .has_alpha         = true,
     },
     {
-        .drm_format = DRM_FORMAT_BGR888,
+        .drm_format        = DRM_FORMAT_BGR888,
         .opaque_substitute = DRM_FORMAT_INVALID,
-        .bpp = 24,
-        .has_alpha = false,
+        .bpp               = 24,
+        .has_alpha         = false,
     },
     {
-        .drm_format = DRM_FORMAT_RGBX4444,
+        .drm_format        = DRM_FORMAT_RGBX4444,
         .opaque_substitute = DRM_FORMAT_INVALID,
-        .bpp = 16,
-        .has_alpha = false,
+        .bpp               = 16,
+        .has_alpha         = false,
     },
     {
-        .drm_format = DRM_FORMAT_RGBA4444,
+        .drm_format        = DRM_FORMAT_RGBA4444,
         .opaque_substitute = DRM_FORMAT_RGBX4444,
-        .bpp = 16,
-        .has_alpha = true,
+        .bpp               = 16,
+        .has_alpha         = true,
     },
     {
-        .drm_format = DRM_FORMAT_RGBX5551,
+        .drm_format        = DRM_FORMAT_RGBX5551,
         .opaque_substitute = DRM_FORMAT_INVALID,
-        .bpp = 16,
-        .has_alpha = false,
+        .bpp               = 16,
+        .has_alpha         = false,
     },
     {
-        .drm_format = DRM_FORMAT_RGBA5551,
+        .drm_format        = DRM_FORMAT_RGBA5551,
         .opaque_substitute = DRM_FORMAT_RGBX5551,
-        .bpp = 16,
-        .has_alpha = true,
+        .bpp               = 16,
+        .has_alpha         = true,
     },
     {
-        .drm_format = DRM_FORMAT_RGB565,
+        .drm_format        = DRM_FORMAT_RGB565,
         .opaque_substitute = DRM_FORMAT_INVALID,
-        .bpp = 16,
-        .has_alpha = false,
+        .bpp               = 16,
+        .has_alpha         = false,
     },
     {
-        .drm_format = DRM_FORMAT_BGR565,
+        .drm_format        = DRM_FORMAT_BGR565,
         .opaque_substitute = DRM_FORMAT_INVALID,
-        .bpp = 16,
-        .has_alpha = false,
+        .bpp               = 16,
+        .has_alpha         = false,
     },
     {
-        .drm_format = DRM_FORMAT_XRGB2101010,
+        .drm_format        = DRM_FORMAT_XRGB2101010,
         .opaque_substitute = DRM_FORMAT_INVALID,
-        .bpp = 32,
-        .has_alpha = false,
+        .bpp               = 32,
+        .has_alpha         = false,
     },
     {
-        .drm_format = DRM_FORMAT_ARGB2101010,
+        .drm_format        = DRM_FORMAT_ARGB2101010,
         .opaque_substitute = DRM_FORMAT_XRGB2101010,
-        .bpp = 32,
-        .has_alpha = true,
+        .bpp               = 32,
+        .has_alpha         = true,
     },
     {
-        .drm_format = DRM_FORMAT_XBGR2101010,
+        .drm_format        = DRM_FORMAT_XBGR2101010,
         .opaque_substitute = DRM_FORMAT_INVALID,
-        .bpp = 32,
-        .has_alpha = false,
+        .bpp               = 32,
+        .has_alpha         = false,
     },
     {
-        .drm_format = DRM_FORMAT_ABGR2101010,
+        .drm_format        = DRM_FORMAT_ABGR2101010,
         .opaque_substitute = DRM_FORMAT_XBGR2101010,
-        .bpp = 32,
-        .has_alpha = true,
+        .bpp               = 32,
+        .has_alpha         = true,
     },
     {
-        .drm_format = DRM_FORMAT_XBGR16161616F,
+        .drm_format        = DRM_FORMAT_XBGR16161616F,
         .opaque_substitute = DRM_FORMAT_INVALID,
-        .bpp = 64,
-        .has_alpha = false,
+        .bpp               = 64,
+        .has_alpha         = false,
     },
     {
-        .drm_format = DRM_FORMAT_ABGR16161616F,
+        .drm_format        = DRM_FORMAT_ABGR16161616F,
         .opaque_substitute = DRM_FORMAT_XBGR16161616F,
-        .bpp = 64,
-        .has_alpha = true,
+        .bpp               = 64,
+        .has_alpha         = true,
     },
     {
-        .drm_format = DRM_FORMAT_XBGR16161616,
+        .drm_format        = DRM_FORMAT_XBGR16161616,
         .opaque_substitute = DRM_FORMAT_INVALID,
-        .bpp = 64,
-        .has_alpha = false,
+        .bpp               = 64,
+        .has_alpha         = false,
     },
     {
-        .drm_format = DRM_FORMAT_ABGR16161616,
+        .drm_format        = DRM_FORMAT_ABGR16161616,
         .opaque_substitute = DRM_FORMAT_XBGR16161616,
-        .bpp = 64,
-        .has_alpha = true,
+        .bpp               = 64,
+        .has_alpha         = true,
     },
 };
 
-static const size_t pixel_format_info_size =
-    sizeof(pixel_format_info) / sizeof(pixel_format_info[0]);
+static const size_t                 pixel_format_info_size = sizeof(pixel_format_info) / sizeof(pixel_format_info[0]);
 
 const struct wlr_pixel_format_info* drm_get_pixel_format_info(uint32_t fmt) {
     for (size_t i = 0; i < pixel_format_info_size; ++i) {
@@ -171,23 +170,17 @@ const struct wlr_pixel_format_info* drm_get_pixel_format_info(uint32_t fmt) {
 
 uint32_t convert_wl_shm_format_to_drm(enum wl_shm_format fmt) {
     switch (fmt) {
-        case WL_SHM_FORMAT_XRGB8888:
-            return DRM_FORMAT_XRGB8888;
-        case WL_SHM_FORMAT_ARGB8888:
-            return DRM_FORMAT_ARGB8888;
-        default:
-            return (uint32_t)fmt;
+        case WL_SHM_FORMAT_XRGB8888: return DRM_FORMAT_XRGB8888;
+        case WL_SHM_FORMAT_ARGB8888: return DRM_FORMAT_ARGB8888;
+        default: return (uint32_t)fmt;
     }
 }
 
 enum wl_shm_format convert_drm_format_to_wl_shm(uint32_t fmt) {
     switch (fmt) {
-        case DRM_FORMAT_XRGB8888:
-            return WL_SHM_FORMAT_XRGB8888;
-        case DRM_FORMAT_ARGB8888:
-            return WL_SHM_FORMAT_ARGB8888;
-        default:
-            return (enum wl_shm_format)fmt;
+        case DRM_FORMAT_XRGB8888: return WL_SHM_FORMAT_XRGB8888;
+        case DRM_FORMAT_ARGB8888: return WL_SHM_FORMAT_ARGB8888;
+        default: return (enum wl_shm_format)fmt;
     }
 }
 
@@ -196,108 +189,108 @@ struct wlr_gles2_pixel_format {
     // optional field, if empty then internalformat = format
     GLint gl_internalformat;
     GLint gl_format, gl_type;
-    bool has_alpha;
+    bool  has_alpha;
 };
 
 static const struct wlr_gles2_pixel_format formats[] = {
     {
         .drm_format = DRM_FORMAT_ARGB8888,
-        .gl_format = GL_BGRA_EXT,
-        .gl_type = GL_UNSIGNED_BYTE,
-        .has_alpha = true,
+        .gl_format  = GL_BGRA_EXT,
+        .gl_type    = GL_UNSIGNED_BYTE,
+        .has_alpha  = true,
     },
     {
         .drm_format = DRM_FORMAT_XRGB8888,
-        .gl_format = GL_BGRA_EXT,
-        .gl_type = GL_UNSIGNED_BYTE,
-        .has_alpha = false,
+        .gl_format  = GL_BGRA_EXT,
+        .gl_type    = GL_UNSIGNED_BYTE,
+        .has_alpha  = false,
     },
     {
         .drm_format = DRM_FORMAT_XBGR8888,
-        .gl_format = GL_RGBA,
-        .gl_type = GL_UNSIGNED_BYTE,
-        .has_alpha = false,
+        .gl_format  = GL_RGBA,
+        .gl_type    = GL_UNSIGNED_BYTE,
+        .has_alpha  = false,
     },
     {
         .drm_format = DRM_FORMAT_ABGR8888,
-        .gl_format = GL_RGBA,
-        .gl_type = GL_UNSIGNED_BYTE,
-        .has_alpha = true,
+        .gl_format  = GL_RGBA,
+        .gl_type    = GL_UNSIGNED_BYTE,
+        .has_alpha  = true,
     },
     {
         .drm_format = DRM_FORMAT_BGR888,
-        .gl_format = GL_RGB,
-        .gl_type = GL_UNSIGNED_BYTE,
-        .has_alpha = false,
+        .gl_format  = GL_RGB,
+        .gl_type    = GL_UNSIGNED_BYTE,
+        .has_alpha  = false,
     },
 #if WLR_LITTLE_ENDIAN
     {
         .drm_format = DRM_FORMAT_RGBX4444,
-        .gl_format = GL_RGBA,
-        .gl_type = GL_UNSIGNED_SHORT_4_4_4_4,
-        .has_alpha = false,
+        .gl_format  = GL_RGBA,
+        .gl_type    = GL_UNSIGNED_SHORT_4_4_4_4,
+        .has_alpha  = false,
     },
     {
         .drm_format = DRM_FORMAT_RGBA4444,
-        .gl_format = GL_RGBA,
-        .gl_type = GL_UNSIGNED_SHORT_4_4_4_4,
-        .has_alpha = true,
+        .gl_format  = GL_RGBA,
+        .gl_type    = GL_UNSIGNED_SHORT_4_4_4_4,
+        .has_alpha  = true,
     },
     {
         .drm_format = DRM_FORMAT_RGBX5551,
-        .gl_format = GL_RGBA,
-        .gl_type = GL_UNSIGNED_SHORT_5_5_5_1,
-        .has_alpha = false,
+        .gl_format  = GL_RGBA,
+        .gl_type    = GL_UNSIGNED_SHORT_5_5_5_1,
+        .has_alpha  = false,
     },
     {
         .drm_format = DRM_FORMAT_RGBA5551,
-        .gl_format = GL_RGBA,
-        .gl_type = GL_UNSIGNED_SHORT_5_5_5_1,
-        .has_alpha = true,
+        .gl_format  = GL_RGBA,
+        .gl_type    = GL_UNSIGNED_SHORT_5_5_5_1,
+        .has_alpha  = true,
     },
     {
         .drm_format = DRM_FORMAT_RGB565,
-        .gl_format = GL_RGB,
-        .gl_type = GL_UNSIGNED_SHORT_5_6_5,
-        .has_alpha = false,
+        .gl_format  = GL_RGB,
+        .gl_type    = GL_UNSIGNED_SHORT_5_6_5,
+        .has_alpha  = false,
     },
     {
         .drm_format = DRM_FORMAT_XBGR2101010,
-        .gl_format = GL_RGBA,
-        .gl_type = GL_UNSIGNED_INT_2_10_10_10_REV_EXT,
-        .has_alpha = false,
+        .gl_format  = GL_RGBA,
+        .gl_type    = GL_UNSIGNED_INT_2_10_10_10_REV_EXT,
+        .has_alpha  = false,
     },
     {
         .drm_format = DRM_FORMAT_ABGR2101010,
-        .gl_format = GL_RGBA,
-        .gl_type = GL_UNSIGNED_INT_2_10_10_10_REV_EXT,
-        .has_alpha = true,
+        .gl_format  = GL_RGBA,
+        .gl_type    = GL_UNSIGNED_INT_2_10_10_10_REV_EXT,
+        .has_alpha  = true,
     },
     {
         .drm_format = DRM_FORMAT_XBGR16161616F,
-        .gl_format = GL_RGBA,
-        .gl_type = GL_HALF_FLOAT_OES,
-        .has_alpha = false,
+        .gl_format  = GL_RGBA,
+        .gl_type    = GL_HALF_FLOAT_OES,
+        .has_alpha  = false,
     },
     {
         .drm_format = DRM_FORMAT_ABGR16161616F,
-        .gl_format = GL_RGBA,
-        .gl_type = GL_HALF_FLOAT_OES,
-        .has_alpha = true,
+        .gl_format  = GL_RGBA,
+        .gl_type    = GL_HALF_FLOAT_OES,
+        .has_alpha  = true,
     },
     {
-        .drm_format = DRM_FORMAT_XBGR16161616,
+        .drm_format        = DRM_FORMAT_XBGR16161616,
         .gl_internalformat = GL_RGBA16_EXT,
-        .gl_format = GL_RGBA,
-        .gl_type = GL_UNSIGNED_SHORT,
-        .has_alpha = false,
+        .gl_format         = GL_RGBA,
+        .gl_type           = GL_UNSIGNED_SHORT,
+        .has_alpha         = false,
     },
     {
-        .drm_format = DRM_FORMAT_ABGR16161616,
+        .drm_format        = DRM_FORMAT_ABGR16161616,
         .gl_internalformat = GL_RGBA16_EXT,
-        .gl_format = GL_RGBA,
-        .gl_type = GL_UNSIGNED_SHORT,
-        .has_alpha = true,
+        .gl_format         = GL_RGBA,
+        .gl_type           = GL_UNSIGNED_SHORT,
+        .has_alpha         = true,
     },
 #endif
 };