Attachment 227934 Details for Bug 409366

[patch] updated patch

linuxwacom-fix-xsetwacom_find_devices.diff (text/plain), 5.98 KB, created by Danny Al-Gaaf on 2008-07-15 20:40:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Danny Al-Gaaf

Created: 2008-07-15 20:40:02 UTC

Size: 5.98 KB

patch

obsolete

>--- src/util/wacomcfg.c	2008-06-10 19:23:00.000000000 +0200
>+++ src/util/wacomcfg.c	2008-06-10 19:25:05.000000000 +0200
>@@ -41,11 +41,20 @@
> #include <stdio.h> /* debugging only, we've got no business output text */
> #include <ctype.h>
> #include <stdlib.h>
>+#include <stdarg.h>
> #include <errno.h>
> #include <string.h>
> #include <memory.h>
> #include <assert.h>
> 
>+#include "xf86Parser.h"
>+
>+WACOMDEVICETYPE checkIfWacomDevice (XF86ConfigPtr, const char* );
>+WACOMDEVICETYPE mapStringToType (const char*);
>+XF86ConfigPtr readConfig (char *);
>+void VErrorF(const char*, va_list);
>+void ErrorF (const char*, ...);
>+
> /*****************************************************************************
> ** Internal structures
> *****************************************************************************/
>@@ -123,6 +132,7 @@
> 	unsigned char* pReq;
> 	WACOMDEVICEINFO* pInfo;
> 	XDeviceInfo* info;
>+	XF86ConfigPtr conf;
> 	char devName[64];
> 
> 	if (!hConfig || !ppInfo || !puCount)
>@@ -132,12 +142,15 @@
> 	if (!hConfig->pDevs && CfgGetDevs(hConfig))
> 		return -1;
> 
>+	/* read the config in for wacom devices which don'T use the commnon identifier */
>+	conf = readConfig ("/etc/X11/xorg.conf");
>+
> 	/* estimate size of memory needed to hold structures */
> 	nSize = nCount = 0;
> 	for (i=0; i<hConfig->nDevCnt; ++i)
> 	{
> 		info = hConfig->pDevs + i;
>-		if (info->use != IsXExtensionDevice) continue;
>+		if (info->use != IsXExtensionDevice && info->use != IsXExtensionPointer) continue;
> 		if (!info->num_classes) continue;
> 		nSize += sizeof(WACOMDEVICEINFO);
> 		nSize += strlen(info->name) + 1;
>@@ -146,8 +159,10 @@
> 
> 	/* allocate memory and zero */
> 	pReq = (unsigned char*)malloc(nSize);
>-	if (!pReq) return CfgError(hConfig,errno,
>-		"WacomConfigListDevices: failed to allocate memory");
>+
>+	if (!pReq) 
>+		return CfgError(hConfig,errno, "WacomConfigListDevices: failed to allocate memory");
>+
> 	memset(pReq,0,nSize);
> 
> 	/* populate data */
>@@ -158,7 +173,7 @@
> 	{
> 		info = hConfig->pDevs + i;
> 		/* ignore non-extension devices */
>-		if (info->use != IsXExtensionDevice) continue;
>+		if (info->use != IsXExtensionDevice && info->use != IsXExtensionPointer) continue;
> 		/* ignore uninitialized tools  */
> 		if (!info->num_classes) continue;
> 		/* copy name */
>@@ -170,16 +185,12 @@
> 		for (j=0; j<strlen(pInfo->pszName); j++)
> 			devName[j] = tolower(pInfo->pszName[j]);
> 		devName[j] = '\0';
>-		if (strstr(devName,"cursor") != NULL)
>-			pInfo->type = WACOMDEVICETYPE_CURSOR;
>-		else if (strstr(devName,"stylus") != NULL)
>-			pInfo->type = WACOMDEVICETYPE_STYLUS;
>-		else if (strstr(devName,"eraser") != NULL)
>-			pInfo->type = WACOMDEVICETYPE_ERASER;
>-		else if (strstr(devName,"pad") != NULL)
>-			pInfo->type = WACOMDEVICETYPE_PAD;
>-		else
>-			pInfo->type = WACOMDEVICETYPE_UNKNOWN;
>+
>+		pInfo->type = mapStringToType (devName);
>+
>+		if ( pInfo->type == WACOMDEVICETYPE_UNKNOWN ) {
>+			pInfo->type = checkIfWacomDevice (conf, pInfo->pszName);
>+		}
> 
> 		if ( pInfo->type != WACOMDEVICETYPE_UNKNOWN )
> 		{
>@@ -196,6 +207,62 @@
> 	return 0;
> }
> 
>+WACOMDEVICETYPE checkIfWacomDevice (XF86ConfigPtr conf, const char* pszDeviceName) {
>+	XF86ConfInputPtr ip;
>+
>+	if (!conf || !pszDeviceName) {
>+		return WACOMDEVICETYPE_UNKNOWN;
>+	}
>+
>+	ip = (XF86ConfInputPtr) conf->conf_input_lst;
>+	if (! ip) {
>+		return WACOMDEVICETYPE_UNKNOWN;
>+	}
>+
>+	for (;ip;ip=ip->list.next) {
>+		XF86OptionPtr op = (XF86OptionPtr) ip->inp_option_lst;
>+		char* type = 0;
>+
>+		if (! op) {
>+			return WACOMDEVICETYPE_UNKNOWN;
>+		}
>+
>+		if (strcasecmp(ip->inp_identifier, pszDeviceName) != 0) {
>+			continue;
>+		}
>+
>+		if (strcasecmp(ip->inp_driver,"wacom") != 0) {
>+			continue;
>+		}
>+
>+		for (;op;op=op->list.next) {
>+			if (strcasecmp(op->opt_name,"Type") == 0) {
>+				type = op->opt_val;
>+				return mapStringToType(type);
>+			}
>+		}
>+	}
>+	
>+	return WACOMDEVICETYPE_UNKNOWN;
>+}
>+
>+WACOMDEVICETYPE mapStringToType (const char* name) {
>+	if (!name)
>+		return WACOMDEVICETYPE_UNKNOWN;
>+
>+	if (strstr(name,"cursor") != NULL)
>+		return WACOMDEVICETYPE_CURSOR;
>+	else if (strstr(name,"stylus") != NULL)
>+		return WACOMDEVICETYPE_STYLUS;
>+	else if (strstr(name,"eraser") != NULL)
>+		return WACOMDEVICETYPE_ERASER;
>+	else if (strstr(name,"pad") != NULL)
>+		return WACOMDEVICETYPE_PAD;
>+	else
>+		return WACOMDEVICETYPE_UNKNOWN;
>+	
>+}
>+
> WACOMDEVICE * WacomConfigOpenDevice(WACOMCONFIG * hConfig,
> 	const char* pszDeviceName)
> {
>@@ -381,3 +448,36 @@
> 
> 	free(pvData);
> }
>+
>+XF86ConfigPtr readConfig (char *filename) {
>+	XF86ConfigPtr conf = 0;
>+	const char *file   = 0;
>+	char CONFPATH[]= "%A,%R,/etc/%R,%P/etc/X11/%R,%E,%F,/etc/X11/%F," \
>+			 "%P/etc/X11/%F,%D/%X,/etc/X11/%X,/etc/%X,%P/etc/X11/%X.%H," \
>+			 "%P/etc/X11/%X,%P/lib/X11/%X.%H,%P/lib/X11/%X";
>+
>+	if (!(file = (char*)xf86openConfigFile (CONFPATH, filename, 0))) {
>+		fprintf (stderr, "Unable to open config file\n");
>+		return 0;
>+	}
>+
>+	if ((conf = (XF86ConfigPtr)xf86readConfigFile ()) == 0) {
>+		fprintf (stderr, "Problem when parsing config file\n");
>+		xf86closeConfigFile ();
>+		return 0;
>+	}
>+
>+	xf86closeConfigFile ();
>+	return conf;
>+}
>+
>+void VErrorF(const char *f, va_list args) {
>+	vfprintf(stderr, f, args);
>+}
>+
>+void ErrorF(const char *f, ...) {
>+	va_list args;
>+	va_start(args, f);
>+	vfprintf(stderr, f, args);
>+	va_end(args);
>+}
>--- src/util/Makefile.am	2007-10-24 21:44:52.000000000 +0000
>+++ src/util/Makefile.am	2008-05-16 20:22:53.000000000 +0000
>@@ -4,7 +4,10 @@
> wacomcfgdir = $(includedir)/wacomcfg
> wacomcfg_HEADERS = wacomcfg.h
> 
>-AM_CFLAGS = -Wall -pedantic
>+if WCM_ENV_XORGSDK
>+WACOMCFG_INCLUDES = -I/usr/include/xorg $(X_CFLAGS)
>+endif
>+AM_CFLAGS = -Wall -pedantic $(WACOMCFG_INCLUDES)
> DEPFLAGS = @WCM_DEPFLAGS@
> 
> # These identify which programs, libraries, and headers could
>@@ -27,7 +35,7 @@
> 
> libwacomcfg_la_SOURCES = wacomcfg.c wacomcfg.h ../include/Xwacom.h
> libwacomcfg_la_LDFLAGS = -no-undefined -version-info @WCM_LIBWACOMCFG_VER@
>-libwacomcfg_la_LIBADD = @WCM_LIBWACOMCFG_LIBS@
>+libwacomcfg_la_LIBADD = @WCM_LIBWACOMCFG_LIBS@ -lxf86config -lm
> 
> xsetwacom_SOURCES = xsetwacom.c wacomcfg.h wcmAction.c wcmAction.h ../include/Xwacom.h
> xsetwacom_LDADD = libwacomcfg.la

Actions: View | Diff

Attachments on bug 409366: 227934