Menu
▾
▴
g15tools-commits — Commit messages for g15tools-svn
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(23) |
Dec
(26) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(2) |
Feb
(7) |
Mar
(5) |
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
(7) |
Sep
(8) |
Oct
(5) |
Nov
(11) |
Dec
(2) |
| 2008 |
Jan
(8) |
Feb
(2) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(3) |
Aug
|
Sep
|
Oct
|
Nov
(4) |
Dec
|
| 2009 |
Jan
(1) |
Feb
(2) |
Mar
(1) |
Apr
(16) |
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
(3) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
(2) |
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <lra...@us...> - 2007-08-03 09:51:22
|
Revision: 245
http://g15tools.svn.sourceforge.net/g15tools/?rev=245&view=rev
Author: lranders
Date: 2007-08-03 02:51:17 -0700 (Fri, 03 Aug 2007)
Log Message:
-----------
fix compiler warnings.
Modified Paths:
--------------
branches/libg15render-3/src/pixel.c
Property Changed:
----------------
branches/libg15render-3/src/pixel.c
Modified: branches/libg15render-3/src/pixel.c
===================================================================
--- branches/libg15render-3/src/pixel.c 2007-08-03 08:43:17 UTC (rev 244)
+++ branches/libg15render-3/src/pixel.c 2007-08-03 09:51:17 UTC (rev 245)
@@ -14,8 +14,12 @@
You should have received a copy of the GNU General Public License
along with g15lcd; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+ $Id$
*/
+#include <stdlib.h>
+#include <unistd.h>
#include <fcntl.h>
#include <math.h>
#include "libg15render.h"
@@ -339,7 +343,7 @@
int num, int max, int type)
{
float len, length;
- int x;
+
if (max <= 0 || num <= 0)
return;
if (num > max)
@@ -472,7 +476,7 @@
int wbmp_fd;
int retval;
int x,y,val;
- char *buf;
+ char *buf = NULL;
unsigned int buflen,header=4;
unsigned char headerbytes[5];
unsigned int pixel_offset = 0;
Property changes on: branches/libg15render-3/src/pixel.c
___________________________________________________________________
Name: svn:keywords
+ Id
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lra...@us...> - 2007-08-03 08:43:42
|
Revision: 244
http://g15tools.svn.sourceforge.net/g15tools/?rev=244&view=rev
Author: lranders
Date: 2007-08-03 01:43:17 -0700 (Fri, 03 Aug 2007)
Log Message:
-----------
Branch for the upcomming version 3
Added Paths:
-----------
branches/libg15render-3/
Copied: branches/libg15render-3 (from rev 243, trunk/libg15render)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lra...@us...> - 2007-07-29 23:07:54
|
Revision: 243
http://g15tools.svn.sourceforge.net/g15tools/?rev=243&view=rev
Author: lranders
Date: 2007-07-29 16:07:57 -0700 (Sun, 29 Jul 2007)
Log Message:
-----------
fixes compiler warning.
Modified Paths:
--------------
trunk/libg15render/src/text.c
Modified: trunk/libg15render/src/text.c
===================================================================
--- trunk/libg15render/src/text.c 2007-07-29 21:01:37 UTC (rev 242)
+++ trunk/libg15render/src/text.c 2007-07-29 23:07:57 UTC (rev 243)
@@ -106,7 +106,7 @@
{
int i = 0;
- for (i; stringOut[i] != NULL; ++i)
+ for (i; stringOut[i] != 0; ++i)
{
switch (size)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lra...@us...> - 2007-07-29 21:01:38
|
Revision: 242
http://g15tools.svn.sourceforge.net/g15tools/?rev=242&view=rev
Author: lranders
Date: 2007-07-29 14:01:37 -0700 (Sun, 29 Jul 2007)
Log Message:
-----------
Created src/ and moved source files inside.
Modified Paths:
--------------
trunk/libg15render/configure.in
Added Paths:
-----------
trunk/libg15render/Makefile.am
trunk/libg15render/src/
trunk/libg15render/src/Makefile.am
trunk/libg15render/src/font_6x4.c
trunk/libg15render/src/font_7x5.c
trunk/libg15render/src/font_8x8.c
trunk/libg15render/src/libg15render.h
trunk/libg15render/src/pixel.c
trunk/libg15render/src/screen.c
trunk/libg15render/src/text.c
Removed Paths:
-------------
trunk/libg15render/Makefile.am
trunk/libg15render/font_6x4.c
trunk/libg15render/font_7x5.c
trunk/libg15render/font_8x8.c
trunk/libg15render/libg15render.h
trunk/libg15render/pixel.c
trunk/libg15render/screen.c
trunk/libg15render/text.c
Deleted: trunk/libg15render/Makefile.am
===================================================================
--- trunk/libg15render/Makefile.am 2007-03-21 14:56:24 UTC (rev 241)
+++ trunk/libg15render/Makefile.am 2007-07-29 21:01:37 UTC (rev 242)
@@ -1,14 +0,0 @@
-LLIBDIR=@LIBDIR@
-AM_CFLAGS=@CFLAGS@
-lib_LTLIBRARIES = libg15render.la
-libg15render_la_SOURCES = libg15render.h text.c pixel.c screen.c font_6x4.c font_7x5.c font_8x8.c
-libg15render_la_LIBADD = @FTLIB@
-libg15render_la_LDFLAGS = -version-info 2:0:1
-include_HEADERS= libg15render.h
-EXTRA_DIST = debian Doxyfile libg15render.3
-man3_MANS = $(top_srcdir)/libg15render.3
-docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
-doc_DATA = AUTHORS ChangeLog COPYING NEWS README
-
-dist-hook:
- rm -rf `find $(distdir)/debian -name .svn`
Added: trunk/libg15render/Makefile.am
===================================================================
--- trunk/libg15render/Makefile.am (rev 0)
+++ trunk/libg15render/Makefile.am 2007-07-29 21:01:37 UTC (rev 242)
@@ -0,0 +1,20 @@
+## Process this file with automake to produce Makefile.in
+
+SUBDIRS = src
+
+EXTRA_DIST = debian Doxyfile libg15render.3
+
+MAINTAINERCLEANFILES = \
+ configure \
+ Makefile.in \
+ config.h.in \
+ aclocal.m4 \
+ config/*
+
+man3_MANS = $(top_srcdir)/libg15render.3
+docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
+doc_DATA = AUTHORS ChangeLog COPYING NEWS README
+
+dist-hook:
+ rm -rf `find $(distdir)/debian -name .svn`
+
Modified: trunk/libg15render/configure.in
===================================================================
--- trunk/libg15render/configure.in 2007-03-21 14:56:24 UTC (rev 241)
+++ trunk/libg15render/configure.in 2007-07-29 21:01:37 UTC (rev 242)
@@ -5,7 +5,7 @@
AC_INIT(libg15render, 1.2, mir...@gm...)
AC_CONFIG_AUX_DIR(config)
AM_INIT_AUTOMAKE()
-AC_CONFIG_SRCDIR([libg15render.h])
+AC_CONFIG_SRCDIR([src/libg15render.h])
AC_CONFIG_HEADER([config.h])
# Checks for programs.
@@ -43,5 +43,8 @@
AC_CHECK_FUNCS([memset])
AC_SUBST(FTLIB)
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([
+Makefile
+src/Makefile
+])
AC_OUTPUT
Deleted: trunk/libg15render/font_6x4.c
===================================================================
--- trunk/libg15render/font_6x4.c 2007-03-21 14:56:24 UTC (rev 241)
+++ trunk/libg15render/font_6x4.c 2007-07-29 21:01:37 UTC (rev 242)
@@ -1,20 +0,0 @@
-/*
- This file is part of g15lcd.
-
- g15lcd is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- g15lcd is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with g15lcd; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-*/
-/* This font was provided by Sebastian XXX (sorry bastl, i still cant spell your last name ) */
-
-unsigned char fontdata_6x4[] = {0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00};
Deleted: trunk/libg15render/font_7x5.c
===================================================================
--- trunk/libg15render/font_7x5.c 2007-03-21 14:56:24 UTC (rev 241)
+++ trunk/libg15render/font_7x5.c 2007-07-29 21:01:37 UTC (rev 242)
@@ -1,2066 +0,0 @@
-/*
- This file is part of g15lcd.
-
- g15lcd is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- g15lcd is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with g15lcd; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-*/
-
-/* This font was provided by Sebastian XXX (sorry bastl, i still cant spell your last name ) */
-unsigned char fontdata_7x5[] = {0x00, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x00, 0x00, 0x00, 0x01,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x01, 0x01, 0x01, 0x00,
-0x01, 0x01, 0x01, 0x01, 0x01,
-0x00, 0x01, 0x01, 0x01, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01,
-
-0x01, 0x00, 0x01, 0x00, 0x00,
-0x01, 0x01, 0x01, 0x00, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x01, 0x01, 0x01, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x01, 0x01, 0x01, 0x00, 0x00,
-0x01, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x01, 0x01, 0x01, 0x01,
-0x01, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x01, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x01, 0x01, 0x00, 0x00,
-0x01, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x01, 0x01, 0x00, 0x00,
-0x00, 0x01, 0x00, 0x01, 0x00,
-0x00, 0x01, 0x01, 0x00, 0x00,
-0x00, 0x01, 0x00, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x01, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x01, 0x01, 0x01, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x01, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x01, 0x00, 0x01, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x01, 0x01, 0x01, 0x01, 0x01,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x01, 0x01, 0x01, 0x01, 0x01,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x01, 0x01, 0x00, 0x00, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x01, 0x01,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x01, 0x00, 0x01, 0x00, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x01, 0x01, 0x01, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x01, 0x01, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x01, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x01, 0x01,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x01, 0x01,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x01, 0x01, 0x01, 0x01, 0x01,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-
-0x01, 0x01, 0x01, 0x01, 0x01,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x01, 0x01, 0x01, 0x01,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x01, 0x01, 0x01, 0x01,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x01, 0x01, 0x01, 0x01,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x01, 0x01, 0x01, 0x01,
-
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x01, 0x01,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x01, 0x01, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x01, 0x01, 0x01, 0x01, 0x01,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x01, 0x01, 0x01, 0x01,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-
-0x00, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x01, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x01, 0x01, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x01, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x01, 0x00, 0x00, 0x00,
-0x00, 0x01, 0x01, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x01, 0x01, 0x01, 0x00,
-0x00, 0x01, 0x00, 0x01, 0x00,
-0x00, 0x01, 0x00, 0x01, 0x00,
-0x00, 0x01, 0x00, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x00,
-0x01, 0x01, 0x01, 0x01, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x01, 0x01, 0x01, 0x01, 0x00,
-0x00, 0x01, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x01, 0x00,
-0x00, 0x01, 0x00, 0x00, 0x00,
-0x01, 0x01, 0x01, 0x00, 0x00,
-0x00, 0x01, 0x00, 0x00, 0x00,
-0x01, 0x00, 0x01, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x01, 0x01, 0x00, 0x00,
-0x00, 0x01, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x01, 0x00, 0x01, 0x00,
-0x00, 0x01, 0x00, 0x01, 0x00,
-0x00, 0x01, 0x00, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x01, 0x01, 0x01, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x01, 0x01, 0x01, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x01, 0x01, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x01, 0x01, 0x01, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x01, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x01, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x01, 0x00, 0x00, 0x00,
-0x01, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x01, 0x00, 0x00, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x01, 0x00, 0x00, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x01, 0x00, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x01, 0x00, 0x00, 0x00,
-0x00, 0x01, 0x00, 0x00, 0x00,
-0x00, 0x01, 0x00, 0x00, 0x00,
-0x00, 0x01, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x01, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x01, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x01, 0x00, 0x01, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x01, 0x01, 0x01, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x01, 0x00, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x01, 0x01, 0x01, 0x01, 0x01,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x01, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x01, 0x00, 0x00, 0x00,
-
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x01, 0x01, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x01, 0x01, 0x00, 0x00,
-0x00, 0x01, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x01, 0x00, 0x00, 0x00,
-0x01, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x01, 0x00, 0x01, 0x00,
-0x00, 0x01, 0x00, 0x01, 0x00,
-0x00, 0x01, 0x00, 0x01, 0x00,
-0x00, 0x01, 0x00, 0x01, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x01, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x01, 0x01, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x01, 0x01, 0x00, 0x00,
-0x01, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x01, 0x00, 0x00, 0x00,
-0x01, 0x01, 0x01, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x01, 0x01, 0x01, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x01, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x01, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x01, 0x01, 0x00, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x00,
-0x01, 0x01, 0x01, 0x01, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x01, 0x01, 0x01, 0x01, 0x00,
-0x01, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x01, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x01, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x01, 0x01, 0x00, 0x00,
-0x01, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x01, 0x01, 0x00, 0x00,
-0x01, 0x00, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x01, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x01, 0x01, 0x01, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x01, 0x00, 0x00, 0x00,
-0x00, 0x01, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x01, 0x01, 0x00, 0x00,
-0x01, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x01, 0x01, 0x00, 0x00,
-0x01, 0x00, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x01, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x01, 0x01, 0x00, 0x00,
-0x01, 0x00, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x01, 0x01, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x01, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x01, 0x01, 0x00, 0x00,
-0x00, 0x01, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x01, 0x01, 0x00, 0x00,
-0x00, 0x01, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x01, 0x01, 0x00, 0x00,
-0x00, 0x01, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x01, 0x01, 0x00, 0x00,
-0x00, 0x01, 0x00, 0x00, 0x00,
-0x01, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x01, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x01, 0x01, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x01, 0x01, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x01, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x01, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x01, 0x00, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x01, 0x01, 0x00, 0x00,
-0x01, 0x00, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x01, 0x00,
-0x01, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x01, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x01, 0x01, 0x00, 0x00,
-0x01, 0x00, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x00, 0x01, 0x00,
-0x01, 0x01, 0x01, 0x01, 0x00,
-0x01, 0x00, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x01, 0x01, 0x01, 0x00, 0x00,
-0x01, 0x00, 0x00, 0x01, 0x00,
-0x01, 0x01, 0x01, 0x00, 0x00,
-0x01, 0x00, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x00, 0x01, 0x00,
-0x01, 0x01, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x01, 0x01, 0x00, 0x00,
-0x01, 0x00, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x01, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x01, 0x01, 0x01, 0x00, 0x00,
-0x01, 0x00, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x00, 0x01, 0x00,
-0x01, 0x01, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x01, 0x01, 0x01, 0x01, 0x00,
-0x01, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x01, 0x01, 0x00, 0x00,
-0x01, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x01, 0x01, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x01, 0x01, 0x01, 0x01, 0x00,
-0x01, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x01, 0x01, 0x00, 0x00,
-0x01, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x01, 0x01, 0x00, 0x00,
-0x01, 0x00, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x00, 0x01, 0x01, 0x00,
-0x01, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x01, 0x01, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x01, 0x00, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x00, 0x01, 0x00,
-0x01, 0x01, 0x01, 0x01, 0x00,
-0x01, 0x00, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x01, 0x01, 0x01, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x01, 0x01, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x01, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x01, 0x00, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x00,
-0x01, 0x01, 0x00, 0x00, 0x00,
-0x01, 0x01, 0x00, 0x00, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x00,
-0x01, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x01, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x01, 0x01, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x01, 0x00, 0x00, 0x01, 0x00,
-0x01, 0x01, 0x01, 0x01, 0x00,
-0x01, 0x01, 0x01, 0x01, 0x00,
-0x01, 0x00, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x01, 0x00, 0x00, 0x01, 0x00,
-0x01, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x01, 0x00,
-0x01, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x01, 0x01, 0x00, 0x00,
-0x01, 0x00, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x01, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x01, 0x01, 0x01, 0x00, 0x00,
-0x01, 0x00, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x00, 0x01, 0x00,
-0x01, 0x01, 0x01, 0x00, 0x00,
-0x01, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00,
-
-0x00, 0x01, 0x01, 0x00, 0x00,
-0x01, 0x00, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x00, 0x01, 0x00,
-0x01, 0x00...
[truncated message content] |
|
From: <rob...@us...> - 2007-03-21 14:56:24
|
Revision: 241
http://svn.sourceforge.net/g15tools/?rev=241&view=rev
Author: robynhub
Date: 2007-03-21 07:56:24 -0700 (Wed, 21 Mar 2007)
Log Message:
-----------
some configure.ac fixes and config dir added
Modified Paths:
--------------
trunk/g15cat/configure.ac
Added Paths:
-----------
trunk/g15cat/config/
Modified: trunk/g15cat/configure.ac
===================================================================
--- trunk/g15cat/configure.ac 2007-03-21 13:57:56 UTC (rev 240)
+++ trunk/g15cat/configure.ac 2007-03-21 14:56:24 UTC (rev 241)
@@ -3,6 +3,7 @@
AC_PREREQ(2.61)
AC_INIT(g15cat, 1.1, rob...@gm...)
+AC_CONFIG_AUX_DIR(config)
AM_INIT_AUTOMAKE()
AC_CONFIG_SRCDIR([g15cat.c])
AC_CONFIG_HEADER([config.h])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rob...@us...> - 2007-03-21 13:57:56
|
Revision: 240
http://svn.sourceforge.net/g15tools/?rev=240&view=rev
Author: robynhub
Date: 2007-03-21 06:57:56 -0700 (Wed, 21 Mar 2007)
Log Message:
-----------
Added some references to the project in README file and g15cat.c
Modified Paths:
--------------
trunk/g15cat/README
trunk/g15cat/g15cat.c
Modified: trunk/g15cat/README
===================================================================
--- trunk/g15cat/README 2007-03-20 05:15:23 UTC (rev 239)
+++ trunk/g15cat/README 2007-03-21 13:57:56 UTC (rev 240)
@@ -1,4 +1,5 @@
g15cat ver. 1.1 - GNU Software - (c) 2007 Antonio Bartolini
+part of G15tools - http://g15tools.sourceforge.net/
How to install:
Modified: trunk/g15cat/g15cat.c
===================================================================
--- trunk/g15cat/g15cat.c 2007-03-20 05:15:23 UTC (rev 239)
+++ trunk/g15cat/g15cat.c 2007-03-21 13:57:56 UTC (rev 240)
@@ -79,7 +79,8 @@
/* print the main usage */
void main_usage(void){
- printf("g15cat ver. %s - GNU Software - (c) 2007 Antonio Bartolini\n\nUsage:\n", version);
+ printf("g15cat ver. %s - GNU Software - (c) 2007 Antonio Bartolini\n", version);
+ printf("part of G15tools - http://g15tools.sourceforge.net/\n\nUsage:\n");
printf(" g15cat [-F FILENAME] [-s SECONDS] [-f FORMAT] [-c NUMCHARS] [-t] [-d SECONDS]\n\n Where possibile options are:\n");
printf(" -F FILENAME = Read Filename as Input. [default STDIN]\n");
printf(" -s SECONDS = Wait n. SECONDS until exit. [default 5]\n");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ane...@us...> - 2007-03-20 05:44:02
|
Revision: 239
http://svn.sourceforge.net/g15tools/?rev=239&view=rev
Author: aneurysm9
Date: 2007-03-19 22:15:23 -0700 (Mon, 19 Mar 2007)
Log Message:
-----------
g15cat 1.1 from robynhub with memory handling and autotools improvements
Modified Paths:
--------------
trunk/g15cat/README
trunk/g15cat/display.c
trunk/g15cat/display.h
trunk/g15cat/g15cat.c
trunk/g15cat/g15cat.h
Added Paths:
-----------
trunk/g15cat/AUTHORS
trunk/g15cat/COPYING
trunk/g15cat/ChangeLog
trunk/g15cat/INSTALL
trunk/g15cat/Makefile.am
trunk/g15cat/NEWS
trunk/g15cat/bootstrap
trunk/g15cat/configure.ac
trunk/g15cat/doc/
trunk/g15cat/doc/doxy.conf
trunk/g15cat/doc/html/
trunk/g15cat/man/
trunk/g15cat/man/g15cat.1
Removed Paths:
-------------
trunk/g15cat/LICENSE
trunk/g15cat/Makefile
Added: trunk/g15cat/AUTHORS
===================================================================
--- trunk/g15cat/AUTHORS (rev 0)
+++ trunk/g15cat/AUTHORS 2007-03-20 05:15:23 UTC (rev 239)
@@ -0,0 +1,2 @@
+Antonio Bartolini <rob...@gm...>
+- Main devloper
Added: trunk/g15cat/COPYING
===================================================================
--- trunk/g15cat/COPYING (rev 0)
+++ trunk/g15cat/COPYING 2007-03-20 05:15:23 UTC (rev 239)
@@ -0,0 +1,340 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ 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
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
+
Added: trunk/g15cat/ChangeLog
===================================================================
Added: trunk/g15cat/INSTALL
===================================================================
--- trunk/g15cat/INSTALL (rev 0)
+++ trunk/g15cat/INSTALL 2007-03-20 05:15:23 UTC (rev 239)
@@ -0,0 +1,234 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006 Free Software Foundation, Inc.
+
+This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
+
+ The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation. It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions. Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+ It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring. Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+ If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release. If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+ The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'. You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+The simplest way to compile this package is:
+
+ 1. `cd' to the directory containing the package's source code and type
+ `./configure' to configure the package for your system.
+
+ Running `configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
+
+ 2. Type `make' to compile the package.
+
+ 3. Optionally, type `make check' to run any self-tests that come with
+ the package.
+
+ 4. Type `make install' to install the programs and any data files and
+ documentation.
+
+ 5. You can remove the program binaries and object files from the
+ source code directory by typing `make clean'. To also remove the
+ files that `configure' created (so you can compile the package for
+ a different kind of computer), type `make distclean'. There is
+ also a `make maintainer-clean' target, but that is intended mainly
+ for the package's developers. If you use it, you may have to get
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
+Compilers and Options
+=====================
+
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about. Run `./configure --help' for
+details on some of the pertinent environment variables.
+
+ You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment. Here
+is an example:
+
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+ *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory. To do this, you can use GNU `make'. `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script. `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+ With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+Installation Names
+==================
+
+By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc. You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+ You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files. If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+ In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files. Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+ If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System). The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+ For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Specifying the System Type
+==========================
+
+There may be some features `configure' cannot figure out automatically,
+but needs to determine by the type of machine the package will run on.
+Usually, assuming the package is built to be run on the _same_
+architectures, `configure' can figure that out, but if it prints a
+message saying it cannot guess the machine type, give it the
+`--build=TYPE' option. TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+ CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+ OS KERNEL-OS
+
+ See the file `config.sub' for the possible values of each field. If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+ If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+ If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+If you want to set default values for `configure' scripts to share, you
+can create a site shell script called `config.site' that gives default
+values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists. Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+Variables not defined in a site shell script can be set in the
+environment passed to `configure'. However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost. In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'. For example:
+
+ ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
+
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+`configure' recognizes the following options to control how it operates.
+
+`--help'
+`-h'
+ Print a summary of the options to `configure', and exit.
+
+`--version'
+`-V'
+ Print the version of Autoconf used to generate the `configure'
+ script, and exit.
+
+`--cache-file=FILE'
+ Enable the cache: use and save the results of the tests in FILE,
+ traditionally `config.cache'. FILE defaults to `/dev/null' to
+ disable caching.
+
+`--config-cache'
+`-C'
+ Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+ Do not print messages saying which checks are being made. To
+ suppress all normal output, redirect it to `/dev/null' (any error
+ messages will still be shown).
+
+`--srcdir=DIR'
+ Look for the package's source code in directory DIR. Usually
+ `configure' can determine that directory automatically.
+
+`configure' also accepts some other, not widely useful, options. Run
+`configure --help' for more details.
+
Deleted: trunk/g15cat/LICENSE
===================================================================
--- trunk/g15cat/LICENSE 2007-03-15 22:08:54 UTC (rev 238)
+++ trunk/g15cat/LICENSE 2007-03-20 05:15:23 UTC (rev 239)
@@ -1,340 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- 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
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
-
Deleted: trunk/g15cat/Makefile
===================================================================
--- trunk/g15cat/Makefile 2007-03-15 22:08:54 UTC (rev 238)
+++ trunk/g15cat/Makefile 2007-03-20 05:15:23 UTC (rev 239)
@@ -1,23 +0,0 @@
-CC = gcc
-CFLAGS= -Wall -pedantic -lg15render -lg15daemon_client
-
-.PHONY: clean cleanall
-
-
-
-g15cat: g15cat.c g15cat.h display.o
-
-display: display.c display.h
-
-
-install:
- cp -f g15cat /usr/bin/
-
-uninstall:
- rm -f /usr/bin/g15cat
-
-
-
-
-clean:
- -rm -f *.o *~ core g15cat
Added: trunk/g15cat/Makefile.am
===================================================================
--- trunk/g15cat/Makefile.am (rev 0)
+++ trunk/g15cat/Makefile.am 2007-03-20 05:15:23 UTC (rev 239)
@@ -0,0 +1,9 @@
+bin_PROGRAMS = g15cat
+g15cat_SOURCES = display.c g15cat.c g15cat.h display.h
+EXTRA_DIST = doc
+man1_MANS = $(top_srcdir)/man/g15cat.1
+docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
+doc_DATA = AUTHORS COPYING README
+
+dist-hook:
+ rm -rf `find $(distdir)/doc -name .svn`
Added: trunk/g15cat/NEWS
===================================================================
Modified: trunk/g15cat/README
===================================================================
--- trunk/g15cat/README 2007-03-15 22:08:54 UTC (rev 238)
+++ trunk/g15cat/README 2007-03-20 05:15:23 UTC (rev 239)
@@ -1,8 +1,8 @@
-g15cat ver.0.3 - GNU Software - (c) 2007 Antonio Bartolini
+g15cat ver. 1.1 - GNU Software - (c) 2007 Antonio Bartolini
How to install:
- make
+ ./configure && make
and (as root):
@@ -12,19 +12,19 @@
make uninstall
-
-
Usage:
+ g15cat [-F FILENAME] [-s SECONDS] [-f FORMAT] [-c NUMCHARS] [-t] [-d SECONDS]
- g15cat [-p pipe] [-f FORMAT] [-d]
-
Where possibile options are:
- -f FORMAT = TS, TM or TL [default TS]
- -p PIPE = Path of the G15 pipe [default /var/run/g15]
- -t = Display data in Top-Down mode
- -d = Debug mode
+ -F FILENAME = Read Filename as Input. [default STDIN]
+ -s SECONDS = Wait n. SECONDS until exit. [default 5]
+ -f FORMAT = S, M or L. [default S]
+ -c NUMCHARS = Cut first NUMCHARS characters from the begin of each line.
+ -t = Display data in Top-Down mode.
+ -d SECONDS = Wait n. SECONDS before printing each line (Slow mode).
+ -h = Display this help.
- Report bugs to rob...@gm...
+Report bugs to rob...@gm...
g15cat is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Added: trunk/g15cat/bootstrap
===================================================================
--- trunk/g15cat/bootstrap (rev 0)
+++ trunk/g15cat/bootstrap 2007-03-20 05:15:23 UTC (rev 239)
@@ -0,0 +1,8 @@
+#! /bin/sh
+
+set -x
+aclocal
+#libtoolize --force --copy
+autoheader
+automake --add-missing --copy
+autoconf
Property changes on: trunk/g15cat/bootstrap
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/g15cat/configure.ac
===================================================================
--- trunk/g15cat/configure.ac (rev 0)
+++ trunk/g15cat/configure.ac 2007-03-20 05:15:23 UTC (rev 239)
@@ -0,0 +1,32 @@
+# -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+AC_PREREQ(2.61)
+AC_INIT(g15cat, 1.1, rob...@gm...)
+AM_INIT_AUTOMAKE()
+AC_CONFIG_SRCDIR([g15cat.c])
+AC_CONFIG_HEADER([config.h])
+
+AC_PREFIX_DEFAULT(/usr)
+# Checks for programs.
+AC_PROG_CC
+AC_PROG_INSTALL
+AC_PROG_MAKE_SET
+
+
+# Checks for libraries.
+AC_CHECK_LIB([g15daemon_client], [g15_send], ,AC_MSG_ERROR(["libg15daemon_client not found. please install it"]))
+AC_CHECK_LIB([g15render], [g15r_loadWbmpToBuf], ,AC_MSG_ERROR([">=libg15render-1.2 not found. please install it"]))
+
+# Checks for header files.
+AC_HEADER_STDC
+AC_CHECK_HEADERS([errno.h signal.h fcntl.h stdio.h stdlib.h string.h sys/stat.h sys/types.h unistd.h g15daemon_client.h libg15.h libg15render.h])
+
+# Checks for typedefs, structures, and compiler characteristics.
+
+# Checks for library functions.
+AC_FUNC_MALLOC
+AC_CHECK_FUNCS([malloc fgetc getopt feof printf sigaction sleep])
+
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
Modified: trunk/g15cat/display.c
===================================================================
--- trunk/g15cat/display.c 2007-03-15 22:08:54 UTC (rev 238)
+++ trunk/g15cat/display.c 2007-03-20 05:15:23 UTC (rev 239)
@@ -22,6 +22,9 @@
#include <stdio.h>
#include <string.h>
+
+/* Add data to the end of linked list and free the first one */
+
int display_add(display *disp, char *val, int linelen){
linea *l, *u;
@@ -32,10 +35,10 @@
disp->first->prev = NULL;
/* free frist linea */
free(u);
-
+
/* add the last */
l = (linea *) malloc(sizeof(linea));
- l->data = (char *) malloc(sizeof(char) * linelen + 2);
+ l->data = (char *) calloc(linelen + 2, sizeof(char));
strcpy(l->data,val);
disp->last->next = (struct linea *) l;
l->prev = (struct linea *) disp->last;
@@ -44,49 +47,57 @@
return 0;
}
-display * display_create(display *disp, int linelen, int maxlines, char *format){
+
+/* create a new linked list of lines */
+display * display_create(display *disp, int linelen, int numlines, char *format){
int i;
linea *prec;
linea *latest;
disp = (display *) malloc(sizeof(display));
disp->first = (linea *) malloc(sizeof(linea));
- disp->first->data = (char *) malloc(sizeof(char) * linelen + 2);
+ disp->first->data = (char *) calloc(linelen + 2, sizeof(char));
/* initialing data */
- strcpy(disp->first->data," ");
disp->first->prev = NULL;
latest = disp->first;
-
- for(i=0;i<maxlines;i++){
+
+ for(i=0;i<numlines;i++){
/* moving pointer */
prec = latest;
- /* latest = (linea *) latest->next; */
-
- /* fill data */
+ /* fill pointers data */
latest = malloc(sizeof(linea));
latest->prev = (struct linea *) prec;
prec->next = (struct linea *) latest;
- /* initialing data */
- latest->data = malloc(sizeof(char) * linelen + 2);
- strcpy(latest->data," ");
+ /* fill with empty data */
+ latest->data = calloc(linelen + 2, sizeof(char));
}
/* last one */
disp->last = latest;
disp->last->next = NULL;
-
+
+ /* maybe for future use */
+ disp->numlines = numlines;
return disp;
}
+
+/* free world with free memory */
int free_display(display *disp){
linea *pointer;
+ /* check for correct args */
+ if (disp == NULL)
+ return -1;
+
/* free data */
pointer = disp->first;
+ /* clean each data until ends */
while (pointer->next != NULL){
free(pointer->data);
- pointer = (linea *)pointer->next;
+ pointer = (linea *)pointer->next;
}
+ /* cleaning the last one */
free(pointer->data);
/* free lines */
Modified: trunk/g15cat/display.h
===================================================================
--- trunk/g15cat/display.h 2007-03-15 22:08:54 UTC (rev 238)
+++ trunk/g15cat/display.h 2007-03-20 05:15:23 UTC (rev 239)
@@ -17,6 +17,10 @@
*/
+#ifndef DISPLAY_H_
+#define DISPLAY_H_
+
+/* element of the linked list */
typedef struct{
char *data;
struct linea* next;
@@ -24,16 +28,20 @@
} linea;
+
+/* Linked list */
typedef struct {
- int linelength;
- int maxlines;
- int numlines;
- char* format;
- linea* first;
- linea* last;
+ int linelength; /* length of the line */
+ int numlines; /* number of the lines to keep in the linked list*/
+ char* format; /* format of text */
+ linea* first; /* pointer to the first line */
+ linea* last; /* pointer to the last one */
} display;
+
+/* function for display.c */
int display_add(display *disp, char *val, int linelen);
display * display_create(display *disp, int linelen, int maxlines, char *format);
int free_display(display *disp);
+#endif /* DISPLAY_H_ */
Added: trunk/g15cat/doc/doxy.conf
===================================================================
--- trunk/g15cat/doc/doxy.conf (rev 0)
+++ trunk/g15cat/doc/doxy.conf 2007-03-20 05:15:23 UTC (rev 239)
@@ -0,0 +1,27 @@
+
+PROJECT_NAME = "g15cat"
+
+OUTPUT_LANGUAGE = "English"
+
+OUTPUT_DIRECTORY = "doc"
+
+
+GENERATE_HTML = YES
+
+SOURCE_BROWSER = YES
+
+GENERATE_LATEX = NO
+
+RECURSIVE = YES
+
+MACRO_EXPANSION = YES
+
+OPTIMIZE_OUTPUT_FOR_C = YES
+
+INLINE_INFO = YES
+
+ENABLE_PREPROCESSING = YES
+
+TEMPLATE_RELATIONS = YES
+
+SEARCHENGINE = NO
Modified: trunk/g15cat/g15cat.c
===================================================================
--- trunk/g15cat/g15cat.c 2007-03-15 22:08:54 UTC (rev 238)
+++ trunk/g15cat/g15cat.c 2007-03-20 05:15:23 UTC (rev 239)
@@ -32,100 +32,93 @@
#include <libg15.h>
#include <libg15render.h>
-#include "display.h"
+//#include "display.h"
#include "g15cat.h"
-char *version="1.0";
-char *format="S";
-char *buffer;
-display *disp;
-int debug=0;
-int topdown=0;
-int g15fd;
-int seconds=5;
-int dim = G15_TEXT_SMALL;
+/* config variables */
+char *version = "VERSION"; /* version of this program */
+char *format = "S"; /* default format of text */
+char *buffer; /* buffer to render */
+display *disp; /* linked list for storage data */
+g15canvas *canvas; /* g15canvas struct for screen data */
+int slow_mode = 0; /* slowdown mode also for debug */
+int topdown = 0; /* direction of the text */
+int g15fd; /* file descriptor of the g15 display */
+int seconds = 5; /* seconds to wait until exit */
+int slow; /* If >0 wait. Else go wild */
+int cut = 0; /* number of chars that need to be cutted */
+int dim = G15_TEXT_SMALL; /* size of the text */
+FILE * fd; /* file descriptor of input */
-int refresh(display *);
-
-
struct sigaction action; /* struct to handle signals */
/* init routine to handle signals */
void siginit(void){
- /* assegnamento gestione segnale SIGINT a client_exit() */
+ /* signal assignment: SIGINT to client_exit() */
IFERROR3(sigaction(SIGINT,NULL,&action),"sigaction",exit(errno));
action.sa_handler=client_exit;
IFERROR3(sigaction(SIGINT,&action,NULL),"sigaction",exit(errno));
- /* assegnamento gestione segnale SIGQUIT a client_exit() */
+ /* signal assignment: SIGQUIT to client_exit() */
IFERROR3(sigaction(SIGQUIT,NULL,&action),"sigaction",exit(errno));
action.sa_handler=client_exit;
IFERROR3(sigaction(SIGQUIT,&action,NULL),"sigaction",exit(errno));
- /* assegnamento gestione segnale SIGTERM a client_exit() */
+ /* signal assignment: SIGTERM to client_exit() */
IFERROR3(sigaction(SIGTERM,NULL,&action),"sigaction",exit(errno));
action.sa_handler=client_exit;
IFERROR3(sigaction(SIGTERM,&action,NULL),"sigaction",exit(errno));
}
+/* clean exit on signals */
void client_exit(int st){
free_display(disp);
- /* DEBUG("bye. \n");*/
exit(st);
}
/* print the main usage */
void main_usage(void){
- /* print help */
-
- printf("g15cat ver.%s - GNU Software - (c) 2007 Antonio Bartolini\n\nUsage:\n", version);
- printf(" g15cat [-s SECONDS] [-f FORMAT] [-d]\n\n Where possibile options are:\n");
- printf(" -f FORMAT = S, M or L [default S]\n");
- printf(" -t = Display data in Top-Down mode\n");
- printf(" -s SECONDS = Wait n. SECONDS until exit [default 5]\n");
- printf(" -d = Debug mode\n\n");
- printf(" Report bugs to rob...@gm...\n");
- /* exit */
- exit(0);
+ printf("g15cat ver. %s - GNU Software - (c) 2007 Antonio Bartolini\n\nUsage:\n", version);
+ printf(" g15cat [-F FILENAME] [-s SECONDS] [-f FORMAT] [-c NUMCHARS] [-t] [-d SECONDS]\n\n Where possibile options are:\n");
+ printf(" -F FILENAME = Read Filename as Input. [default STDIN]\n");
+ printf(" -s SECONDS = Wait n. SECONDS until exit. [default 5]\n");
+ printf(" -f FORMAT = S, M or L. [default S]\n");
+ printf(" -c NUMCHARS = Cut first NUMCHARS characters from the begin of each line.\n");
+ printf(" -t = Display data in Top-Down mode.\n");
+ printf(" -d SECONDS = Wait n. SECONDS before printing each line (Slow mode).\n");
+ printf(" -h = Display this help.\n\n");
+ printf("Report bugs to rob...@gm...\n...
[truncated message content] |
|
From: <ane...@us...> - 2007-03-15 22:08:54
|
Revision: 238
http://svn.sourceforge.net/g15tools/?rev=238&view=rev
Author: aneurysm9
Date: 2007-03-15 15:08:54 -0700 (Thu, 15 Mar 2007)
Log Message:
-----------
Import g15cat
Added Paths:
-----------
trunk/g15cat/
trunk/g15cat/LICENSE
trunk/g15cat/Makefile
trunk/g15cat/README
trunk/g15cat/display.c
trunk/g15cat/display.h
trunk/g15cat/g15cat.c
trunk/g15cat/g15cat.h
Added: trunk/g15cat/LICENSE
===================================================================
--- trunk/g15cat/LICENSE (rev 0)
+++ trunk/g15cat/LICENSE 2007-03-15 22:08:54 UTC (rev 238)
@@ -0,0 +1,340 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ 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
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
+
Added: trunk/g15cat/Makefile
===================================================================
--- trunk/g15cat/Makefile (rev 0)
+++ trunk/g15cat/Makefile 2007-03-15 22:08:54 UTC (rev 238)
@@ -0,0 +1,23 @@
+CC = gcc
+CFLAGS= -Wall -pedantic -lg15render -lg15daemon_client
+
+.PHONY: clean cleanall
+
+
+
+g15cat: g15cat.c g15cat.h display.o
+
+display: display.c display.h
+
+
+install:
+ cp -f g15cat /usr/bin/
+
+uninstall:
+ rm -f /usr/bin/g15cat
+
+
+
+
+clean:
+ -rm -f *.o *~ core g15cat
Added: trunk/g15cat/README
===================================================================
--- trunk/g15cat/README (rev 0)
+++ trunk/g15cat/README 2007-03-15 22:08:54 UTC (rev 238)
@@ -0,0 +1,38 @@
+g15cat ver.0.3 - GNU Software - (c) 2007 Antonio Bartolini
+
+How to install:
+
+ make
+
+and (as root):
+
+ make install
+
+How to uninstall (as root):
+
+ make uninstall
+
+
+
+Usage:
+
+ g15cat [-p pipe] [-f FORMAT] [-d]
+
+ Where possibile options are:
+ -f FORMAT = TS, TM or TL [default TS]
+ -p PIPE = Path of the G15 pipe [default /var/run/g15]
+ -t = Display data in Top-Down mode
+ -d = Debug mode
+
+ Report bugs to rob...@gm...
+
+ g15cat is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ g15cat is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
Added: trunk/g15cat/display.c
===================================================================
--- trunk/g15cat/display.c (rev 0)
+++ trunk/g15cat/display.c 2007-03-15 22:08:54 UTC (rev 238)
@@ -0,0 +1,103 @@
+/*
+ g15cat is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ g15cat is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with g15daemon; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+ Copyright Antonio Bartolini - (c) 2007 - rob...@gm...
+
+*/
+
+#include "display.h"
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+int display_add(display *disp, char *val, int linelen){
+ linea *l, *u;
+
+ /* free the first data */
+ free(disp->first->data);
+ u = disp->first;
+ disp->first = (linea *) disp->first->next;
+ disp->first->prev = NULL;
+ /* free frist linea */
+ free(u);
+
+ /* add the last */
+ l = (linea *) malloc(sizeof(linea));
+ l->data = (char *) malloc(sizeof(char) * linelen + 2);
+ strcpy(l->data,val);
+ disp->last->next = (struct linea *) l;
+ l->prev = (struct linea *) disp->last;
+ l->next = NULL;
+ disp->last = l;
+ return 0;
+}
+
+display * display_create(display *disp, int linelen, int maxlines, char *format){
+ int i;
+ linea *prec;
+ linea *latest;
+
+ disp = (display *) malloc(sizeof(display));
+ disp->first = (linea *) malloc(sizeof(linea));
+ disp->first->data = (char *) malloc(sizeof(char) * linelen + 2);
+
+ /* initialing data */
+ strcpy(disp->first->data," ");
+ disp->first->prev = NULL;
+ latest = disp->first;
+
+ for(i=0;i<maxlines;i++){
+ /* moving pointer */
+ prec = latest;
+ /* latest = (linea *) latest->next; */
+
+ /* fill data */
+ latest = malloc(sizeof(linea));
+ latest->prev = (struct linea *) prec;
+ prec->next = (struct linea *) latest;
+ /* initialing data */
+ latest->data = malloc(sizeof(char) * linelen + 2);
+ strcpy(latest->data," ");
+ }
+ /* last one */
+ disp->last = latest;
+ disp->last->next = NULL;
+
+ return disp;
+}
+
+int free_display(display *disp){
+ linea *pointer;
+
+ /* free data */
+ pointer = disp->first;
+ while (pointer->next != NULL){
+ free(pointer->data);
+ pointer = (linea *)pointer->next;
+ }
+ free(pointer->data);
+
+ /* free lines */
+ while (pointer->next != NULL){
+ pointer = (linea *)pointer->prev;
+ free(pointer->next);
+ }
+ /* free the last one */
+ free(pointer);
+ /* free display */
+ free(disp);
+
+ return 0;
+}
Added: trunk/g15cat/display.h
===================================================================
--- trunk/g15cat/display.h (rev 0)
+++ trunk/g15cat/display.h 2007-03-15 22:08:54 UTC (rev 238)
@@ -0,0 +1,39 @@
+/*
+ g15cat is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ g15cat is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with g15daemon; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+ Copyright Antonio Bartolini - (c) 2007 - rob...@gm...
+
+*/
+
+typedef struct{
+ char *data;
+ struct linea* next;
+ struct linea* prev;
+
+} linea;
+
+typedef struct {
+ int linelength;
+ int maxlines;
+ int numlines;
+ char* format;
+ linea* first;
+ linea* last;
+} display;
+
+int display_add(display *disp, char *val, int linelen);
+display * display_create(display *disp, int linelen, int maxlines, char *format);
+int free_display(display *disp);
+
Added: trunk/g15cat/g15cat.c
===================================================================
--- trunk/g15cat/g15cat.c (rev 0)
+++ trunk/g15cat/g15cat.c 2007-03-15 22:08:54 UTC (rev 238)
@@ -0,0 +1,222 @@
+/*
+ g15cat is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ g15cat is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with g15daemon; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+ Copyright Antonio Bartolini - (c) 2007 - rob...@gm...
+
+*/
+
+/* header standard */
+#include <errno.h>
+#include <signal.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+#include <g15daemon_client.h>
+#include <libg15.h>
+#include <libg15render.h>
+
+#include "display.h"
+#include "g15cat.h"
+
+char *version="1.0";
+char *format="S";
+char *buffer;
+display *disp;
+int debug=0;
+int topdown=0;
+int g15fd;
+int seconds=5;
+int dim = G15_TEXT_SMALL;
+
+int refresh(display *);
+
+
+
+struct sigaction action; /* struct to handle signals */
+
+/* init routine to handle signals */
+void siginit(void){
+
+ /* assegnamento gestione segnale SIGINT a client_exit() */
+ IFERROR3(sigaction(SIGINT,NULL,&action),"sigaction",exit(errno));
+ action.sa_handler=client_exit;
+ IFERROR3(sigaction(SIGINT,&action,NULL),"sigaction",exit(errno));
+ /* assegnamento gestione segnale SIGQUIT a client_exit() */
+ IFERROR3(sigaction(SIGQUIT,NULL,&action),"sigaction",exit(errno));
+ action.sa_handler=client_exit;
+ IFERROR3(sigaction(SIGQUIT,&action,NULL),"sigaction",exit(errno));
+ /* assegnamento gestione segnale SIGTERM a client_exit() */
+ IFERROR3(sigaction(SIGTERM,NULL,&action),"sigaction",exit(errno));
+ action.sa_handler=client_exit;
+ IFERROR3(sigaction(SIGTERM,&action,NULL),"sigaction",exit(errno));
+}
+
+void client_exit(int st){
+ free_display(disp);
+ /* DEBUG("bye. \n");*/
+ exit(st);
+}
+
+
+/* print the main usage */
+void main_usage(void){
+ /* print help */
+
+ printf("g15cat ver.%s - GNU Software - (c) 2007 Antonio Bartolini\n\nUsage:\n", version);
+ printf(" g15cat [-s SECONDS] [-f FORMAT] [-d]\n\n Where possibile options are:\n");
+ printf(" -f FORMAT = S, M or L [default S]\n");
+ printf(" -t = Display data in Top-Down mode\n");
+ printf(" -s SECONDS = Wait n. SECONDS until exit [default 5]\n");
+ printf(" -d = Debug mode\n\n");
+ printf(" Report bugs to rob...@gm...\n");
+ /* exit */
+ exit(0);
+}
+
+
+/* refresh routine */
+
+int refresh(display *buf){
+ char *buffer;
+ linea *pointer;
+ g15canvas *canvas;
+ int lineno=0;
+
+ /* empty buffer */
+ strcpy(buffer," ");
+ canvas = (g15canvas *) malloc (sizeof (g15canvas));
+ if (canvas != NULL) {
+ memset(canvas->buffer, 0, G15_BUFFER_LEN);
+ canvas->mode_cache = 0;
+ canvas->mode_reverse = 0;
+ canvas->mode_xor = 0;
+ }
+
+ if (topdown)
+ pointer = buf->last;
+ else
+ pointer = buf->first;
+ do{
+ g15r_renderString (canvas, (unsigned char *)pointer->data, lineno, dim, 0, 0);
+ lineno++;
+ if (topdown)
+ pointer = (linea *) pointer->prev;
+ else
+ pointer = (linea *) pointer->next;
+ } while (pointer!= NULL);
+
+ /* send data */
+ g15_send(g15fd,(char *)canvas->buffer,G15_BUFFER_LEN);
+ free(canvas);
+ return 0;
+}
+
+/* main loop */
+
+void main_loop(void){
+ int num_chars;
+ int num_lines;
+ int counter;
+ char c;
+
+ if(*format == 'S'){
+ num_chars = TS_CHARS;
+ num_lines = TS_LINES;
+ dim = G15_TEXT_SMALL;
+ } else if(*format == 'M'){
+ num_chars = TM_CHARS;
+ num_lines = TM_LINES;
+ dim = G15_TEXT_MED;
+ } else if(*format == 'L'){
+ num_chars = TL_CHARS;
+ num_lines = TL_LINES;
+ dim = G15_TEXT_LARGE;
+ } else {
+ main_usage();
+ }
+
+ buffer = malloc((num_chars + 2) * sizeof(char));
+
+ disp = display_create(disp, num_chars,num_lines,format);
+ g15fd = new_g15_screen(G15_G15RBUF);
+
+ if(g15fd < 0){
+ printf("Can't connect to daemon!\n");
+ client_exit(255);
+ }
+
+ while ((c = getchar()) && !feof(stdin) ){
+ if (c == '\n' || counter == num_chars){
+ /* add the line */
+ display_add(disp,buffer,num_chars);
+ /* refresh display */
+ refresh(disp);
+ /* empty buffer */
+ strcpy(buffer,"");
+
+ /* ignore rest of line */
+ if (counter == num_chars)
+ do { c = getchar(); } while (c != '\n' || feof(stdin) );
+ counter = 0;
+
+ } else {
+ strncat(buffer, &c, 1);
+ counter++;
+ }
+ }
+ sleep(seconds);
+ free(buffer);
+ client_exit(0);
+
+}
+
+
+int main(int argc,char **argv){
+
+ int option;
+
+ siginit();
+ while ((option = getopt(argc,argv,"tdhf:s:")) != -1){
+
+ switch(option){
+ case 's':
+ seconds=atoi(optarg);
+ break;
+ case 'f':
+ format=optarg;
+ break;
+ case 'd':
+ debug = 1;
+ break;
+ case 't':
+ topdown = 1;
+ break;
+ case 'h':
+ main_usage();
+ }
+ }
+
+ main_loop();
+ return 0; /* never reached */
+}
+
+
+
+
Added: trunk/g15cat/g15cat.h
===================================================================
--- trunk/g15cat/g15cat.h (rev 0)
+++ trunk/g15cat/g15cat.h 2007-03-15 22:08:54 UTC (rev 238)
@@ -0,0 +1,45 @@
+/*
+ g15cat is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ g15cat is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with g15daemon; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+ Copyright Antonio Bartolini - (c) 2007 - rob...@gm...
+
+
+*/
+
+
+#define TM_CHARS 32
+#define TS_CHARS 40
+#define TL_CHARS 20
+#define TM_LINES 5
+#define TS_LINES 6
+#define TL_LINES 4
+
+
+/* in caso di fallimento stampa errore e abort pulito */
+#define IFERROR(s,m) if((s)==-1) {perror(m); client_exit(errno);}
+/* in caso di fallimento stampa errore e comando variabile */
+#define IFERROR3(s,m,c) if((s)==-1) {perror(m); c;}
+/* in caso di fallimento abort pulito senza stampa di errore */
+#define IFERRORQ(s) if((s)==-1) {client_exit(status);}
+/* debug routine */
+#define DEBUG(m) if(debug) {printf("%s",m);}
+
+/* functions declaration */
+void client_exit(int);
+void siginit(void);
+void main_usage(void);
+void main_loop(void);
+
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ane...@us...> - 2007-03-15 22:05:17
|
Revision: 237
http://svn.sourceforge.net/g15tools/?rev=237&view=rev
Author: aneurysm9
Date: 2007-03-15 15:05:16 -0700 (Thu, 15 Mar 2007)
Log Message:
-----------
Include math.h in pixel.c
Better checks for input to g15r_drawBar
Modified Paths:
--------------
trunk/libg15render/pixel.c
Modified: trunk/libg15render/pixel.c
===================================================================
--- trunk/libg15render/pixel.c 2007-02-18 05:12:05 UTC (rev 236)
+++ trunk/libg15render/pixel.c 2007-03-15 22:05:16 UTC (rev 237)
@@ -17,6 +17,7 @@
*/
#include <fcntl.h>
+#include <math.h>
#include "libg15render.h"
void
@@ -339,7 +340,7 @@
{
float len, length;
int x;
- if (max == 0)
+ if (max <= 0 || num <= 0)
return;
if (num > max)
num = max;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mla...@us...> - 2007-02-18 05:12:08
|
Revision: 236
http://svn.sourceforge.net/g15tools/?rev=236&view=rev
Author: mlampard
Date: 2007-02-17 21:12:05 -0800 (Sat, 17 Feb 2007)
Log Message:
-----------
update changelog
Modified Paths:
--------------
trunk/libg15/ChangeLog
Modified: trunk/libg15/ChangeLog
===================================================================
--- trunk/libg15/ChangeLog 2007-02-18 04:55:24 UTC (rev 235)
+++ trunk/libg15/ChangeLog 2007-02-18 05:12:05 UTC (rev 236)
@@ -28,3 +28,6 @@
Control message URBs are no longer being lost if sent by a different
thread in the middle of a screen transfer etc.
* Reset the keyboard before init to ensure correct initialisation on kernels > 2.6.19
+1.2.1 -> svn
+* Add support for the logitech Z-10 speakers - many thanks to Dwayne Fontenot for
+ detailed information and debugging.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mla...@us...> - 2007-02-18 04:55:24
|
Revision: 235
http://svn.sourceforge.net/g15tools/?rev=235&view=rev
Author: mlampard
Date: 2007-02-17 20:55:24 -0800 (Sat, 17 Feb 2007)
Log Message:
-----------
ensure that the device caps are set correctly for the detected device
Modified Paths:
--------------
trunk/libg15/libg15.c
Modified: trunk/libg15/libg15.c
===================================================================
--- trunk/libg15/libg15.c 2007-02-16 00:01:33 UTC (rev 234)
+++ trunk/libg15/libg15.c 2007-02-18 04:55:24 UTC (rev 235)
@@ -112,7 +112,7 @@
return G15_NO_ERROR;
}
-static usb_dev_handle * findAndOpenDevice(libg15_devices_t handled_device)
+static usb_dev_handle * findAndOpenDevice(libg15_devices_t handled_device, int device_index)
{
struct usb_bus *bus = 0;
struct usb_device *dev = 0;
@@ -130,6 +130,7 @@
char name_buffer[65535];
name_buffer[0] = 0;
usb_dev_handle *devh = 0;
+ found_devicetype = device_index;
g15_log(stderr,G15_LOG_INFO,"Found %s, trying to open it\n",handled_device.name);
#if 0
devh = usb_open(dev);
@@ -173,7 +174,7 @@
* Non-linux users will need some way to detach the HID driver from
* the G15 until we work out how to do this for other OS's automatically.
* For the moment, we just skip this code..
- */
+ */
#ifdef LIBUSB_HAS_GET_DRIVER_NP
ret = usb_get_driver_np(devh, i, name_buffer, 65535);
/* some kernel versions say that a driver is attached even though there is none
@@ -259,8 +260,7 @@
int i;
for (i=0; g15_devices[i].name !=NULL ;i++){
g15_log(stderr,G15_LOG_INFO,"Trying to find %s\n",g15_devices[i].name);
- if(keyboard_device = findAndOpenDevice(g15_devices[i])){
- found_devicetype = i;
+ if(keyboard_device = findAndOpenDevice(g15_devices[i],i)){
break;
}
else
@@ -466,7 +466,7 @@
if(shared_device>0)
return G15_ERROR_UNSUPPORTED;
-
+
pthread_mutex_lock(&libusb_mutex);
retval = usb_control_msg(keyboard_device, USB_TYPE_CLASS + USB_RECIP_INTERFACE, 9, 0x302, 0, (char*)m_led_buf, 4, 10000);
pthread_mutex_unlock(&libusb_mutex);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mla...@us...> - 2007-02-16 00:02:12
|
Revision: 234
http://svn.sourceforge.net/g15tools/?rev=234&view=rev
Author: mlampard
Date: 2007-02-15 16:01:33 -0800 (Thu, 15 Feb 2007)
Log Message:
-----------
fix a couple of bugs from last commit.
Modified Paths:
--------------
trunk/libg15/libg15.c
Modified: trunk/libg15/libg15.c
===================================================================
--- trunk/libg15/libg15.c 2007-02-15 08:23:58 UTC (rev 233)
+++ trunk/libg15/libg15.c 2007-02-16 00:01:33 UTC (rev 234)
@@ -30,8 +30,8 @@
static int found_devicetype = -1;
static int shared_device = 0;
-static int g15_keys_endpoint;
-static int g15_lcd_endpoint;
+static int g15_keys_endpoint = 0;
+static int g15_lcd_endpoint = 0;
static pthread_mutex_t libusb_mutex;
@@ -39,9 +39,9 @@
/* Fields are: "Name",VendorID,ProductID,Capabilities */
const libg15_devices_t g15_devices[] = {
DEVICE("Logitech G15",0x46d,0xc222,G15_LCD|G15_KEYS),
- DEVICE("Logitech G11",0x46d,0xc225,G15_KEYS),
- DEVICE("Logitech Z-10",0x46d,0x0a07,G15_LCD|G15_KEYS|G15_DEVICE_IS_SHARED),
- DEVICE(NULL,0,0,0)
+ DEVICE("Logitech G11",0x46d,0xc225,G15_KEYS),
+ DEVICE("Logitech Z-10",0x46d,0x0a07,G15_LCD|G15_KEYS|G15_DEVICE_IS_SHARED),
+ DEVICE(NULL,0,0,0)
};
/* return device capabilities */
@@ -149,11 +149,18 @@
g15_log(stderr, G15_LOG_INFO, "Device has %i possible configurations\n",dev->descriptor.bNumConfigurations);
+ /* if device is shared with another driver, such as the Z-10 speakers sharing with alsa, we have to disable some calls */
+ if(g15DeviceCapabilities() & G15_DEVICE_IS_SHARED)
+ shared_device = 1;
+
for (j = 0; j<dev->descriptor.bNumConfigurations;j++){
struct usb_config_descriptor *cfg = &dev->config[j];
for (i=0;i<cfg->bNumInterfaces; i++){
struct usb_interface *ifp = &cfg->interface[i];
+ /* if endpoints are already known, finish up */
+ if(g15_keys_endpoint && g15_lcd_endpoint)
+ break;
g15_log(stderr, G15_LOG_INFO, "Device has %i Alternate Settings\n", ifp->num_altsetting);
for(k=0;k<ifp->num_altsetting;k++){
@@ -189,14 +196,15 @@
}
#endif
-
- ret = usb_set_configuration(devh, 1);
- if (ret)
- {
+ /* don't set configuration if device is shared */
+ if(0 == shared_device) {
+ ret = usb_set_configuration(devh, 1);
+ if (ret)
+ {
g15_log(stderr,G15_LOG_INFO,"Error setting the configuration, this is fatal\n");
return 0;
+ }
}
-
usleep(50*1000);
while((ret = usb_claim_interface(devh,i)) && retries <10) {
usleep(50*1000);
@@ -237,11 +245,6 @@
}
-
-
- /* if device is shared with another driver, such as the Z-10 speakers sharing with alsa, we have to disable some calls */
- shared_device = g15DeviceCapabilities();
-
g15_log(stderr,G15_LOG_INFO,"Done opening the keyboard\n");
usleep(500*1000); // sleep a bit for good measure
return devh;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mla...@us...> - 2007-02-15 08:23:58
|
Revision: 233
http://svn.sourceforge.net/g15tools/?rev=233&view=rev
Author: mlampard
Date: 2007-02-15 00:23:58 -0800 (Thu, 15 Feb 2007)
Log Message:
-----------
read the usb descriptors rather than hard-coding values. add z10 productid. if device is known to share with another driver, disable calls that might interfere with that driver.
Modified Paths:
--------------
trunk/libg15/debian/changelog
trunk/libg15/libg15.c
trunk/libg15/libg15.h
trunk/libg15/rpm/libg15.spec
Modified: trunk/libg15/debian/changelog
===================================================================
--- trunk/libg15/debian/changelog 2007-02-11 22:15:30 UTC (rev 232)
+++ trunk/libg15/debian/changelog 2007-02-15 08:23:58 UTC (rev 233)
@@ -1,4 +1,4 @@
-libg15 (1.2.0) edgy; urgency=low
+libg15 (1.2.1) edgy; urgency=low
* Add debugging function to enable/disable extra output
* All debugging output is now prefixed with libg15 to aid localising
problems.
@@ -14,6 +14,8 @@
* libg15 now uses pthread mutexes to force sequential access to the bus via
libusb. Control message URBs are no longer being lost if sent by a different
thread in the middle of a screen transfer etc.
+ * Reset the keyboard before init to ensure correct initialisation on
+ kernels > 2.6.19
libg15 (1.1.1-1) edgy; urgency=low
Modified: trunk/libg15/libg15.c
===================================================================
--- trunk/libg15/libg15.c 2007-02-11 22:15:30 UTC (rev 232)
+++ trunk/libg15/libg15.c 2007-02-15 08:23:58 UTC (rev 233)
@@ -29,63 +29,66 @@
static int enospc_slowdown = 0;
static int found_devicetype = -1;
-
+static int shared_device = 0;
+static int g15_keys_endpoint;
+static int g15_lcd_endpoint;
static pthread_mutex_t libusb_mutex;
/* to add a new device, simply create a new DEVICE() in this list */
/* Fields are: "Name",VendorID,ProductID,Capabilities */
const libg15_devices_t g15_devices[] = {
- DEVICE("Logitech G15",0x46d,0xc222,G15_LCD|G15_KEYS),
- DEVICE("Logitech G11",0x46d,0xc225,G15_KEYS),
- DEVICE(NULL,0,0,0)
+ DEVICE("Logitech G15",0x46d,0xc222,G15_LCD|G15_KEYS),
+ DEVICE("Logitech G11",0x46d,0xc225,G15_KEYS),
+ DEVICE("Logitech Z-10",0x46d,0x0a07,G15_LCD|G15_KEYS|G15_DEVICE_IS_SHARED),
+ DEVICE(NULL,0,0,0)
};
/* return device capabilities */
int g15DeviceCapabilities() {
if(found_devicetype>-1)
- return g15_devices[found_devicetype].caps;
+ return g15_devices[found_devicetype].caps;
else
- return -1;
+ return -1;
}
/* enable or disable debugging */
void libg15Debug(int option) {
- libg15_debugging_enabled = option;
- usb_set_debug(option);
+ libg15_debugging_enabled = option;
+ usb_set_debug(option);
}
/* debugging wrapper */
static int g15_log (FILE *fd, unsigned int level, const char *fmt, ...) {
- if (libg15_debugging_enabled && libg15_debugging_enabled>=level) {
- fprintf(fd,"libg15: ");
- va_list argp;
- va_start (argp, fmt);
- vfprintf(fd,fmt,argp);
- va_end (argp);
- }
+ if (libg15_debugging_enabled && libg15_debugging_enabled>=level) {
+ fprintf(fd,"libg15: ");
+ va_list argp;
+ va_start (argp, fmt);
+ vfprintf(fd,fmt,argp);
+ va_end (argp);
+ }
- return 0;
+ return 0;
}
/* return number of connected and supported devices */
int g15NumberOfConnectedDevices() {
- struct usb_bus *bus = 0;
- struct usb_device *dev = 0;
- int i=0;
- unsigned int found = 0;
+ struct usb_bus *bus = 0;
+ struct usb_device *dev = 0;
+ int i=0;
+ unsigned int found = 0;
- for (i=0; g15_devices[i].name !=NULL;i++)
- for (bus = usb_busses; bus; bus = bus->next)
+ for (i=0; g15_devices[i].name !=NULL;i++)
+ for (bus = usb_busses; bus; bus = bus->next)
{
- for (dev = bus->devices; dev; dev = dev->next)
- {
- if ((dev->descriptor.idVendor == g15_devices[i].vendorid && dev->descriptor.idProduct == g15_devices[i].productid))
- found++;
- }
+ for (dev = bus->devices; dev; dev = dev->next)
+ {
+ if ((dev->descriptor.idVendor == g15_devices[i].vendorid && dev->descriptor.idProduct == g15_devices[i].productid))
+ found++;
+ }
}
g15_log(stderr,G15_LOG_INFO,"Found %i supported devices\n",found);
return found;
@@ -93,488 +96,552 @@
static int initLibUsb()
{
- usb_init();
+ usb_init();
/**
- * usb_find_busses and usb_find_devices both report the number of devices
- * / busses added / removed since the last call. since this is the first
+ * usb_find_busses and usb_find_devices both report the number of devices
+ * / busses added / removed since the last call. since this is the first
* call we have to return values != 0 or else we didnt find anything */
- if (!usb_find_busses())
- return G15_ERROR_OPENING_USB_DEVICE;
+ if (!usb_find_busses())
+ return G15_ERROR_OPENING_USB_DEVICE;
- if (!usb_find_devices())
- return G15_ERROR_OPENING_USB_DEVICE;
+ if (!usb_find_devices())
+ return G15_ERROR_OPENING_USB_DEVICE;
- return G15_NO_ERROR;
+ return G15_NO_ERROR;
}
static usb_dev_handle * findAndOpenDevice(libg15_devices_t handled_device)
{
- struct usb_bus *bus = 0;
- struct usb_device *dev = 0;
- int retries=0;
- for (bus = usb_busses; bus; bus = bus->next)
- {
- for (dev = bus->devices; dev; dev = dev->next)
+ struct usb_bus *bus = 0;
+ struct usb_device *dev = 0;
+ int retries=0;
+ int j,i,k,l;
+ int interface=0;
+
+ for (bus = usb_busses; bus; bus = bus->next)
{
- if ((dev->descriptor.idVendor == handled_device.vendorid && dev->descriptor.idProduct == handled_device.productid))
- {
- int ret=0;
- char name_buffer[65535];
- name_buffer[0] = 0;
- usb_dev_handle *devh = 0;
- g15_log(stderr,G15_LOG_INFO,"Found %s, trying to open it\n",handled_device.name);
-
- devh = usb_open(dev);
- usb_reset(devh);
- usleep(50*1000);
- usb_close(devh);
-
- devh = usb_open(dev);
- if (!devh)
+ for (dev = bus->devices; dev; dev = dev->next)
{
- g15_log(stderr,G15_LOG_INFO, "Error, could not open the keyboard\n");
- g15_log(stderr,G15_LOG_INFO, "Perhaps you dont have enough permissions to access it\n");
- return 0;
- }
+ if ((dev->descriptor.idVendor == handled_device.vendorid && dev->descriptor.idProduct == handled_device.productid))
+ {
+ int ret=0;
+ char name_buffer[65535];
+ name_buffer[0] = 0;
+ usb_dev_handle *devh = 0;
+ g15_log(stderr,G15_LOG_INFO,"Found %s, trying to open it\n",handled_device.name);
+#if 0
+ devh = usb_open(dev);
+ usb_reset(devh);
+ usleep(50*1000);
+ usb_close(devh);
+#endif
+ devh = usb_open(dev);
+ if (!devh)
+ {
+ g15_log(stderr,G15_LOG_INFO, "Error, could not open the keyboard\n");
+ g15_log(stderr,G15_LOG_INFO, "Perhaps you dont have enough permissions to access it\n");
+ return 0;
+ }
- usleep(50*1000);
+ usleep(50*1000);
- /* libusb functions ending in _np are not portable between OS's
- * Non-linux users will need some way to detach the HID driver from
- * the G15 until we work out how to do this for other OS's automatically.
- * For the moment, we just skip this code..
- */
+ g15_log(stderr, G15_LOG_INFO, "Device has %i possible configurations\n",dev->descriptor.bNumConfigurations);
+
+ for (j = 0; j<dev->descriptor.bNumConfigurations;j++){
+ struct usb_config_descriptor *cfg = &dev->config[j];
+
+ for (i=0;i<cfg->bNumInterfaces; i++){
+ struct usb_interface *ifp = &cfg->interface[i];
+ g15_log(stderr, G15_LOG_INFO, "Device has %i Alternate Settings\n", ifp->num_altsetting);
+
+ for(k=0;k<ifp->num_altsetting;k++){
+ struct usb_interface_descriptor *as = &ifp->altsetting[k];
+ /* verify that the interface is for a HID device */
+ if(as->bInterfaceClass==USB_CLASS_HID){
+ g15_log(stderr, G15_LOG_INFO, "Interface %i has %i Endpoints\n", i, as->bNumEndpoints);
+ usleep(50*1000);
+ /* libusb functions ending in _np are not portable between OS's
+ * Non-linux users will need some way to detach the HID driver from
+ * the G15 until we work out how to do this for other OS's automatically.
+ * For the moment, we just skip this code..
+ */
#ifdef LIBUSB_HAS_GET_DRIVER_NP
- ret = usb_get_driver_np(devh, 0, name_buffer, 65535);
- /* some kernel versions say that a driver is attached even though there is none
- in this case the name buffer has not been changed
- thanks to RobEngle for pointing this out */
- if (!ret && name_buffer[0])
- {
- g15_log(stderr,G15_LOG_INFO,"Trying to detach driver currently attached: \"%s\"\n",name_buffer);
+ ret = usb_get_driver_np(devh, i, name_buffer, 65535);
+ /* some kernel versions say that a driver is attached even though there is none
+ in this case the name buffer has not been changed
+ thanks to RobEngle for pointing this out */
+ if (!ret && name_buffer[0])
+ {
+ g15_log(stderr,G15_LOG_INFO,"Trying to detach driver currently attached: \"%s\"\n",name_buffer);
- ret = usb_detach_kernel_driver_np(devh, 0);
- if (!ret)
- {
- g15_log(stderr,G15_LOG_INFO,"Success, detached the driver\n");
- }
- else
- {
- g15_log(stderr,G15_LOG_INFO,"Sorry, I could not detached the driver, giving up\n");
- return 0;
- }
+ ret = usb_detach_kernel_driver_np(devh, i);
+ if (!ret)
+ {
+ g15_log(stderr,G15_LOG_INFO,"Success, detached the driver\n");
+ }
+ else
+ {
+ g15_log(stderr,G15_LOG_INFO,"Sorry, I could not detached the driver, giving up\n");
+ return 0;
+ }
- }
+ }
#endif
- usleep(50*1000);
- ret = usb_set_configuration(devh, 1);
- if (ret)
- {
- g15_log(stderr,G15_LOG_INFO,"Error setting the configuration, this is fatal\n");
- return 0;
- }
-
- usleep(50*1000);
-
- while((ret = usb_claim_interface(devh,0)) && retries <10) {
- usleep(50*1000);
- retries++;
- g15_log(stderr,G15_LOG_INFO,"Trying to claim interface\n");
- }
-
- if (ret)
- {
- g15_log(stderr,G15_LOG_INFO,"Error claiming interface, good day cruel world\n");
- return 0;
- }
- g15_log(stderr,G15_LOG_INFO,"Done opening the keyboard\n");
- usleep(500*1000); // sleep a bit for good measure
- return devh;
- }
- }
- }
- return 0;
+ ret = usb_set_configuration(devh, 1);
+ if (ret)
+ {
+ g15_log(stderr,G15_LOG_INFO,"Error setting the configuration, this is fatal\n");
+ return 0;
+ }
+
+ usleep(50*1000);
+ while((ret = usb_claim_interface(devh,i)) && retries <10) {
+ usleep(50*1000);
+ retries++;
+ g15_log(stderr,G15_LOG_INFO,"Trying to claim interface\n");
+ }
+
+ if (ret)
+ {
+ g15_log(stderr,G15_LOG_INFO,"Error claiming interface, good day cruel world\n");
+ return 0;
+ }
+
+ for (l=0; l< as->bNumEndpoints;l++){
+ struct usb_endpoint_descriptor *ep=&as->endpoint[l];
+ g15_log(stderr, G15_LOG_INFO, "Found %s endpoint %i with address 0x%X maxtransfersize=%i \n",
+ 0x80&ep->bEndpointAddress?"\"Extra Keys\"":"\"LCD\"",
+ ep->bEndpointAddress&0x0f,ep->bEndpointAddress, ep->wMaxPacketSize
+ );
+
+ if(0x80 & ep->bEndpointAddress) {
+ g15_keys_endpoint = ep->bEndpointAddress;
+ } else {
+ g15_lcd_endpoint = ep->bEndpointAddress;
+ }
+#if 0
+ usb_resetep(devh,ep->bEndpointAddress);
+#endif
+ }
+
+ if (ret)
+ {
+ g15_log(stderr, G15_LOG_INFO, "Error setting Alternate Interface\n");
+ }
+ }
+ }
+ }
+ }
+
+
+
+
+ /* if device is shared with another driver, such as the Z-10 speakers sharing with alsa, we have to disable some calls */
+ shared_device = g15DeviceCapabilities();
+
+ g15_log(stderr,G15_LOG_INFO,"Done opening the keyboard\n");
+ usleep(500*1000); // sleep a bit for good measure
+ return devh;
+ }
+ }
+ }
+ return 0;
}
static usb_dev_handle * findAndOpenG15() {
- int i;
- for (i=0; g15_devices[i].name !=NULL ;i++){
- g15_log(stderr,G15_LOG_INFO,"Trying to find %s\n",g15_devices[i].name);
- if(keyboard_device = findAndOpenDevice(g15_devices[i])){
- found_devicetype = i;
- break;
+ int i;
+ for (i=0; g15_devices[i].name !=NULL ;i++){
+ g15_log(stderr,G15_LOG_INFO,"Trying to find %s\n",g15_devices[i].name);
+ if(keyboard_device = findAndOpenDevice(g15_devices[i])){
+ found_devicetype = i;
+ break;
+ }
+ else
+ g15_log(stderr,G15_LOG_INFO,"%s not found\n",g15_devices[i].name);
}
- else
- g15_log(stderr,G15_LOG_INFO,"%s not found\n",g15_devices[i].name);
- }
- return keyboard_device;
+ return keyboard_device;
}
int re_initLibG15()
{
- usb_init();
+ usb_init();
/**
- * usb_find_busses and usb_find_devices both report the number of devices
- * / busses added / removed since the last call. since this is the first
+ * usb_find_busses and usb_find_devices both report the number of devices
+ * / busses added / removed since the last call. since this is the first
* call we have to return values != 0 or else we didnt find anything */
- if (!usb_find_devices())
- return G15_ERROR_OPENING_USB_DEVICE;
+ if (!usb_find_devices())
+ return G15_ERROR_OPENING_USB_DEVICE;
- keyboard_device = findAndOpenG15();
- if (!keyboard_device)
- return G15_ERROR_OPENING_USB_DEVICE;
+ keyboard_device = findAndOpenG15();
+ if (!keyboard_device)
+ return G15_ERROR_OPENING_USB_DEVICE;
- return G15_NO_ERROR;
+ return G15_NO_ERROR;
}
int initLibG15()
{
- int retval = G15_NO_ERROR;
- retval = initLibUsb();
- if (retval)
- return retval;
+ int retval = G15_NO_ERROR;
+ retval = initLibUsb();
+ if (retval)
+ return retval;
- g15NumberOfConnectedDevices();
+ g15NumberOfConnectedDevices();
- keyboard_device = findAndOpenG15();
- if (!keyboard_device)
- return G15_ERROR_OPENING_USB_DEVICE;
+ keyboard_device = findAndOpenG15();
+ if (!keyboard_device)
+ return G15_ERROR_OPENING_USB_DEVICE;
- pthread_mutex_init(&libusb_mutex, NULL);
- return retval;
+ pthread_mutex_init(&libusb_mutex, NULL);
+ return retval;
}
/* reset the keyboard, returning it to a known state */
int exitLibG15()
{
- int retval = G15_NO_ERROR;
- if (keyboard_device){
- retval = usb_release_interface (keyboard_device, 0);
- usleep(50*1000);
- retval = usb_reset(keyboard_device);
- usleep(50*1000);
- usb_close(keyboard_device);
- keyboard_device=0;
- pthread_mutex_destroy(&libusb_mutex);
- return retval;
- }
- return -1;
+ int retval = G15_NO_ERROR;
+ if (keyboard_device){
+ retval = usb_release_interface (keyboard_device, 0);
+ usleep(50*1000);
+#if 0
+ retval = usb_reset(keyboard_device);
+ usleep(50*1000);
+#endif
+ usb_close(keyboard_device);
+ keyboard_device=0;
+ pthread_mutex_destroy(&libusb_mutex);
+ return retval;
+ }
+ return -1;
}
static void dumpPixmapIntoLCDFormat(unsigned char *lcd_buffer, unsigned char const *data)
{
- unsigned int offset_from_start = G15_LCD_OFFSET;
- unsigned int curr_row = 0;
- unsigned int curr_col = 0;
+ unsigned int offset_from_start = G15_LCD_OFFSET;
+ unsigned int curr_row = 0;
+ unsigned int curr_col = 0;
- for (curr_row=0;curr_row<G15_LCD_HEIGHT;++curr_row)
- {
- for (curr_col=0;curr_col<G15_LCD_WIDTH;++curr_col)
+ for (curr_row=0;curr_row<G15_LCD_HEIGHT;++curr_row)
{
- unsigned int pixel_offset = curr_row*G15_LCD_WIDTH + curr_col;
- unsigned int byte_offset = pixel_offset / 8;
- unsigned int bit_offset = pixel_offset % 8;
- unsigned int val = data[byte_offset] & 1<<(7-bit_offset);
+ for (curr_col=0;curr_col<G15_LCD_WIDTH;++curr_col)
+ {
+ unsigned int pixel_offset = curr_row*G15_LCD_WIDTH + curr_col;
+ unsigned int byte_offset = pixel_offset / 8;
+ unsigned int bit_offset = pixel_offset % 8;
+ unsigned int val = data[byte_offset] & 1<<(7-bit_offset);
- unsigned int row = curr_row / 8;
- unsigned int offset = G15_LCD_WIDTH*row + curr_col;
- unsigned int bit = curr_row % 8;
+ unsigned int row = curr_row / 8;
+ unsigned int offset = G15_LCD_WIDTH*row + curr_col;
+ unsigned int bit = curr_row % 8;
/*
- if (val)
- printf("Setting pixel at row %d col %d to %d offset %d bit %d\n",curr_row,curr_col, val, offset, bit);
+ if (val)
+ printf("Setting pixel at row %d col %d to %d offset %d bit %d\n",curr_row,curr_col, val, offset, bit);
*/
- if (val)
- lcd_buffer[offset_from_start + offset] = lcd_buffer[offset_from_start + offset] | 1 << bit;
- else
- lcd_buffer[offset_from_start + offset] = lcd_buffer[offset_from_start + offset] & ~(1 << bit);
+ if (val)
+ lcd_buffer[offset_from_start + offset] = lcd_buffer[offset_from_start + offset] | 1 << bit;
+ else
+ lcd_buffer[offset_from_start + offset] = lcd_buffer[offset_from_start + offset] & ~(1 << bit);
+ }
}
- }
}
int handle_usb_errors(const char *prefix, int ret) {
- switch (ret){
- case -ETIMEDOUT:
- return G15_ERROR_READING_USB_DEVICE; /* backward-compatibility */
- break;
- case -ENOSPC: /* the we dont have enough bandwidth, apparently.. something has to give here.. */
- g15_log(stderr,G15_LOG_INFO,"usb error: ENOSPC.. reducing speed\n");
- enospc_slowdown = 1;
- break;
- case -ENODEV: /* the device went away - we probably should attempt to reattach */
- case -ENXIO: /* host controller bug */
- case -EINVAL: /* invalid request */
- case -EAGAIN: /* try again */
- case -EFBIG: /* too many frames to handle */
- case -EMSGSIZE: /* msgsize is invalid */
- g15_log(stderr,G15_LOG_INFO,"usb error: %s (%i)\n",prefix,ret);
- break;
- case -EPIPE: /* endpoint is stalled */
- g15_log(stderr,G15_LOG_INFO,"usb error: %s EPIPE! clearing...\n",prefix);
- pthread_mutex_lock(&libusb_mutex);
- usb_clear_halt(keyboard_device, 0x81);
- pthread_mutex_unlock(&libusb_mutex);
- break;
- default: /* timed out */
- g15_log(stderr,G15_LOG_INFO,"Unknown usb error: %s !! (err is %i)\n",prefix,ret);
- }
- return ret;
+ switch (ret){
+ case -ETIMEDOUT:
+ return G15_ERROR_READING_USB_DEVICE; /* backward-compatibility */
+ break;
+ case -ENOSPC: /* the we dont have enough bandwidth, apparently.. something has to give here.. */
+ g15_log(stderr,G15_LOG_INFO,"usb error: ENOSPC.. reducing speed\n");
+ enospc_slowdown = 1;
+ break;
+ case -ENODEV: /* the device went away - we probably should attempt to reattach */
+ case -ENXIO: /* host controller bug */
+ case -EINVAL: /* invalid request */
+ case -EAGAIN: /* try again */
+ case -EFBIG: /* too many frames to handle */
+ case -EMSGSIZE: /* msgsize is invalid */
+ g15_log(stderr,G15_LOG_INFO,"usb error: %s (%i)\n",prefix,ret);
+ break;
+ case -EPIPE: /* endpoint is stalled */
+ g15_log(stderr,G15_LOG_INFO,"usb error: %s EPIPE! clearing...\n",prefix);
+ pthread_mutex_lock(&libusb_mutex);
+ usb_clear_halt(keyboard_device, 0x81);
+ pthread_mutex_unlock(&libusb_mutex);
+ break;
+ default: /* timed out */
+ g15_log(stderr,G15_LOG_INFO,"Unknown usb error: %s !! (err is %i)\n",prefix,ret);
+ }
+ return ret;
}
int writePixmapToLCD(unsigned char const *data)
{
- int ret = 0;
- int transfercount=0;
- unsigned char lcd_buffer[G15_BUFFER_LEN];
- memset(lcd_buffer,0,G15_BUFFER_LEN);
- dumpPixmapIntoLCDFormat(lcd_buffer, data);
+ int ret = 0;
+ int transfercount=0;
+ unsigned char lcd_buffer[G15_BUFFER_LEN];
+ memset(lcd_buffer,0,G15_BUFFER_LEN);
+ dumpPixmapIntoLCDFormat(lcd_buffer, data);
- if(!(g15_devices[found_devicetype].caps & G15_LCD))
- return 0;
+ if(!(g15_devices[found_devicetype].caps & G15_LCD))
+ return 0;
- /* the keyboard needs this magic byte */
- lcd_buffer[0] = 0x03;
+ /* the keyboard needs this magic byte */
+ lcd_buffer[0] = 0x03;
/* in an attempt to reduce peak bus utilisation, we break the transfer into 32 byte chunks and sleep a bit in between.
- It shouldnt make much difference, but then again, the g15 shouldnt be flooding the bus enough to cause ENOSPC, yet
- apparently does on some machines...
- I'm not sure how successful this will be in combatting ENOSPC, but we'll give it try in the real-world. */
+ It shouldnt make much difference, but then again, the g15 shouldnt be flooding the bus enough to cause ENOSPC, yet
+ apparently does on some machines...
+ I'm not sure how successful this will be in combatting ENOSPC, but we'll give it try in the real-world. */
- if(enospc_slowdown != 0){
- pthread_mutex_lock(&libusb_mutex);
- for(transfercount = 0;transfercount<=31;transfercount++){
- ret = usb_interrupt_write(keyboard_device, 2, (char*)lcd_buffer+(32*transfercount), 32, 1000);
- if (ret != 32)
- {
- handle_usb_errors ("LCDPixmap Slow Write",ret);
- return G15_ERROR_WRITING_PIXMAP;
- }
- usleep(100);
+ if(enospc_slowdown != 0){
+ pthread_mutex_lock(&libusb_mutex);
+ for(transfercount = 0;transfercount<=31;transfercount++){
+ ret = usb_interrupt_write(keyboard_device, g15_lcd_endpoint, (char*)lcd_buffer+(32*transfercount), 32, 1000);
+ if (ret != 32)
+ {
+ handle_usb_errors ("LCDPixmap Slow Write",ret);
+ return G15_ERROR_WRITING_PIXMAP;
+ }
+ usleep(100);
+ }
+ pthread_mutex_unlock(&libusb_mutex);
+ }else{
+ /* transfer entire buffer in one hit */
+ pthread_mutex_lock(&libusb_mutex);
+ ret = usb_interrupt_write(keyboard_device, g15_lcd_endpoint, (char*)lcd_buffer, G15_BUFFER_LEN, 1000);
+ pthread_mutex_unlock(&libusb_mutex);
+ if (ret != G15_BUFFER_LEN)
+ {
+ handle_usb_errors ("LCDPixmap Write",ret);
+ return G15_ERROR_WRITING_PIXMAP;
+ }
+ usleep(100);
}
- pthread_mutex_unlock(&libusb_mutex);
- }else{
- /* transfer entire buffer in one hit */
- pthread_mutex_lock(&libusb_mutex);
- ret = usb_interrupt_write(keyboard_device, 2, (char*)lcd_buffer, G15_BUFFER_LEN, 1000);
- pthread_mutex_unlock(&libusb_mutex);
- if (ret != G15_BUFFER_LEN)
- {
- handle_usb_errors ("LCDPixmap Write",ret);
- return G15_ERROR_WRITING_PIXMAP;
- }
- usleep(100);
- }
- return 0;
+ return 0;
}
int setLCDContrast(unsigned int level)
{
- int retval = 0;
- unsigned char usb_data[] = { 2, 32, 129, 0 };
-
- switch(level)
- {
- case 1:
- usb_data[3] = 22;
- break;
- case 2:
- usb_data[3] = 26;
- break;
- default:
- usb_data[3] = 18;
- }
- pthread_mutex_lock(&libusb_mutex);
- retval = usb_control_msg(keyboard_device, USB_TYPE_CLASS + USB_RECIP_INTERFACE, 9, 0x302, 0, (char*)usb_data, 4, 10000);
- pthread_mutex_unlock(&libusb_mutex);
- return retval;
+ int retval = 0;
+ unsigned char usb_data[] = { 2, 32, 129, 0 };
+
+ if(shared_device>0)
+ return G15_ERROR_UNSUPPORTED;
+
+ switch(level)
+ {
+ case 1:
+ usb_data[3] = 22;
+ break;
+ case 2:
+ usb_data[3] = 26;
+ break;
+ default:
+ usb_data[3] = 18;
+ }
+ pthread_mutex_lock(&libusb_mutex);
+ retval = usb_control_msg(keyboard_device, USB_TYPE_CLASS + USB_RECIP_INTERFACE, 9, 0x302, 0, (char*)usb_data, 4, 10000);
+ pthread_mutex_unlock(&libusb_mutex);
+ return retval;
}
int setLEDs(unsigned int leds)
{
- int retval = 0;
- unsigned char m_led_buf[4] = { 2, 4, 0, 0 };
- m_led_buf[2] = ~(unsigned char)leds;
- pthread_mutex_lock(&libusb_mutex);
- retval = usb_control_msg(keyboard_device, USB_TYPE_CLASS + USB_RECIP_INTERFACE, 9, 0x302, 0, (char*)m_led_buf, 4, 10000);
- pthread_mutex_unlock(&libusb_mutex);
- return retval;
+ int retval = 0;
+ unsigned char m_led_buf[4] = { 2, 4, 0, 0 };
+ m_led_buf[2] = ~(unsigned char)leds;
+
+ if(shared_device>0)
+ return G15_ERROR_UNSUPPORTED;
+
+ pthread_mutex_lock(&libusb_mutex);
+ retval = usb_control_msg(keyboard_device, USB_TYPE_CLASS + USB_RECIP_INTERFACE, 9, 0x302, 0, (char*)m_led_buf, 4, 10000);
+ pthread_mutex_unlock(&libusb_mutex);
+ return retval;
}
int setLCDBrightness(unsigned int level)
{
- int retval = 0;
- unsigned char usb_data[] = { 2, 2, 0, 0 };
-
- switch(level)
- {
- case 1 :
- usb_data[2] = 0x10;
- break;
- case 2 :
- usb_data[2] = 0x20;
- break;
- default:
- usb_data[2] = 0x00;
- }
- pthread_mutex_lock(&libusb_mutex);
- retval = usb_control_msg(keyboard_device, USB_TYPE_CLASS + USB_RECIP_INTERFACE, 9, 0x302, 0, (char*)usb_data, 4, 10000);
- pthread_mutex_unlock(&libusb_mutex);
- return retval;
+ int retval = 0;
+ unsigned char usb_data[] = { 2, 2, 0, 0 };
+
+ if(shared_device>0)
+ return G15_ERROR_UNSUPPORTED;
+
+ switch(level)
+ {
+ case 1 :
+ usb_data[2] = 0x10;
+ break;
+ case 2 :
+ usb_data[2] = 0x20;
+ break;
+ default:
+ usb_data[2] = 0x00;
+ }
+ pthread_mutex_lock(&libusb_mutex);
+ retval = usb_control_msg(keyboard_device, USB_TYPE_CLASS + USB_RECIP_INTERFACE, 9, 0x302, 0, (char*)usb_data, 4, 10000);
+ pthread_mutex_unlock(&libusb_mutex);
+ return retval;
}
/* set the keyboard backlight. doesnt affect lcd backlight. 0==off,1==medium,2==high */
int setKBBrightness(unsigned int level)
{
- int retval = 0;
- unsigned char usb_data[] = { 2, 1, 0, 0 };
+ int retval = 0;
+ unsigned char usb_data[] = { 2, 1, 0, 0 };
+
+ if(shared_device>0)
+ return G15_ERROR_UNSUPPORTED;
- switch(level)
- {
- case 1 :
- usb_data[2] = 0x1;
- break;
- case 2 :
- usb_data[2] = 0x2;
- break;
- default:
- usb_data[2] = 0x0;
- }
- pthread_mutex_lock(&libusb_mutex);
- retval = usb_control_msg(keyboard_device, USB_TYPE_CLASS + USB_RECIP_INTERFACE, 9, 0x302, 0, (char*)usb_data, 4, 10000);
- pthread_mutex_unlock(&libusb_mutex);
- return retval;
+ switch(level)
+ {
+ case 1 :
+ usb_data[2] = 0x1;
+ break;
+ case 2 :
+ usb_data[2] = 0x2;
+ break;
+ default:
+ usb_data[2] = 0x0;
+ }
+ pthread_mutex_lock(&libusb_mutex);
+ retval = usb_control_msg(keyboard_device, USB_TYPE_CLASS + USB_RECIP_INTERFACE, 9, 0x302, 0, (char*)usb_data, 4, 10000);
+ pthread_mutex_unlock(&libusb_mutex);
+ return retval;
}
static unsigned char g15KeyToLogitechKeyCode(int key)
{
// first 12 G keys produce F1 - F12, thats 0x3a + key
- if (key < 12)
- {
- return 0x3a + key;
- }
+ if (key < 12)
+ {
+ return 0x3a + key;
+ }
// the other keys produce Key '1' (above letters) + key, thats 0x1e + key
- else
- {
- return 0x1e + key - 12; // sigh, half an hour to find -12 ....
- }
+ else
+ {
+ return 0x1e + key - 12; // sigh, half an hour to find -12 ....
+ }
}
static void processKeyEvent(unsigned int *pressed_keys, unsigned char *buffer)
{
- int i;
+ int i;
- *pressed_keys = 0;
+ *pressed_keys = 0;
- g15_log(stderr,G15_LOG_WARN,"Keyboard: %x, %x, %x, %x, %x, %x, %x, %x, %x\n",buffer[0],buffer[1],buffer[2],buffer[3],buffer[4],buffer[5],buffer[6],buffer[7],buffer[8]);
+ g15_log(stderr,G15_LOG_WARN,"Keyboard: %x, %x, %x, %x, %x, %x, %x, %x, %x\n",buffer[0],buffer[1],buffer[2],buffer[3],buffer[4],buffer[5],buffer[6],buffer[7],buffer[8]);
- if (buffer[0] == 0x02)
- {
- if (buffer[1]&0x01)
- *pressed_keys |= G15_KEY_G1;
+ if (buffer[0] == 0x02)
+ {
+ if (buffer[1]&0x01)
+ *pressed_keys |= G15_KEY_G1;
- if (buffer[2]&0x02)
- *pressed_keys |= G15_KEY_G2;
+ if (buffer[2]&0x02)
+ *pressed_keys |= G15_KEY_G2;
- if (buffer[3]&0x04)
- *pressed_keys |= G15_KEY_G3;
+ if (buffer[3]&0x04)
+ *pressed_keys |= G15_KEY_G3;
- if (buffer[4]&0x08)
- *pressed_keys |= G15_KEY_G4;
+ if (buffer[4]&0x08)
+ *pressed_keys |= G15_KEY_G4;
- if (buffer[5]&0x10)
- *pressed_keys |= G15_KEY_G5;
+ if (buffer[5]&0x10)
+ *pressed_keys |= G15_KEY_G5;
- if (buffer[6]&0x20)
- *pressed_keys |= G15_KEY_G6;
+ if (buffer[6]&0x20)
+ *pressed_keys |= G15_KEY_G6;
- if (buffer[2]&0x01)
- *pressed_keys |= G15_KEY_G7;
+ if (buffer[2]&0x01)
+ *pressed_keys |= G15_KEY_G7;
- if (buffer[3]&0x02)
- *pressed_keys |= G15_KEY_G8;
+ if (buffer[3]&0x02)
+ *pressed_keys |= G15_KEY_G8;
- if (buffer[4]&0x04)
- *pressed_keys |= G15_KEY_G9;
+ if (buffer[4]&0x04)
+ *pressed_keys |= G15_KEY_G9;
- if (buffer[5]&0x08)
- *pressed_keys |= G15_KEY_G10;
+ if (buffer[5]&0x08)
+ *pressed_keys |= G15_KEY_G10;
- if (buffer[6]&0x10)
- *pressed_keys |= G15_KEY_G11;
+ if (buffer[6]&0x10)
+ *pressed_keys |= G15_KEY_G11;
- if (buffer[7]&0x20)
- *pressed_keys |= G15_KEY_G12;
+ if (buffer[7]&0x20)
+ *pressed_keys |= G15_KEY_G12;
- if (buffer[1]&0x04)
- *pressed_keys |= G15_KEY_G13;
+ if (buffer[1]&0x04)
+ *pressed_keys |= G15_KEY_G13;
- if (buffer[2]&0x08)
- *pressed_keys |= G15_KEY_G14;
+ if (buffer[2]&0x08)
+ *pressed_keys |= G15_KEY_G14;
- if (buffer[3]&0x10)
- *pressed_keys |= G15_KEY_G15;
+ if (buffer[3]&0x10)
+ *pressed_keys |= G15_KEY_G15;
- if (buffer[4]&0x20)
- *pressed_keys |= G15_KEY_G16;
+ if (buffer[4]&0x20)
+ *pressed_keys |= G15_KEY_G16;
- if (buffer[5]&0x40)
- *pressed_keys |= G15_KEY_G17;
+ if (buffer[5]&0x40)
+ *pressed_keys |= G15_KEY_G17;
- if (buffer[8]&0x40)
- *pressed_keys |= G15_KEY_G18;
+ if (buffer[8]&0x40)
+ *pressed_keys |= G15_KEY_G18;
- if (buffer[6]&0x01)
- *pressed_keys |= G15_KEY_M1;
- if (buffer[7]&0x02)
- *pressed_keys |= G15_KEY_M2;
- if (buffer[8]&0x04)
- *pressed_keys |= G15_KEY_M3;
- if (buffer[7]&0x40)
- *pressed_keys |= G15_KEY_MR;
+ if (buffer[6]&0x01)
+ *pressed_keys |= G15_KEY_M1;
+ if (buffer[7]&0x02)
+ *pressed_keys |= G15_KEY_M2;
+ if (buffer[8]&0x04)
+ *pressed_keys |= G15_KEY_M3;
+ if (buffer[7]&0x40)
+ *pressed_keys |= G15_KEY_MR;
- if (buffer[8]&0x80)
- *pressed_keys |= G15_KEY_L1;
- if (buffer[2]&0x80)
- *pressed_keys |= G15_KEY_L2;
- if (buffer[3]&0x80)
- *pressed_keys |= G15_KEY_L3;
- if (buffer[4]&0x80)
- *pressed_keys |= G15_KEY_L4;
- if (buffer[5]&0x80)
- *pressed_keys |= G15_KEY_L5;
+ if (buffer[8]&0x80)
+ *pressed_keys |= G15_KEY_L1;
+ if (buffer[2]&0x80)
+ *pressed_keys |= G15_KEY_L2;
+ if (buffer[3]&0x80)
+ *pressed_keys |= G15_KEY_L3;
+ if (buffer[4]&0x80)
+ *pressed_keys |= G15_KEY_L4;
+ if (buffer[5]&0x80)
+ *pressed_keys |= G15_KEY_L5;
- if (buffer[1]&0x80)
- *pressed_keys |= G15_KEY_LIGHT;
+ if (buffer[1]&0x80)
+ *pressed_keys |= G15_KEY_LIGHT;
- }
+ }
}
int getPressedKeys(unsigned int *pressed_keys, unsigned int timeout)
{
- unsigned char buffer[9];
- int ret = 0;
- pthread_mutex_lock(&libusb_mutex);
- ret = usb_interrupt_read(keyboard_device, 0x81, (char*)buffer, 9, timeout);
- pthread_mutex_unlock(&libusb_mutex);
+ unsigned char buffer[9];
+ int ret = 0;
+ pthread_mutex_lock(&libusb_mutex);
+ ret = usb_interrupt_read(keyboard_device, g15_keys_endpoint, (char*)buffer, 9, timeout);
+ pthread_mutex_unlock(&libusb_mutex);
- if (ret == 9)
- {
- if (buffer[0] == 1)
- return G15_ERROR_TRY_AGAIN;
+ if (ret == 9)
+ {
+ if (buffer[0] == 1)
+ return G15_ERROR_TRY_AGAIN;
- processKeyEvent(pressed_keys, buffer);
+ processKeyEvent(pressed_keys, buffer);
- return G15_NO_ERROR;
- }
- return handle_usb_errors("Keyboard Read", ret); /* allow the app to deal with errors */
+ return G15_NO_ERROR;
+ }
+ return handle_usb_errors("Keyboard Read", ret); /* allow the app to deal with errors */
}
Modified: trunk/libg15/libg15.h
===================================================================
--- trunk/libg15/libg15.h 2007-02-11 22:15:30 UTC (rev 232)
+++ trunk/libg15/libg15.h 2007-02-15 08:23:58 UTC (rev 233)
@@ -26,6 +26,7 @@
#define G15_LCD 1
#define G15_KEYS 2
+#define G15_DEVICE_IS_SHARED 4
typedef struct libg15_devices_t libg15_devices_t;
@@ -60,7 +61,8 @@
G15_ERROR_TIMEOUT,
G15_ERROR_READING_USB_DEVICE,
G15_ERROR_TRY_AGAIN,
- G15_ERROR_WRITING_BUFFER
+ G15_ERROR_WRITING_BUFFER,
+ G15_ERROR_UNSUPPORTED
};
enum
Modified: trunk/libg15/rpm/libg15.spec
===================================================================
--- trunk/libg15/rpm/libg15.spec 2007-02-11 22:15:30 UTC (rev 232)
+++ trunk/libg15/rpm/libg15.spec 2007-02-15 08:23:58 UTC (rev 233)
@@ -3,11 +3,11 @@
%define prefix /usr
Summary: library to control logitech G15 keyboards
Name: libg15
-Version: 1.2.0
+Version: 1.2.1
Release: 1
Copyright: GPL
Group: Applications/System
-Source: http://prdownloads.sourceforge.net/g15tools/libg15-1.2.0.tar.bz2
+Source: http://prdownloads.sourceforge.net/g15tools/libg15-1.2.1.tar.bz2
URL: http://sourceforge.net/projects/g15tools
Distribution: Linux
Vendor: NONE
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ane...@us...> - 2007-02-11 22:15:30
|
Revision: 232
http://svn.sourceforge.net/g15tools/?rev=232&view=rev
Author: aneurysm9
Date: 2007-02-11 14:15:30 -0800 (Sun, 11 Feb 2007)
Log Message:
-----------
Revert 230 and 231 to make way for a more robust solution
Modified Paths:
--------------
trunk/g15composer/g15composer.c
trunk/libg15render/libg15render.h
trunk/libg15render/screen.c
trunk/libg15render/text.c
Modified: trunk/g15composer/g15composer.c
===================================================================
--- trunk/g15composer/g15composer.c 2007-02-10 15:39:44 UTC (rev 231)
+++ trunk/g15composer/g15composer.c 2007-02-11 22:15:30 UTC (rev 232)
@@ -109,11 +109,7 @@
fprintf (stderr, "Sorry, can't connect to g15daemon\n");
param->leaving = 1;
}
-#ifdef TTF_SUPPORT
- g15r_initTTFCanvas (param->canvas);
-#else
g15r_initCanvas (param->canvas);
-#endif
param->canvas->mode_reverse = 1;
g15r_pixelOverlay (param->canvas, 0, 0, 160, 43, g15c_logo_data);
param->canvas->mode_reverse = 0;
@@ -158,8 +154,6 @@
{
if (param->g15screen_fd)
g15_close_screen (param->g15screen_fd);
- if (param->canvas->ttf_canvas != NULL)
- free (param->canvas->ttf_canvas);
if (param->canvas != NULL)
free (param->canvas);
}
Modified: trunk/libg15render/libg15render.h
===================================================================
--- trunk/libg15render/libg15render.h 2007-02-10 15:39:44 UTC (rev 231)
+++ trunk/libg15render/libg15render.h 2007-02-11 22:15:30 UTC (rev 232)
@@ -32,15 +32,6 @@
#define G15_PIXEL_FILL 1
#define G15_MAX_FACE 5
- typedef struct g15_ttf_canvas
- {
-#ifdef TTF_SUPPORT
- FT_Library ftLib;
- FT_Face ttf_face[G15_MAX_FACE][sizeof (FT_Face)];
- int ttf_fontsize[G15_MAX_FACE];
-#endif
- } g15_ttf_canvas;
-
/** \brief This structure holds the data need to render objects to the LCD screen.*/
typedef struct g15canvas
{
@@ -52,8 +43,11 @@
int mode_cache;
/** g15canvas::mode_reverse determines whether color values passed to g15r_setPixel are reversed.*/
int mode_reverse;
-/** g15canvas::ttf_canvas is a pointer to a g15_ttf_canvas struct containing data for ttf operations.*/
- g15_ttf_canvas *ttf_canvas;
+#ifdef TTF_SUPPORT
+ FT_Library ftLib;
+ FT_Face ttf_face[G15_MAX_FACE][sizeof (FT_Face)];
+ int ttf_fontsize[G15_MAX_FACE];
+#endif
} g15canvas;
/** \brief Fills an area bounded by (x1, y1) and (x2, y2)*/
@@ -97,8 +91,6 @@
void g15r_clearScreen (g15canvas * canvas, int color);
/** \brief Clears the canvas and resets the mode switches*/
void g15r_initCanvas (g15canvas * canvas);
-/** \brief Clears the canvas, resets the mode switches, and initializes ttf support*/
- void g15r_initTTFCanvas (g15canvas * canvas);
/** \brief Font data for the large (8x8) font*/
extern unsigned char fontdata_8x8[];
Modified: trunk/libg15render/screen.c
===================================================================
--- trunk/libg15render/screen.c 2007-02-10 15:39:44 UTC (rev 231)
+++ trunk/libg15render/screen.c 2007-02-11 22:15:30 UTC (rev 232)
@@ -94,23 +94,8 @@
canvas->mode_cache = 0;
canvas->mode_reverse = 0;
canvas->mode_xor = 0;
-}
-
-void
-g15r_initTTFCanvas (g15canvas * canvas)
-{
- memset (canvas->buffer, 0, G15_BUFFER_LEN);
- canvas->mode_cache = 0;
- canvas->mode_reverse = 0;
- canvas->mode_xor = 0;
- canvas->ttf_canvas = (g15_ttf_canvas *) calloc (1, sizeof (g15_ttf_canvas));
- if (canvas->ttf_canvas == NULL)
- {
- printf ("Error allocating ttf_canvas\n");
- return;
- }
#ifdef TTF_SUPPORT
- if (FT_Init_FreeType (&canvas->ttf_canvas->ftLib))
+ if (FT_Init_FreeType (&canvas->ftLib))
printf ("Freetype couldnt initialise\n");
#endif
}
Modified: trunk/libg15render/text.c
===================================================================
--- trunk/libg15render/text.c 2007-02-10 15:39:44 UTC (rev 231)
+++ trunk/libg15render/text.c 2007-02-11 22:15:30 UTC (rev 232)
@@ -151,27 +151,27 @@
if (face_num > G15_MAX_FACE)
face_num = G15_MAX_FACE;
- if (canvas->ttf_canvas->ttf_fontsize[face_num])
- FT_Done_Face (canvas->ttf_canvas->ttf_face[face_num][0]); /* destroy the last face */
+ if (canvas->ttf_fontsize[face_num])
+ FT_Done_Face (canvas->ttf_face[face_num][0]); /* destroy the last face */
- if (!canvas->ttf_canvas->ttf_fontsize[face_num] && !fontsize)
- canvas->ttf_canvas->ttf_fontsize[face_num] = 10;
+ if (!canvas->ttf_fontsize[face_num] && !fontsize)
+ canvas->ttf_fontsize[face_num] = 10;
else
- canvas->ttf_canvas->ttf_fontsize[face_num] = fontsize;
+ canvas->ttf_fontsize[face_num] = fontsize;
errcode =
- FT_New_Face (canvas->ttf_canvas->ftLib, fontname, 0, &canvas->ttf_canvas->ttf_face[face_num][0]);
+ FT_New_Face (canvas->ftLib, fontname, 0, &canvas->ttf_face[face_num][0]);
if (errcode)
{
- canvas->ttf_canvas->ttf_fontsize[face_num] = 0;
+ canvas->ttf_fontsize[face_num] = 0;
}
else
{
- if (canvas->ttf_canvas->ttf_fontsize[face_num]
- && FT_IS_SCALABLE (canvas->ttf_canvas->ttf_face[face_num][0]))
+ if (canvas->ttf_fontsize[face_num]
+ && FT_IS_SCALABLE (canvas->ttf_face[face_num][0]))
errcode =
- FT_Set_Char_Size (canvas->ttf_canvas->ttf_face[face_num][0], 0,
- canvas->ttf_canvas->ttf_fontsize[face_num] * 64, 90, 0);
+ FT_Set_Char_Size (canvas->ttf_face[face_num][0], 0,
+ canvas->ttf_fontsize[face_num] * 64, 90, 0);
}
}
@@ -239,7 +239,7 @@
static FT_Bitmap tmpbuffer;
/* convert to 8bit format.. */
- FT_Bitmap_Convert (canvas->ttf_canvas->ftLib, &charbitmap, &tmpbuffer, 1);
+ FT_Bitmap_Convert (canvas->ftLib, &charbitmap, &tmpbuffer, 1);
for (char_y = y, q = 0; char_y < y_max; char_y++, q++)
for (char_x = x, p = 0; char_x < x_max; char_x++, p++)
@@ -285,26 +285,26 @@
{
int errcode = 0;
- if (canvas->ttf_canvas->ttf_fontsize[face_num])
+ if (canvas->ttf_fontsize[face_num])
{
- if (fontsize > 0 && FT_IS_SCALABLE (canvas->ttf_canvas->ttf_face[face_num][0]))
+ if (fontsize > 0 && FT_IS_SCALABLE (canvas->ttf_face[face_num][0]))
{
- canvas->ttf_canvas->ttf_fontsize[face_num] = fontsize;
+ canvas->ttf_fontsize[face_num] = fontsize;
int errcode =
- FT_Set_Pixel_Sizes (canvas->ttf_canvas->ttf_face[face_num][0], 0,
- canvas->ttf_canvas->ttf_fontsize[face_num]);
+ FT_Set_Pixel_Sizes (canvas->ttf_face[face_num][0], 0,
+ canvas->ttf_fontsize[face_num]);
if (errcode)
printf ("Trouble setting the Glyph size!\n");
}
y =
- calc_ttf_true_ypos (canvas->ttf_canvas->ttf_face[face_num][0], y,
- canvas->ttf_canvas->ttf_fontsize[face_num]);
+ calc_ttf_true_ypos (canvas->ttf_face[face_num][0], y,
+ canvas->ttf_fontsize[face_num]);
if (center == 1)
- x = calc_ttf_centering (canvas->ttf_canvas->ttf_face[face_num][0], print_string);
+ x = calc_ttf_centering (canvas->ttf_face[face_num][0], print_string);
else if (center == 2)
x = calc_ttf_right_justify (canvas->ttf_face[face_num][0], print_string);
draw_ttf_str (canvas, print_string, x, y, color,
- canvas->ttf_canvas->ttf_face[face_num][0]);
+ canvas->ttf_face[face_num][0]);
}
}
#endif /* TTF_SUPPORT */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ane...@us...> - 2007-02-10 15:39:43
|
Revision: 231
http://svn.sourceforge.net/g15tools/?rev=231&view=rev
Author: aneurysm9
Date: 2007-02-10 07:39:44 -0800 (Sat, 10 Feb 2007)
Log Message:
-----------
Use g15r_initTTFCanvas ifdef TTF_SUPPORT
Modified Paths:
--------------
trunk/g15composer/g15composer.c
Modified: trunk/g15composer/g15composer.c
===================================================================
--- trunk/g15composer/g15composer.c 2007-02-10 15:29:16 UTC (rev 230)
+++ trunk/g15composer/g15composer.c 2007-02-10 15:39:44 UTC (rev 231)
@@ -109,7 +109,11 @@
fprintf (stderr, "Sorry, can't connect to g15daemon\n");
param->leaving = 1;
}
+#ifdef TTF_SUPPORT
+ g15r_initTTFCanvas (param->canvas);
+#else
g15r_initCanvas (param->canvas);
+#endif
param->canvas->mode_reverse = 1;
g15r_pixelOverlay (param->canvas, 0, 0, 160, 43, g15c_logo_data);
param->canvas->mode_reverse = 0;
@@ -154,6 +158,8 @@
{
if (param->g15screen_fd)
g15_close_screen (param->g15screen_fd);
+ if (param->canvas->ttf_canvas != NULL)
+ free (param->canvas->ttf_canvas);
if (param->canvas != NULL)
free (param->canvas);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ane...@us...> - 2007-02-10 15:29:16
|
Revision: 230
http://svn.sourceforge.net/g15tools/?rev=230&view=rev
Author: aneurysm9
Date: 2007-02-10 07:29:16 -0800 (Sat, 10 Feb 2007)
Log Message:
-----------
This should hopefully fix segfaults with g15r_initCanvas when libg15render is built with TTF_SUPPORT and the calling program is not. Programs wishing to use TTF_SUPPO
RT should use g15r_initTTFCanvas instead. They should also be careful to ensure that they free canvas->ttf_canvas to avoid memory leaks.
Modified Paths:
--------------
trunk/libg15render/libg15render.h
trunk/libg15render/screen.c
trunk/libg15render/text.c
Modified: trunk/libg15render/libg15render.h
===================================================================
--- trunk/libg15render/libg15render.h 2007-01-01 22:12:30 UTC (rev 229)
+++ trunk/libg15render/libg15render.h 2007-02-10 15:29:16 UTC (rev 230)
@@ -32,6 +32,15 @@
#define G15_PIXEL_FILL 1
#define G15_MAX_FACE 5
+ typedef struct g15_ttf_canvas
+ {
+#ifdef TTF_SUPPORT
+ FT_Library ftLib;
+ FT_Face ttf_face[G15_MAX_FACE][sizeof (FT_Face)];
+ int ttf_fontsize[G15_MAX_FACE];
+#endif
+ } g15_ttf_canvas;
+
/** \brief This structure holds the data need to render objects to the LCD screen.*/
typedef struct g15canvas
{
@@ -43,11 +52,8 @@
int mode_cache;
/** g15canvas::mode_reverse determines whether color values passed to g15r_setPixel are reversed.*/
int mode_reverse;
-#ifdef TTF_SUPPORT
- FT_Library ftLib;
- FT_Face ttf_face[G15_MAX_FACE][sizeof (FT_Face)];
- int ttf_fontsize[G15_MAX_FACE];
-#endif
+/** g15canvas::ttf_canvas is a pointer to a g15_ttf_canvas struct containing data for ttf operations.*/
+ g15_ttf_canvas *ttf_canvas;
} g15canvas;
/** \brief Fills an area bounded by (x1, y1) and (x2, y2)*/
@@ -91,6 +97,8 @@
void g15r_clearScreen (g15canvas * canvas, int color);
/** \brief Clears the canvas and resets the mode switches*/
void g15r_initCanvas (g15canvas * canvas);
+/** \brief Clears the canvas, resets the mode switches, and initializes ttf support*/
+ void g15r_initTTFCanvas (g15canvas * canvas);
/** \brief Font data for the large (8x8) font*/
extern unsigned char fontdata_8x8[];
Modified: trunk/libg15render/screen.c
===================================================================
--- trunk/libg15render/screen.c 2007-01-01 22:12:30 UTC (rev 229)
+++ trunk/libg15render/screen.c 2007-02-10 15:29:16 UTC (rev 230)
@@ -94,8 +94,23 @@
canvas->mode_cache = 0;
canvas->mode_reverse = 0;
canvas->mode_xor = 0;
+}
+
+void
+g15r_initTTFCanvas (g15canvas * canvas)
+{
+ memset (canvas->buffer, 0, G15_BUFFER_LEN);
+ canvas->mode_cache = 0;
+ canvas->mode_reverse = 0;
+ canvas->mode_xor = 0;
+ canvas->ttf_canvas = (g15_ttf_canvas *) calloc (1, sizeof (g15_ttf_canvas));
+ if (canvas->ttf_canvas == NULL)
+ {
+ printf ("Error allocating ttf_canvas\n");
+ return;
+ }
#ifdef TTF_SUPPORT
- if (FT_Init_FreeType (&canvas->ftLib))
+ if (FT_Init_FreeType (&canvas->ttf_canvas->ftLib))
printf ("Freetype couldnt initialise\n");
#endif
}
Modified: trunk/libg15render/text.c
===================================================================
--- trunk/libg15render/text.c 2007-01-01 22:12:30 UTC (rev 229)
+++ trunk/libg15render/text.c 2007-02-10 15:29:16 UTC (rev 230)
@@ -151,27 +151,27 @@
if (face_num > G15_MAX_FACE)
face_num = G15_MAX_FACE;
- if (canvas->ttf_fontsize[face_num])
- FT_Done_Face (canvas->ttf_face[face_num][0]); /* destroy the last face */
+ if (canvas->ttf_canvas->ttf_fontsize[face_num])
+ FT_Done_Face (canvas->ttf_canvas->ttf_face[face_num][0]); /* destroy the last face */
- if (!canvas->ttf_fontsize[face_num] && !fontsize)
- canvas->ttf_fontsize[face_num] = 10;
+ if (!canvas->ttf_canvas->ttf_fontsize[face_num] && !fontsize)
+ canvas->ttf_canvas->ttf_fontsize[face_num] = 10;
else
- canvas->ttf_fontsize[face_num] = fontsize;
+ canvas->ttf_canvas->ttf_fontsize[face_num] = fontsize;
errcode =
- FT_New_Face (canvas->ftLib, fontname, 0, &canvas->ttf_face[face_num][0]);
+ FT_New_Face (canvas->ttf_canvas->ftLib, fontname, 0, &canvas->ttf_canvas->ttf_face[face_num][0]);
if (errcode)
{
- canvas->ttf_fontsize[face_num] = 0;
+ canvas->ttf_canvas->ttf_fontsize[face_num] = 0;
}
else
{
- if (canvas->ttf_fontsize[face_num]
- && FT_IS_SCALABLE (canvas->ttf_face[face_num][0]))
+ if (canvas->ttf_canvas->ttf_fontsize[face_num]
+ && FT_IS_SCALABLE (canvas->ttf_canvas->ttf_face[face_num][0]))
errcode =
- FT_Set_Char_Size (canvas->ttf_face[face_num][0], 0,
- canvas->ttf_fontsize[face_num] * 64, 90, 0);
+ FT_Set_Char_Size (canvas->ttf_canvas->ttf_face[face_num][0], 0,
+ canvas->ttf_canvas->ttf_fontsize[face_num] * 64, 90, 0);
}
}
@@ -239,7 +239,7 @@
static FT_Bitmap tmpbuffer;
/* convert to 8bit format.. */
- FT_Bitmap_Convert (canvas->ftLib, &charbitmap, &tmpbuffer, 1);
+ FT_Bitmap_Convert (canvas->ttf_canvas->ftLib, &charbitmap, &tmpbuffer, 1);
for (char_y = y, q = 0; char_y < y_max; char_y++, q++)
for (char_x = x, p = 0; char_x < x_max; char_x++, p++)
@@ -285,26 +285,26 @@
{
int errcode = 0;
- if (canvas->ttf_fontsize[face_num])
+ if (canvas->ttf_canvas->ttf_fontsize[face_num])
{
- if (fontsize > 0 && FT_IS_SCALABLE (canvas->ttf_face[face_num][0]))
+ if (fontsize > 0 && FT_IS_SCALABLE (canvas->ttf_canvas->ttf_face[face_num][0]))
{
- canvas->ttf_fontsize[face_num] = fontsize;
+ canvas->ttf_canvas->ttf_fontsize[face_num] = fontsize;
int errcode =
- FT_Set_Pixel_Sizes (canvas->ttf_face[face_num][0], 0,
- canvas->ttf_fontsize[face_num]);
+ FT_Set_Pixel_Sizes (canvas->ttf_canvas->ttf_face[face_num][0], 0,
+ canvas->ttf_canvas->ttf_fontsize[face_num]);
if (errcode)
printf ("Trouble setting the Glyph size!\n");
}
y =
- calc_ttf_true_ypos (canvas->ttf_face[face_num][0], y,
- canvas->ttf_fontsize[face_num]);
+ calc_ttf_true_ypos (canvas->ttf_canvas->ttf_face[face_num][0], y,
+ canvas->ttf_canvas->ttf_fontsize[face_num]);
if (center == 1)
- x = calc_ttf_centering (canvas->ttf_face[face_num][0], print_string);
+ x = calc_ttf_centering (canvas->ttf_canvas->ttf_face[face_num][0], print_string);
else if (center == 2)
x = calc_ttf_right_justify (canvas->ttf_face[face_num][0], print_string);
draw_ttf_str (canvas, print_string, x, y, color,
- canvas->ttf_face[face_num][0]);
+ canvas->ttf_canvas->ttf_face[face_num][0]);
}
}
#endif /* TTF_SUPPORT */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ane...@us...> - 2007-01-01 22:12:30
|
Revision: 229
http://svn.sourceforge.net/g15tools/?rev=229&view=rev
Author: aneurysm9
Date: 2007-01-01 14:12:30 -0800 (Mon, 01 Jan 2007)
Log Message:
-----------
Update debian changelog and deps
Modified Paths:
--------------
trunk/g15composer/debian/changelog
trunk/g15composer/debian/control
Modified: trunk/g15composer/debian/changelog
===================================================================
--- trunk/g15composer/debian/changelog 2007-01-01 22:09:24 UTC (rev 228)
+++ trunk/g15composer/debian/changelog 2007-01-01 22:12:30 UTC (rev 229)
@@ -1,3 +1,12 @@
+g15composer (3.1-1) edgy; urgency=low
+
+ * Add support for new WBMP and bignum routines in libg15render-1.2
+ * Improve FIFO handling to recover dangling FIFOs
+ * Add -u/--user -g/--group command line options to change effective UID/GID
+ * Add -r command line option to reuse running g15composer instance
+
+ -- Anthony J. Mirabella <mir...@gm...> Mon, 01 Jan 2007 17:16:35 -0500
+
g15composer (3.0-1) edgy; urgency=low
* Reimplement g15composer using flex and bison
@@ -4,7 +13,7 @@
* Text may now be right justified with the TO command
* Some command syntax has changed. See README for details.
- -- Anthony J. Mirabella <mir...@gm...> Thu, 26 Oct 2006 17:06:13 -0400
+ -- Anthony J. Mirabella <mir...@gm...> Thu, 26 Oct 2006 17:06:13 -0400
g15composer (2.1-1) dapper; urgency=low
Modified: trunk/g15composer/debian/control
===================================================================
--- trunk/g15composer/debian/control 2007-01-01 22:09:24 UTC (rev 228)
+++ trunk/g15composer/debian/control 2007-01-01 22:12:30 UTC (rev 229)
@@ -2,7 +2,7 @@
Section: utils
Priority: optional
Maintainer: Anthony J. Mirabella <mir...@gm...>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev, libg15-dev, libg15daemon-client-dev, libg15render-dev, libfreetype6-dev
+Build-Depends: debhelper (>= 4.0.0), autotools-dev, libg15-dev, libg15daemon-client-dev, libg15render-dev (>= 1.2), libfreetype6-dev
Standards-Version: 3.6.2
Package: g15composer
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ane...@us...> - 2007-01-01 22:09:25
|
Revision: 228
http://svn.sourceforge.net/g15tools/?rev=228&view=rev
Author: aneurysm9
Date: 2007-01-01 14:09:24 -0800 (Mon, 01 Jan 2007)
Log Message:
-----------
Update changelogs for 1.2 release
Modified Paths:
--------------
trunk/libg15render/ChangeLog
trunk/libg15render/debian/changelog
trunk/libg15render/text.c
Modified: trunk/libg15render/ChangeLog
===================================================================
--- trunk/libg15render/ChangeLog 2006-12-29 21:13:41 UTC (rev 227)
+++ trunk/libg15render/ChangeLog 2007-01-01 22:09:24 UTC (rev 228)
@@ -1,3 +1,9 @@
+1.2
+* Add WBMP loading and drawing routines
+* Add drawBigNum routine
+* Add man page
+* Enable right justified TTF printing
+
1.1
* Lower buffer size from 7k to 1k (recompile programs linked against v1.0)
* Add drawCircle, drawRoundBox, and drawBar routines
Modified: trunk/libg15render/debian/changelog
===================================================================
--- trunk/libg15render/debian/changelog 2006-12-29 21:13:41 UTC (rev 227)
+++ trunk/libg15render/debian/changelog 2007-01-01 22:09:24 UTC (rev 228)
@@ -1,3 +1,12 @@
+libg15render (1.2-1) edgy; urgency=low
+
+ * Add WBMP loading and drawing routines
+ * Add drawBigNum routine
+ * Add man page
+ * Enable right justified TTF printing
+
+ -- Anthony J. Mirabella <mir...@gm...> Mon, 01 Jan 2007 17:11:31 -0500
+
libg15render (1.1-1) breezy; urgency=low
* Initial release
Modified: trunk/libg15render/text.c
===================================================================
--- trunk/libg15render/text.c 2006-12-29 21:13:41 UTC (rev 227)
+++ trunk/libg15render/text.c 2007-01-01 22:09:24 UTC (rev 228)
@@ -182,7 +182,7 @@
if (!FT_IS_SCALABLE (face))
ttf_fontsize = face->available_sizes->height;
- y += ttf_fontsize - (ttf_fontsize * .25);
+ y += ttf_fontsize * .75;
return y;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ane...@us...> - 2006-12-29 21:13:41
|
Revision: 227
http://svn.sourceforge.net/g15tools/?rev=227&view=rev
Author: aneurysm9
Date: 2006-12-29 13:13:41 -0800 (Fri, 29 Dec 2006)
Log Message:
-----------
Don't try to draw a bar if max value is 0
Modified Paths:
--------------
trunk/libg15render/pixel.c
Modified: trunk/libg15render/pixel.c
===================================================================
--- trunk/libg15render/pixel.c 2006-12-28 02:58:04 UTC (rev 226)
+++ trunk/libg15render/pixel.c 2006-12-29 21:13:41 UTC (rev 227)
@@ -339,6 +339,8 @@
{
float len, length;
int x;
+ if (max == 0)
+ return;
if (num > max)
num = max;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ane...@us...> - 2006-12-28 02:58:05
|
Revision: 226
http://svn.sourceforge.net/g15tools/?rev=226&view=rev
Author: aneurysm9
Date: 2006-12-27 18:58:04 -0800 (Wed, 27 Dec 2006)
Log Message:
-----------
Make FIFO reuse dependent on -r option
Add -g/--group option to set EGID
Modified Paths:
--------------
trunk/g15composer/ChangeLog
trunk/g15composer/doc/g15composer.1
trunk/g15composer/g15composer.c
Modified: trunk/g15composer/ChangeLog
===================================================================
--- trunk/g15composer/ChangeLog 2006-12-27 15:40:26 UTC (rev 225)
+++ trunk/g15composer/ChangeLog 2006-12-28 02:58:04 UTC (rev 226)
@@ -1,7 +1,8 @@
3.1
* Add support for new WBMP and bignum routines in libg15render-1.2
* Improve FIFO handling to recover dangling FIFOs
-* Add -u/--user command line option to change effective UID/GID
+* Add -u/--user -g/--group command line options to change effective UID/GID
+* Add -r command line option to reuse running g15composer instance
3.0
* Reimplement g15composer using flex and bison
Modified: trunk/g15composer/doc/g15composer.1
===================================================================
--- trunk/g15composer/doc/g15composer.1 2006-12-27 15:40:26 UTC (rev 225)
+++ trunk/g15composer/doc/g15composer.1 2006-12-28 02:58:04 UTC (rev 226)
@@ -1,4 +1,4 @@
-.TH "G15Composer" "1" "3.0.1" "G15Tools - G15Composer" "G15Tools User Manual"
+.TH "G15Composer" "1" "3.1" "G15Tools - G15Composer" "G15Tools User Manual"
.SH "NAME"
g15composer \- Scriptable command interface to
.BR libg15render (3)
@@ -21,6 +21,16 @@
.br
Change effective UID to that of
.I username
+.P
+.HP
+\-g
+.I gid
+.br
+Change effective GID to
+.I gid
+.P
+.HP
+\-r Reuse /var/run/g15composer if another g15composer instance is listening there.
.SH "BASIC USAGE"
nohup ./g15composer /path/to/pipe &
Modified: trunk/g15composer/g15composer.c
===================================================================
--- trunk/g15composer/g15composer.c 2006-12-27 15:40:26 UTC (rev 225)
+++ trunk/g15composer/g15composer.c 2006-12-28 02:58:04 UTC (rev 226)
@@ -179,6 +179,8 @@
param->fifo_filename = NULL;
unsigned char user[256];
+ unsigned char group[256];
+ int reuse_fifo = 0;
int i = 1;
for (i = 1; (i < argc && param->fifo_filename == NULL); ++i)
@@ -192,6 +194,10 @@
{
param->background = 1;
}
+ else if (!strcmp (argv[i], "-r"))
+ {
+ reuse_fifo = 1;
+ }
else if (!strcmp (argv[i], "-u") || !strcmp (argv[i], "--user"))
{
if (argv[i + 1] != NULL)
@@ -200,6 +206,14 @@
i++;
}
}
+ else if (!strcmp (argv[i], "-g") || !strcmp (argv[i], "--group"))
+ {
+ if (argv[i + 1] != NULL)
+ {
+ strncpy ((char *) group, argv[i + 1], 128);
+ i++;
+ }
+ }
else
{
param->fifo_filename = argv[i];
@@ -220,32 +234,41 @@
sprintf (param->fifo_filename, "%s/%s", cwd, bname);
}
- int tmpfd = open ("/var/run/g15composer", O_WRONLY | O_NDELAY);
- if (tmpfd > 0)
- {
- FILE *control = fdopen (tmpfd, "w");
- fprintf (control, "SN \"%s\"\n", param->fifo_filename);
- fclose (control);
- close (tmpfd);
- return 0;
+ if (reuse_fifo)
+ {
+ int tmpfd = open ("/var/run/g15composer", O_WRONLY | O_NDELAY);
+ if (tmpfd > 0)
+ {
+ FILE *control = fdopen (tmpfd, "w");
+ fprintf (control, "SN \"%s\"\n", param->fifo_filename);
+ fclose (control);
+ close (tmpfd);
+ return 0;
+ }
}
- struct passwd *nobody;
+ struct passwd *euser;
if (strlen ((char *) user) == 0)
- nobody = getpwnam ("nobody");
+ euser = getpwnam ("nobody");
else
- nobody = getpwnam ((char *) user);
+ euser = getpwnam ((char *) user);
- if (nobody == NULL)
- nobody = getpwuid (geteuid ());
+ if (euser == NULL)
+ euser = getpwuid (geteuid ());
- if (nobody != NULL)
+ if (strlen ((char *) group))
{
- setegid (nobody->pw_gid);
- seteuid (nobody->pw_uid);
+ setegid (atoi(group));
}
+ if (euser != NULL)
+ {
+ if (group == NULL)
+ setegid (euser->pw_gid);
+ seteuid (euser->pw_uid);
+ }
+
struct threadList *thread_list = new_threadList ();
param->threads = thread_list;
pthread_create (¶m->thread, NULL, threadEntry, (void *) param);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mla...@us...> - 2006-12-27 15:40:26
|
Revision: 225
http://svn.sourceforge.net/g15tools/?rev=225&view=rev
Author: mlampard
Date: 2006-12-27 07:40:26 -0800 (Wed, 27 Dec 2006)
Log Message:
-----------
only bump minor by one :)
Modified Paths:
--------------
trunk/libg15/libg15.h
Modified: trunk/libg15/libg15.h
===================================================================
--- trunk/libg15/libg15.h 2006-12-27 15:39:23 UTC (rev 224)
+++ trunk/libg15/libg15.h 2006-12-27 15:40:26 UTC (rev 225)
@@ -44,7 +44,7 @@
}
/* allow for api changes */
-#define LIBG15_VERSION 1210
+#define LIBG15_VERSION 1201
enum
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mla...@us...> - 2006-12-27 15:39:23
|
Revision: 224
http://svn.sourceforge.net/g15tools/?rev=224&view=rev
Author: mlampard
Date: 2006-12-27 07:39:23 -0800 (Wed, 27 Dec 2006)
Log Message:
-----------
prepare for 1.2.1 release
Modified Paths:
--------------
trunk/libg15/ChangeLog
trunk/libg15/configure.in
trunk/libg15/libg15.c
trunk/libg15/libg15.h
Modified: trunk/libg15/ChangeLog
===================================================================
--- trunk/libg15/ChangeLog 2006-12-27 13:57:14 UTC (rev 223)
+++ trunk/libg15/ChangeLog 2006-12-27 15:39:23 UTC (rev 224)
@@ -11,7 +11,7 @@
* revert all bulk transfers - bulk transfers are illegal for low-speed
devices, and cause -22 (EINVAL) warnings on new kernels.
* pass most errors to the client app.
-1.2.0
+1.2.1
* Add debugging function to enable/disable extra output
* All debugging output is now prefixed with libg15 to aid localising
problems.
@@ -27,3 +27,4 @@
* libg15 now uses pthread mutexes to force sequential access to the bus via libusb.
Control message URBs are no longer being lost if sent by a different
thread in the middle of a screen transfer etc.
+* Reset the keyboard before init to ensure correct initialisation on kernels > 2.6.19
Modified: trunk/libg15/configure.in
===================================================================
--- trunk/libg15/configure.in 2006-12-27 13:57:14 UTC (rev 223)
+++ trunk/libg15/configure.in 2006-12-27 15:39:23 UTC (rev 224)
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT(libg15, 1.2.0, mla...@us...)
+AC_INIT(libg15, 1.2.1, mla...@us...)
AC_PREFIX_DEFAULT(/usr)
AC_CONFIG_AUX_DIR(config)
AM_INIT_AUTOMAKE()
Modified: trunk/libg15/libg15.c
===================================================================
--- trunk/libg15/libg15.c 2006-12-27 13:57:14 UTC (rev 223)
+++ trunk/libg15/libg15.c 2006-12-27 15:39:23 UTC (rev 224)
@@ -191,7 +191,7 @@
return 0;
}
g15_log(stderr,G15_LOG_INFO,"Done opening the keyboard\n");
-
+ usleep(500*1000); // sleep a bit for good measure
return devh;
}
}
@@ -248,10 +248,7 @@
if (!keyboard_device)
return G15_ERROR_OPENING_USB_DEVICE;
-// setLEDs(0);
-// usleep(1000*1000); // FIXME. I should find a way of polling the status to ensure the endpoint has woken up, rather than just waiting for a second
pthread_mutex_init(&libusb_mutex, NULL);
-
return retval;
}
Modified: trunk/libg15/libg15.h
===================================================================
--- trunk/libg15/libg15.h 2006-12-27 13:57:14 UTC (rev 223)
+++ trunk/libg15/libg15.h 2006-12-27 15:39:23 UTC (rev 224)
@@ -44,7 +44,7 @@
}
/* allow for api changes */
-#define LIBG15_VERSION 1200
+#define LIBG15_VERSION 1210
enum
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mla...@us...> - 2006-12-27 13:57:14
|
Revision: 223
http://svn.sourceforge.net/g15tools/?rev=223&view=rev
Author: mlampard
Date: 2006-12-27 05:57:14 -0800 (Wed, 27 Dec 2006)
Log Message:
-----------
open/reset/close the device before finally opening and using it
Modified Paths:
--------------
trunk/libg15/libg15.c
Modified: trunk/libg15/libg15.c
===================================================================
--- trunk/libg15/libg15.c 2006-12-27 13:37:29 UTC (rev 222)
+++ trunk/libg15/libg15.c 2006-12-27 13:57:14 UTC (rev 223)
@@ -125,6 +125,11 @@
name_buffer[0] = 0;
usb_dev_handle *devh = 0;
g15_log(stderr,G15_LOG_INFO,"Found %s, trying to open it\n",handled_device.name);
+
+ devh = usb_open(dev);
+ usb_reset(devh);
+ usleep(50*1000);
+ usb_close(devh);
devh = usb_open(dev);
if (!devh)
@@ -243,8 +248,8 @@
if (!keyboard_device)
return G15_ERROR_OPENING_USB_DEVICE;
- setLEDs(0);
- usleep(1000*1000); // FIXME. I should find a way of polling the status to ensure the endpoint has woken up, rather than just waiting for a second
+// setLEDs(0);
+// usleep(1000*1000); // FIXME. I should find a way of polling the status to ensure the endpoint has woken up, rather than just waiting for a second
pthread_mutex_init(&libusb_mutex, NULL);
return retval;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mla...@us...> - 2006-12-27 13:37:29
|
Revision: 222
http://svn.sourceforge.net/g15tools/?rev=222&view=rev
Author: mlampard
Date: 2006-12-27 05:37:29 -0800 (Wed, 27 Dec 2006)
Log Message:
-----------
send a ctrl message to the keyboard on init, then wait
Modified Paths:
--------------
trunk/libg15/libg15.c
Modified: trunk/libg15/libg15.c
===================================================================
--- trunk/libg15/libg15.c 2006-12-27 12:52:31 UTC (rev 221)
+++ trunk/libg15/libg15.c 2006-12-27 13:37:29 UTC (rev 222)
@@ -185,7 +185,6 @@
g15_log(stderr,G15_LOG_INFO,"Error claiming interface, good day cruel world\n");
return 0;
}
- usleep(1000*1000); // FIXME. I should find a way of polling the status to ensure the endpoint has woken up, rather than just waiting for a second
g15_log(stderr,G15_LOG_INFO,"Done opening the keyboard\n");
return devh;
@@ -244,6 +243,8 @@
if (!keyboard_device)
return G15_ERROR_OPENING_USB_DEVICE;
+ setLEDs(0);
+ usleep(1000*1000); // FIXME. I should find a way of polling the status to ensure the endpoint has woken up, rather than just waiting for a second
pthread_mutex_init(&libusb_mutex, NULL);
return retval;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mla...@us...> - 2006-12-27 12:52:31
|
Revision: 221
http://svn.sourceforge.net/g15tools/?rev=221&view=rev
Author: mlampard
Date: 2006-12-27 04:52:31 -0800 (Wed, 27 Dec 2006)
Log Message:
-----------
allow varying debug levels to g15_log function. add logging of keypresses when debuglevel >1
Modified Paths:
--------------
trunk/libg15/libg15.c
trunk/libg15/libg15.h
Modified: trunk/libg15/libg15.c
===================================================================
--- trunk/libg15/libg15.c 2006-12-27 08:38:19 UTC (rev 220)
+++ trunk/libg15/libg15.c 2006-12-27 12:52:31 UTC (rev 221)
@@ -32,6 +32,7 @@
static pthread_mutex_t libusb_mutex;
+
/* to add a new device, simply create a new DEVICE() in this list */
/* Fields are: "Name",VendorID,ProductID,Capabilities */
const libg15_devices_t g15_devices[] = {
@@ -40,6 +41,7 @@
DEVICE(NULL,0,0,0)
};
+/* return device capabilities */
int g15DeviceCapabilities() {
if(found_devicetype>-1)
return g15_devices[found_devicetype].caps;
@@ -47,6 +49,7 @@
return -1;
}
+
/* enable or disable debugging */
void libg15Debug(int option) {
@@ -55,18 +58,39 @@
}
/* debugging wrapper */
-static int g15_log (FILE *fd, const char *fmt, ...) {
+static int g15_log (FILE *fd, unsigned int level, const char *fmt, ...) {
- if (libg15_debugging_enabled){
+ if (libg15_debugging_enabled && libg15_debugging_enabled>=level) {
fprintf(fd,"libg15: ");
va_list argp;
va_start (argp, fmt);
vfprintf(fd,fmt,argp);
va_end (argp);
- }
+ }
+
return 0;
}
+/* return number of connected and supported devices */
+int g15NumberOfConnectedDevices() {
+ struct usb_bus *bus = 0;
+ struct usb_device *dev = 0;
+ int i=0;
+ unsigned int found = 0;
+
+ for (i=0; g15_devices[i].name !=NULL;i++)
+ for (bus = usb_busses; bus; bus = bus->next)
+ {
+ for (dev = bus->devices; dev; dev = dev->next)
+ {
+ if ((dev->descriptor.idVendor == g15_devices[i].vendorid && dev->descriptor.idProduct == g15_devices[i].productid))
+ found++;
+ }
+ }
+ g15_log(stderr,G15_LOG_INFO,"Found %i supported devices\n",found);
+ return found;
+}
+
static int initLibUsb()
{
usb_init();
@@ -100,13 +124,13 @@
char name_buffer[65535];
name_buffer[0] = 0;
usb_dev_handle *devh = 0;
- g15_log(stderr,"Found %s, trying to open it\n",handled_device.name);
+ g15_log(stderr,G15_LOG_INFO,"Found %s, trying to open it\n",handled_device.name);
devh = usb_open(dev);
if (!devh)
{
- g15_log(stderr, "Error, could not open the keyboard\n");
- g15_log(stderr, "Perhaps you dont have enough permissions to access it\n");
+ g15_log(stderr,G15_LOG_INFO, "Error, could not open the keyboard\n");
+ g15_log(stderr,G15_LOG_INFO, "Perhaps you dont have enough permissions to access it\n");
return 0;
}
@@ -124,16 +148,16 @@
thanks to RobEngle for pointing this out */
if (!ret && name_buffer[0])
{
- g15_log(stderr,"Trying to detach driver currently attached: \"%s\"\n",name_buffer);
+ g15_log(stderr,G15_LOG_INFO,"Trying to detach driver currently attached: \"%s\"\n",name_buffer);
ret = usb_detach_kernel_driver_np(devh, 0);
if (!ret)
{
- g15_log(stderr,"Success, detached the driver\n");
+ g15_log(stderr,G15_LOG_INFO,"Success, detached the driver\n");
}
else
{
- g15_log(stderr,"Sorry, I could not detached the driver, giving up\n");
+ g15_log(stderr,G15_LOG_INFO,"Sorry, I could not detached the driver, giving up\n");
return 0;
}
@@ -144,7 +168,7 @@
ret = usb_set_configuration(devh, 1);
if (ret)
{
- g15_log(stderr,"Error setting the configuration, this is fatal\n");
+ g15_log(stderr,G15_LOG_INFO,"Error setting the configuration, this is fatal\n");
return 0;
}
@@ -153,16 +177,16 @@
while((ret = usb_claim_interface(devh,0)) && retries <10) {
usleep(50*1000);
retries++;
- g15_log(stderr,"Trying to claim interface\n");
+ g15_log(stderr,G15_LOG_INFO,"Trying to claim interface\n");
}
if (ret)
{
- g15_log(stderr,"Error claiming interface, good day cruel world\n");
+ g15_log(stderr,G15_LOG_INFO,"Error claiming interface, good day cruel world\n");
return 0;
}
usleep(1000*1000); // FIXME. I should find a way of polling the status to ensure the endpoint has woken up, rather than just waiting for a second
- g15_log(stderr,"Done opening the keyboard\n");
+ g15_log(stderr,G15_LOG_INFO,"Done opening the keyboard\n");
return devh;
}
@@ -175,13 +199,13 @@
static usb_dev_handle * findAndOpenG15() {
int i;
for (i=0; g15_devices[i].name !=NULL ;i++){
- g15_log(stderr,"Trying to find %s\n",g15_devices[i].name);
+ g15_log(stderr,G15_LOG_INFO,"Trying to find %s\n",g15_devices[i].name);
if(keyboard_device = findAndOpenDevice(g15_devices[i])){
found_devicetype = i;
break;
}
else
- g15_log(stderr,"%s not found\n",g15_devices[i].name);
+ g15_log(stderr,G15_LOG_INFO,"%s not found\n",g15_devices[i].name);
}
return keyboard_device;
}
@@ -214,6 +238,8 @@
if (retval)
return retval;
+ g15NumberOfConnectedDevices();
+
keyboard_device = findAndOpenG15();
if (!keyboard_device)
return G15_ERROR_OPENING_USB_DEVICE;
@@ -278,7 +304,7 @@
return G15_ERROR_READING_USB_DEVICE; /* backward-compatibility */
break;
case -ENOSPC: /* the we dont have enough bandwidth, apparently.. something has to give here.. */
- g15_log(stderr,"usb error: ENOSPC.. reducing speed\n");
+ g15_log(stderr,G15_LOG_INFO,"usb error: ENOSPC.. reducing speed\n");
enospc_slowdown = 1;
break;
case -ENODEV: /* the device went away - we probably should attempt to reattach */
@@ -287,16 +313,16 @@
case -EAGAIN: /* try again */
case -EFBIG: /* too many frames to handle */
case -EMSGSIZE: /* msgsize is invalid */
- g15_log(stderr,"usb error: %s (%i)\n",prefix,ret);
+ g15_log(stderr,G15_LOG_INFO,"usb error: %s (%i)\n",prefix,ret);
break;
case -EPIPE: /* endpoint is stalled */
- g15_log(stderr,"usb error: %s EPIPE! clearing...\n",prefix);
+ g15_log(stderr,G15_LOG_INFO,"usb error: %s EPIPE! clearing...\n",prefix);
pthread_mutex_lock(&libusb_mutex);
usb_clear_halt(keyboard_device, 0x81);
pthread_mutex_unlock(&libusb_mutex);
break;
default: /* timed out */
- g15_log(stderr,"Unknown usb error: %s !! (err is %i)\n",prefix,ret);
+ g15_log(stderr,G15_LOG_INFO,"Unknown usb error: %s !! (err is %i)\n",prefix,ret);
}
return ret;
}
@@ -444,8 +470,9 @@
int i;
*pressed_keys = 0;
- /*printf("Buffer: %x, %x, %x, %x, %x, %x, %x, %x, %x\n",buffer[0],buffer[1],buffer[2],buffer[3],buffer[4],buffer[5],buffer[6],buffer[7],buffer[8]);
- */
+
+ g15_log(stderr,G15_LOG_WARN,"Keyboard: %x, %x, %x, %x, %x, %x, %x, %x, %x\n",buffer[0],buffer[1],buffer[2],buffer[3],buffer[4],buffer[5],buffer[6],buffer[7],buffer[8]);
+
if (buffer[0] == 0x02)
{
if (buffer[1]&0x01)
Modified: trunk/libg15/libg15.h
===================================================================
--- trunk/libg15/libg15.h 2006-12-27 08:38:19 UTC (rev 220)
+++ trunk/libg15/libg15.h 2006-12-27 12:52:31 UTC (rev 221)
@@ -45,7 +45,13 @@
/* allow for api changes */
#define LIBG15_VERSION 1200
-
+
+ enum
+ {
+ G15_LOG_INFO = 1,
+ G15_LOG_WARN
+ };
+
enum
{
G15_NO_ERROR = 0,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|