Use XInput device name for tabletModel. Fixes #3.

ZaneA · Jan 12, 2013 · 089ffd2 · 089ffd2
1 parent d08c9b3
commit 089ffd2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/XInput.c b/src/XInput.c
@@ -35,8 +35,6 @@
 // Holds the values for the Wacom API.
 xinput_values_t g_xinput_values = {
   .isWacom = true,
-  .tabletModel = "Intuos 5", // FIXME
-  .tabletModelID = "Intuos 5",
 };
 
 // Holds XInput wrapper state.
@@ -66,7 +64,12 @@ static XDeviceInfo* xinput_findDeviceById(Display *display, int id)
 
   for (int i = 0; i < num; i++) {
     if (id == devices[i].id) {
+      // Fill tablet model here.
+      snprintf(g_xinput_values.tabletModel, sizeof(g_xinput_values.tabletModel), devices[i].name);
+      snprintf(g_xinput_values.tabletModelID, sizeof(g_xinput_values.tabletModelID), devices[i].name);
+
       debug("Got %s, %i\n", devices[i].name, devices[i].type);
+
       tablet = &devices[i];
 
       XAnyClassPtr any = (XAnyClassPtr)tablet->inputclassinfo;

diff --git a/src/XInput.h b/src/XInput.h
@@ -54,8 +54,8 @@ typedef struct xinput_values_t {
   float tiltY;
   float tangentialPressure;
   long pointerType;
-  char *tabletModel;
-  char *tabletModelID;
+  char tabletModel[256];
+  char tabletModelID[256];
 } xinput_values_t;
 
 // Any other global XInput wrapper state.