Trim trailing white spaces on empty lines.

[geeqie.git] / src / lirc.c

diff --git a/src/lirc.c b/src/lirc.c
index a91901d..cbd09d4 100644 (file)
--- a/src/lirc.c
+++ b/src/lirc.c
@@ -1,12 +1,22 @@
+/*
+ * Geeqie
+ * Copyright (C) 2008 - 2012 The Geeqie Team
+ *
+ */
+
+#include <glib/gprintf.h>
+
 #include "lirc.h"
 
+#include "misc.h"
+
 #ifdef HAVE_LIRC
 #include <lirc/lirc_client.h>
 #include "layout_image.h"
 
 gint lirc_fd = -1;
 struct lirc_config *config = NULL;
-guint input_tag;
+guint input_tag = 0; /* event source id */
 GIOChannel *gio_chan;
 
 /*
@@ -43,7 +53,7 @@ static gboolean lirc_input_callback(GIOChannel *source, GIOCondition condition,
        gint ret;
        gint x = 0;
        gint y = 0;
-       
+
        /* LIRC code and corresponding geeqie command (and parameters)*/
        gchar *code;
        gchar *cmd;
@@ -61,7 +71,7 @@ static gboolean lirc_input_callback(GIOChannel *source, GIOCondition condition,
                                ptr = cmd + 4;
                                while (g_ascii_isspace(*ptr)) ptr++;
                                i_parm = atoi(ptr);
-                               
+
                                if (i_parm <= 0) i_parm = 1;
                                x -= i_parm;
                                }
@@ -70,7 +80,7 @@ static gboolean lirc_input_callback(GIOChannel *source, GIOCondition condition,
                                ptr = cmd + 5;
                                while (g_ascii_isspace(*ptr)) ptr++;
                                i_parm = atoi(ptr);
-                               
+
                                if (i_parm <= 0) i_parm = 1;
                                x += i_parm;
                                }
@@ -79,7 +89,7 @@ static gboolean lirc_input_callback(GIOChannel *source, GIOCondition condition,
                                ptr = cmd + 2;
                                while (g_ascii_isspace(*ptr)) ptr++;
                                i_parm = atoi(ptr);
-                               
+
                                if (i_parm <= 0) i_parm = 1;
                                y -= i_parm;
                                }
@@ -88,7 +98,7 @@ static gboolean lirc_input_callback(GIOChannel *source, GIOCondition condition,
                                ptr = cmd + 4;
                                while (g_ascii_isspace(*ptr)) ptr++;
                                i_parm = atoi(ptr);
-                               
+
                                if (i_parm <= 0) i_parm = 1;
                                y += i_parm;
                                }
@@ -105,40 +115,44 @@ static gboolean lirc_input_callback(GIOChannel *source, GIOCondition condition,
                                ptr = cmd + 7;
                                while (g_ascii_isspace(*ptr)) ptr++;
                                fl_parm = atoi(ptr) / 10.0;
-                               
+
                                if (fl_parm <= 0.01) fl_parm = get_zoom_increment();
-                               layout_image_zoom_adjust(lw, fl_parm);
+                               layout_image_zoom_adjust(lw, fl_parm, FALSE);
                                }
                        else if (g_ascii_strncasecmp("ZOOM_OUT", cmd, 8) == 0)
                                {
                                ptr = cmd + 8;
                                while (g_ascii_isspace(*ptr)) ptr++;
                                fl_parm = atoi(ptr) / 10.0;
-                               
+
                                if (fl_parm <= 0.01) fl_parm = get_zoom_increment();
-                               layout_image_zoom_adjust(lw, -fl_parm);
+                               layout_image_zoom_adjust(lw, -fl_parm, FALSE);
                                }
                        else if (g_ascii_strcasecmp("ZOOM_MAX", cmd) == 0)
                                {
-                               layout_image_zoom_set(lw, 0.0);
+                               layout_image_zoom_set(lw, 0.0, FALSE);
+                               }
+                       else if (g_ascii_strcasecmp("FULL_SCREEN", cmd) == 0)
+                               {
+                               layout_image_full_screen_toggle(lw);
                                }
                        else if (g_ascii_strncasecmp("SET_ZOOM", cmd, 8) == 0)
                                {
                                ptr = cmd + 8;
                                while (g_ascii_isspace(*ptr)) ptr++;
                                i_parm = atoi(ptr);
-                               
+
                                if (i_parm <= 0) i_parm = 1;
-                               layout_image_zoom_set(lw, 1.0);
+                               layout_image_zoom_set(lw, 1.0, FALSE);
                                }
                        else if (g_ascii_strncasecmp("SET_INV_ZOOM", cmd, 12) == 0)
                                {
                                ptr = cmd + 12;
                                while (g_ascii_isspace(*ptr)) ptr++;
                                i_parm = atoi(ptr);
-                               
+
                                if (i_parm <= 0) i_parm = 1;
-                               layout_image_zoom_set(lw, -i_parm);
+                               layout_image_zoom_set(lw, -i_parm, FALSE);
                                }
                        else if (g_ascii_strcasecmp("FIRST", cmd) == 0)
                                {
@@ -154,11 +168,11 @@ static gboolean lirc_input_callback(GIOChannel *source, GIOCondition condition,
                                }
                        else if (g_ascii_strcasecmp("ROTATE_90", cmd) == 0)
                                {
-                               layout_image_alter(lw, ALTER_ROTATE_90);
+                               layout_image_alter_orientation(lw, ALTER_ROTATE_90);
                                }
                        else if (g_ascii_strcasecmp("ROTATE_90_CC", cmd) == 0)
                                {
-                               layout_image_alter(lw, ALTER_ROTATE_90_CC);
+                               layout_image_alter_orientation(lw, ALTER_ROTATE_90_CC);
                                }
                        else if (g_ascii_strcasecmp("INFO", cmd) == 0)
                                {
@@ -174,13 +188,13 @@ static gboolean lirc_input_callback(GIOChannel *source, GIOCondition condition,
                }
        if (x != 0 || y != 0)
                {
-               layout_image_scroll(lw, x, y);
+               layout_image_scroll(lw, x, y, FALSE);
                }
 
        if (ret == -1)
                {
                /* something went badly wrong */
-               fprintf(stderr, _("disconnected from LIRC\n"));
+               g_fprintf(stderr, _("disconnected from LIRC\n"));
                lirc_cleanup();
                return (gboolean)FALSE;
                }
@@ -190,18 +204,18 @@ static gboolean lirc_input_callback(GIOChannel *source, GIOCondition condition,
 void layout_image_lirc_init(LayoutWindow *lw)
 {
        gint flags;
-       
+
        DEBUG_1("Initializing LIRC...");
        lirc_fd = lirc_init(GQ_APPNAME_LC, get_debug_level() > 0);
        if (lirc_fd == -1)
                {
-               fprintf(stderr, _("Could not init LIRC support\n"));
+               g_fprintf(stderr, _("Could not init LIRC support\n"));
                return;
                }
        if (lirc_readconfig(NULL, &config, NULL) == -1)
                {
                lirc_deinit();
-               fprintf(stderr,
+               g_fprintf(stderr,
                        _("could not read LIRC config file\n"
                        "please read the documentation of LIRC to \n"
                        "know how to create a proper config file\n"));
@@ -217,3 +231,4 @@ void layout_image_lirc_init(LayoutWindow *lw)
 }
 
 #endif /* HAVE_LIRC */
+/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */