From 51a3950aa8df4aad3a77c72ab1f5989892904715 Mon Sep 17 00:00:00 2001
From: Nick Gasson <nick@nickg.me.uk>
Date: Mon, 3 Feb 2020 16:59:27 +0800
Subject: [PATCH] Whitespace and cosmetic fixes

---
 src/floating_shape.c |  2 +-
 src/xcowsay.c        |  2 +-
 src/xcowsayd.c       | 22 +++++++++++++---------
 test.sh              |  3 +++
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/floating_shape.c b/src/floating_shape.c
index 9da600d..aefe8ef 100644
--- a/src/floating_shape.c
+++ b/src/floating_shape.c
@@ -44,7 +44,7 @@ static gboolean draw_shape(GtkWidget *widget, GdkEventExpose *event,
 
    cr = gdk_cairo_create(gtk_widget_get_window(widget));
 
-   cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, 0.0);
+   cairo_set_source_rgba(cr, 1.0, 1.0, 1.0, 0.0);
 
    gtk_window_get_size(GTK_WINDOW(widget), &width, &height);
 
diff --git a/src/xcowsay.c b/src/xcowsay.c
index 0ac3b0d..daba63f 100644
--- a/src/xcowsay.c
+++ b/src/xcowsay.c
@@ -117,7 +117,7 @@ static void usage()
       "     --bubble-at=X,Y\t%s\n"
       "     --no-wrap\t\t%s\n"
       "     --config=FILE\t%s\n"
-      "     --debug\t\t%s\n\n"
+      "     --debug\t\t%s\n"
       "     --release\t\t%s\n\n"
       "%s\n\n"
       "%s\n\n"
diff --git a/src/xcowsayd.c b/src/xcowsayd.c
index 02da251..645f0ba 100644
--- a/src/xcowsayd.c
+++ b/src/xcowsayd.c
@@ -1,5 +1,5 @@
 /*  xcowsayd.c -- DBus xcowsay daemon.
- *  Copyright (C) 2008  Nick Gasson
+ *  Copyright (C) 2008-2020  Nick Gasson
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -93,7 +93,7 @@ static void enqueue_request(const char *mess, cowmode_t mode)
       }
       REQUEST_READY_SIGNAL;
    }
-   QUEUE_MUTEX_UNLOCK;   
+   QUEUE_MUTEX_UNLOCK;
 }
 
 static void wait_for_request(const char** mess, cowmode_t *mode)
@@ -125,9 +125,11 @@ static void request_complete()
 static gpointer cow_display_thread(gpointer data)
 {
    bool debug = *(bool*)data;
-   
+
    debug_msg("In the cow display thread\n");
 
+   g_mutex_lock(display_lock);
+
    for (;;) {
       const char *mess;
       cowmode_t mode;
@@ -142,10 +144,12 @@ static gpointer cow_display_thread(gpointer data)
       gdk_threads_leave();
 
       g_cond_wait(display_complete, display_lock);
-      
+
       request_complete();
    }
-   
+
+   g_mutex_unlock(display_lock);
+
    return NULL;
 }
 
@@ -189,8 +193,8 @@ static void cowsayd_init(Cowsay *server)
       exit(EXIT_FAILURE);
    }
 
-   g_object_unref(driver_proxy);       
-                                       
+   g_object_unref(driver_proxy);
+
 }
 
 static gboolean cowsay_show_cow(Cowsay *obj, const gchar *mess, GError **error)
@@ -255,12 +259,12 @@ void run_cowsay_daemon(bool debug, int argc, char **argv)
    request_ready = g_cond_new();
    display_complete = g_cond_new();
    display_lock = g_mutex_new();
-   
+
    cowsay_init(&argc, &argv);
 
    g_type_init();
    Cowsay *server = g_object_new(cowsayd_get_type(), NULL);
-   
+
    GThread *displ = g_thread_create(cow_display_thread, (gpointer)&debug, FALSE, NULL);
    g_assert(displ);
 
diff --git a/test.sh b/test.sh
index 4761127..12e47da 100755
--- a/test.sh
+++ b/test.sh
@@ -16,3 +16,6 @@ $BUILD_DIR/src/xcowsay --think Hello World --left
 
 echo Dream
 $BUILD_DIR/src/xcowsay --dream $SRC_DIR/cow_small.png -t 2
+
+echo Unicode and Pango attributes
+$BUILD_DIR/src/xcowsay "<b>你好</b> <i>world</i>"
-- 
2.39.2