tz-launcher: fix warnings, coding style, memory leak

This commit fixes all the warnings issued during the
"tz-launcher" compilation process. It also enforces
coding style consistency, and fixes one memory leak
of a cairo context.

Change-Id: Ide7a7d8ada146c54c8bc493277d384854793709f
Signed-off-by: Manuel Bachmann <manuel.bachmann@open.eurogiciel.org>

diff --git a/packaging/weston-common.spec b/packaging/weston-common.spec
index 075c29b..6faae7f 100644 (file)
--- a/packaging/weston-common.spec
+++ b/packaging/weston-common.spec
@@ -44,7 +44,7 @@ ExclusiveArch:
 Summary: A small launcher for Wayland compositors
 
 %description tz-launcher
-A small launcher for Wayland compositors
+A small launcher for Wayland compositors, which reads .desktop files from paths given on the command line or in a config file, and then displays them graphically.
 ############
 
 %description

diff --git a/src/Makefile.am b/src/Makefile.am
index c1ecd64..ce29423 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -30,7 +30,7 @@ tz_launcher_SOURCES =                                 \
        toytoolkit/window.c
 
 wl_pre_LDFLAGS = -export-dynamic
-wl_pre_CFLAGS = $(GCC_CFLAGS) $(CLIENT_CFLAGS)
+wl_pre_CFLAGS = $(GCC_CFLAGS) $(CLIENT_CFLAGS) -Wno-unused-result
 wl_pre_LDADD = $(DLOPEN_LIBS) $(CLIENT_LIBS)
 
 wl_pre_SOURCES = wl-pre.c

diff --git a/src/tz-launcher-wl.c b/src/tz-launcher-wl.c
index 4ef94a0..ba7df70 100644 (file)
--- a/src/tz-launcher-wl.c
+++ b/src/tz-launcher-wl.c
@@ -2,6 +2,7 @@
 
 #include <stdlib.h>
 #include <unistd.h>
+#include <sys/wait.h>
 
 #include <glib.h>
 #include <gio/gio.h>
