Hello community, here is the log from the commit of package libwacom for openSUSE:Factory checked in at 2015-04-28 20:42:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libwacom (Old) and /work/SRC/openSUSE:Factory/.libwacom.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libwacom" Changes: -------- --- /work/SRC/openSUSE:Factory/libwacom/libwacom.changes 2015-04-03 14:33:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libwacom.new/libwacom.changes 2015-04-28 20:42:28.000000000 +0200 @@ -1,0 +2,11 @@ +Sat Apr 25 07:30:56 UTC 2015 - [email protected] + +- Update to version 0.13: + + New devices: + - DTU-1141. + - Huion H610 Pro. + + Several memory leak fixes. + + Added libwacom_match_get_name() to allow data-file matching on + the name as well as the pid/vid. + +------------------------------------------------------------------- Old: ---- libwacom-0.12.tar.bz2 New: ---- libwacom-0.13.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libwacom.spec ++++++ --- /var/tmp/diff_new_pack.g4aQTZ/_old 2015-04-28 20:42:28.000000000 +0200 +++ /var/tmp/diff_new_pack.g4aQTZ/_new 2015-04-28 20:42:28.000000000 +0200 @@ -17,7 +17,7 @@ Name: libwacom -Version: 0.12 +Version: 0.13 Release: 0 Summary: Library to identify wacom tablets License: MIT ++++++ libwacom-0.12.tar.bz2 -> libwacom-0.13.tar.bz2 ++++++ ++++ 2770 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwacom-0.12/NEWS new/libwacom-0.13/NEWS --- old/libwacom-0.12/NEWS 2015-03-10 03:25:55.000000000 +0100 +++ new/libwacom-0.13/NEWS 2015-04-20 04:07:26.000000000 +0200 @@ -1,3 +1,11 @@ +libwacom 0.13: +- New devices: + - DTU-1141 + - Huion H610 Pro +- Several memory leak fixes +- Added libwacom_match_get_name() to allow data-file matching on the name as + well as the pid/vid + libwacom 0.12: - Added libwacom_stylus_has_wheel() for relative wheel detection - Added libwacom_stylus_get_axes() for a list of supported axes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwacom-0.12/compile new/libwacom-0.13/compile --- old/libwacom-0.12/compile 2014-11-06 01:11:29.000000000 +0100 +++ new/libwacom-0.13/compile 2015-04-17 06:18:07.000000000 +0200 @@ -3,7 +3,7 @@ scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # Written by Tom Tromey <[email protected]>. # # This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwacom-0.12/configure.ac new/libwacom-0.13/configure.ac --- old/libwacom-0.12/configure.ac 2015-03-10 03:21:48.000000000 +0100 +++ new/libwacom-0.13/configure.ac 2015-04-20 04:06:42.000000000 +0200 @@ -1,6 +1,6 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([libwacom], [0.12]) +AC_INIT([libwacom], [0.13]) AC_CONFIG_HEADERS([config.h]) # Initialize Automake @@ -17,7 +17,7 @@ # - If binary compatibility has been broken (eg removed or changed interfaces) # change to C+1:0:0 # - If the interface is the same as the previous version, change to C:R+1:A -LIBWACOM_LT_VERSION=5:0:3 +LIBWACOM_LT_VERSION=6:0:4 AC_SUBST(LIBWACOM_LT_VERSION) # Initialize libtool diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwacom-0.12/data/dtu-1141.tablet new/libwacom-0.13/data/dtu-1141.tablet --- old/libwacom-0.12/data/dtu-1141.tablet 1970-01-01 01:00:00.000000000 +0100 +++ new/libwacom-0.13/data/dtu-1141.tablet 2015-04-17 06:17:52.000000000 +0200 @@ -0,0 +1,37 @@ +# Wacom +# DTU-1141 Interactive Pen Display +# Button Map: +# (A=1, B=2, C=3, ...) +# +# A B C D +# *-----------------* +# | | +# | | +# | DISPLAY | +# | | +# | | +# *-----------------* +# + +[Device] +Name=Wacom DTU1141 +DeviceMatch=usb:056a:0336 +Class=PenDisplay +Width=9 +Height=5 +Layout=dtu-1141.svg +IntegratedIn=Display + +[Features] +# This tablet supports two stylus models: +# a pen without eraser and a pen with eraser +Stylus=true +Reversible=false +Touch=false +Ring=false +Ring2=false +NumStrips=0 +Buttons=4 + +[Buttons] +Top=A;B;C;D diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwacom-0.12/data/huion-h610-pro.tablet new/libwacom-0.13/data/huion-h610-pro.tablet --- old/libwacom-0.12/data/huion-h610-pro.tablet 1970-01-01 01:00:00.000000000 +0100 +++ new/libwacom-0.13/data/huion-h610-pro.tablet 2015-03-16 03:35:31.000000000 +0100 @@ -0,0 +1,22 @@ +# HUION +# H610 Pro +# + +[Device] +Name=Huion H610 Pro +DeviceMatch=usb:256c:006e:HUION PenTablet Pen;usb:256c:006e:HUION PenTablet Pad +Class=Bamboo +Width=10 +Height=6 +IntegratedIn= +Layout=huion-h610-pro.svg +Styli=0xffffd; + +[Features] +Stylus=true +Reversible=true +Touch=false +Buttons=8 + +[Buttons] +Left=A;B;C;D;E;F;G;H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwacom-0.12/data/layouts/dtu-1141.svg new/libwacom-0.13/data/layouts/dtu-1141.svg --- old/libwacom-0.12/data/layouts/dtu-1141.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/libwacom-0.13/data/layouts/dtu-1141.svg 2015-04-17 06:17:52.000000000 +0200 @@ -0,0 +1,88 @@ +<?xml version="1.0" standalone="no"?> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" + "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";> +<!-- + Size and positions of controls may not be accurate + --> +<svg + xmlns="http://www.w3.org/2000/svg"; + version="1.1" + style="color:#000000;stroke:#7f7f7f;fill:none;stroke-width:.25;font-size:8" + id="dtu-1141" + width="344" + height="300"> + <title + id="title">Wacom DTU-1141</title> + <g> + <circle + id="ButtonA" + class="A Button" + cx="95" + cy="10" + r=".5" /> + <path + id="LeaderA" + class="A Leader" + d="M 91 14 l -46 46 l 0 30 m -5 0 l 10 0" /> + <text + id="LabelA" + class="A Label" + x="45" + y="105" + style="text-anchor:middle;">A</text> + </g> + <g> + <circle + id="ButtonB" + class="B Button" + cx="112" + cy="10" + r=".5" /> + <path + id="LeaderB" + class="B Leader" + d="M 112 15 l 0 75 m -5 0 l 10 0" /> + <text + id="LabelB" + class="B Label" + x="112" + y="105" + style="text-anchor:middle;">B</text> + </g> + <g> + <circle + id="ButtonC" + class="C Button" + cx="129" + cy="10" + r=".5" /> + <path + id="LeaderC" + class="C Leader" + d="M 133 14 l 46 46 l 0 30 m -5 0 l 10 0" /> + <text + id="LabelC" + class="C Label" + x="179" + y="105" + style="text-anchor:middle;">C</text> + </g> + <g> + <circle + id="ButtonD" + class="D Button" + cx="146" + cy="10" + r=".5" /> + <path + id="LeaderD" + class="D Leader" + d="M 152 10 l 82 0 l 0 80 m -5 0 l 10 0" /> + <text + id="LabelD" + class="D Label" + x="234" + y="105" + style="text-anchor:middle;">D</text> + </g> +</svg> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwacom-0.12/data/layouts/huion-h610-pro.svg new/libwacom-0.13/data/layouts/huion-h610-pro.svg --- old/libwacom-0.12/data/layouts/huion-h610-pro.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/libwacom-0.13/data/layouts/huion-h610-pro.svg 2015-03-16 03:35:31.000000000 +0100 @@ -0,0 +1,153 @@ +<?xml version="1.0" standalone="no"?> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" + "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";> +<svg + xmlns="http://www.w3.org/2000/svg"; + version="1.1" + style="color:#000000;stroke:#7f7f7f;fill:none;stroke-width:.25;font-size:8" + id="intuos-pro-m" + width="355" + height="250"> + <title + id="title">Huion H610 Pro</title> + <g> + <circle + id="ButtonA" + class="A ModeSwitch Button" + cx="29" + cy="56" + r="7.5" /> + <path + id="LeaderA" + class="A ModeSwitch Leader" + d="m 51,56 4,0" /> + <text + id="LabelA" + class="A ModeSwitch Label" + x="57" + y="56" + style="text-anchor:start">A</text> + </g> + <g> + <circle + r="7.5" + cy="75" + cx="29" + class="B ModeSwitch Button" + id="ButtonB" /> + <path + d="m 51,75 4,0" + class="B ModeSwitch Leader" + id="LeaderB" /> + <text + style="text-anchor:start" + y="75" + x="57" + class="B ModeSwitch Label" + id="LabelB">B</text> + </g> + <g> + <circle + id="ButtonC" + class="C ModeSwitch Button" + cx="29" + cy="94" + r="7.5" /> + <path + id="LeaderC" + class="C ModeSwitch Leader" + d="m 51,94 4,0" /> + <text + id="LabelC" + class="C ModeSwitch Label" + x="57" + y="94" + style="text-anchor:start">C</text> + </g> + <g> + <path + id="ButtonD" + class="D ModeSwitch Button" + d="m 18.056792,123.54602 c 0.300764,-2.53638 1.528708,-4.99316 3.165033,-6.65348 1.990614,-1.99061 4.740609,-3.22183 7.778175,-3.22183 3.037566,0 5.787566,1.23122 7.778174,3.22183 1.772939,2.1284 2.827481,4.24769 3.165034,6.65348 -10.929806,-3.03352 -12.689135,3.86 -21.886416,0 z"/> + <path + id="LeaderD" + class="D ModeSwitch Leader" + d="m 51,118 4,0" /> + <text + id="LabelD" + class="D ModeSwitch Label" + x="57" + y="118" + style="text-anchor:start">D</text> + </g> + <g> + <path + d="m 39.943205,125.91036 c -0.30076,2.53638 -1.5287,4.99316 -3.16503,6.65348 -1.99061,1.99061 -4.74061,3.22183 -7.77817,3.22183 -3.03757,0 -5.78757,-1.23122 -7.77818,-3.22183 -1.77294,-2.1284 -2.82748,-4.24769 -3.16503,-6.65348 10.9298,3.03352 12.68913,-3.86 21.88641,0 z" + id="ButtonE" + class="E ModeSwitch Button" /> + <path + id="LeaderE" + class="E ModeSwitch Leader" + d="m 51,132 4,0" /> + <text + id="LabelE" + class="E ModeSwitch Label" + x="57" + y="132" + style="text-anchor:start">E</text> + </g> + <g> + <circle + id="ButtonF" + class="F ModeSwitch Button" + cx="29" + cy="156" + r="7.5" /> + <path + id="LeaderF" + class="F ModeSwitch Leader" + d="m 51,156 4,0" /> + <text + id="LabelF" + class="F ModeSwitch Label" + x="57" + y="156" + style="text-anchor:start">F</text> + </g> + <g> + <circle + id="ButtonG" + class="G ModeSwitch Button" + cx="29" + cy="175" + r="7.5" /> + <path + id="LeaderG" + class="G ModeSwitch Leader" + d="m 51,175 4,0" /> + <text + id="LabelG" + class="G ModeSwitch Label" + x="57" + y="175" + style="text-anchor:start">G</text> + </g> + <g> + <circle + id="ButtonH" + class="H ModeSwitch Button" + cx="29" + cy="194" + r="7.5" /> + <path + id="LeaderH" + class="H ModeSwitch Leader" + d="m 51,194 4,0" /> + <text + id="LabelH" + class="H ModeSwitch Label" + x="57" + y="194" + style="text-anchor:start">H</text> + </g> +</svg> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwacom-0.12/data/libwacom.stylus new/libwacom-0.13/data/libwacom.stylus --- old/libwacom-0.12/data/libwacom.stylus 2015-03-04 05:22:41.000000000 +0100 +++ new/libwacom-0.13/data/libwacom.stylus 2015-03-16 03:35:31.000000000 +0100 @@ -13,6 +13,13 @@ Axes=Tilt;Pressure;Distance; Type=General +[0xffffd] +Name=General Pen with no Eraser +HasEraser=false +Buttons=2 +Axes=Pressure; +Type=General + # Inking pen have no eraser [0x812] # Intuos and Intuos2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwacom-0.12/doc/html/deprecated.html new/libwacom-0.13/doc/html/deprecated.html --- old/libwacom-0.12/doc/html/deprecated.html 2015-03-10 04:33:54.000000000 +0100 +++ new/libwacom-0.13/doc/html/deprecated.html 2015-04-20 04:07:53.000000000 +0200 @@ -86,7 +86,7 @@ </div></div><!-- contents --> <!-- start footer part --> <hr class="footer"/><address class="footer"><small> -Generated on Tue Mar 10 2015 13:33:54 for libwacom by  <a href="http://www.doxygen.org/index.html";> +Generated on Mon Apr 20 2015 12:07:53 for libwacom by  <a href="http://www.doxygen.org/index.html";> <img class="footer" src="doxygen.png" alt="doxygen"/> </a> 1.8.9.1 </small></address> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwacom-0.12/doc/html/dir_2bc10c097a08e7c15dc75588169cd55b.html new/libwacom-0.13/doc/html/dir_2bc10c097a08e7c15dc75588169cd55b.html --- old/libwacom-0.12/doc/html/dir_2bc10c097a08e7c15dc75588169cd55b.html 2015-03-10 04:33:54.000000000 +0100 +++ new/libwacom-0.13/doc/html/dir_2bc10c097a08e7c15dc75588169cd55b.html 2015-04-20 04:07:53.000000000 +0200 @@ -92,7 +92,7 @@ </div><!-- contents --> <!-- start footer part --> <hr class="footer"/><address class="footer"><small> -Generated on Tue Mar 10 2015 13:33:54 for libwacom by  <a href="http://www.doxygen.org/index.html";> +Generated on Mon Apr 20 2015 12:07:53 for libwacom by  <a href="http://www.doxygen.org/index.html";> <img class="footer" src="doxygen.png" alt="doxygen"/> </a> 1.8.9.1 </small></address> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwacom-0.12/doc/html/files.html new/libwacom-0.13/doc/html/files.html --- old/libwacom-0.12/doc/html/files.html 2015-03-10 04:33:54.000000000 +0100 +++ new/libwacom-0.13/doc/html/files.html 2015-04-20 04:07:53.000000000 +0200 @@ -94,7 +94,7 @@ </div><!-- contents --> <!-- start footer part --> <hr class="footer"/><address class="footer"><small> -Generated on Tue Mar 10 2015 13:33:54 for libwacom by  <a href="http://www.doxygen.org/index.html";> +Generated on Mon Apr 20 2015 12:07:53 for libwacom by  <a href="http://www.doxygen.org/index.html";> <img class="footer" src="doxygen.png" alt="doxygen"/> </a> 1.8.9.1 </small></address> Files old/libwacom-0.12/doc/html/ftv2blank.png and new/libwacom-0.13/doc/html/ftv2blank.png differ Files old/libwacom-0.12/doc/html/ftv2cl.png and new/libwacom-0.13/doc/html/ftv2cl.png differ Files old/libwacom-0.12/doc/html/ftv2doc.png and new/libwacom-0.13/doc/html/ftv2doc.png differ Files old/libwacom-0.12/doc/html/ftv2folderclosed.png and new/libwacom-0.13/doc/html/ftv2folderclosed.png differ Files old/libwacom-0.12/doc/html/ftv2folderopen.png and new/libwacom-0.13/doc/html/ftv2folderopen.png differ Files old/libwacom-0.12/doc/html/ftv2lastnode.png and new/libwacom-0.13/doc/html/ftv2lastnode.png differ Files old/libwacom-0.12/doc/html/ftv2link.png and new/libwacom-0.13/doc/html/ftv2link.png differ Files old/libwacom-0.12/doc/html/ftv2mlastnode.png and new/libwacom-0.13/doc/html/ftv2mlastnode.png differ Files old/libwacom-0.12/doc/html/ftv2mnode.png and new/libwacom-0.13/doc/html/ftv2mnode.png differ Files old/libwacom-0.12/doc/html/ftv2mo.png and new/libwacom-0.13/doc/html/ftv2mo.png differ Files old/libwacom-0.12/doc/html/ftv2node.png and new/libwacom-0.13/doc/html/ftv2node.png differ Files old/libwacom-0.12/doc/html/ftv2ns.png and new/libwacom-0.13/doc/html/ftv2ns.png differ Files old/libwacom-0.12/doc/html/ftv2plastnode.png and new/libwacom-0.13/doc/html/ftv2plastnode.png differ Files old/libwacom-0.12/doc/html/ftv2pnode.png and new/libwacom-0.13/doc/html/ftv2pnode.png differ Files old/libwacom-0.12/doc/html/ftv2splitbar.png and new/libwacom-0.13/doc/html/ftv2splitbar.png differ Files old/libwacom-0.12/doc/html/ftv2vertline.png and new/libwacom-0.13/doc/html/ftv2vertline.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwacom-0.12/doc/html/globals.html new/libwacom-0.13/doc/html/globals.html --- old/libwacom-0.12/doc/html/globals.html 2015-03-10 04:33:54.000000000 +0100 +++ new/libwacom-0.13/doc/html/globals.html 2015-04-20 04:07:53.000000000 +0200 @@ -220,6 +220,9 @@ <li>libwacom_match_get_match_string() : <a class="el" href="libwacom_8h.html#af46230253f8009987a620705cccf7634">libwacom.h</a> </li> +<li>libwacom_match_get_name() +: <a class="el" href="libwacom_8h.html#a37bbe762737a4dc1901325d3206fc443">libwacom.h</a> +</li> <li>libwacom_match_get_product_id() : <a class="el" href="libwacom_8h.html#aa447133161dd5529d4c45a6b2addd150">libwacom.h</a> </li> @@ -513,7 +516,7 @@ </div><!-- contents --> <!-- start footer part --> <hr class="footer"/><address class="footer"><small> -Generated on Tue Mar 10 2015 13:33:54 for libwacom by  <a href="http://www.doxygen.org/index.html";> +Generated on Mon Apr 20 2015 12:07:53 for libwacom by  <a href="http://www.doxygen.org/index.html";> <img class="footer" src="doxygen.png" alt="doxygen"/> </a> 1.8.9.1 </small></address> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwacom-0.12/doc/html/globals_defs.html new/libwacom-0.13/doc/html/globals_defs.html --- old/libwacom-0.12/doc/html/globals_defs.html 2015-03-10 04:33:54.000000000 +0100 +++ new/libwacom-0.13/doc/html/globals_defs.html 2015-04-20 04:07:53.000000000 +0200 @@ -105,7 +105,7 @@ </div><!-- contents --> <!-- start footer part --> <hr class="footer"/><address class="footer"><small> -Generated on Tue Mar 10 2015 13:33:54 for libwacom by  <a href="http://www.doxygen.org/index.html";> +Generated on Mon Apr 20 2015 12:07:53 for libwacom by  <a href="http://www.doxygen.org/index.html";> <img class="footer" src="doxygen.png" alt="doxygen"/> </a> 1.8.9.1 </small></address> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwacom-0.12/doc/html/globals_enum.html new/libwacom-0.13/doc/html/globals_enum.html --- old/libwacom-0.12/doc/html/globals_enum.html 2015-03-10 04:33:54.000000000 +0100 +++ new/libwacom-0.13/doc/html/globals_enum.html 2015-04-20 04:07:53.000000000 +0200 @@ -126,7 +126,7 @@ </div><!-- contents --> <!-- start footer part --> <hr class="footer"/><address class="footer"><small> -Generated on Tue Mar 10 2015 13:33:54 for libwacom by  <a href="http://www.doxygen.org/index.html";> +Generated on Mon Apr 20 2015 12:07:53 for libwacom by  <a href="http://www.doxygen.org/index.html";> <img class="footer" src="doxygen.png" alt="doxygen"/> </a> 1.8.9.1 </small></address> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwacom-0.12/doc/html/globals_eval.html new/libwacom-0.13/doc/html/globals_eval.html --- old/libwacom-0.12/doc/html/globals_eval.html 2015-03-10 04:33:54.000000000 +0100 +++ new/libwacom-0.13/doc/html/globals_eval.html 2015-04-20 04:07:53.000000000 +0200 @@ -286,7 +286,7 @@ </div><!-- contents --> <!-- start footer part --> <hr class="footer"/><address class="footer"><small> -Generated on Tue Mar 10 2015 13:33:54 for libwacom by  <a href="http://www.doxygen.org/index.html";> +Generated on Mon Apr 20 2015 12:07:53 for libwacom by  <a href="http://www.doxygen.org/index.html";> <img class="footer" src="doxygen.png" alt="doxygen"/> </a> 1.8.9.1 </small></address> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwacom-0.12/doc/html/globals_func.html new/libwacom-0.13/doc/html/globals_func.html --- old/libwacom-0.12/doc/html/globals_func.html 2015-03-10 04:33:54.000000000 +0100 +++ new/libwacom-0.13/doc/html/globals_func.html 2015-04-20 04:07:53.000000000 +0200 @@ -216,6 +216,9 @@ <li>libwacom_match_get_match_string() : <a class="el" href="libwacom_8h.html#af46230253f8009987a620705cccf7634">libwacom.h</a> </li> +<li>libwacom_match_get_name() +: <a class="el" href="libwacom_8h.html#a37bbe762737a4dc1901325d3206fc443">libwacom.h</a> +</li> <li>libwacom_match_get_product_id() : <a class="el" href="libwacom_8h.html#aa447133161dd5529d4c45a6b2addd150">libwacom.h</a> </li> @@ -271,7 +274,7 @@ </div><!-- contents --> <!-- start footer part --> <hr class="footer"/><address class="footer"><small> -Generated on Tue Mar 10 2015 13:33:54 for libwacom by  <a href="http://www.doxygen.org/index.html";> +Generated on Mon Apr 20 2015 12:07:53 for libwacom by  <a href="http://www.doxygen.org/index.html";> <img class="footer" src="doxygen.png" alt="doxygen"/> </a> 1.8.9.1 </small></address> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwacom-0.12/doc/html/globals_type.html new/libwacom-0.13/doc/html/globals_type.html --- old/libwacom-0.12/doc/html/globals_type.html 2015-03-10 04:33:54.000000000 +0100 +++ new/libwacom-0.13/doc/html/globals_type.html 2015-04-20 04:07:53.000000000 +0200 @@ -111,7 +111,7 @@ </div><!-- contents --> <!-- start footer part --> <hr class="footer"/><address class="footer"><small> -Generated on Tue Mar 10 2015 13:33:54 for libwacom by  <a href="http://www.doxygen.org/index.html";> +Generated on Mon Apr 20 2015 12:07:53 for libwacom by  <a href="http://www.doxygen.org/index.html";> <img class="footer" src="doxygen.png" alt="doxygen"/> </a> 1.8.9.1 </small></address> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwacom-0.12/doc/html/index.html new/libwacom-0.13/doc/html/index.html --- old/libwacom-0.12/doc/html/index.html 2015-03-10 04:33:54.000000000 +0100 +++ new/libwacom-0.13/doc/html/index.html 2015-04-20 04:07:53.000000000 +0200 @@ -103,7 +103,7 @@ </div></div><!-- contents --> <!-- start footer part --> <hr class="footer"/><address class="footer"><small> -Generated on Tue Mar 10 2015 13:33:54 for libwacom by  <a href="http://www.doxygen.org/index.html";> +Generated on Mon Apr 20 2015 12:07:53 for libwacom by  <a href="http://www.doxygen.org/index.html";> <img class="footer" src="doxygen.png" alt="doxygen"/> </a> 1.8.9.1 </small></address> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwacom-0.12/doc/html/libwacom_8h.html new/libwacom-0.13/doc/html/libwacom_8h.html --- old/libwacom-0.12/doc/html/libwacom_8h.html 2015-03-10 04:33:54.000000000 +0100 +++ new/libwacom-0.13/doc/html/libwacom_8h.html 2015-04-20 04:07:53.000000000 +0200 @@ -356,6 +356,8 @@ <tr class="memitem:a84b9c038c3d9f53c8c9fed4ff30f71f2"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="libwacom_8h.html#a84b9c038c3d9f53c8c9fed4ff30f71f2">libwacom_print_stylus_description</a> (int fd, const <a class="el" href="libwacom_8h.html#ade7dd5ce503ef37813e5f08bf1544170">WacomStylus</a> *stylus)</td></tr> <tr class="memdesc:a84b9c038c3d9f53c8c9fed4ff30f71f2"><td class="mdescLeft"> </td><td class="mdescRight">Print the description of this stylus to the given file. <a href="#a84b9c038c3d9f53c8c9fed4ff30f71f2">More...</a><br /></td></tr> <tr class="separator:a84b9c038c3d9f53c8c9fed4ff30f71f2"><td class="memSeparator" colspan="2"> </td></tr> +<tr class="memitem:a37bbe762737a4dc1901325d3206fc443"><td class="memItemLeft" align="right" valign="top">const char * </td><td class="memItemRight" valign="bottom"><a class="el" href="libwacom_8h.html#a37bbe762737a4dc1901325d3206fc443">libwacom_match_get_name</a> (const <a class="el" href="libwacom_8h.html#ad9598829a59951a74f91c640a01f2fad">WacomMatch</a> *match)</td></tr> +<tr class="separator:a37bbe762737a4dc1901325d3206fc443"><td class="memSeparator" colspan="2"> </td></tr> <tr class="memitem:a9159afd9136fb5f712669d0472553fc5"><td class="memItemLeft" align="right" valign="top"><a class="el" href="libwacom_8h.html#ac2fa165c0691b65d55f46eabdd02c96e">WacomBusType</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="libwacom_8h.html#a9159afd9136fb5f712669d0472553fc5">libwacom_match_get_bustype</a> (const <a class="el" href="libwacom_8h.html#ad9598829a59951a74f91c640a01f2fad">WacomMatch</a> *match)</td></tr> <tr class="separator:a9159afd9136fb5f712669d0472553fc5"><td class="memSeparator" colspan="2"> </td></tr> <tr class="memitem:aa447133161dd5529d4c45a6b2addd150"><td class="memItemLeft" align="right" valign="top">uint32_t </td><td class="memItemRight" valign="bottom"><a class="el" href="libwacom_8h.html#aa447133161dd5529d4c45a6b2addd150">libwacom_match_get_product_id</a> (const <a class="el" href="libwacom_8h.html#ad9598829a59951a74f91c640a01f2fad">WacomMatch</a> *match)</td></tr> @@ -1721,6 +1723,22 @@ </div> </div> +<a class="anchor" id="a37bbe762737a4dc1901325d3206fc443"></a> +<div class="memitem"> +<div class="memproto"> + <table class="memname"> + <tr> + <td class="memname">const char* libwacom_match_get_name </td> + <td>(</td> + <td class="paramtype">const <a class="el" href="libwacom_8h.html#ad9598829a59951a74f91c640a01f2fad">WacomMatch</a> * </td> + <td class="paramname"><em>match</em></td><td>)</td> + <td></td> + </tr> + </table> +</div><div class="memdoc"> + +</div> +</div> <a class="anchor" id="aa447133161dd5529d4c45a6b2addd150"></a> <div class="memitem"> <div class="memproto"> @@ -2215,7 +2233,7 @@ </div><!-- contents --> <!-- start footer part --> <hr class="footer"/><address class="footer"><small> -Generated on Tue Mar 10 2015 13:33:54 for libwacom by  <a href="http://www.doxygen.org/index.html";> +Generated on Mon Apr 20 2015 12:07:53 for libwacom by  <a href="http://www.doxygen.org/index.html";> <img class="footer" src="doxygen.png" alt="doxygen"/> </a> 1.8.9.1 </small></address> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwacom-0.12/doc/html/libwacom_8h_source.html new/libwacom-0.13/doc/html/libwacom_8h_source.html --- old/libwacom-0.12/doc/html/libwacom_8h_source.html 2015-03-10 04:33:54.000000000 +0100 +++ new/libwacom-0.13/doc/html/libwacom_8h_source.html 2015-04-20 04:07:53.000000000 +0200 @@ -339,14 +339,15 @@ <div class="line"><a name="l00596"></a><span class="lineno"> 596</span> </div> <div class="line"><a name="l00603"></a><span class="lineno"> 603</span> <span class="keywordtype">void</span> <a class="code" href="libwacom_8h.html#a84b9c038c3d9f53c8c9fed4ff30f71f2">libwacom_print_stylus_description</a> (<span class="keywordtype">int</span> fd, <span class="keyword">const</span> <a class="code" href="libwacom_8h.html#ade7dd5ce503ef37813e5f08bf1544170">WacomStylus</a> *stylus);</div> <div class="line"><a name="l00604"></a><span class="lineno"> 604</span> </div> -<div class="line"><a name="l00605"></a><span class="lineno"> 605</span> <a class="code" href="libwacom_8h.html#ac2fa165c0691b65d55f46eabdd02c96e">WacomBusType</a> <a class="code" href="libwacom_8h.html#a9159afd9136fb5f712669d0472553fc5">libwacom_match_get_bustype</a>(<span class="keyword">const</span> <a class="code" href="libwacom_8h.html#ad9598829a59951a74f91c640a01f2fad">WacomMatch</a> *match);</div> -<div class="line"><a name="l00606"></a><span class="lineno"> 606</span> uint32_t <a class="code" href="libwacom_8h.html#aa447133161dd5529d4c45a6b2addd150">libwacom_match_get_product_id</a>(<span class="keyword">const</span> <a class="code" href="libwacom_8h.html#ad9598829a59951a74f91c640a01f2fad">WacomMatch</a> *match);</div> -<div class="line"><a name="l00607"></a><span class="lineno"> 607</span> uint32_t <a class="code" href="libwacom_8h.html#aa11e234a0e3bb7f4d939d1abc66c9c19">libwacom_match_get_vendor_id</a>(<span class="keyword">const</span> <a class="code" href="libwacom_8h.html#ad9598829a59951a74f91c640a01f2fad">WacomMatch</a> *match);</div> -<div class="line"><a name="l00608"></a><span class="lineno"> 608</span> <span class="keyword">const</span> <span class="keywordtype">char</span>* <a class="code" href="libwacom_8h.html#af46230253f8009987a620705cccf7634">libwacom_match_get_match_string</a>(<span class="keyword">const</span> <a class="code" href="libwacom_8h.html#ad9598829a59951a74f91c640a01f2fad">WacomMatch</a> *match);</div> -<div class="line"><a name="l00609"></a><span class="lineno"> 609</span> </div> -<div class="line"><a name="l00611"></a><span class="lineno"> 611</span> <span class="preprocessor">#endif </span><span class="comment">/* _LIBWACOM_H_ */</span><span class="preprocessor"></span></div> -<div class="line"><a name="l00612"></a><span class="lineno"> 612</span> </div> -<div class="line"><a name="l00614"></a><span class="lineno"> 614</span> <span class="comment">/* vim: set noexpandtab tabstop=8 shiftwidth=8: */</span></div> +<div class="line"><a name="l00605"></a><span class="lineno"> 605</span> <span class="keyword">const</span> <span class="keywordtype">char</span> *<a class="code" href="libwacom_8h.html#a37bbe762737a4dc1901325d3206fc443">libwacom_match_get_name</a>(<span class="keyword">const</span> <a class="code" href="libwacom_8h.html#ad9598829a59951a74f91c640a01f2fad">WacomMatch</a> *match);</div> +<div class="line"><a name="l00606"></a><span class="lineno"> 606</span> <a class="code" href="libwacom_8h.html#ac2fa165c0691b65d55f46eabdd02c96e">WacomBusType</a> <a class="code" href="libwacom_8h.html#a9159afd9136fb5f712669d0472553fc5">libwacom_match_get_bustype</a>(<span class="keyword">const</span> <a class="code" href="libwacom_8h.html#ad9598829a59951a74f91c640a01f2fad">WacomMatch</a> *match);</div> +<div class="line"><a name="l00607"></a><span class="lineno"> 607</span> uint32_t <a class="code" href="libwacom_8h.html#aa447133161dd5529d4c45a6b2addd150">libwacom_match_get_product_id</a>(<span class="keyword">const</span> <a class="code" href="libwacom_8h.html#ad9598829a59951a74f91c640a01f2fad">WacomMatch</a> *match);</div> +<div class="line"><a name="l00608"></a><span class="lineno"> 608</span> uint32_t <a class="code" href="libwacom_8h.html#aa11e234a0e3bb7f4d939d1abc66c9c19">libwacom_match_get_vendor_id</a>(<span class="keyword">const</span> <a class="code" href="libwacom_8h.html#ad9598829a59951a74f91c640a01f2fad">WacomMatch</a> *match);</div> +<div class="line"><a name="l00609"></a><span class="lineno"> 609</span> <span class="keyword">const</span> <span class="keywordtype">char</span>* <a class="code" href="libwacom_8h.html#af46230253f8009987a620705cccf7634">libwacom_match_get_match_string</a>(<span class="keyword">const</span> <a class="code" href="libwacom_8h.html#ad9598829a59951a74f91c640a01f2fad">WacomMatch</a> *match);</div> +<div class="line"><a name="l00610"></a><span class="lineno"> 610</span> </div> +<div class="line"><a name="l00612"></a><span class="lineno"> 612</span> <span class="preprocessor">#endif </span><span class="comment">/* _LIBWACOM_H_ */</span><span class="preprocessor"></span></div> +<div class="line"><a name="l00613"></a><span class="lineno"> 613</span> </div> +<div class="line"><a name="l00615"></a><span class="lineno"> 615</span> <span class="comment">/* vim: set noexpandtab tabstop=8 shiftwidth=8: */</span></div> <div class="ttc" id="libwacom_8h_html_a4b023b830ddfcbbff8279ac9956afe38"><div class="ttname"><a href="libwacom_8h.html#a4b023b830ddfcbbff8279ac9956afe38">libwacom_get_status_leds</a></div><div class="ttdeci">const WacomStatusLEDs * libwacom_get_status_leds(const WacomDevice *device, int *num_leds)</div></div> <div class="ttc" id="libwacom_8h_html_a7349dfd03aece0522b2133c7fbe9021dab8d69722b1e8e6eb1a2ea32ca5635829"><div class="ttname"><a href="libwacom_8h.html#a7349dfd03aece0522b2133c7fbe9021dab8d69722b1e8e6eb1a2ea32ca5635829">WACOM_BUTTON_MODESWITCH</a></div><div class="ttdef"><b>Definition:</b> libwacom.h:174</div></div> <div class="ttc" id="libwacom_8h_html_a89b8a336b7d1d0d37659db8fe976323da9b8f1d3d89a25bf5628789a8822800f1"><div class="ttname"><a href="libwacom_8h.html#a89b8a336b7d1d0d37659db8fe976323da9b8f1d3d89a25bf5628789a8822800f1">WACOM_DEVICE_INTEGRATED_NONE</a></div><div class="ttdef"><b>Definition:</b> libwacom.h:124</div></div> @@ -413,6 +414,7 @@ <div class="ttc" id="libwacom_8h_html_aa447133161dd5529d4c45a6b2addd150"><div class="ttname"><a href="libwacom_8h.html#aa447133161dd5529d4c45a6b2addd150">libwacom_match_get_product_id</a></div><div class="ttdeci">uint32_t libwacom_match_get_product_id(const WacomMatch *match)</div></div> <div class="ttc" id="libwacom_8h_html_ac3d9ee175999d6b22cee82aae8f829dea3d78c00cc843776081a65ee1a5aa422c"><div class="ttname"><a href="libwacom_8h.html#ac3d9ee175999d6b22cee82aae8f829dea3d78c00cc843776081a65ee1a5aa422c">WERROR_BAD_ALLOC</a></div><div class="ttdoc">Allocation error. </div><div class="ttdef"><b>Definition:</b> libwacom.h:103</div></div> <div class="ttc" id="libwacom_8h_html_a60160e5e8d1c2c8a24a24e803d83a597"><div class="ttname"><a href="libwacom_8h.html#a60160e5e8d1c2c8a24a24e803d83a597">libwacom_stylus_get_name</a></div><div class="ttdeci">const char * libwacom_stylus_get_name(const WacomStylus *stylus)</div></div> +<div class="ttc" id="libwacom_8h_html_a37bbe762737a4dc1901325d3206fc443"><div class="ttname"><a href="libwacom_8h.html#a37bbe762737a4dc1901325d3206fc443">libwacom_match_get_name</a></div><div class="ttdeci">const char * libwacom_match_get_name(const WacomMatch *match)</div></div> <div class="ttc" id="libwacom_8h_html_abe5d90234cce1b8ad62be2676a1d56e5a538110afcafb8e6d8987aa3b96d4103f"><div class="ttname"><a href="libwacom_8h.html#abe5d90234cce1b8ad62be2676a1d56e5a538110afcafb8e6d8987aa3b96d4103f">WCLASS_PEN_DISPLAYS</a></div><div class="ttdoc">Any "interactive pen display". </div><div class="ttdef"><b>Definition:</b> libwacom.h:143</div></div> <div class="ttc" id="libwacom_8h_html_a6f44878163668d0c67d5fa0d5cda8658"><div class="ttname"><a href="libwacom_8h.html#a6f44878163668d0c67d5fa0d5cda8658">libwacom_error_get_message</a></div><div class="ttdeci">const char * libwacom_error_get_message(WacomError *error)</div></div> <div class="ttc" id="libwacom_8h_html_a25750936d41579fa5cb0d5296e68d7f8"><div class="ttname"><a href="libwacom_8h.html#a25750936d41579fa5cb0d5296e68d7f8">libwacom_stylus_has_wheel</a></div><div class="ttdeci">int libwacom_stylus_has_wheel(const WacomStylus *stylus)</div></div> @@ -483,7 +485,7 @@ </div><!-- fragment --></div><!-- contents --> <!-- start footer part --> <hr class="footer"/><address class="footer"><small> -Generated on Tue Mar 10 2015 13:33:54 for libwacom by  <a href="http://www.doxygen.org/index.html";> +Generated on Mon Apr 20 2015 12:07:53 for libwacom by  <a href="http://www.doxygen.org/index.html";> <img class="footer" src="doxygen.png" alt="doxygen"/> </a> 1.8.9.1 </small></address> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwacom-0.12/doc/html/pages.html new/libwacom-0.13/doc/html/pages.html --- old/libwacom-0.12/doc/html/pages.html 2015-03-10 04:33:54.000000000 +0100 +++ new/libwacom-0.13/doc/html/pages.html 2015-04-20 04:07:53.000000000 +0200 @@ -87,7 +87,7 @@ </div><!-- contents --> <!-- start footer part --> <hr class="footer"/><address class="footer"><small> -Generated on Tue Mar 10 2015 13:33:54 for libwacom by  <a href="http://www.doxygen.org/index.html";> +Generated on Mon Apr 20 2015 12:07:53 for libwacom by  <a href="http://www.doxygen.org/index.html";> <img class="footer" src="doxygen.png" alt="doxygen"/> </a> 1.8.9.1 </small></address> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwacom-0.12/doc/html/search/all_1.js new/libwacom-0.13/doc/html/search/all_1.js --- old/libwacom-0.12/doc/html/search/all_1.js 2015-03-10 04:33:54.000000000 +0100 +++ new/libwacom-0.13/doc/html/search/all_1.js 2015-04-20 04:07:53.000000000 +0200 @@ -41,6 +41,7 @@ ['libwacom_5flist_5fdevices_5ffrom_5fdatabase',['libwacom_list_devices_from_database',['../libwacom_8h.html#a0e77418c20ce3bfdf217ec12524f232c',1,'libwacom.h']]], ['libwacom_5fmatch_5fget_5fbustype',['libwacom_match_get_bustype',['../libwacom_8h.html#a9159afd9136fb5f712669d0472553fc5',1,'libwacom.h']]], ['libwacom_5fmatch_5fget_5fmatch_5fstring',['libwacom_match_get_match_string',['../libwacom_8h.html#af46230253f8009987a620705cccf7634',1,'libwacom.h']]], + ['libwacom_5fmatch_5fget_5fname',['libwacom_match_get_name',['../libwacom_8h.html#a37bbe762737a4dc1901325d3206fc443',1,'libwacom.h']]], ['libwacom_5fmatch_5fget_5fproduct_5fid',['libwacom_match_get_product_id',['../libwacom_8h.html#aa447133161dd5529d4c45a6b2addd150',1,'libwacom.h']]], ['libwacom_5fmatch_5fget_5fvendor_5fid',['libwacom_match_get_vendor_id',['../libwacom_8h.html#aa11e234a0e3bb7f4d939d1abc66c9c19',1,'libwacom.h']]], ['libwacom_5fnew_5ffrom_5fname',['libwacom_new_from_name',['../libwacom_8h.html#ae58659a01922c67e9fd9129f68a60b0b',1,'libwacom.h']]], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwacom-0.12/doc/html/search/functions_0.js new/libwacom-0.13/doc/html/search/functions_0.js --- old/libwacom-0.12/doc/html/search/functions_0.js 2015-03-10 04:33:54.000000000 +0100 +++ new/libwacom-0.13/doc/html/search/functions_0.js 2015-04-20 04:07:53.000000000 +0200 @@ -39,6 +39,7 @@ ['libwacom_5flist_5fdevices_5ffrom_5fdatabase',['libwacom_list_devices_from_database',['../libwacom_8h.html#a0e77418c20ce3bfdf217ec12524f232c',1,'libwacom.h']]], ['libwacom_5fmatch_5fget_5fbustype',['libwacom_match_get_bustype',['../libwacom_8h.html#a9159afd9136fb5f712669d0472553fc5',1,'libwacom.h']]], ['libwacom_5fmatch_5fget_5fmatch_5fstring',['libwacom_match_get_match_string',['../libwacom_8h.html#af46230253f8009987a620705cccf7634',1,'libwacom.h']]], + ['libwacom_5fmatch_5fget_5fname',['libwacom_match_get_name',['../libwacom_8h.html#a37bbe762737a4dc1901325d3206fc443',1,'libwacom.h']]], ['libwacom_5fmatch_5fget_5fproduct_5fid',['libwacom_match_get_product_id',['../libwacom_8h.html#aa447133161dd5529d4c45a6b2addd150',1,'libwacom.h']]], ['libwacom_5fmatch_5fget_5fvendor_5fid',['libwacom_match_get_vendor_id',['../libwacom_8h.html#aa11e234a0e3bb7f4d939d1abc66c9c19',1,'libwacom.h']]], ['libwacom_5fnew_5ffrom_5fname',['libwacom_new_from_name',['../libwacom_8h.html#ae58659a01922c67e9fd9129f68a60b0b',1,'libwacom.h']]], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwacom-0.12/libwacom/libwacom-database.c new/libwacom-0.13/libwacom/libwacom-database.c --- old/libwacom-0.12/libwacom/libwacom-database.c 2015-03-03 08:36:23.000000000 +0100 +++ new/libwacom-0.13/libwacom/libwacom-database.c 2015-03-16 03:35:37.000000000 +0100 @@ -124,51 +124,48 @@ } char * -make_match_string (WacomBusType bus, int vendor_id, int product_id) +make_match_string (const char *name, WacomBusType bus, int vendor_id, int product_id) { - return g_strdup_printf("%s:%04x:%04x", bus_to_str (bus), vendor_id, product_id); + return g_strdup_printf("%s:%04x:%04x%s%s", + bus_to_str (bus), + vendor_id, product_id, + name ? ":" : "", + name ? name : ""); } -static int -libwacom_matchstr_to_matches(WacomDevice *device, const char *match) +static gboolean +libwacom_matchstr_to_match(WacomDevice *device, const char *match) { int rc = 1; - char **strs; - int i, nmatches = 0; - WacomBusType first_bus; - int first_vendor_id, first_product_id; + char busstr[64], namestr[64]; + char *name; + int vendor_id, product_id; + WacomBusType bus; if (match == NULL) - return 0; + return FALSE; - strs = g_strsplit(match, ";", 0); - for (i = 0; strs[i] != NULL && *strs[i] != '\0'; i++) { - char busstr[64]; - int vendor_id, product_id; - WacomBusType bus; - rc = sscanf(strs[i], "%63[^:]:%x:%x", busstr, &vendor_id, &product_id); - if (rc != 3) { - DBG("failed to match '%s' for product/vendor IDs. Skipping.\n", strs[i]); - continue; - } - bus = bus_from_str (busstr); + if (g_strcmp0 (match, GENERIC_DEVICE_MATCH) == 0) { + libwacom_update_match(device, NULL, WBUSTYPE_UNKNOWN, 0, 0); + return TRUE; + } - libwacom_update_match(device, bus, vendor_id, product_id); + memset(namestr, 0, sizeof(namestr)); - if (nmatches == 0) { - first_bus = bus; - first_vendor_id = vendor_id; - first_product_id = product_id; - } - nmatches++; + rc = sscanf(match, "%63[^:]:%x:%x:%63c", busstr, &vendor_id, &product_id, namestr); + if (rc == 4) { + name = namestr; + } else if (rc == 3) { + name = NULL; + } else { + DBG("failed to match '%s' for product/vendor IDs. Skipping.\n", match); + return 0; } + bus = bus_from_str (busstr); - /* set default to first entry */ - if (nmatches > 1) - libwacom_update_match(device, first_bus, first_vendor_id, first_product_id); + libwacom_update_match(device, name, bus, vendor_id, product_id); - g_strfreev(strs); - return i; + return TRUE; } static void @@ -382,7 +379,6 @@ char *path; char *layout; char *class; - char *match; char **string_list; keyfile = g_key_file_new(); @@ -397,19 +393,30 @@ device = g_new0 (WacomDevice, 1); - match = g_key_file_get_string(keyfile, DEVICE_GROUP, "DeviceMatch", NULL); - if (g_strcmp0 (match, GENERIC_DEVICE_MATCH) == 0) { - libwacom_update_match(device, WBUSTYPE_UNKNOWN, 0, 0); - } else { - if (libwacom_matchstr_to_matches(device, match) == 0) { - DBG("failed to match '%s' for product/vendor IDs in '%s'\n", match, path); - g_free (match); - g_free (device); - device = NULL; - goto out; + string_list = g_key_file_get_string_list(keyfile, DEVICE_GROUP, "DeviceMatch", NULL, NULL); + if (string_list) { + guint i; + guint nmatches = 0; + guint first_valid_match = 0; + for (i = 0; string_list[i]; i++) { + if (libwacom_matchstr_to_match (device, string_list[i])) + nmatches++; + if (nmatches == 1) + first_valid_match = i; + } + if (nmatches == 0) { + DBG("failed to match '%s' for product/vendor IDs in '%s'\n", string_list[i], path); + g_strfreev (string_list); + g_free (device); + device = NULL; + goto out; + } + if (nmatches > 1) { + /* set default to first entry */ + libwacom_matchstr_to_match(device, string_list[first_valid_match]); } + g_strfreev (string_list); } - g_free (match); device->name = g_key_file_get_string(keyfile, DEVICE_GROUP, "Name", NULL); device->width = g_key_file_get_integer(keyfile, DEVICE_GROUP, "Width", NULL); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwacom-0.12/libwacom/libwacom.c new/libwacom-0.13/libwacom/libwacom.c --- old/libwacom-0.12/libwacom/libwacom.c 2015-02-26 01:40:55.000000000 +0100 +++ new/libwacom-0.13/libwacom/libwacom.c 2015-03-16 03:35:51.000000000 +0100 @@ -300,6 +300,7 @@ dst = g_new0(WacomMatch, 1); dst->match = g_strdup(src->match); + dst->name = g_strdup(src->name); dst->bus = src->bus; dst->vendor_id = src->vendor_id; dst->product_id = src->product_id; @@ -368,6 +369,7 @@ libwacom_same_layouts (const WacomDevice *a, const WacomDevice *b) { gchar *file1, *file2; + gboolean rc; /* Conveniently handle the null case */ if (a->layout == b->layout) @@ -380,7 +382,12 @@ if (b->layout != NULL) file2 = g_path_get_basename (b->layout); - return (g_strcmp0 (file1, file2) == 0); + rc = (g_strcmp0 (file1, file2) == 0); + + g_free (file1); + g_free (file2); + + return rc; } int @@ -388,7 +395,7 @@ { g_return_val_if_fail(a || b, 0); - if ((a && !b) || (b && !a)) + if (!a || !b) return 1; if (strcmp(a->name, b->name) != 0) @@ -448,7 +455,7 @@ } static const WacomDevice * -libwacom_new (const WacomDeviceDatabase *db, int vendor_id, int product_id, WacomBusType bus, WacomError *error) +libwacom_new (const WacomDeviceDatabase *db, const char *name, int vendor_id, int product_id, WacomBusType bus, WacomError *error) { const WacomDevice *device; char *match; @@ -458,7 +465,7 @@ return NULL; } - match = make_match_string(bus, vendor_id, product_id); + match = make_match_string(name, bus, vendor_id, product_id); device = libwacom_get_device(db, match); g_free (match); @@ -471,9 +478,9 @@ int vendor_id, product_id; WacomBusType bus; const WacomDevice *device; - WacomDevice *ret; + WacomDevice *ret = NULL; WacomIntegrationFlags integration_flags; - char *name; + char *name, *match_name; if (!db) { libwacom_error_set(error, WERROR_INVALID_DB, "db is NULL"); @@ -488,7 +495,12 @@ if (!get_device_info (path, &vendor_id, &product_id, &name, &bus, &integration_flags, error)) return NULL; - device = libwacom_new (db, vendor_id, product_id, bus, error); + match_name = name; + device = libwacom_new (db, match_name, vendor_id, product_id, bus, error); + if (device == NULL) { + match_name = NULL; + device = libwacom_new (db, match_name, vendor_id, product_id, bus, error); + } if (device != NULL) ret = libwacom_copy(device); else if (fallback == WFALLBACK_NONE) @@ -503,14 +515,14 @@ if (name != NULL) { g_free (ret->name); - ret->name = name; + ret->name = g_strdup(name); } - } else { - g_free (name); } /* for multiple-match devices, set to the one we requested */ - libwacom_update_match(ret, bus, vendor_id, product_id); + libwacom_update_match(ret, match_name, bus, vendor_id, product_id); + + g_free (name); if (device) { /* if unset, use the kernel flags. Could be unset as well. */ @@ -536,7 +548,7 @@ return NULL; } - device = libwacom_new(db, vendor_id, product_id, WBUSTYPE_USB, error); + device = libwacom_new(db, NULL, vendor_id, product_id, WBUSTYPE_USB, error); if (device) return libwacom_copy(device); @@ -706,6 +718,7 @@ dprintf(fd, "Name=%s\n", libwacom_get_name(device)); dprintf(fd, "DeviceMatch="); for (match = libwacom_get_matches(device); *match; match++) { + const char *name = libwacom_match_get_name(*match); WacomBusType type = libwacom_match_get_bustype(*match); int vendor = libwacom_match_get_vendor_id(*match); int product = libwacom_match_get_product_id(*match); @@ -717,7 +730,10 @@ case WBUSTYPE_UNKNOWN: bus_name = "unknown"; break; default: g_assert_not_reached(); break; } - dprintf(fd, "%s:%04x:%04x;", bus_name, vendor, product); + dprintf(fd, "%s:%04x:%04x", bus_name, vendor, product); + if (name) + dprintf(fd, ":%s", name); + dprintf(fd, ";"); } dprintf(fd, "\n"); @@ -758,6 +774,7 @@ for (i = 0; i < device->nmatches; i++) { g_free (device->matches[i]->match); + g_free (device->matches[i]->name); g_free (device->matches[i]); } g_free (device->matches); @@ -768,18 +785,19 @@ } void -libwacom_update_match(WacomDevice *device, WacomBusType bus, int vendor_id, int product_id) +libwacom_update_match(WacomDevice *device, const char *name, WacomBusType bus, int vendor_id, int product_id) { char *newmatch; int i; WacomMatch match; - if (bus == WBUSTYPE_UNKNOWN && vendor_id == 0 && product_id == 0) + if (name == NULL && bus == WBUSTYPE_UNKNOWN && vendor_id == 0 && product_id == 0) newmatch = g_strdup("generic"); else - newmatch = make_match_string(bus, vendor_id, product_id); + newmatch = make_match_string(name, bus, vendor_id, product_id); match.match = newmatch; + match.name = g_strdup(name); match.bus = bus; match.vendor_id = vendor_id; match.product_id = product_id; @@ -794,7 +812,7 @@ device->nmatches++; - device->matches = g_realloc_n(device->matches, device->nmatches + 1, sizeof(WacomMatch)); + device->matches = g_realloc_n(device->matches, device->nmatches + 1, sizeof(WacomMatch*)); device->matches[device->nmatches] = NULL; device->matches[device->nmatches - 1] = libwacom_copy_match(&match); device->match = device->nmatches - 1; @@ -1100,6 +1118,11 @@ } +const char *libwacom_match_get_name(const WacomMatch *match) +{ + return match->name; +} + WacomBusType libwacom_match_get_bustype(const WacomMatch *match) { return match->bus; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwacom-0.12/libwacom/libwacom.h new/libwacom-0.13/libwacom/libwacom.h --- old/libwacom-0.12/libwacom/libwacom.h 2015-02-26 01:40:55.000000000 +0100 +++ new/libwacom-0.13/libwacom/libwacom.h 2015-03-16 03:35:31.000000000 +0100 @@ -602,6 +602,7 @@ */ void libwacom_print_stylus_description (int fd, const WacomStylus *stylus); +const char *libwacom_match_get_name(const WacomMatch *match); WacomBusType libwacom_match_get_bustype(const WacomMatch *match); uint32_t libwacom_match_get_product_id(const WacomMatch *match); uint32_t libwacom_match_get_vendor_id(const WacomMatch *match); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwacom-0.12/libwacom/libwacomint.h new/libwacom-0.13/libwacom/libwacomint.h --- old/libwacom-0.12/libwacom/libwacomint.h 2015-02-26 01:40:55.000000000 +0100 +++ new/libwacom-0.13/libwacom/libwacomint.h 2015-03-16 03:35:31.000000000 +0100 @@ -54,6 +54,7 @@ * make sure to update libwacom_copy_match() ! */ struct _WacomMatch { char *match; + char *name; WacomBusType bus; uint32_t vendor_id; uint32_t product_id; @@ -119,12 +120,11 @@ /* INTERNAL */ void libwacom_error_set(WacomError *error, enum WacomErrorCode code, const char *msg, ...); void libwacom_stylus_destroy(WacomStylus *stylus); -void libwacom_update_match(WacomDevice *device, WacomBusType bus, int vendor_id, int product_id); +void libwacom_update_match(WacomDevice *device, const char *name, WacomBusType bus, int vendor_id, int product_id); WacomBusType bus_from_str (const char *str); const char *bus_to_str (WacomBusType bus); -char *make_match_string(WacomBusType bus, int vendor_id, int product_id); - +char *make_match_string(const char *name, WacomBusType bus, int vendor_id, int product_id); #endif /* _LIBWACOMINT_H_ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwacom-0.12/missing new/libwacom-0.13/missing --- old/libwacom-0.12/missing 2014-11-06 01:11:29.000000000 +0100 +++ new/libwacom-0.13/missing 2015-04-17 06:18:07.000000000 +0200 @@ -3,7 +3,7 @@ scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwacom-0.12/test/dbverify.c new/libwacom-0.13/test/dbverify.c --- old/libwacom-0.12/test/dbverify.c 2012-10-16 07:30:39.000000000 +0200 +++ new/libwacom-0.13/test/dbverify.c 2015-03-16 03:35:51.000000000 +0100 @@ -111,6 +111,9 @@ assert(old_matched[i]); } + free(old_matched); + free(oldall); + free(newall); } /* write out the current db, read it back in, compare */ @@ -160,6 +163,7 @@ assert(fd_stylus >= 0); libwacom_print_stylus_description(fd_stylus, stylus); close(fd_stylus); + free(path); } } @@ -170,6 +174,7 @@ rmtmpdir(dirname); free(dirname); + free(devices); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwacom-0.12/test/load.c new/libwacom-0.13/test/load.c --- old/libwacom-0.12/test/load.c 2014-02-06 22:03:49.000000000 +0100 +++ new/libwacom-0.13/test/load.c 2015-03-16 03:35:51.000000000 +0100 @@ -127,6 +127,7 @@ assert(device); assert(libwacom_get_integration_flags (device) & WACOM_DEVICE_INTEGRATED_DISPLAY); assert(libwacom_get_integration_flags (device) & WACOM_DEVICE_INTEGRATED_SYSTEM); + libwacom_destroy(device); libwacom_database_destroy (db); return 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwacom-0.12/test/tablet-svg-validity.c new/libwacom-0.13/test/tablet-svg-validity.c --- old/libwacom-0.12/test/tablet-svg-validity.c 2012-12-13 00:42:46.000000000 +0100 +++ new/libwacom-0.13/test/tablet-svg-validity.c 2015-03-16 03:35:51.000000000 +0100 @@ -100,6 +100,7 @@ g_strfreev (classes_present); g_strfreev (classes_expected); + xmlFree (prop); } static void @@ -314,6 +315,7 @@ for (device = devices; *device; device++) verify_tablet_layout(db, *device); + free(devices); libwacom_database_destroy (db); return 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwacom-0.12/test/tablet-validity.c new/libwacom-0.13/test/tablet-validity.c --- old/libwacom-0.12/test/tablet-validity.c 2015-03-04 05:25:17.000000000 +0100 +++ new/libwacom-0.13/test/tablet-validity.c 2015-03-16 03:35:51.000000000 +0100 @@ -153,6 +153,7 @@ case WCLASS_INTUOS2: case WCLASS_INTUOS3: case WCLASS_INTUOS4: + case WCLASS_INTUOS5: case WCLASS_CINTIQ: { int i; @@ -161,8 +162,9 @@ assert(styli[i] != WACOM_ERASER_FALLBACK_ID); } } + break; default: - assert(1); /* don't get here */ + abort(); /* don't get here */ } for (i = 0; i < nstyli; i++) { @@ -199,7 +201,7 @@ axes = libwacom_stylus_get_axes (stylus); if (libwacom_stylus_get_type (stylus) == WSTYLUS_PUCK) { assert((axes & WACOM_AXIS_TYPE_PRESSURE) == 0); - } else { + } else if (styli[i] != 0xffffd) { assert(axes & WACOM_AXIS_TYPE_TILT); assert(axes & WACOM_AXIS_TYPE_PRESSURE); assert(axes & WACOM_AXIS_TYPE_DISTANCE); @@ -240,6 +242,8 @@ libwacom_database_destroy (db); + free(devices); + return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libwacom-0.12/test-driver new/libwacom-0.13/test-driver --- old/libwacom-0.12/test-driver 2014-11-06 01:11:29.000000000 +0100 +++ new/libwacom-0.13/test-driver 2015-04-17 06:18:07.000000000 +0200 @@ -3,7 +3,7 @@ scriptversion=2013-07-13.22; # UTC -# Copyright (C) 2011-2013 Free Software Foundation, Inc. +# Copyright (C) 2011-2014 Free Software Foundation, Inc. # # 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 @@ -106,11 +106,14 @@ # Test script is run here. "$@" >$log_file 2>&1 estatus=$? + if test $enable_hard_errors = no && test $estatus -eq 99; then - estatus=1 + tweaked_estatus=1 +else + tweaked_estatus=$estatus fi -case $estatus:$expect_failure in +case $tweaked_estatus:$expect_failure in 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;; 0:*) col=$grn res=PASS recheck=no gcopy=no;; 77:*) col=$blu res=SKIP recheck=no gcopy=yes;; @@ -119,6 +122,12 @@ *:*) col=$red res=FAIL recheck=yes gcopy=yes;; esac +# Report the test outcome and exit status in the logs, so that one can +# know whether the test passed or failed simply by looking at the '.log' +# file, without the need of also peaking into the corresponding '.trs' +# file (automake bug#11814). +echo "$res $test_name (exit status: $estatus)" >>$log_file + # Report outcome to console. echo "${col}${res}${std}: $test_name"
