From baa22cf17a8d1bea1c8e423d0c3ccf1c4a4df96b Mon Sep 17 00:00:00 2001 From: michux Date: Thu, 26 Mar 2009 13:07:17 +0000 Subject: add sample cfg for vnc driver, indent git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@1006 3ae390bd-cb1e-0410-b409-cd5a39f66f1f --- cfg.c | 4 ++-- drv_vnc.c | 8 ++++---- lcd4linux.conf.sample | 10 ++++++++++ 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/cfg.c b/cfg.c index 6843bd6..fe1a551 100644 --- a/cfg.c +++ b/cfg.c @@ -485,12 +485,12 @@ static int cfg_check_source(const char *file) error("security error: owner and/or group of '%s' don't match", file); error = -1; } -#if ! defined(__CYGWIN__) +#if ! defined(__CYGWIN__) if (stbuf.st_mode & S_IRWXG || stbuf.st_mode & S_IRWXO) { error("security error: group or other have access to '%s'", file); error = -1; } -#endif +#endif return error; } diff --git a/drv_vnc.c b/drv_vnc.c index 6e12b95..3262596 100644 --- a/drv_vnc.c +++ b/drv_vnc.c @@ -77,7 +77,7 @@ static void clientgone(rfbClientPtr cl) { if (clientCount > 0) clientCount--; - debug("%d clients connected\n", clientCount); + debug("%d clients connecten", clientCount); } static enum rfbNewClientAction newclient(rfbClientPtr cl) @@ -85,10 +85,10 @@ static enum rfbNewClientAction newclient(rfbClientPtr cl) if (clientCount < max_clients) { clientCount++; cl->clientGoneHook = clientgone; - debug("%d clients connected\n", clientCount); + debug("%d clients connected", clientCount); return RFB_CLIENT_ACCEPT; } else { - info("client refused due max. client connections (%d)\n", clientCount); + info("client refused due max. client connections (%d)", clientCount); return RFB_CLIENT_REFUSE; } } @@ -109,7 +109,7 @@ static void doptr(int buttonMask, int x, int y, rfbClientPtr cl) static int drv_vnc_open(const char *Section) { if (cfg_number(Section, "xres", 320, 32, 2048, &xres) < 1) { - info("[DRV_VNC] no '%s.xres' entry frXom %s using default %d", Section, cfg_source(), xres); + info("[DRV_VNC] no '%s.xres' entry from %s using default %d", Section, cfg_source(), xres); } if (cfg_number(Section, "yres", 200, 32, 2048, &yres) < 1) { info("[DRV_VNC] no '%s.yres' entry from %s using default %d", Section, cfg_source(), yres); diff --git a/lcd4linux.conf.sample b/lcd4linux.conf.sample index 090e3a7..8231274 100644 --- a/lcd4linux.conf.sample +++ b/lcd4linux.conf.sample @@ -504,6 +504,15 @@ Display Image { Basecolor '80d000' } +Display VNC { + Driver 'VNC' + Font '6x8' + xres '320' + yres '140' + bpp '4' + maxclients '1' +} + #Plugin KVV { # StationID '12_701' # Refresh 30 @@ -1241,6 +1250,7 @@ Layout Debug { #Display 'LPH7508' #Display 'ctinclud' #Display 'picoLCD' +#Display 'VNC' Display 'GLCD2USB' #Layout 'Default' -- cgit v1.2.3