Merge tag '1.7.3' into wayland

test/helper-pidfile.c

@@ -25,101 +25,78 @@
  *
  */
 
-#include <assert.h>
-#include <locale.h>
-#include <glib.h>
-#include <stdio.h>
-#include <helper.h>
-#include <string.h>
 #include "display.h"
+#include "rofi-icon-fetcher.h"
 #include "rofi.h"
 #include "settings.h"
 #include "widgets/textbox.h"
-#include "rofi-icon-fetcher.h"
+#include <assert.h>
+#include <glib.h>
+#include <helper.h>
+#include <locale.h>
+#include <stdio.h>
+#include <string.h>
 
-static int       test = 0;
+static int test = 0;
 
-#define TASSERT( a )        {                            \
-        assert ( a );                                    \
-        printf ( "Test %i passed (%s)\n", ++test, # a ); \
-}
+#define TASSERT(a)                                                             \
+  {                                                                            \
+    assert(a);                                                                 \
+    printf("Test %i passed (%s)\n", ++test, #a);                               \
+  }
 #include "theme.h"
 ThemeWidget *rofi_theme = NULL;
 
-uint32_t rofi_icon_fetcher_query ( const char *name, const int size )
-{
-  return 0;
-}
-uint32_t rofi_icon_fetcher_query_advanced ( const char *name, const int wsize, const int hsize )
-{
+uint32_t rofi_icon_fetcher_query(const char *name, const int size) { return 0; }
+uint32_t rofi_icon_fetcher_query_advanced(const char *name, const int wsize,
+                                          const int hsize) {
   return 0;
 }
 
-cairo_surface_t * rofi_icon_fetcher_get ( const uint32_t uid )
-{
-  return NULL;
-}
+cairo_surface_t *rofi_icon_fetcher_get(const uint32_t uid) { return NULL; }
 
-void rofi_clear_error_messages ( void )
-{
-}
+void rofi_clear_error_messages(void) {}
 
-gboolean rofi_theme_parse_string ( const char *string )
-{
-  return FALSE;
+gboolean rofi_theme_parse_string(const char *string) { return FALSE; }
+double textbox_get_estimated_char_height(void) { return 12.0; }
+void rofi_view_get_current_monitor(int *width, int *height) {
+  *width = 1920;
+  *height = 1080;
 }
-double textbox_get_estimated_char_height ( void )
-{
-  return 12.0;
-}
-void rofi_view_get_current_monitor ( int *width, int *height )
-{
-*width = 1920;
-*height = 1080;
-}
-double textbox_get_estimated_ch ( void )
-{
-  return 9.0;
-}
-void rofi_add_error_message ( G_GNUC_UNUSED GString *msg )
-{
-}
-int rofi_view_error_dialog ( const char *msg, G_GNUC_UNUSED int markup )
-{
-    fputs ( msg, stderr );
-    return TRUE;
-}
-int monitor_active ( G_GNUC_UNUSED workarea *mon )
-{
-    return 0;
+double textbox_get_estimated_ch(void) { return 9.0; }
+void rofi_add_error_message(G_GNUC_UNUSED GString *msg) {}
+int rofi_view_error_dialog(const char *msg, G_GNUC_UNUSED int markup) {
+  fputs(msg, stderr);
+  return TRUE;
 }
+int monitor_active(G_GNUC_UNUSED workarea *mon) { return 0; }
 
-void display_startup_notification ( G_GNUC_UNUSED RofiHelperExecuteContext *context, G_GNUC_UNUSED GSpawnChildSetupFunc *child_setup, G_GNUC_UNUSED gpointer *user_data )
-{
-}
+void display_startup_notification(
+    G_GNUC_UNUSED RofiHelperExecuteContext *context,
+    G_GNUC_UNUSED GSpawnChildSetupFunc *child_setup,
+    G_GNUC_UNUSED gpointer *user_data) {}
 
-int main ( G_GNUC_UNUSED int argc, G_GNUC_UNUSED char **argv )
-{
-    if ( setlocale ( LC_ALL, "" ) == NULL ) {
-        fprintf ( stderr, "Failed to set locale.\n" );
-        return EXIT_FAILURE;
-    }
-    // Pid test.
-    // Tests basic functionality of writing it, locking, seeing if I can write same again
-    // And close/reopen it again.
-    {
-        const char *tmpd = g_get_tmp_dir ();
-        char *path = g_build_filename (tmpd, "rofi-pid.pid", NULL);
-        TASSERT ( create_pid_file ( NULL ) == -1 );
-        int fd = create_pid_file ( path );
-        TASSERT ( fd >= 0 );
-        int fd2 = create_pid_file ( path );
-        TASSERT ( fd2 <  0 );
+int main(G_GNUC_UNUSED int argc, G_GNUC_UNUSED char **argv) {
+  if (setlocale(LC_ALL, "") == NULL) {
+    fprintf(stderr, "Failed to set locale.\n");
+    return EXIT_FAILURE;
+  }
+  // Pid test.
+  // Tests basic functionality of writing it, locking, seeing if I can write
+  // same again And close/reopen it again.
+  {
+    const char *tmpd = g_get_tmp_dir();
+    char *path = g_build_filename(tmpd, "rofi-pid.pid", NULL);
+    TASSERT(create_pid_file(NULL, FALSE) == -1);
+    int fd = create_pid_file(path, FALSE);
+    TASSERT(fd >= 0);
+    int fd2 = create_pid_file(path, FALSE);
+    TASSERT(fd2 < 0);
 
-        remove_pid_file ( fd );
-        fd = create_pid_file ( path );
-        TASSERT ( fd >= 0 );
-        remove_pid_file ( fd );
-        free ( path );
-    }
+    remove_pid_file(fd);
+    fd = create_pid_file(path, FALSE);
+    TASSERT(fd >= 0);
+    remove_pid_file(fd);
+    free(path);
+  }
 }