@@ -96,8 +97,8 @@ load_icon_from_themes (char *iconpath, char *path)
                GFileType type = g_file_info_get_file_type (info);
                switch (type) {
                        case G_FILE_TYPE_REGULAR:
-                               if ((!strcmp (iconpath, g_file_info_get_name (info))) ||
-                                   (!strcmp (g_strconcat (iconpath, ".png", NULL), g_file_info_get_name (info)))) {
+                               if ((!g_strcmp0 (iconpath, g_file_info_get_name (info))) ||
+                                   (!g_strcmp0 (g_strconcat (iconpath, ".png", NULL), g_file_info_get_name (info)))) {
                                        icon_temp = cairo_image_surface_create_from_png (subpath);
                                        return icon_temp;
                                }
@@ -107,6 +108,8 @@ load_icon_from_themes (char *iconpath, char *path)
                                if (icon_temp)
                                        return icon_temp;
                                break;
+                       default:
+                               break;
                }
                g_free (subpath);
                g_object_unref (info);
@@ -160,7 +163,7 @@ load_icon (char *path)
         /* resize the icon to 32x32 */
        int width = cairo_image_surface_get_width(icon_temp);
        int height = cairo_image_surface_get_height(icon_temp);
-       if (width != height != 32) {
+       if ((width != 32) && (height != 32)) {
                double ratio = ((32.0/width) < (32.0/height) ? (32.0/width) : (32.0/height));
                cairo_scale (cr, ratio, ratio);
        }
@@ -184,17 +187,17 @@ sigchild_handler (int s)
 }
 
 static void
-keyboard_focus_handler(struct window *window,
-                      struct input *input, void *data)
+keyboard_focus_handler (struct window *window,
+                       struct input *input, void *data)
 {
-       window_schedule_redraw(main_window->window);
+       window_schedule_redraw (main_window->window);
 }
 
 static void
 launcher_button_handler(struct widget *widget,
-                             struct input *input, uint32_t time,
-                             uint32_t button,
-                             enum wl_pointer_button_state state, void *data)
+                       struct input *input, uint32_t time,
+                       uint32_t button, enum wl_pointer_button_state state,
+                       void *data)
 {
        struct launcher *launcher = data;
 
@@ -212,14 +215,14 @@ launcher_button_handler(struct widget *widget,
 }
 
 static void
-launcher_touch_up_handler(struct widget *widget, struct input *input,
-                            uint32_t serial, uint32_t time, int32_t id,
-                            void *data)
+launcher_touch_up_handler (struct widget *widget, struct input *input,
+                          uint32_t serial, uint32_t time, int32_t id,
+                          void *data)
 {
        struct launcher *launcher = data;
 
        launcher->focused = 0;
-       widget_schedule_redraw(widget);
+       widget_schedule_redraw (widget);
 
        gchar **command = g_strsplit (launcher->exec, " ", 0);
        if (command && command[0]) {
@@ -232,21 +235,21 @@ launcher_touch_up_handler(struct widget *widget, struct input *input,
 }
 
 static void
-launcher_touch_down_handler(struct widget *widget, struct input *input,
+launcher_touch_down_handler (struct widget *widget, struct input *input,
                             uint32_t serial, uint32_t time, int32_t id,
                             float x, float y, void *data)
 {
        struct launcher *launcher = data;
 
        launcher->focused = 1;
-       widget_schedule_redraw(widget);
+       widget_schedule_redraw (widget);
 
        main_window->selected_launcher = launcher;
 }
 
 static int
-launcher_enter_handler(struct widget *widget, struct input *input,
-                            float x, float y, void *data)
+launcher_enter_handler (struct widget *widget, struct input *input,
+                       float x, float y, void *data)
 {
        struct launcher *launcher = data;
 
@@ -259,8 +262,8 @@ launcher_enter_handler(struct widget *widget, struct input *input,
 }
 
 static void
-launcher_leave_handler(struct widget *widget,
-                            struct input *input, void *data)
+launcher_leave_handler (struct widget *widget,
+                       struct input *input, void *data)
 {
        struct launcher *launcher = data;
 
@@ -272,8 +275,8 @@ launcher_leave_handler(struct widget *widget,
 }
 
 static int
-launcher_motion_handler(struct widget *widget, struct input *input,
-                             uint32_t time, float x, float y, void *data)
+launcher_motion_handler (struct widget *widget, struct input *input,
+                        uint32_t time, float x, float y, void *data)
 {
        struct launcher *launcher = data;
 
@@ -283,71 +286,71 @@ launcher_motion_handler(struct widget *widget, struct input *input,
 }
 
 static void
-launcher_redraw_handler(struct widget *widget, void *data)
+launcher_redraw_handler (struct widget *widget, void *data)
 {
        struct launcher *launcher = data;
        struct rectangle allocation;
        cairo_t *cr;
 
-       cr = widget_cairo_create(main_window->widget);
+       cr = widget_cairo_create (main_window->widget);
 
-       widget_get_allocation(widget, &allocation);
+       widget_get_allocation (widget, &allocation);
        if (launcher->pressed) {
                allocation.x++;
                allocation.y++;
        }
 
-       cairo_set_source_surface(cr, launcher->icon,
-                                allocation.x, allocation.y);
-       cairo_paint(cr);
+       cairo_set_source_surface (cr, launcher->icon,
+                                 allocation.x, allocation.y);
+       cairo_paint (cr);
 
        if (launcher->focused) {
-               cairo_set_source_rgba(cr, 1.0, 1.0, 1.0, 0.4);
-               cairo_mask_surface(cr, launcher->icon,
-                                  allocation.x, allocation.y);
+               cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, 0.4);
+               cairo_mask_surface (cr, launcher->icon,
+                                   allocation.x, allocation.y);
        }
 
-       cairo_destroy(cr);
+       cairo_destroy (cr);
 }
 
 void
 main_window_add_launcher (gchar **desktopentry)
 {
        struct launcher *launcher;
-       launcher = xzalloc(sizeof *launcher);
+       launcher = xzalloc (sizeof *launcher);
 
        launcher->name = g_strdup (desktopentry[0]);
        launcher->comment = g_strdup (desktopentry[1]);
        launcher->exec = g_strdup (desktopentry[2]);
        launcher->icon = load_icon (desktopentry[3]);
 
-       if (strcmp("true", g_ascii_strdown(desktopentry[4],-1)) == 0)
+       if (g_strcmp0 ("true", g_ascii_strdown (desktopentry[4],-1)) == 0)
                launcher->terminal = TRUE;
        else
                launcher->terminal = FALSE;
 
-       wl_list_insert(main_window->launcher_list.prev, &launcher->link);
-
-       launcher->widget = widget_add_widget(main_window->widget, launcher);
-       window_set_keyboard_focus_handler(main_window->window, keyboard_focus_handler);
-       widget_set_enter_handler(launcher->widget, launcher_enter_handler);
-       widget_set_leave_handler(launcher->widget, launcher_leave_handler);
-       widget_set_motion_handler(launcher->widget, launcher_motion_handler);
-       widget_set_button_handler(launcher->widget, launcher_button_handler);
-       widget_set_touch_down_handler(launcher->widget, launcher_touch_down_handler);
-       widget_set_touch_up_handler(launcher->widget, launcher_touch_up_handler);
-       widget_set_redraw_handler(launcher->widget, launcher_redraw_handler);
+       wl_list_insert (main_window->launcher_list.prev, &launcher->link);
+
+       launcher->widget = widget_add_widget (main_window->widget, launcher);
+       window_set_keyboard_focus_handler (main_window->window, keyboard_focus_handler);
+       widget_set_enter_handler (launcher->widget, launcher_enter_handler);
+       widget_set_leave_handler (launcher->widget, launcher_leave_handler);
+       widget_set_motion_handler (launcher->widget, launcher_motion_handler);
+       widget_set_button_handler (launcher->widget, launcher_button_handler);
+       widget_set_touch_down_handler (launcher->widget, launcher_touch_down_handler);
+       widget_set_touch_up_handler (launcher->widget, launcher_touch_up_handler);
+       widget_set_redraw_handler (launcher->widget, launcher_redraw_handler);
 }
 
 static void
-resize_handler(struct widget *widget, int32_t width, int32_t height, void *data)
+resize_handler (struct widget *widget, int32_t width, int32_t height, void *data)
 {
        struct main_window *main_window = data;
        struct launcher *launcher;
        int x, y, w, h, i;
 
        x = 40; y = 60; i = 0;
-       wl_list_for_each(launcher, &main_window->launcher_list, link) {
+       wl_list_for_each (launcher, &main_window->launcher_list, link) {
                w = cairo_image_surface_get_width(launcher->icon);
                h = cairo_image_surface_get_height(launcher->icon);
                widget_set_allocation(launcher->widget,
@@ -361,7 +364,7 @@ resize_handler(struct widget *widget, int32_t width, int32_t height, void *data)
 }
 
 static void
-redraw_handler(struct widget *widget, void *data)
+redraw_handler (struct widget *widget, void *data)
 {
        struct main_window *main_window = data;
        struct rectangle allocation;
@@ -373,13 +376,13 @@ redraw_handler(struct widget *widget, void *data)
        widget_get_allocation (main_window->widget, &allocation);
 
        surface = window_get_surface (main_window->window);
-       cr = cairo_create(surface);
-       cairo_set_operator( cr, CAIRO_OPERATOR_SOURCE);
+       cr = cairo_create (surface);
+       cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
        cairo_rectangle (cr,
-                       allocation.x,
-                       allocation.y,
-                       allocation.width,
-                       allocation.height);
+                        allocation.x,
+                        allocation.y,
+                        allocation.width,
+                        allocation.height);
 
        red = green = blue = 0.0;
        switch (getuid() % 10) {
@@ -401,6 +404,8 @@ redraw_handler(struct widget *widget, void *data)
                               allocation.y + (allocation.height - extents.height));
                cairo_show_text (cr, main_window->selected_launcher->name);
        }
+
+       cairo_destroy (cr);
 }
 
 void
@@ -426,15 +431,15 @@ main_window_create (struct display *display, int desktopfiles, gchar ***desktopt
        window_set_title (main_window->window, title);
        g_free (title);
 
-       window_set_user_data(main_window->window, main_window);
-       widget_set_redraw_handler(main_window->widget, redraw_handler);
-       widget_set_resize_handler(main_window->widget, resize_handler);
+       window_set_user_data (main_window->window, main_window);
+       widget_set_redraw_handler (main_window->widget, redraw_handler);
+       widget_set_resize_handler (main_window->widget, resize_handler);
 
        int rows = 0;
        int margin = desktopfiles - 18;
        if (margin > 0)
                rows = ((margin/9 * 48) + 48);
-       widget_schedule_resize(main_window->widget, 480, 200 + rows);
+       widget_schedule_resize (main_window->widget, 480, 200 + rows);
 }
 
 void
@@ -444,10 +449,10 @@ main_window_destroy ()
                cairo_surface_destroy (main_window->surface);
 
        struct launcher *launcher, *tmp;
-       wl_list_for_each_safe(launcher, tmp, &main_window->launcher_list, link) {
+       wl_list_for_each_safe (launcher, tmp, &main_window->launcher_list, link) {
                cairo_surface_destroy (launcher->icon);
-               widget_destroy(launcher->widget);
-               wl_list_remove(&launcher->link);
+               widget_destroy (launcher->widget);
+               wl_list_remove (&launcher->link);
                free (launcher->name);
                free (launcher->comment);
                free (launcher->exec);

diff --git a/src/tz-launcher.c b/src/tz-launcher.c
index e4851c5..8f8d9fc 100644 (file)
--- a/src/tz-launcher.c
+++ b/src/tz-launcher.c
@@ -11,6 +11,9 @@ gchar **desktoptable[MAX_DESKTOPFILES];
 int global_argc;
 char **global_argv;
 
+extern void tz_launcher_wl_reload (int desktopfiles, gchar ***desktoptable);
+extern void tz_launcher_wl_run (int desktopfiles, gchar ***desktoptable);
+
 
 gboolean
 file_is_parsable (GFile *file)
@@ -153,6 +156,8 @@ tz_launcher_parse_directory (GFile *directory)
                        case G_FILE_TYPE_DIRECTORY:
                                tz_launcher_parse_directory (file);
                                break;
+                       default:
+                               break;
                }
                g_object_unref (file);
                g_object_unref (info);
@@ -172,9 +177,9 @@ tz_launcher_parse_config_file (GFile *file)
 
        istream = g_file_read (file, NULL, NULL);
        stream = g_data_input_stream_new (G_INPUT_STREAM(istream));
-       while (line = g_data_input_stream_read_line (stream, NULL, NULL, NULL)) {
+       while ((line = g_data_input_stream_read_line (stream, NULL, NULL, NULL))) {
                line = g_strstrip (line);
-               if ((strcmp (line, "")) && (!g_str_has_prefix (line, "#"))) {
+               if ((g_strcmp0 (line, "")) && (!g_str_has_prefix (line, "#"))) {
                        linefile = g_file_new_for_path (line);
                        if (g_file_query_exists (linefile, NULL)) {
 
@@ -191,6 +196,8 @@ tz_launcher_parse_config_file (GFile *file)
                                case G_FILE_TYPE_DIRECTORY:
                                        tz_launcher_parse_directory (linefile);
                                        break;
+                               default:
+                                       break;
                                }
 
                        }
@@ -213,7 +220,7 @@ parse_args (int argc, char **argv)
 
        for (i = 1; i < argc ; i++) {
 
-               if (!strcmp (argv[i], "-c")) {
+               if (!g_strcmp0 (argv[i], "-c")) {
                        desktopfile = g_file_new_for_path (argv[i+1]);
                        if (!g_file_query_exists (desktopfile, NULL)) {
                                g_printerr ("Config file \"%s\" does not exist !\n", argv[i+1]);
@@ -244,6 +251,8 @@ parse_args (int argc, char **argv)
                        case G_FILE_TYPE_DIRECTORY:
                                tz_launcher_parse_directory (desktopfile);
                                break;
+                       default:
+                               break;
                }
 
                g_object_unref (desktopfile);
@@ -272,9 +281,6 @@ main (int argc, char **argv)
                return 0;
        }
 
-       g_type_init ();
-
-
        signal (SIGUSR1, sigreload_handler);
        global_argc = argc;
        global_argv = argv;

diff --git a/src/wl-pre.c b/src/wl-pre.c
index 275af41..20d3ba9 100644 (file)
--- a/src/wl-pre.c
+++ b/src/wl-pre.c
@@ -1,25 +1,28 @@
-#include <stdio.h>\r
-#include <wayland-client.h>\r
-\r
-\r
-int main (int argc, char *argv[])\r
-{\r
-        if (argc != 2) {\r
-                printf ("Usage : wl-pre \"<command line>\"\n");\r
-                return 0;\r
-        }\r
-\r
-       struct wl_display *display = NULL;\r
-\r
-       while (!display) {\r
-               display = wl_display_connect (NULL);\r
-               sleep (1);\r
-       }\r
-\r
-       char *command;\r
-       asprintf (&command, "%s &", argv[1]);\r
-       system (command);\r
-       free (command);\r
-\r
-       return 0;\r
-}\r
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include <wayland-client.h>
+
+
+int main (int argc, char *argv[])
+{
+        if (argc != 2) {
+                printf ("Usage : wl-pre \"<command line>\"\n");
+                return 0;
+        }
+
+       struct wl_display *display = NULL;
+
+       while (!display) {
+               display = wl_display_connect (NULL);
+               sleep (1);
+       }
+
+       char *command;
+       asprintf (&command, "%s &", argv[1]);
+       system (command);
+       free (command);
+
+       return 0;
+}