PR#11 improvment proposal

.clang-format

@@ -1,4 +1,55 @@
 ---
-IndentWidth: '2'
-
-...
+Language: Cpp
+IndentWidth: 2
+AlignConsecutiveAssignments:
+  Enabled: true
+  AcrossEmptyLines: false
+  AcrossComments: true
+  AlignCompound: true
+  PadOperators: true
+AlignConsecutiveBitFields: Consecutive
+AlignConsecutiveMacros: Consecutive
+AlignConsecutiveShortCaseStatements:
+  Enabled: true
+  # AlignCaseArrows: true
+  AlignCaseColons: true
+AlignOperands: Align
+AlignTrailingComments: Always
+AllowShortBlocksOnASingleLine: Always
+AllowShortCaseLabelsOnASingleLine: true
+# AllowShortCaseExpressionOnASingleLine: true
+AllowShortEnumsOnASingleLine: true
+AllowShortFunctionsOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: AllIfsAndElse
+AllowShortLambdasOnASingleLine: All
+AllowShortLoopsOnASingleLine: true
+BinPackArguments: true
+BinPackParameters: true
+BreakBeforeBraces: Attach
+BreakBeforeConceptDeclarations: Never
+BreakBeforeBinaryOperators: true
+BreakBeforeTernaryOperators: true
+ColumnLimit: 128
+IndentCaseBlocks: false
+IndentCaseLabels: true
+IndentPPDirectives: AfterHash
+InsertBraces: false
+InsertNewlineAtEOF: true
+LineEnding: LF
+PointerAlignment: Right
+QualifierAlignment: Left
+ReferenceAlignment: Right
+ReflowComments: true
+RemoveBracesLLVM: true
+SeparateDefinitionBlocks: Always
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCaseColon: false
+SpaceBeforeParens: ControlStatementsExceptControlMacros
+SpaceBeforeSquareBrackets: false
+SpaceInEmptyBlock: false
+SpacesInAngles: Never
+SpacesInLineCommentPrefix:
+  Minimum: 1
+  Maximum: 1
+SpacesInParens: Never
+UseTab: Never

CHANGELOG.md

@@ -6,6 +6,14 @@ This project tries to adhere to [Semantic Versioning][2].
 
 ## [Unreleased]
 
+### Added
+
+Support for saving kanshi config file
+
+### Changed
+
+### Fixed
+
 ## [1.1.1] - 2023-07-01
 
 ### Added

protocol/meson.build

@@ -5,7 +5,7 @@ wayland_scanner = find_program('wayland-scanner')
 wayland_client = dependency('wayland-client')
 wayland_protos = dependency('wayland-protocols', version: '>=1.17')
 
-wl_protocol_dir = wayland_protos.get_pkgconfig_variable('pkgdatadir')
+wl_protocol_dir = wayland_protos.get_variable('pkgdatadir')
 
 wayland_scanner_code = generator(
   wayland_scanner,

src/main.c

@@ -1083,7 +1083,7 @@ static void activate(GtkApplication* app, gpointer user_data) {
 
 int main(int argc, char *argv[]) {
   g_setenv("GDK_GL", "gles", FALSE);
-  GtkApplication *app = gtk_application_new(WDISPLAYS_APP_ID, G_APPLICATION_FLAGS_NONE);
+  GtkApplication *app = gtk_application_new(WDISPLAYS_APP_ID, G_APPLICATION_DEFAULT_FLAGS);
   g_signal_connect(app, "activate", G_CALLBACK(activate), NULL);
   int status = g_application_run(G_APPLICATION(app), argc, argv);
   g_object_unref(app);

src/meson.build

@@ -6,7 +6,7 @@ m_dep = cc.find_library('m', required : false)
 rt_dep = cc.find_library('rt', required : false)
 gdk = dependency('gdk-3.0', version: '>= 3.24')
 gtk = dependency('gtk+-3.0', version: '>= 3.24')
-assert(gdk.get_pkgconfig_variable('targets').split().contains('wayland'), 'Wayland GDK backend not present')
+assert(gdk.get_variable('targets').split().contains('wayland'), 'Wayland GDK backend not present')
 epoxy = dependency('epoxy')
 
 configure_file(input: 'config.h.in', output: 'config.h', configuration: conf)

src/outputs.c

@@ -533,7 +533,7 @@ static void output_manager_handle_done(void *data,
 static const struct zwlr_output_manager_v1_listener output_manager_listener = {
   .head = output_manager_handle_head,
   .done = output_manager_handle_done,
-  .finished = noop,
+  .finished = (void (*)(void *, struct zwlr_output_manager_v1 *))noop,
 };
 static void registry_handle_global(void *data, struct wl_registry *registry,
     uint32_t name, const char *interface, uint32_t version) {
@@ -560,7 +560,7 @@ static void registry_handle_global(void *data, struct wl_registry *registry,
 
 static const struct wl_registry_listener registry_listener = {
   .global = registry_handle_global,
-  .global_remove = noop,
+  .global_remove = (void (*)(void *, struct wl_registry *, uint32_t))noop,
 };
 
 void wd_add_output_management_listener(struct wd_state *state, struct
@@ -610,10 +610,10 @@ static void output_name(void *data, struct zxdg_output_v1 *zxdg_output_v1,
 
 static const struct zxdg_output_v1_listener output_listener = {
   .logical_position = output_logical_position,
-  .logical_size = noop,
-  .done = noop,
+  .logical_size = (void (*)(void *, struct zxdg_output_v1 *, int32_t,  int32_t))noop,
+  .done = (void (*)(void *, struct zxdg_output_v1 *))noop,
   .name = output_name,
-  .description = noop
+  .description = (void (*)(void *, struct zxdg_output_v1 *, const char *))noop
 };
 
 void wd_add_output(struct wd_state *state, struct wl_output *wl_output,