Menu
▾
▴
ddccontrol-cvs — CVS commits
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
(47) |
Mar
(43) |
Apr
(26) |
May
(1) |
Jun
(12) |
Jul
(29) |
Aug
(12) |
Sep
|
Oct
(27) |
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
|
Feb
|
Mar
(3) |
Apr
|
May
|
Jun
(31) |
Jul
|
Aug
|
Sep
|
Oct
(55) |
Nov
(4) |
Dec
|
| 2008 |
Jan
(7) |
Feb
(29) |
Mar
|
Apr
(3) |
May
(3) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
(3) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(4) |
Oct
|
Nov
(1) |
Dec
|
|
From: Nicolas B. <nbo...@us...> - 2006-04-26 19:54:55
|
Update of /cvsroot/ddccontrol/ddccontrol/po In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1967/po Modified Files: Makefile.in.in Log Message: Fix small problems added by the last commit. Index: Makefile.in.in =================================================================== RCS file: /cvsroot/ddccontrol/ddccontrol/po/Makefile.in.in,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- Makefile.in.in 26 Apr 2006 19:11:01 -0000 1.8 +++ Makefile.in.in 26 Apr 2006 19:54:50 -0000 1.9 @@ -73,7 +73,7 @@ POTFILES = \ CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ +CATOBJEXT = .gmo .SUFFIXES: .SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat |
|
From: Nicolas B. <nbo...@us...> - 2006-04-26 19:11:12
|
Update of /cvsroot/ddccontrol/ddccontrol/src/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30510/src/lib Modified Files: ddcci.c Log Message: Allow disabling /dev/i2c-* devices (useful for OSes other than Linux) Index: ddcci.c =================================================================== RCS file: /cvsroot/ddccontrol/ddccontrol/src/lib/ddcci.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- ddcci.c 26 Apr 2006 16:14:55 -0000 1.36 +++ ddcci.c 26 Apr 2006 19:11:01 -0000 1.37 @@ -27,11 +27,16 @@ #include <sys/ioctl.h> #include <string.h> +#ifdef HAVE_I2C_DEV #include "i2c-dev.h" +#endif #include <unistd.h> #include <dirent.h> #include <stdlib.h> +#include <sys/types.h> +#include <sys/stat.h> + #include "ddcci.h" #include "conf.h" @@ -81,15 +86,6 @@ return verbosity; } -/* IPC functions */ -#ifdef HAVE_DDCPCI -#include "ddcpci-ipc.h" -#include <sys/msg.h> -#include <sys/ipc.h> - -#define DDCPCI_RETRY_DELAY 10000 /* in us */ -#define DDCPCI_RETRIES 100000 - /* debugging */ static void dumphex(FILE *f, char *text, unsigned char *buf, int len) { @@ -126,6 +122,15 @@ } } +/* IPC functions */ +#ifdef HAVE_DDCPCI +#include "ddcpci-ipc.h" +#include <sys/msg.h> +#include <sys/ipc.h> + +#define DDCPCI_RETRY_DELAY 10000 /* in us */ +#define DDCPCI_RETRIES 100000 + static int msqid = -2; int ddcpci_init() @@ -246,7 +251,10 @@ /* return 0 on success, -1 on failure */ static int i2c_write(struct monitor* mon, unsigned int addr, unsigned char *buf, unsigned char len) { - if (mon->type == dev) { + switch (mon->type) { +#ifdef HAVE_I2C_DEV + case dev: + { int i; struct i2c_rdwr_ioctl_data msg_rdwr; struct i2c_msg i2cmsg; @@ -275,8 +283,10 @@ return i; } +#endif #ifdef HAVE_DDCPCI - else if (mon->type == pci) { + case pci: + { struct query qdata; memset(&qdata, 0, sizeof(struct query)); qdata.mtype = 1; @@ -308,7 +318,7 @@ return adata.status; } #endif - else { + default: return -1; } } @@ -317,7 +327,10 @@ /* return -1 on failure */ static int i2c_read(struct monitor* mon, unsigned int addr, unsigned char *buf, unsigned char len) { - if (mon->type == dev) { + switch (mon->type) { +#ifdef HAVE_I2C_DEV + case dev: + { struct i2c_rdwr_ioctl_data msg_rdwr; struct i2c_msg i2cmsg; int i; @@ -345,8 +358,10 @@ return i; } +#endif #ifdef HAVE_DDCPCI - else if (mon->type == pci) { + case pci: + { int ret; struct query qdata; memset(&qdata, 0, sizeof(struct query)); @@ -381,7 +396,7 @@ return ret - ANSWER_SIZE; } #endif - else { + default: return -1; } } |
|
From: Nicolas B. <nbo...@us...> - 2006-04-26 19:11:12
|
Update of /cvsroot/ddccontrol/ddccontrol/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30510/src Modified Files: config.h.in Log Message: Allow disabling /dev/i2c-* devices (useful for OSes other than Linux) Index: config.h.in =================================================================== RCS file: /cvsroot/ddccontrol/ddccontrol/src/config.h.in,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- config.h.in 4 Nov 2005 11:05:37 -0000 1.11 +++ config.h.in 26 Apr 2006 19:11:01 -0000 1.12 @@ -38,6 +38,9 @@ /* Define if the GNU gettext() function is already present or preinstalled. */ #undef HAVE_GETTEXT +/* Define if ddccontrol is built with /dev/i2c-* support. */ +#undef HAVE_I2C_DEV + /* Define if you have the iconv() function. */ #undef HAVE_ICONV |
|
From: Nicolas B. <nbo...@us...> - 2006-04-26 19:11:12
|
Update of /cvsroot/ddccontrol/ddccontrol In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30510 Modified Files: configure.ac Log Message: Allow disabling /dev/i2c-* devices (useful for OSes other than Linux) Index: configure.ac =================================================================== RCS file: /cvsroot/ddccontrol/ddccontrol/configure.ac,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- configure.ac 4 Apr 2006 22:00:29 -0000 1.37 +++ configure.ac 26 Apr 2006 19:11:01 -0000 1.38 @@ -22,37 +22,48 @@ AC_STDC_HEADERS AC_CHECK_HEADERS([stdio.h unistd.h sys/time.h stdlib.h errno.h unistd.h string.h sys/types.h sys/stat.h fcntl.h sys/ioctl.h dirent.h], [], [AC_MSG_ERROR([Important header not found, please install it.], [1])], []) -AC_CHECK_HEADERS([linux/types.h], [], [AC_MSG_ERROR([Linux kernel header files not found, please install them.], [1])], []) +# /dev/i2c-* check +i2c_dev_val=1 +AC_ARG_ENABLE(i2cdev, + [ --disable-i2c enable /dev/i2c-* busses (enabled) ], + [if test x$enableval = xno; then + i2c_dev_val=0 + fi]) -support_i2c_dev=no -AC_MSG_CHECKING([if linux/i2c-dev.h works with non-kernel linux/types.h]) -AC_COMPILE_IFELSE([ -[#include <linux/types.h>] -[#include <linux/i2c-dev.h>] -[const int a = I2C_RDWR + I2C_M_RD;] -[struct i2c_msg i2cmsg;] -], -support_i2c_dev=yes -AC_MSG_RESULT(yes), -AC_MSG_RESULT(no) -) +if test "x$i2c_dev_val" = "x1" ; then + AC_DEFINE_UNQUOTED(HAVE_I2C_DEV, 1, [Define if ddccontrol is built with /dev/i2c-* support.]) + AC_CHECK_HEADERS([linux/types.h], [], [AC_MSG_ERROR([Linux kernel header files not found, please install them.], [1])], []) -if test "x$support_i2c_dev" = "xno" ; then - AC_MSG_CHECKING([if src/lib/i2c-dev.h works instead]) - AC_COMPILE_IFELSE([ - [#define HAVE_BUGGY_I2C_DEV 1] - [#include "src/lib/i2c-dev.h"] - [const int a = I2C_RDWR + I2C_M_RD;] - [struct i2c_msg i2cmsg;] - ], - AC_DEFINE(HAVE_BUGGY_I2C_DEV, 1, [Define if linux/i2c-dev.h is buggy on your system, so defaults constants and structures must be used]) - support_i2c_dev=yes - AC_MSG_RESULT(yes), - AC_MSG_RESULT(no) - ) - if test "x$support_i2c_dev" = "xno" ; then - AC_MSG_ERROR([Unable to use neither linux/i2c-dev.h nor src/lib/i2c-dev.h on your system, kernel headers may be more buggy than usual, or inexistant, try to (re-)install kernel headers.], [1]) - fi + support_i2c_dev_works=no + AC_MSG_CHECKING([if linux/i2c-dev.h works with non-kernel linux/types.h]) + AC_COMPILE_IFELSE([ + [#include <linux/types.h>] + [#include <linux/i2c-dev.h>] + [const int a = I2C_RDWR + I2C_M_RD;] + [struct i2c_msg i2cmsg;] + ], + support_i2c_dev_works=yes + AC_MSG_RESULT(yes), + AC_MSG_RESULT(no) + ) + + if test "x$support_i2c_dev_noworkaround" = "xno" ; then + AC_MSG_CHECKING([if src/lib/i2c-dev.h works instead]) + AC_COMPILE_IFELSE([ + [#define HAVE_BUGGY_I2C_DEV 1] + [#include "src/lib/i2c-dev.h"] + [const int a = I2C_RDWR + I2C_M_RD;] + [struct i2c_msg i2cmsg;] + ], + AC_DEFINE(HAVE_BUGGY_I2C_DEV, 1, [Define if linux/i2c-dev.h is buggy on your system, so defaults constants and structures must be used]) + support_i2c_dev_works=yes + AC_MSG_RESULT(yes), + AC_MSG_RESULT(no) + ) + if test "x$support_i2c_dev_works" = "xno" ; then + AC_MSG_ERROR([Unable to use neither linux/i2c-dev.h nor src/lib/i2c-dev.h on your system, kernel headers may be more buggy than usual, or inexistant, try to (re-)install kernel headers.], [1]) + fi + fi fi AC_DEFINE(_GNU_SOURCE, 1, [Define unconditionally for setting a GNU environment.]) @@ -81,14 +92,12 @@ fi]) DDCPCI= -ddcpci_val=0 if test x$support_ddcpci = xyes; then AC_CHECK_HEADERS([pci/pci.h], [], [AC_MSG_ERROR([PCI utils headers not found, please install pci-utils.], [1])], []) AC_CHECK_LIB([pci], [pci_alloc], [], [AC_MSG_ERROR([PCI utils library not found, please install pci-utils.], [1])]) DDCPCI=ddcpci - ddcpci_val=1 + AC_DEFINE_UNQUOTED(HAVE_DDCPCI, 1, [Define if ddccontrol is built with ddcpci support.]) fi -AC_DEFINE_UNQUOTED(HAVE_DDCPCI, $ddcpci_val, [Define if ddccontrol is built with ddcpci support.]) AC_SUBST([DDCPCI]) @@ -132,8 +141,11 @@ GNOME_APPLET= if test x$support_gnome_applet = xyes; then - GNOME_APPLET="gnome-ddcc-applet" - PKG_CHECK_MODULES(GNOME, libpanelapplet-2.0 >= 2.10,,GNOME_APPLET="") + if pkg-config --atleast-version=2.10 libpanelapplet-2.0 ; then + GNOME_APPLET="gnome-ddcc-applet" + else + GNOME_APPLET="" + endif GNOME_LDFLAGS="$LIBXML2_LDFLAGS `pkg-config --libs gtk+-2.0 gthread-2.0 libpanelapplet-2.0`" GNOME_CFLAGS="$LIBXML2_CFLAGS `pkg-config --cflags gtk+-2.0 gthread-2.0 libpanelapplet-2.0`" fi @@ -207,7 +219,7 @@ AC_SUBST(DOCBOOK_ROOT) AC_SUBST(DOC) -AC_CONFIG_FILES([ +AC_CONFIG_FILES([ m4/Makefile po/Makefile.in Makefile src/Makefile |
|
From: Nicolas B. <nbo...@us...> - 2006-04-26 19:11:12
|
Update of /cvsroot/ddccontrol/ddccontrol/po In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30510/po Modified Files: Makefile.in.in Log Message: Allow disabling /dev/i2c-* devices (useful for OSes other than Linux) Index: Makefile.in.in =================================================================== RCS file: /cvsroot/ddccontrol/ddccontrol/po/Makefile.in.in,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Makefile.in.in 4 Apr 2006 22:00:30 -0000 1.7 +++ Makefile.in.in 26 Apr 2006 19:11:01 -0000 1.8 @@ -73,7 +73,7 @@ POTFILES = \ CATALOGS = @CATALOGS@ -CATOBJEXT = .gmo +CATOBJEXT = @CATOBJEXT@ .SUFFIXES: .SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat |
|
From: Nicolas B. <nbo...@us...> - 2006-04-26 19:01:23
|
Update of /cvsroot/ddccontrol/ddccontrol In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22915 Modified Files: ChangeLog Log Message: Update ChangeLog Index: ChangeLog =================================================================== RCS file: /cvsroot/ddccontrol/ddccontrol/ChangeLog,v retrieving revision 1.111 retrieving revision 1.112 diff -u -d -r1.111 -r1.112 --- ChangeLog 26 Apr 2006 16:15:08 -0000 1.111 +++ ChangeLog 26 Apr 2006 19:01:19 -0000 1.112 @@ -1,3 +1,9 @@ +2006-04-26 19:01 nboichat + + * src/: ddccontrol/main.c, gddccontrol/main.c, + gnome-ddcc-applet/ddcc-applet.c, lib/conf.c, lib/ddcci.h, + lib/monitor_db.c: Allow building without gettext. + 2006-04-26 16:14 nboichat * src/: ddcpci/i2c-algo-bit.c, gddccontrol/gprofile.c, |
|
From: Nicolas B. <nbo...@us...> - 2006-04-26 19:01:15
|
Update of /cvsroot/ddccontrol/ddccontrol/src/gnome-ddcc-applet In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22487/src/gnome-ddcc-applet Modified Files: ddcc-applet.c Log Message: Allow building without gettext. Index: ddcc-applet.c =================================================================== RCS file: /cvsroot/ddccontrol/ddccontrol/src/gnome-ddcc-applet/ddcc-applet.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- ddcc-applet.c 14 Nov 2005 17:46:58 -0000 1.10 +++ ddcc-applet.c 26 Apr 2006 19:01:04 -0000 1.11 @@ -22,6 +22,9 @@ * Includes * ****************/ +/* config */ +#include "config.h" + /* libddccontrol */ #include "ddcci.h" #include "conf.h" @@ -41,9 +44,8 @@ /* libddccontrol ipc */ #include "ddcpci-ipc.h" -/* config */ -#include "config.h" - +#define GETTEXT_PACKAGE PACKAGE +#define GNOMELOCALEDIR LOCALEDIR /* **************** * Constants |
|
From: Nicolas B. <nbo...@us...> - 2006-04-26 19:01:14
|
Update of /cvsroot/ddccontrol/ddccontrol/src/gddccontrol In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22487/src/gddccontrol Modified Files: main.c Log Message: Allow building without gettext. Index: main.c =================================================================== RCS file: /cvsroot/ddccontrol/ddccontrol/src/gddccontrol/main.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- main.c 23 Feb 2006 21:48:56 -0000 1.30 +++ main.c 26 Apr 2006 19:01:04 -0000 1.31 @@ -378,13 +378,15 @@ mon = NULL; monitor_manager = NULL; +#ifdef HAVE_GETTEXT setlocale(LC_ALL, ""); bindtextdomain(PACKAGE, LOCALEDIR); bindtextdomain("ddccontrol-db", LOCALEDIR); bind_textdomain_codeset(PACKAGE, "UTF-8"); bind_textdomain_codeset("ddccontrol-db", "UTF-8"); textdomain(PACKAGE); - +#endif + while ((i=getopt(argc,argv,"v")) >= 0) { switch(i) { |
|
From: Nicolas B. <nbo...@us...> - 2006-04-26 19:01:14
|
Update of /cvsroot/ddccontrol/ddccontrol/src/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22487/src/lib Modified Files: conf.c ddcci.h monitor_db.c Log Message: Allow building without gettext. Index: conf.c =================================================================== RCS file: /cvsroot/ddccontrol/ddccontrol/src/lib/conf.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- conf.c 26 Apr 2006 16:14:55 -0000 1.7 +++ conf.c 26 Apr 2006 19:01:05 -0000 1.8 @@ -39,14 +39,6 @@ #include "conf.h" -/* Localize, and alloc in libxml */ -#define _D(text) xmlCharStrdup(dgettext(DBPACKAGE, text)) -#include <libintl.h> -#include <locale.h> -#define _(String) gettext (String) -#define gettext_noop(String) String -#define N_(String) gettext_noop (String) - #define RETRYS 3 // number of read retrys /* Read/write monitor list */ Index: ddcci.h =================================================================== RCS file: /cvsroot/ddccontrol/ddccontrol/src/lib/ddcci.h,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- ddcci.h 26 Apr 2006 16:14:55 -0000 1.22 +++ ddcci.h 26 Apr 2006 19:01:05 -0000 1.23 @@ -21,13 +21,18 @@ #ifndef DDCCI_H #define DDCCI_H -//#include "config.h" +#include "config.h" +#ifdef HAVE_GETTEXT #include <libintl.h> #include <locale.h> #define _(String) gettext (String) #define gettext_noop(String) String #define N_(String) gettext_noop (String) +#else +#define _(String) String +#define N_(String) String +#endif #include <time.h> #include <sys/time.h> Index: monitor_db.c =================================================================== RCS file: /cvsroot/ddccontrol/ddccontrol/src/lib/monitor_db.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- monitor_db.c 26 Apr 2006 16:14:55 -0000 1.31 +++ monitor_db.c 26 Apr 2006 19:01:05 -0000 1.32 @@ -32,12 +32,11 @@ #include "ddcci.h" /* Localize, and alloc in libxml */ +#ifdef HAVE_GETTEXT #define _D(text) xmlCharStrdup(dgettext(DBPACKAGE, text)) -#include <libintl.h> -#include <locale.h> -#define _(String) gettext (String) -#define gettext_noop(String) String -#define N_(String) gettext_noop (String) +#else +#define _D(text) xmlCharStrdup(text) +#endif #define DBPACKAGE "ddccontrol-db" |
|
From: Nicolas B. <nbo...@us...> - 2006-04-26 19:01:14
|
Update of /cvsroot/ddccontrol/ddccontrol/src/ddccontrol In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22487/src/ddccontrol Modified Files: main.c Log Message: Allow building without gettext. Index: main.c =================================================================== RCS file: /cvsroot/ddccontrol/ddccontrol/src/ddccontrol/main.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- main.c 24 Feb 2006 21:49:22 -0000 1.33 +++ main.c 26 Apr 2006 19:01:01 -0000 1.34 @@ -206,10 +206,12 @@ int verbosity = 0; int probe = 0; +#ifdef HAVE_GETTEXT setlocale(LC_ALL, ""); bindtextdomain(PACKAGE, LOCALEDIR); bindtextdomain("ddccontrol-db", LOCALEDIR); textdomain(PACKAGE); +#endif fprintf(stdout, _("ddccontrol version %s\n" |
|
From: Nicolas B. <nbo...@us...> - 2006-04-26 16:15:12
|
Update of /cvsroot/ddccontrol/ddccontrol In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16394 Modified Files: ChangeLog Log Message: Update ChangeLog Index: ChangeLog =================================================================== RCS file: /cvsroot/ddccontrol/ddccontrol/ChangeLog,v retrieving revision 1.110 retrieving revision 1.111 diff -u -d -r1.110 -r1.111 --- ChangeLog 10 Mar 2006 23:33:12 -0000 1.110 +++ ChangeLog 26 Apr 2006 16:15:08 -0000 1.111 @@ -1,3 +1,33 @@ +2006-04-26 16:14 nboichat + + * src/: ddcpci/i2c-algo-bit.c, gddccontrol/gprofile.c, + gddccontrol/notebook.c, gddccontrol/notebook.h, lib/conf.c, + lib/conf.h, lib/ddcci.c, lib/ddcci.h, lib/ddcpci-ipc.h, + lib/monitor_db.c: Fix gcc 4.0.3 compilation warnings. + +2006-04-25 19:36 nboichat + + * src/lib/ddcci.c: Fix invalid CAPS magic for NEC LCD 1970NX. + +2006-04-24 15:32 nboichat + + * doc/install.xml: Add small note about a dependency on FC5. + +2006-04-04 22:03 nboichat + + * TODO, src/ddcpci/intel810.c: Add more I2C busses to Intel + 810-like chips. + +2006-04-04 22:00 nboichat + + * Makefile.am, configure.ac, doc/main.xml, + doc/supportedmonitors.xml, doc/techdocs.xml, po/Makefile.in.in: + Add documentation for translators. + +2006-03-12 14:56 nboichat + + * src/lib/ddcci.c: Add more info when CAPS reading fails. + 2006-03-10 23:32 nboichat * src/lib/ddcci.c: Allow binary data in CAPS. |
|
From: Nicolas B. <nbo...@us...> - 2006-04-26 16:14:58
|
Update of /cvsroot/ddccontrol/ddccontrol/src/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15983/src/lib Modified Files: conf.c conf.h ddcci.c ddcci.h ddcpci-ipc.h monitor_db.c Log Message: Fix gcc 4.0.3 compilation warnings. Index: monitor_db.c =================================================================== RCS file: /cvsroot/ddccontrol/ddccontrol/src/lib/monitor_db.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- monitor_db.c 23 Feb 2006 21:48:56 -0000 1.30 +++ monitor_db.c 26 Apr 2006 16:14:55 -0000 1.31 @@ -105,13 +105,13 @@ if (!(xmlStrcmp(cur->name, (const xmlChar *)"value"))) { mon_valueid = xmlGetProp(cur, BAD_CAST "id"); if (!xmlStrcmp(mon_valueid, options_valueid)) { - current_value->id = xmlCharStrdup(options_valueid); - current_value->name = _D(options_valuename); + current_value->id = xmlStrdup(options_valueid); + current_value->name = _D((char*)options_valuename); tmp = xmlGetProp(cur, BAD_CAST "value"); DDCCI_DB_RETURN_IF(tmp == NULL, -1, _("Can't find value property."), cur); - current_value->value = strtol(tmp, &endptr, 0); + current_value->value = strtol((char*)tmp, &endptr, 0); DDCCI_DB_RETURN_IF(*endptr != 0, -1, _("Can't convert value to int."), cur); xmlFree(tmp); @@ -228,7 +228,7 @@ if (!xmlStrcmp(mon_ctrlid, options_ctrlid)) { tmp = xmlGetProp(cur, BAD_CAST "address"); DDCCI_DB_RETURN_IF(tmp == NULL, 0, _("Can't find address property."), cur); - current_control->address = strtol(tmp, &endptr, 0); + current_control->address = strtol((char*)tmp, &endptr, 0); DDCCI_DB_RETURN_IF(*endptr != 0, 0, _("Can't convert address to int."), cur); xmlFree(tmp); @@ -250,13 +250,13 @@ break; } - current_control->id = xmlCharStrdup(options_ctrlid); - current_control->name = _D(options_ctrlname); + current_control->id = xmlStrdup(options_ctrlid); + current_control->name = _D((char*)options_ctrlname); current_control->refresh = options_refresh; tmp = xmlGetProp(cur, BAD_CAST "delay"); if (tmp) { - current_control->delay = strtol(tmp, &endptr, 10); + current_control->delay = strtol((char*)tmp, &endptr, 10); DDCCI_DB_RETURN_IF(*endptr != 0, 0, _("Can't convert delay to int."), cur); xmlFree(tmp); } @@ -277,7 +277,7 @@ if (current_control->value_list == NULL) { /* No value defined, use the default 0x01 value */ struct value_db *current_value = malloc(sizeof(struct value_db)); current_value->id = xmlCharStrdup("default"); - current_value->name = _D(options_ctrlname); + current_value->name = _D((char*)options_ctrlname); current_value->value = 0x01; current_value->next = NULL; current_control->value_list = current_value; @@ -425,7 +425,7 @@ options_groupname = xmlGetProp(group, BAD_CAST "name"); DDCCI_DB_RETURN_IF(options_groupname == NULL, 0, _("Can't find name property."), group); - current_group->name = _D(options_groupname); /* Note: copy string, so we can free options_groupname */ + current_group->name = _D((char*)options_groupname); /* Note: copy string, so we can free options_groupname */ xmlFree(options_groupname); struct subgroup_db *current_subgroup; @@ -447,7 +447,7 @@ options_subgroupname = xmlGetProp(subgroup, BAD_CAST "name"); DDCCI_DB_RETURN_IF(options_subgroupname == NULL, 0, _("Can't find name property."), subgroup); - current_subgroup->name = _D(options_subgroupname); /* Note: copy string, so we can free options_subgroupname */ + current_subgroup->name = _D((char*)options_subgroupname); /* Note: copy string, so we can free options_subgroupname */ xmlFree(options_subgroupname); current_subgroup->pattern = xmlGetProp(subgroup, BAD_CAST "pattern"); } @@ -464,9 +464,9 @@ xmlChar* add = xmlGetProp(mon_child, BAD_CAST "add"); DDCCI_DB_RETURN_IF(!remove && !add, 0, _("Can't find add or remove property in caps."), mon_child); if (remove) - DDCCI_DB_RETURN_IF(ddcci_parse_caps(remove, caps, 0) <= 0, 0, _("Invalid remove caps."), mon_child); + DDCCI_DB_RETURN_IF(ddcci_parse_caps((char*)remove, caps, 0) <= 0, 0, _("Invalid remove caps."), mon_child); if (add) - DDCCI_DB_RETURN_IF(ddcci_parse_caps(add, caps, 1) <= 0, 0, _("Invalid add caps."), mon_child); + DDCCI_DB_RETURN_IF(ddcci_parse_caps((char*)add, caps, 1) <= 0, 0, _("Invalid add caps."), mon_child); } else if (!xmlStrcmp(mon_child->name, (const xmlChar *) "include")) { controls_or_include = 1; @@ -478,7 +478,7 @@ xmlChar* file = xmlGetProp(mon_child, BAD_CAST "file"); DDCCI_DB_RETURN_IF(file == NULL, 0, _("Can't find file property."), mon_child); - if (!ddcci_create_db_protected(mon_db, file, caps, recursionlevel+1, defined, faulttolerance)) { + if (!ddcci_create_db_protected(mon_db, (char*)file, caps, recursionlevel+1, defined, faulttolerance)) { xmlFree(file); return 0; } @@ -749,7 +749,7 @@ return 0; } - iversion = strtol(version, &endptr, 0); + iversion = strtol((char*)version, &endptr, 0); DDCCI_DB_RETURN_IF(*endptr != 0, 0, _("Can't convert version to int."), cur); if (iversion > DBVERSION) { Index: conf.h =================================================================== RCS file: /cvsroot/ddccontrol/ddccontrol/src/lib/conf.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- conf.h 18 Aug 2005 15:14:18 -0000 1.1 +++ conf.h 26 Apr 2006 16:14:55 -0000 1.2 @@ -39,13 +39,13 @@ xmlChar* pnpid; int size; /* Number of controls */ - char address[256]; - short value[256]; + unsigned char address[256]; + unsigned short value[256]; struct profile* next; /* Next profile in the list (used by get_all_profiles) */ }; -struct profile* ddcci_create_profile(struct monitor* mon, const char* address, int size); +struct profile* ddcci_create_profile(struct monitor* mon, const unsigned char* address, int size); int ddcci_apply_profile(struct profile* profile, struct monitor* mon); void ddcci_set_profile_name(struct profile* profile, const char* name); Index: conf.c =================================================================== RCS file: /cvsroot/ddccontrol/ddccontrol/src/lib/conf.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- conf.c 23 Feb 2006 21:48:56 -0000 1.6 +++ conf.c 26 Apr 2006 16:14:55 -0000 1.7 @@ -226,7 +226,7 @@ /* Profile functions */ -struct profile* ddcci_create_profile(struct monitor* mon, const char* address, int size) +struct profile* ddcci_create_profile(struct monitor* mon, const unsigned char* address, int size) { int retry, i; Index: ddcci.h =================================================================== RCS file: /cvsroot/ddccontrol/ddccontrol/src/lib/ddcci.h,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- ddcci.h 23 Feb 2006 21:48:56 -0000 1.21 +++ ddcci.h 26 Apr 2006 16:14:55 -0000 1.22 @@ -58,7 +58,7 @@ struct monitor { int fd; unsigned int addr; - unsigned char pnpid[8]; + char pnpid[8]; unsigned char digital; /* 0 - digital, 1 - analog */ struct timeval last; struct monitor_db* db; Index: ddcci.c =================================================================== RCS file: /cvsroot/ddccontrol/ddccontrol/src/lib/ddcci.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- ddcci.c 25 Apr 2006 19:36:06 -0000 1.35 +++ ddcci.c 26 Apr 2006 16:14:55 -0000 1.36 @@ -91,7 +91,7 @@ #define DDCPCI_RETRIES 100000 /* debugging */ -static void dumphex(FILE *f, unsigned char *text, unsigned char *buf, int len) +static void dumphex(FILE *f, char *text, unsigned char *buf, int len) { int i, j; @@ -1039,8 +1039,8 @@ (*current)->filename = filename; (*current)->supported = (ret == 0); if (mon.db) { - (*current)->name = malloc(strlen(mon.db->name)+1); - strcpy((char*)(*current)->name, mon.db->name); + (*current)->name = malloc(strlen((char*)mon.db->name)+1); + strcpy((char*)(*current)->name, (char*)mon.db->name); } else { (*current)->name = malloc(32); Index: ddcpci-ipc.h =================================================================== RCS file: /cvsroot/ddccontrol/ddccontrol/src/lib/ddcpci-ipc.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- ddcpci-ipc.h 20 Apr 2005 21:43:51 -0000 1.6 +++ ddcpci-ipc.h 26 Apr 2006 16:14:55 -0000 1.7 @@ -58,7 +58,7 @@ int addr; int flags; int len; /* only for read queries, number of bytes to read */ - char buffer[MAX_BUFFER_SIZE]; + unsigned char buffer[MAX_BUFFER_SIZE]; }; /* ddcpci to ddccontrol messages (answers) */ @@ -68,7 +68,7 @@ int last; /* 0 - Last message, no bus to read, 1 - Other messages follows (for QUERY_LIST) */ struct i2c_bus bus; /* For answers to QUERY_LIST */ - char buffer[MAX_BUFFER_SIZE]; /* For answers to QUERY_DATA, read operations */ + unsigned char buffer[MAX_BUFFER_SIZE]; /* For answers to QUERY_DATA, read operations */ }; #endif //DDCPCI_IPC_H |
|
From: Nicolas B. <nbo...@us...> - 2006-04-26 16:14:58
|
Update of /cvsroot/ddccontrol/ddccontrol/src/gddccontrol In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15983/src/gddccontrol Modified Files: gprofile.c notebook.c notebook.h Log Message: Fix gcc 4.0.3 compilation warnings. Index: gprofile.c =================================================================== RCS file: /cvsroot/ddccontrol/ddccontrol/src/gddccontrol/gprofile.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- gprofile.c 14 Feb 2006 21:59:05 -0000 1.10 +++ gprofile.c 26 Apr 2006 16:14:55 -0000 1.11 @@ -38,7 +38,7 @@ void saveprofile_callback(GtkWidget *widget, gpointer data) { - char controls[256]; + unsigned char controls[256]; int size; struct profile* profile; @@ -186,7 +186,7 @@ table = gtk_table_new(count == 0 ? 1 : (count*2)-1, 5, FALSE); while (profile != NULL) { - label = gtk_label_new(profile->name); + label = gtk_label_new((gchar*)profile->name); gtk_table_attach(GTK_TABLE(table), label, 0, 1, crow, crow+1, GTK_FILL_EXPAND, GTK_SHRINK, 0, 5); gtk_widget_show(label); @@ -372,7 +372,7 @@ { if (value_db->value == profile->value[i]) { - tmp3 = g_strdup(value_db->name); + tmp3 = g_strdup((gchar*)value_db->name); } } if (!tmp) @@ -476,7 +476,7 @@ gtk_widget_show(label); entry = gtk_entry_new(); - gtk_entry_set_text(GTK_ENTRY(entry), profile->name); + gtk_entry_set_text(GTK_ENTRY(entry), (gchar*)profile->name); gtk_box_pack_start(GTK_BOX(hbox), entry, FALSE, FALSE, 5); g_signal_connect(GTK_ENTRY(entry), "changed", G_CALLBACK(entry_modified_callback), dialog); gtk_widget_show(entry); Index: notebook.c =================================================================== RCS file: /cvsroot/ddccontrol/ddccontrol/src/gddccontrol/notebook.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- notebook.c 23 Feb 2006 21:48:56 -0000 1.29 +++ notebook.c 26 Apr 2006 16:14:55 -0000 1.30 @@ -330,7 +330,7 @@ } /* returns: Number of selected controls */ -int get_profile_checked_controls(char* controls) { +int get_profile_checked_controls(unsigned char* controls) { int current = 0; GSList* list = all_controls; @@ -414,7 +414,7 @@ struct value_db* value; for (value = control->value_list; value != NULL; value = value->next) { - GtkWidget* button = gtk_button_new_with_label(value->name); + GtkWidget* button = gtk_button_new_with_label((char*)value->name); g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(command_callback),value); g_object_set_data(G_OBJECT(button),"ddc_control",control); gtk_widget_show(button); @@ -429,7 +429,7 @@ GSList* group = NULL; for (value = control->value_list; value != NULL; value = value->next) { - GtkWidget* radio = gtk_radio_button_new_with_label(group, value->name); + GtkWidget* radio = gtk_radio_button_new_with_label(group, (char*)value->name); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio), (value->value == currentDefault)); g_object_set_data(G_OBJECT(radio), "ddc_value", value); gtk_widget_show(radio); @@ -479,7 +479,7 @@ struct control_db* control; for (control = subgroup->control_list; control != NULL; control = control->next) { - frame = gtk_frame_new(control->name); + frame = gtk_frame_new((char*)control->name); gtk_container_set_border_width(GTK_CONTAINER(frame),5); createControl(frame,control); gtk_widget_show(frame); @@ -505,7 +505,7 @@ gtk_widget_show(vbox); GtkWidget* label; - label = gtk_label_new(subgroup->name); + label = gtk_label_new((char*)subgroup->name); gtk_widget_show(label); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), mainvbox, label); gtk_widget_show(mainvbox); Index: notebook.h =================================================================== RCS file: /cvsroot/ddccontrol/ddccontrol/src/gddccontrol/notebook.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- notebook.h 23 Feb 2006 21:48:56 -0000 1.13 +++ notebook.h 26 Apr 2006 16:14:55 -0000 1.14 @@ -56,7 +56,7 @@ void delete_monitor_manager(); void show_profile_checks(gboolean show); -int get_profile_checked_controls(char* controls); +int get_profile_checked_controls(unsigned char* controls); void refresh_all_controls(GtkWidget *widget, gpointer nval); |
|
From: Nicolas B. <nbo...@us...> - 2006-04-26 16:14:57
|
Update of /cvsroot/ddccontrol/ddccontrol/src/ddcpci In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15983/src/ddcpci Modified Files: i2c-algo-bit.c Log Message: Fix gcc 4.0.3 compilation warnings. Index: i2c-algo-bit.c =================================================================== RCS file: /cvsroot/ddccontrol/ddccontrol/src/ddcpci/i2c-algo-bit.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- i2c-algo-bit.c 30 Oct 2005 09:54:18 -0000 1.8 +++ i2c-algo-bit.c 26 Apr 2006 16:14:54 -0000 1.9 @@ -349,8 +349,8 @@ int sendbytes(struct i2c_algo_bit_data *adap, struct i2c_msg *msg) { - char c; - const char *temp = msg->buf; + unsigned char c; + const unsigned char *temp = msg->buf; int count = msg->len; unsigned short nak_ok = msg->flags & I2C_M_IGNORE_NAK; int retval; @@ -382,7 +382,7 @@ { int inval; int rdcount=0; /* counts bytes read */ - char *temp = msg->buf; + unsigned char *temp = msg->buf; int count = msg->len; while (count > 0) { |
|
From: Nicolas B. <nbo...@us...> - 2006-04-25 19:36:13
|
Update of /cvsroot/ddccontrol/ddccontrol/src/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8889 Modified Files: ddcci.c Log Message: Fix invalid CAPS magic for NEC LCD 1970NX. Index: ddcci.c =================================================================== RCS file: /cvsroot/ddccontrol/ddccontrol/src/lib/ddcci.c,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- ddcci.c 12 Mar 2006 14:56:12 -0000 1.34 +++ ddcci.c 25 Apr 2006 19:36:06 -0000 1.35 @@ -465,10 +465,10 @@ } if ((_buf[1] & MAGIC_2) == 0) { + /* Fujitsu Siemens P19-2 and NEC LCD 1970NX send wrong magic when reading caps. */ if (!mon->probing || verbosity) { - fprintf(stderr, _("Invalid response, magic is 0x%02x\n"), _buf[1]); + fprintf(stderr, _("Non-fatal error: Invalid response, magic is 0x%02x\n"), _buf[1]); } - return -1; } _len = _buf[1] & ~MAGIC_2; |
|
From: Nicolas B. <nbo...@us...> - 2006-04-04 22:06:55
|
Update of /cvsroot/ddccontrol/ddccontrol-db/db/monitor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6246 Modified Files: SAM0109.xml Log Message: Fix Samsung 997mb comments. Index: SAM0109.xml =================================================================== RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SAM0109.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- SAM0109.xml 22 Feb 2006 22:16:40 -0000 1.3 +++ SAM0109.xml 4 Apr 2006 22:06:51 -0000 1.4 @@ -1,5 +1,9 @@ <?xml version="1.0"?> -<!---Samsung 997MB is a CRT --> +<!---Samsung 997MB is a CRT +(prot(monitor)type(crt)model(LEO96k(LEO Series))cmds(01 02 03 E3 F3) +vcp(01 05 06 08 10 0B 0C 12 14(1 8 5 4) 16 18 1A 20 22 24 26 30 32 3A 40 42 44 +46 48 4a 4c 6C 6E 70 AC AE B0 E5 E6 E7 56 58 DC(1 2 3))vcpname(14(9300 6500)))0 +--> <monitor name="Samsung SyncMaster 997MB" init="standard"> <controls> <control id="degauss" address="0x01"/> @@ -26,6 +30,7 @@ <value id="text" value="1"/> <value id="internet" value="2"/> <value id="entertain" value="3"/> + <!--- 5 is missing (797MB CAPS) --> </control> <!--- Proprietary VCPs : --> |
|
From: Nicolas B. <nbo...@us...> - 2006-04-04 22:06:19
|
Update of /cvsroot/ddccontrol/ddccontrol-db/db/monitor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5896 Added Files: SAM0149.xml Log Message: Add Samsung 720T (Thanks to Piotr) --- NEW FILE: SAM0149.xml --- <?xml version="1.0"?> <!--- (type(LCD CM)vcp(04 05 06 08 10 12 16 18 1A 60(1 3) B0(1 2) B6 C6 C8 C9 D6(1 4) DC(1 2 3 4 5 6) DF E0 F0(0 1 2 3) F1(0 1) F2 87 )) --> <monitor name="Samsung SyncMaster 720T"> <caps add="(vcp(CA CC E2 F5))"/> <include file="SAMmb6"/> <include file="SAMg9"/> <include file="SAMlcd"/> </monitor> |
|
From: Nicolas B. <nbo...@us...> - 2006-04-04 22:05:26
|
Update of /cvsroot/ddccontrol/ddccontrol-db/db/monitor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5296 Added Files: SAM0119.xml Log Message: Add Samsung 797mb (Thanks to Evgeniy) --- NEW FILE: SAM0119.xml --- <?xml version="1.0"?> <!---Samsung 797MB is a CRT (prot(monitor)type(crt)model(LEO96k(LEO Series))cmds(01 02 03 E3 F3) vcp(01 05 06 08 10 0B 0C 12 14(1 8 5 4) 16 18 1A 20 22 24 26 30 32 3A 40 42 44 46 48 4a 4c 6C 6E 70 AC AE B0 E5 E6 E7 56 58 DC(1 2 3 5))vcpname(14(9300 6500)))0 --> <monitor name="Samsung SyncMaster 797MB" init="standard"> <include file="SAM0109"/> </monitor> |
|
From: Nicolas B. <nbo...@us...> - 2006-04-04 22:04:13
|
Update of /cvsroot/ddccontrol/ddccontrol-db/db/monitor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4105 Modified Files: SUNcrt.xml SUN0577.xml Log Message: Fix Sun files. Index: SUNcrt.xml =================================================================== RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SUNcrt.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- SUNcrt.xml 12 Mar 2006 14:54:24 -0000 1.1 +++ SUNcrt.xml 4 Apr 2006 22:04:03 -0000 1.2 @@ -1,4 +1,4 @@ <?xml version="1.0"?> <monitor name="SUN standard CRT"> - <include file="SNYcrt.xml"/> + <include file="SNYcrt"/> </monitor> Index: SUN0577.xml =================================================================== RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SUN0577.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- SUN0577.xml 12 Mar 2006 14:54:24 -0000 1.3 +++ SUN0577.xml 4 Apr 2006 22:04:03 -0000 1.4 @@ -21,5 +21,5 @@ <!-- <control id="vbotmisconvergence" address="0xF7"/> --> </controls> - <include file="SUNcrt.xml"/> + <include file="SUNcrt"/> </monitor> |
|
From: Nicolas B. <nbo...@us...> - 2006-04-04 22:03:33
|
Update of /cvsroot/ddccontrol/ddccontrol/src/ddcpci In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3715/src/ddcpci Modified Files: intel810.c Log Message: Add more I2C busses to Intel 810-like chips. Index: intel810.c =================================================================== RCS file: /cvsroot/ddccontrol/ddccontrol/src/ddcpci/intel810.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- intel810.c 9 Mar 2006 21:18:07 -0000 1.10 +++ intel810.c 4 Apr 2006 22:03:27 -0000 1.11 @@ -217,12 +217,16 @@ char* mmio = data->memory; - i810_card->nbusses = 3; - i810_card->i2c_busses = malloc(3*sizeof(struct i2c_algo_bit_data)); + /* I2C registers see http://mail.directfb.org/pipermail/directfb-dev/2005-July/000457.html */ + i810_card->nbusses = 6; + i810_card->i2c_busses = malloc(6*sizeof(struct i2c_algo_bit_data)); init_i2c_bus(&i810_card->i2c_busses[0], mmio, 0x05010); // GPIOA init_i2c_bus(&i810_card->i2c_busses[1], mmio, 0x05014); // GPIOB - init_i2c_bus(&i810_card->i2c_busses[2], mmio, 0x0501C); // GPIO"C" (DVI daughter card) - + init_i2c_bus(&i810_card->i2c_busses[2], mmio, 0x05018); // GPIO"C" + init_i2c_bus(&i810_card->i2c_busses[3], mmio, 0x0501C); // GPIO"D" (82865G DVI daughter card) + init_i2c_bus(&i810_card->i2c_busses[4], mmio, 0x05020); // GPIO"E" + init_i2c_bus(&i810_card->i2c_busses[5], mmio, 0x05024); // GPIO"F" + return i810_card; } |
|
From: Nicolas B. <nbo...@us...> - 2006-04-04 22:03:32
|
Update of /cvsroot/ddccontrol/ddccontrol In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3715 Modified Files: TODO Log Message: Add more I2C busses to Intel 810-like chips. Index: TODO =================================================================== RCS file: /cvsroot/ddccontrol/ddccontrol/TODO,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- TODO 8 Mar 2006 21:36:19 -0000 1.11 +++ TODO 4 Apr 2006 22:03:26 -0000 1.12 @@ -6,6 +6,8 @@ - Use rsync for SF file transfers. BUGS: + - Fix Samsung 720T (not detected as LCD as type is "LCD CM") + - When changing a control value quickly (moving the mouse outside the control), the value on the scale does not correspond to the real value. - "My only criticism is that the slider |
|
From: Nicolas B. <nbo...@us...> - 2006-04-04 22:00:46
|
Update of /cvsroot/ddccontrol/ddccontrol/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1289/doc Modified Files: main.xml supportedmonitors.xml techdocs.xml Log Message: Add documentation for translators. Index: techdocs.xml =================================================================== RCS file: /cvsroot/ddccontrol/ddccontrol/doc/techdocs.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- techdocs.xml 22 Feb 2006 21:25:05 -0000 1.5 +++ techdocs.xml 4 Apr 2006 22:00:29 -0000 1.6 @@ -1,5 +1,93 @@ <appendix id="techdocs"> <title>Documents for developers</title> +<sect1 id="translators"> +<title>Translation (I18N) guide</title> +<para>Author: Nicolas Boichat <nicolas -at- boichat.ch></para> +<para> +You want to translate ddccontrol to your favorite language? Then, this guide is for you! +</para> +<para> +The distribution is splitted in two packages, <filename>ddccontrol</filename> +(the main program), and <filename>ddccontrol-db</filename> (monitor database). +</para> +<para> +Tools you need: <filename>cvs</filename>, +<filename>automake</filename>/<filename>autoconf</filename>, +<filename>gettext</filename>, <filename>make</filename>, +<filename>poedit</filename> (or another tool, or a simple text editor). +</para> +<para> +First, you need to check-out the sources from the CVS repository +(see +<ulink url="http://sourceforge.net/cvs/?group_id=117933">project CVS page</ulink>, +Anonymous CVS Access section). Note you need to perform this operation, +and the following ones, on both ddccontrol and ddccontrol-db modules (there are +strings to translate in the main program, and in the database). +</para> +<para> +Then run: +<screen format='linespecific'> +# ./autogen.sh +# ./configure (maybe you will need some devel package to make it working) +# cd po +# make update-po +</screen> +</para> +<para> +If the po file for your language doesn't exist, simply copy +<filename>ddccontrol.pot</filename> to <filename>LANG.po</filename> +(for example, for French, it is <filename>fr.po</filename>) and update the +fields in it (like <sgmltag class="attribute">AUTHOR</sgmltag>, +<sgmltag class="attribute">CHARSET</sgmltag>, etc...) +</para> +<para> +Then open your <filename>.po</filename> file, and translate the strings! I +recommend that you use a tool like <ulink url="http://poedit.sf.net/">poedit</ulink> +to edit it, as it warns visually you when strings are wrong, and offers spellcheck, +but it's your choice .-) +</para> +<para> +When you are finished, it would be nice to test if it works by installing and +running the software, but it is not mandatory, particularly if you don't have +the needed hardware (i.e. a monitor supporting DDC/CI). +</para> +<para> +Then, I give you two possibilities for sending the completed +<filename>.po</filename> files, either you send them to +<ulink url="mailto:bac...@li...">bacula-devel</ulink>, +or I give you a CVS write access (in this case, please send me your SourceForge +ID). The later (CVS) is of course my prefered, as it is less work for me, but if +you don't feel comfortable with CVS, and don't have time to learn, e-mail is ok too. +</para> +<para> +I suggest that you subscribe to <filename>ddccontrol-devel</filename>, +particularly if you have problems to translate some technical strings. So +I don't have to explain many times the same terms to all translators .-) +</para> +<para> +Also, as some of you probably have a better English level than mine, it +would be really nice to report English mistakes in the original strings +if you find some. +</para> +<para> +List of languages with active translators: +<itemizedlist mark='bullet'> +<listitem> +French: Nicolas Boichat +</listitem> +<listitem> +Russian: Sergei Epiphanov +</listitem> +</itemizedlist> +</para> +<para> +I hope my explanations were complete, otherwise do not hesitate to contact me +(cc-ing the devel list) if you have questions. +</para> +<para> +THANK YOU. +</para> +</sect1> <sect1 id="dbstruct"> <title>Monitor database structure</title> <para>The monitor database is written in XML, it can be found in the Index: main.xml =================================================================== RCS file: /cvsroot/ddccontrol/ddccontrol/doc/main.xml,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- main.xml 8 Mar 2006 22:10:44 -0000 1.22 +++ main.xml 4 Apr 2006 22:00:29 -0000 1.23 @@ -32,7 +32,7 @@ <abstract> <para> -Documentation for DDCcontrol version 0.4.1. +Documentation for DDCcontrol version 0.4.2. </para> </abstract> Index: supportedmonitors.xml =================================================================== RCS file: /cvsroot/ddccontrol/ddccontrol/doc/supportedmonitors.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- supportedmonitors.xml 8 Mar 2006 21:12:22 -0000 1.16 +++ supportedmonitors.xml 4 Apr 2006 22:00:29 -0000 1.17 @@ -65,7 +65,7 @@ SyncMaster 173P (VGA and DVI inputs) </listitem> <listitem> -SyncMaster 173P Plus +SyncMaster 173P Plus (VGA and DVI inputs) </listitem> <listitem> SyncMaster 173T (VGA input only) |
|
From: Nicolas B. <nbo...@us...> - 2006-04-04 22:00:42
|
Update of /cvsroot/ddccontrol/ddccontrol In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1289 Modified Files: Makefile.am configure.ac Log Message: Add documentation for translators. Index: configure.ac =================================================================== RCS file: /cvsroot/ddccontrol/ddccontrol/configure.ac,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- configure.ac 9 Mar 2006 21:18:06 -0000 1.36 +++ configure.ac 4 Apr 2006 22:00:29 -0000 1.37 @@ -1,4 +1,4 @@ -AC_INIT([DDC/CI control tool], [0.4.1], +AC_INIT([DDC/CI control tool], [0.4.2], [DDCControl users list <ddc...@li...>], [ddccontrol]) AM_CONFIG_HEADER(src/config.h) Index: Makefile.am =================================================================== RCS file: /cvsroot/ddccontrol/ddccontrol/Makefile.am,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- Makefile.am 14 Nov 2005 18:48:21 -0000 1.11 +++ Makefile.am 4 Apr 2006 22:00:29 -0000 1.12 @@ -1,6 +1,6 @@ SUBDIRS = src po $(DOC) -EXTRA_DIST = config.rpath mkinstalldirs config.rpath mkinstalldirs intltool-extract.in intltool-merge.in intltool-update.in po/POTFILES +EXTRA_DIST = config.rpath mkinstalldirs config.rpath mkinstalldirs intltool-extract.in intltool-merge.in intltool-update.in DISTCLEANFILES = intltool-extract intltool-merge intltool-update |
|
From: Nicolas B. <nbo...@us...> - 2006-04-04 22:00:36
|
Update of /cvsroot/ddccontrol/ddccontrol/po In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1289/po Modified Files: Makefile.in.in Log Message: Add documentation for translators. Index: Makefile.in.in =================================================================== RCS file: /cvsroot/ddccontrol/ddccontrol/po/Makefile.in.in,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- Makefile.in.in 20 Feb 2006 17:16:38 -0000 1.6 +++ Makefile.in.in 4 Apr 2006 22:00:30 -0000 1.7 @@ -39,13 +39,14 @@ gettextsrcdir = $(datadir)/glib-2.0/gettext/po subdir = po install_sh = @install_sh@ -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +# Automake >= 1.8 provides @mkdir_p@. +# Until it can be supposed, use the safe fallback: +mkdir_p = $(install_sh) -d INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ CC = @CC@ -GENCAT = gencat GMSGFMT = @GMSGFMT@ MSGFMT = @MSGFMT@ XGETTEXT = @XGETTEXT@ @@ -73,7 +74,6 @@ CATALOGS = @CATALOGS@ CATOBJEXT = .gmo -INSTOBJEXT = .mo .SUFFIXES: .SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat @@ -94,7 +94,7 @@ .po.cat: sed -f ../intl/po2msg.sed < $< > $*.msg \ - && rm -f $@ && $(GENCAT) $@ $*.msg + && rm -f $@ && gencat $@ $*.msg all: all-@USE_NLS@ @@ -110,11 +110,7 @@ install-data: install-data-@USE_NLS@ install-data-no: all install-data-yes: all - if test -n "$(MKINSTALLDIRS)"; then \ - $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \ - else \ - $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \ - fi + $(mkdir_p) $(DESTDIR)$(datadir) @catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ cat=`basename $$cat`; \ @@ -124,39 +120,31 @@ esac; \ lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \ - if test -n "$(MKINSTALLDIRS)"; then \ - $(MKINSTALLDIRS) $$dir; \ - else \ - $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \ - fi; \ + $(mkdir_p) $$dir; \ if test -r $$cat; then \ - $(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ - echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \ + $(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE).mo; \ + echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE).mo"; \ else \ - $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ + $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(GETTEXT_PACKAGE).mo; \ echo "installing $(srcdir)/$$cat as" \ - "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \ + "$$dir/$(GETTEXT_PACKAGE).mo"; \ fi; \ if test -r $$cat.m; then \ - $(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ - echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \ + $(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE).mo.m; \ + echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \ else \ if test -r $(srcdir)/$$cat.m ; then \ $(INSTALL_DATA) $(srcdir)/$$cat.m \ - $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ + $$dir/$(GETTEXT_PACKAGE).mo.m; \ echo "installing $(srcdir)/$$cat as" \ - "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \ + "$$dir/$(GETTEXT_PACKAGE).mo.m"; \ else \ true; \ fi; \ fi; \ done if test "$(PACKAGE)" = "glib"; then \ - if test -n "$(MKINSTALLDIRS)"; then \ - $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \ - else \ - $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \ - fi; \ + $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ $(INSTALL_DATA) $(srcdir)/Makefile.in.in \ $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ else \ @@ -171,10 +159,10 @@ for cat in $$catalogs; do \ cat=`basename $$cat`; \ lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ - rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ - rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ - rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ - rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ + rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ + rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ done if test "$(PACKAGE)" = "glib"; then \ rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ @@ -192,8 +180,8 @@ clean: mostlyclean distclean: clean - rm -f Makefile Makefile.in POTFILES - rm -f *.mo *.msg *.cat *.cat.m $(GMOFILES) + rm -f Makefile Makefile.in POTFILES stamp-it + rm -f *.mo *.msg *.cat *.cat.m *.gmo maintainer-clean: distclean @echo "This command is intended for maintainers to use;" @@ -205,11 +193,12 @@ dists="$(DISTFILES)"; \ extra_dists="$(EXTRA_DISTFILES)"; \ for file in $$extra_dists; do \ - test -f $$file && dists="$$dists $$file"; \ + test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \ done; \ for file in $$dists; do \ - ln $(srcdir)/$$file $(distdir) 2> /dev/null \ - || cp -p $(srcdir)/$$file $(distdir); \ + test -f $$file || file="$(srcdir)/$$file"; \ + ln $$file $(distdir) 2> /dev/null \ + || cp -p $$file $(distdir); \ done update-po: Makefile @@ -239,23 +228,15 @@ fi; \ done -# POTFILES is created from POTFILES.in by stripping comments, empty lines -# and Intltool tags (enclosed in square brackets), and appending a full -# relative path to them -POTFILES: POTFILES.in - ( posrcprefix='$(top_srcdir)/'; \ - rm -f $@-t $@ \ - && (sed -e '/^#/d' \ - -e 's/^[[].*] *//' \ - -e '/^[ ]*$$/d' \ - -e "s@^@ $$posrcprefix@" $(srcdir)/$@.in \ - | sed -e '$$!s/$$/ \\/') > $@-t \ - && chmod a-w $@-t \ - && mv $@-t $@ ) +Makefile POTFILES: stamp-it + @if test ! -f $@; then \ + rm -f stamp-it; \ + $(MAKE) stamp-it; \ + fi -Makefile: Makefile.in.in ../config.status POTFILES +stamp-it: Makefile.in.in ../config.status POTFILES.in cd .. \ - && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \ + && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \ $(SHELL) ./config.status # Tell versions [3.59,3.63) of GNU make not to export all variables. |
|
From: Nicolas B. <nbo...@us...> - 2006-03-22 19:45:12
|
Update of /cvsroot/ddccontrol/ddccontrol-db/db/monitor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6373 Added Files: SAM0197.xml Log Message: Add support for Samsung 173P+ (DVI). --- NEW FILE: SAM0197.xml --- <?xml version="1.0"?> <!---The Samsung 173P+ is identical to 193P+ --> <monitor name="Samsung SyncMaster 173P Plus (DVI)"> <include file="SAM0198"/> </monitor> |
1 message has been excluded from this view by a project administrator.
