Re: [Linuxwacom-devel] [PATCH libwacom] Drop AM_MAINTAINER_MODE
On Thu, Nov 22, 2012 at 08:35:05AM +1000, Peter Hutterer wrote: On Mon, Nov 19, 2012 at 09:59:25PM +1030, Ron wrote: On Mon, Nov 19, 2012 at 10:18:55AM +1000, Peter Hutterer wrote: On Sat, Nov 17, 2012 at 12:39:08AM +1030, Ron wrote: Hi, Sorry to be late to the party on this one, but could we please change this to instead use: AM_MAINTAINER_MODE([enabled]) This gives the same default behaviour as removing it (which I agree is desirable), but still enables people to use the --disable-maintainer-mode option to configure, if they really want to switch it off again (which I do for the package builds since we don't really want a borked timestamp regenerating these files unexpectedly in the source package). where do you get the busted timestamps from? that seems to be the bug that should get fixed. [...] btw, I suspect that sooner or later the X.Org repos will all be switched (server already is) so you need to bring up the issue on the xorg-devel list too. That may not be a problem for the folk maintaining the X packages, they have their own boilerplate and methodology for pulling packages from git and I think they do just regenerate this stuff at every build. Even so, it probably would be nice to use AM_MAINTAINER_MODE([enabled]) everywhere that this is being changed. It takes nothing away from the preferred default, but leaves people with choice if they do need it. Patch is out for libwacom. Do you need the same change in xf86-input-wacom then or is that handled by the X team? Thanks! That looks good. xf86-input-wacom is maintained by me and uses this workflow, so if we can apply the same patch there, that would be great. Cheers, Ron -- Monitor your physical, virtual and cloud infrastructure from a single web console. Get in-depth insight into apps, servers, databases, vmware, SAP, cloud infrastructure, etc. Download 30-day Free Trial. Pricing starts from $795 for 25 servers or applications! http://p.sf.net/sfu/zoho_dev2dev_nov ___ Linuxwacom-devel mailing list Linuxwacom-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
[Linuxwacom-devel] [PATCH] Bring back AM_MAINTAINER_MODE, default to enabled
See Ron's comments discussion on: http://old.nabble.com/-PATCH-libwacom--Drop-AM_MAINTAINER_MODE-td34561358.html Summary: In this workflow all generated files are committed to git to have a known working set. On checkout, git does not restore the original timestamps, so with maintainer-mode enabled, automake will regenerate the files - which is to be avoided since we already have the known working set. AM_MAINTAINER_MODE([enable]) gives us the same behaviour as now, but will allow Ron to disable the regeneration of the files. Requested-by: Ron r...@debian.org Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index 822f4be..e1f7d97 100644 --- a/configure.ac +++ b/configure.ac @@ -32,6 +32,7 @@ AC_CONFIG_HEADERS([config.h]) # Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip]) +AM_MAINTAINER_MODE([enable]) AC_USE_SYSTEM_EXTENSIONS # Initialize libtool -- 1.7.11.7 -- Monitor your physical, virtual and cloud infrastructure from a single web console. Get in-depth insight into apps, servers, databases, vmware, SAP, cloud infrastructure, etc. Download 30-day Free Trial. Pricing starts from $795 for 25 servers or applications! http://p.sf.net/sfu/zoho_dev2dev_nov ___ Linuxwacom-devel mailing list Linuxwacom-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
Re: [Linuxwacom-devel] libwacom: [PATCH 3/3] lib: add IntegratedIn to device group
On Wed, Nov 07, 2012 at 01:22:11PM +0100, Olivier Fourdan wrote:
From 15f93f5d3bd9f2aefd59a5087b2ce44a3c53403c Mon Sep 17 00:00:00 2001
From: Olivier Fourdan ofour...@redhat.com
Date: Thu, 11 Oct 2012 12:04:45 +0200
Subject: [PATCH 3/3] lib: add IntegratedIn to device group
to describe integrated system devices and screen tablets.
A bit field allows to identify the level of integration of
a device:
WACOM_DEVICE_INTEGRATED_NONEdevice is a standalone tablet
WACOM_DEVICE_INTEGRATED_DISPLAY device is a screen tablet
WACOM_DEVICE_INTEGRATED_SYSTEM device is an ISD such as
a tablet PC.
Or -1 (WACOM_DEVICE_INTEGRATED_UNSET) if the information is not
available
two things:
I'd like to see a test that screams bloody murder when the flag is in fact
unset. presumably if we add new devices we known whether they're built-in
and the test should complain if we forget to add this.
the other thing: having UNSET as -1 for a bitmask is not a good choice, it
requires any user to check for UNSET _and_ check for the mask set, since -1
will always set all bits.
so either we bump all up by one so UNSET is 0 and NONE is 1, or we leave
NONE at 0 and guarantee that we always define this and drop UNSET.
These definitions supersede the previous libwacom_is_builtin()
API which is now deprecated.
Signed-off-by: Olivier Fourdan ofour...@redhat.com
---
libwacom/libwacom-database.c | 59 ++--
libwacom/libwacom.c | 67 +
libwacom/libwacom.h | 24 ++-
libwacom/libwacomint.h | 10 +-
4 files changed, 113 insertions(+), 47 deletions(-)
diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c
index bbea114..ae73239 100644
--- a/libwacom/libwacom-database.c
+++ b/libwacom/libwacom-database.c
@@ -256,6 +256,14 @@ struct {
{ Touchstrip2,WACOM_STATUS_LED_TOUCHSTRIP2 }
};
+struct {
+ const char *key;
+ WacomIntegrationFlags value;
+} integration_flags[] = {
+ { Display,WACOM_DEVICE_INTEGRATED_DISPLAY },
+ { System, WACOM_DEVICE_INTEGRATED_SYSTEM }
+};
+
static void
libwacom_parse_buttons_key(WacomDevice *device,
GKeyFile *keyfile,
@@ -329,8 +337,7 @@ libwacom_parse_tablet_keyfile(const char *datadir, const
char *filename)
char *layout;
char *class;
char *match;
- char **styli_list;
- char **leds_list;
+ char **string_list;
keyfile = g_key_file_new();
@@ -361,31 +368,50 @@ libwacom_parse_tablet_keyfile(const char *datadir,
const char *filename)
device-name = g_key_file_get_string(keyfile, DEVICE_GROUP, Name,
NULL);
device-width = g_key_file_get_integer(keyfile, DEVICE_GROUP, Width,
NULL);
device-height = g_key_file_get_integer(keyfile, DEVICE_GROUP,
Height, NULL);
+
+ device-integration_flags = WACOM_DEVICE_INTEGRATED_UNSET;
+ string_list = g_key_file_get_string_list(keyfile, DEVICE_GROUP,
IntegratedIn, NULL, NULL);
+ if (string_list) {
+ guint i, n;
+
+ device-integration_flags = WACOM_DEVICE_INTEGRATED_NONE;
+ for (i = 0; string_list[i]; i++) {
+ for (n = 0; n G_N_ELEMENTS (integration_flags); n++) {
+ if (!strcmp(string_list[i],
integration_flags[n].key)) {
+ device-integration_flags |=
integration_flags[n].value;
+ break;
+ }
+ }
+ }
+ g_strfreev (string_list);
+ }
+
layout = g_key_file_get_string(keyfile, DEVICE_GROUP, Layout, NULL);
if (layout) {
/* For the layout, we store the full path to the SVG layout */
device-layout = g_build_filename (datadir, layouts, layout,
NULL);
g_free (layout);
}
+
class = g_key_file_get_string(keyfile, DEVICE_GROUP, Class, NULL);
device-cls = libwacom_class_string_to_enum(class);
g_free(class);
- styli_list = g_key_file_get_string_list(keyfile, DEVICE_GROUP, Styli,
NULL, NULL);
- if (styli_list) {
+ string_list = g_key_file_get_string_list(keyfile, DEVICE_GROUP,
Styli, NULL, NULL);
+ if (string_list) {
GArray *array;
guint i;
array = g_array_new (FALSE, FALSE, sizeof(int));
device-num_styli = 0;
- for (i = 0; styli_list[i]; i++) {
- glong long_value = strtol (styli_list[i], NULL, 0);
+ for (i = 0; string_list[i]; i++) {
+ glong long_value = strtol (string_list[i], NULL, 0);
int int_value = long_value;
g_array_append_val
Re: [Linuxwacom-devel] [xf86-input-wacom PATCH 1/4] Support up to 16 touch points
On Thursday, November 22, 2012, Peter Hutterer wrote: On Wed, Nov 21, 2012 at 12:13:44PM -0800, Ping Cheng wrote: Bamboo3 and Intuos5 both support 16 fingers Signed-off-by: Ping Cheng pi...@wacom.com javascript:; --- src/xf86WacomDefs.h |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/xf86WacomDefs.h b/src/xf86WacomDefs.h index 2704f3d..7df0e95 100644 --- a/src/xf86WacomDefs.h +++ b/src/xf86WacomDefs.h @@ -397,7 +397,7 @@ extern WacomDeviceClass gWacomISDV4Device; #define TILT_REQUEST_FLAG 1 #define TILT_ENABLED_FLAG 2 -#define MAX_CHANNELS 15 +#define MAX_CHANNELS 17 #define PAD_CHANNEL (MAX_CHANNELS-1) #define MAX_FINGERS (MAX_CHANNELS-1) Reviewed-by: Peter Hutterer peter.hutte...@who-t.net javascript:; for this change, Please merge this one now so we do not break Bamboo3 and Intuos5 support, although I do not think there are many people using their fingers and toes on their tablets except for testing ;). but can we swap this around to define MAX_FINGERS as number and the MAX_CHANNELS is based on MAX_FINGERS + 1? that seems more intuitive, We'll have to come back to these defines since we need to consider the case that pen, touch, and pad events are all reported on the same logical port. This is related to a new feature that I think the driver should support - reporting touch events while pen is in prox. XI2 made this support possible. But it requires more changes to the driver, which I do not have time to work on yet. Ping -- Monitor your physical, virtual and cloud infrastructure from a single web console. Get in-depth insight into apps, servers, databases, vmware, SAP, cloud infrastructure, etc. Download 30-day Free Trial. Pricing starts from $795 for 25 servers or applications! http://p.sf.net/sfu/zoho_dev2dev_nov___ Linuxwacom-devel mailing list Linuxwacom-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
Re: [Linuxwacom-devel] [PATCH] Bring back AM_MAINTAINER_MODE, default to enabled
On Thursday, November 22, 2012, Peter Hutterer wrote: See Ron's comments discussion on: http://old.nabble.com/-PATCH-libwacom--Drop-AM_MAINTAINER_MODE-td34561358.html Summary: In this workflow all generated files are committed to git to have a known working set. On checkout, git does not restore the original timestamps, so with maintainer-mode enabled, automake will regenerate the files - which is to be avoided since we already have the known working set. AM_MAINTAINER_MODE([enable]) gives us the same behaviour as now, but will allow Ron to disable the regeneration of the files. Requested-by: Ron r...@debian.org javascript:; Signed-off-by: Peter Hutterer peter.hutte...@who-t.net javascript:; Acked-by: Ping Cheng pingli...@gmail.com for both patches associated with this issue. Ping --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index 822f4be..e1f7d97 100644 --- a/configure.ac +++ b/configure.ac @@ -32,6 +32,7 @@ AC_CONFIG_HEADERS([config.h]) # Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip]) +AM_MAINTAINER_MODE([enable]) AC_USE_SYSTEM_EXTENSIONS # Initialize libtool -- 1.7.11.7 -- Monitor your physical, virtual and cloud infrastructure from a single web console. Get in-depth insight into apps, servers, databases, vmware, SAP, cloud infrastructure, etc. Download 30-day Free Trial. Pricing starts from $795 for 25 servers or applications! http://p.sf.net/sfu/zoho_dev2dev_nov ___ Linuxwacom-devel mailing list Linuxwacom-devel@lists.sourceforge.net javascript:; https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel -- Monitor your physical, virtual and cloud infrastructure from a single web console. Get in-depth insight into apps, servers, databases, vmware, SAP, cloud infrastructure, etc. Download 30-day Free Trial. Pricing starts from $795 for 25 servers or applications! http://p.sf.net/sfu/zoho_dev2dev_nov___ Linuxwacom-devel mailing list Linuxwacom-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
