开源软件构建与测试

_service:tar_scm:libwacom.spec Changed

_service:tar_scm:libwacom-2.6.0.tar.xz/NEWS -> _service:tar_scm:libwacom-2.7.0.tar.xz/NEWS Changed

_service:tar_scm:libwacom-2.6.0.tar.xz/data/elan-2514.tablet -> _service:tar_scm:libwacom-2.7.0.tar.xz/data/elan-2514.tablet Changed

_service:tar_scm:libwacom-2.6.0.tar.xz/data/huion-h950p.tablet -> _service:tar_scm:libwacom-2.7.0.tar.xz/data/huion-h950p.tablet Changed

_service:tar_scm:libwacom-2.7.0.tar.xz/data/isdv4-121a.tablet Added

_service:tar_scm:libwacom-2.7.0.tar.xz/data/isdv4-52d3.tablet Added

_service:tar_scm:libwacom-2.7.0.tar.xz/data/isdv4-52d5.tablet Added

_service:tar_scm:libwacom-2.7.0.tar.xz/data/layouts/xp-pen-deco-mw.svg Added

@@ -0,0 +1,181 @@
+<?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="xp-pen-deco-l"
+    width="355"
+    height="250">
+  <title id="title">XP-Pen Deco L</title>
+  <g>
+    <path
+       id="ButtonA"
+       class="A ModeSwitch Button"
+       width="22"
+       height="25"
+       x="18"
+       y="33"
+       ry="0"
+       style="stroke-width:0.32"
+       d="M 22,33 H 36 a 4,4 0 0 1 4,4 V 58 H 18 V 37 a 4,4 0 0 1 4,-4 z" />
+    <path
+       id="LeaderA"
+       class="A ModeSwitch Leader"
+       d="m 51,58 4,0" />
+    <text
+       id="LabelA"
+       class="A ModeSwitch Label"
+       x="57"
+       y="58"
+       style="text-anchor:start">A</text>
+  </g>
+  <g>
+    <rect
+       id="ButtonB"
+       class="B ModeSwitch Button"
+       width="22"
+       height="20"
+       x="18"
+       y="60"
+       ry="0"
+       style="stroke-width:0.32" />
+    <path
+       d="m 51,80 4,0"
+       class="B ModeSwitch Leader"
+       id="LeaderB" />
+    <text
+       style="text-anchor:start"
+       y="80"
+       x="57"
+       class="B ModeSwitch Label"
+       id="LabelB">B</text>
+  </g>
+  <g>
+    <rect
+       id="ButtonC"
+       class="C ModeSwitch Button"
+       width="22"
+       height="20"
+       x="18"
+       y="82"
+       ry="0"
+       style="stroke-width:0.32" />
+    <path
+       id="LeaderC"
+       class="C ModeSwitch Leader"
+       d="m 51,102 4,0" />
+    <text
+       id="LabelC"
+       class="C ModeSwitch Label"
+       x="57"
+       y="102"
+       style="text-anchor:start">C</text>
+  </g>
+  <g>
+    <rect
+       id="ButtonD"
+       class="D ModeSwitch Button"
+       width="22"
+       height="20"
+       x="18"
+       y="104"
+       ry="0"
+       style="stroke-width:0.32" />
+    <path
+       id="LeaderD"
+       class="D ModeSwitch Leader"
+       d="m 51,124 4,0" />
+    <text
+       id="LabelD"
+       class="D ModeSwitch Label"
+       x="57"
+       y="124"
+       style="text-anchor:start">D</text>
+  </g>
+  <g>
+    <rect
+       id="ButtonE"
+       class="E ModeSwitch Button"
+       width="22"
+       height="20"
+       x="18"
+       y="126"
+       ry="0"
+       style="stroke-width:0.32" />
+    <path
+       id="LeaderE"
+       class="E ModeSwitch Leader"
+       d="m 51,146 4,0" />
+    <text
+       id="LabelE"
+       class="E ModeSwitch Label"
+       x="57"
+       y="146"
+       style="text-anchor:start">E</text>
+  </g>
+  <g>
+    <rect
+       id="ButtonF"
+       class="F ModeSwitch Button"
+       width="22"
+       height="20"
+       x="18"
+       y="148"
+       ry="0"
+       style="stroke-width:0.32" />
+    <path
+       id="LeaderF"
+       class="F ModeSwitch Leader"
+       d="m 51,168 4,0" />
+    <text
+       id="LabelF"
+       class="F ModeSwitch Label"
+       x="57"
+       y="168"
+       style="text-anchor:start">F</text>
+  </g>
+  <g>
+    <rect
+       id="ButtonG"
+       class="G ModeSwitch Button"
+       width="22"
+       height="20"
+       x="18"
+       y="170"
+       ry="0"
+       style="stroke-width:0.32" />
+    <path
+       id="LeaderG"
+       class="G ModeSwitch Leader"
+       d="m 51,190 4,0" />
+    <text
+       id="LabelG"
+       class="G ModeSwitch Label"
+       x="57"
+       y="190"
+       style="text-anchor:start">G</text>
+  </g>
+  <g>
+    <path
+       id="ButtonH"
+       class="H ModeSwitch Button"
+       width="22"
+       height="20"
+       x="18"
+       y="192"
+       ry="0"
+       style="stroke-width:0.32"
+       d="m 18,192 h 22 v 20 a 5,5 0 0 1 -5,5 H 23 a 5,5 0 0 1 -5,-5 z" />
+    <path
+       id="LeaderH"
+       class="H ModeSwitch Leader"
+       d="m 51,212 4,0" />
+    <text
+       id="LabelH"
+       class="H ModeSwitch Label"
+       x="57"
+       y="212"
+       style="text-anchor:start">H</text>
+  </g>
+</svg>

_service:tar_scm:libwacom-2.7.0.tar.xz/data/layouts/xp-pen-deco-pro-s-m-sw-mw.svg Added

@@ -0,0 +1,200 @@
+<?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
+   id="intuos4-xl"
+   width="623.0"
+   height="462.0"
+   style="color:#000000;stroke:#7f7f7f;fill:none;stroke-width:.25;font-size:8"
+   version="1.1"
+   xmlns="http://www.w3.org/2000/svg">
+  <title id="title">XP-PEN Deco Pro MW</title>
+  <g>
+    <rect
+       id="ButtonH"
+       class="H Button"
+       x="45.0"
+       y="308.0"
+       width="19.5"
+       height="19.5" />
+    <path
+       id="LeaderH"
+       class="H Leader"
+       d="M 90.0 324.5 65.0 324.5" />
+    <text
+       id="LabelH"
+       class="H Label"
+       x="94.5"
+       y="328.0"
+       style="text-anchor:start;">H</text>
+  </g>
+  <g>
+    <rect
+       id="ButtonG"
+       class="G Button"
+       x="20.0"
+       y="308.0"
+       width="19.5"
+       height="19.5" />
+    <path
+       id="LeaderG"
+       class="G Leader"
+       d="M 90.0 310.0 H 75.0 v 23.0 l -45.0 0.0 v -5.0" />
+    <text
+       id="LabelG"
+       class="G Label"
+       x="94.5"
+       y="313.0"
+       style="text-anchor:start;">G</text>
+  </g>
+  <g>
+    <rect
+       id="ButtonF"
+       class="F Button"
+       x="45.0"
+       y="278.0"
+       width="19.5"
+       height="29.5" />
+    <path
+       id="LeaderF"
+       class="F Leader"
+       d="M 65.0 295.0 90.0 295.0" />
+    <text
+       id="LabelF"
+       class="F Label"
+       x="95.0"
+       y="298.5"
+       style="text-anchor:start;">F</text>
+  </g>
+  <g>
+    <rect
+       id="ButtonE"
+       class="E Button"
+       x="20.0"
+       y="278.0"
+       width="19.5"
+       height="29.5" /> 
+    <path
+       id="LeaderE"
+       class="E Leader"
+       d="M 90.0 281.0 H 75.0 l 0.0 -8.0 -45.0 0.0 0.0 5.0" />
+    <text
+       id="LabelE"
+       class="E Label"
+       x="95.0"
+       y="284.0"
+       style="text-anchor:start;">E</text>
+  </g>
+  <g>
+    <circle
+       id="Ring"
+       class="Ring TouchRing"
+       cx="39.5"
+       cy="224.5"
+       r="25.0" />
+    <path
+       id="LeaderRingCCW"
+       class="RingCCW Ring Leader"
+       d="M 40.5 198.0 V 193.5 h 49.5" />
+    <path
+       id="RingCCW"
+       class="RingCCW Button"
+       d="m 35.553343,206.65045 3.821656,-1.91083 v 1.27389 a 9.5541398,9.5541399 0 0 1 6.369426,1.91083 8.2802545,8.2802546 0 0 0 -6.369426,-0.63694 v 1.27388 z" />
+    <path
+       id="LeaderRingCW"
+       class="RingCW Ring Leader"
+       d="m 40.5 250.5 v 4.5 H 90.0" />
+    <path
+       id="RingCW"
+       class="RingCW Button"
+       d="m 35.553343,242.31924 3.821656,-1.91082 v 1.27387 a 9.5541398,9.5541399 0 0 0 6.369426,-1.27387 8.2802545,8.2802546 0 0 1 -6.369426,2.54777 v 1.27388 z" />
+    <text
+       id="LabelRingCCW"
+       class="RingCCW Ring Label"
+       x="94.5"
+       y="196.0"
+       style="text-anchor:start;">CCW</text>
+    <text
+       id="LabelRingCW"
+       class="RingCW Ring Label"
+       x="94.5"
+       y="258.0"
+       style="text-anchor:start;">CW</text>
+  </g>
+  <g>
+    <rect
+       id="ButtonD"
+       class="D Button"
+       x="45.0"
+       y="140.0"
+       width="19.5"
+       height="29.5" />
+    <path
+       id="LeaderD"
+       class="D Leader"
+       d="M 65.0 167.0 H 90.0" />
+    <text
+       id="LabelD"
+       class="D Label"
+       x="94.5"
+       y="170.0"
+       style="text-anchor:start;">D</text>
+  </g>
+  <g>
+    <rect
+       id="ButtonC"
+       class="C Button"
+       x="20.0"
+       y="140.0"
+       width="19.5"
+       height="29.5" />
+    <path
+       id="LeaderC"
+       class="C Leader"
+       d="m 30.0 170.0 v 5.0 h 45.0 v -23.0 l 15.0 0.0" />
+    <text
+       id="LabelC"
+       class="C Label"
+       x="95.0"
+       y="155.0"
+       style="text-anchor:start;">C</text>
+  </g>
+  <g>
+    <rect
+       id="ButtonB"
+       class="B Button"
+       x="45.0"
+       y="120.0"
+       width="19.5"
+       height="19.5" />
+    <path
+       id="LeaderB"
+       class="B Leader"
+       d="M 65.0 137.5 H 90.0" />
+    <text
+       id="LabelB"
+       class="B Label"
+       x="95.0"
+       y="140.5"
+       style="text-anchor:start;">B</text>
+  </g>
+  <g>
+    <rect
+       id="ButtonA"
+       class="A Button"
+       x="20.0"
+       y="120.0"
+       width="19.5"
+       height="19.5" />
+    <path
+       id="LeaderA"
+       class="A Leader"
+       d="m 30.0 120.0 v -5.0 h 45.0 v 8.0 h 15.0" />
+    <text
+       id="LabelA"
+       class="A Label"
+       x="95.0"
+       y="126.0"
+       style="text-anchor:start;">A</text>
+  </g>

_service:tar_scm:libwacom-2.7.0.tar.xz/data/xp-pen-deco-mw.tablet Added

_service:tar_scm:libwacom-2.7.0.tar.xz/data/xp-pen-deco-pro-mw.tablet Added

_service:tar_scm:libwacom-2.7.0.tar.xz/data/xp-pen-deco-pro-sw.tablet Added

_service:tar_scm:libwacom-2.6.0.tar.xz/meson.build -> _service:tar_scm:libwacom-2.7.0.tar.xz/meson.build Changed

_service:tar_scm:libwacom-2.6.0.tar.xz/test/test_data_files.py -> _service:tar_scm:libwacom-2.7.0.tar.xz/test/test_data_files.py Changed

@@ -9,23 +9,23 @@
 
 
 WACOM_RECEIVER_USBIDS = 
-    (0x56a, 0x84),
+    (0x56A, 0x84),
 
 
 
 def datadir():
-    return Path(os.getenv('MESON_SOURCE_ROOT') or '.') / 'data'
+    return Path(os.getenv("MESON_SOURCE_ROOT") or ".") / "data"
 
 
 def layoutsdir():
-    return datadir() / 'layouts'
+    return datadir() / "layouts"
 
 
 def pytest_generate_tests(metafunc):
     # for any function that takes a "tabletfile" argument return the path to
     # a tablet file
-    if 'tabletfile' in metafunc.fixturenames:
-        metafunc.parametrize('tabletfile', f for f in datadir().glob('*.tablet'))
+    if "tabletfile" in metafunc.fixturenames:
+        metafunc.parametrize("tabletfile", f for f in datadir().glob("*.tablet"))
 
 
 def test_device_match(tabletfile):
@@ -36,14 +36,23 @@
     # where bus is 'usb' or 'bluetooth'
     # where vid/pid is a lowercase hex
     # where name is optional
-    for match in config'Device''DeviceMatch'.split(';'):
-        if not match or match == 'generic':
+    for match in config"Device""DeviceMatch".split(";"):
+        if not match or match == "generic":
             continue
 
-        bus, vid, pid = match.split(':'):3  # skip the name part of the match
-        assert bus in 'usb', 'bluetooth', 'i2c', 'serial', f'{tabletfile}: unknown bus type'
-        assert re.match('0-9a-f{4}', vid), f'{tabletfile}: {vid} must be lowercase hex'
-        assert re.match('0-9a-f{4}', pid), f'{tabletfile}: {pid} must be lowercase hex'
+        bus, vid, pid = match.split(":"):3  # skip the name part of the match
+        assert bus in 
+            "usb",
+            "bluetooth",
+            "i2c",
+            "serial",
+        , f"{tabletfile}: unknown bus type"
+        assert re.match(
+            "0-9a-f{4}", vid
+        ), f"{tabletfile}: {vid} must be lowercase hex"
+        assert re.match(
+            "0-9a-f{4}", pid
+        ), f"{tabletfile}: {pid} must be lowercase hex"
 
 
 def test_no_receiver_id(tabletfile):
@@ -52,8 +61,8 @@
     config.optionxform = lambda option: option
     config.read(tabletfile)
 
-    receivers = 'usb:{:04x}:{:04x}'.format(*r) for r in WACOM_RECEIVER_USBIDS
-    for match in config'Device''DeviceMatch'.split(';'):
+    receivers = "usb:{:04x}:{:04x}".format(*r) for r in WACOM_RECEIVER_USBIDS
+    for match in config"Device""DeviceMatch".split(";"):
         assert match not in receivers
 
 
@@ -64,7 +73,7 @@
     config.read(tabletfile)
 
     try:
-        svg = config'Device''Layout'
+        svg = config"Device""Layout"
         assert (layoutsdir() / svg).exists()
 
     except KeyError:
@@ -78,9 +87,11 @@
     config.read(tabletfile)
 
     try:
-        nbuttons = int(config'Features''Buttons')
-        str = config'Buttons''EvdevCodes'
-        codes = c for c in str.split(";") if c  # drop empty strings from trailing semicolons
+        nbuttons = int(config"Features""Buttons")
+        str = config"Buttons""EvdevCodes"
+        codes = 
+            c for c in str.split(";") if c
+          # drop empty strings from trailing semicolons
         assert len(codes) == nbuttons, "Number of buttons mismatches the EvdevCodes"
     except KeyError:
         pass

_service:tar_scm:libwacom-2.6.0.tar.xz/tools/clean_svg.py -> _service:tar_scm:libwacom-2.7.0.tar.xz/tools/clean_svg.py Changed

_service:tar_scm:libwacom-2.6.0.tar.xz/tools/libwacom-update-db.py -> _service:tar_scm:libwacom-2.7.0.tar.xz/tools/libwacom-update-db.py Changed

@@ -84,7 +84,7 @@
         # to accept those.
         # Let's add a generic exclusion rule for anything we know of with a
         # Keyboard device name.
-        if int(vid, 16) != 0x56a:
+        if int(vid, 16) != 0x56A:
             entries"* Keyboard" = "ID_INPUT_TABLET=0"
 
         lines = f"# {tablet.name}"
@@ -189,8 +189,11 @@
         description="Update the system according to the current set of tablet data files"
     )
     parser.add_argument(
-        "path", nargs="?", type=Path, default='/etc/libwacom',
-        help="Directory to load .tablet files from"
+        "path",
+        nargs="?",
+        type=Path,
+        default="/etc/libwacom",
+        help="Directory to load .tablet files from",
     )
     # buildsystem-mode is what we use from meson, it changes the
     # the behavior to just generate the file and print it
@@ -241,8 +244,12 @@
             print(f"New hwdb file: {hwdbfile}")
 
             if not ns.skip_systemd_hwdb_update:
-                subprocess.run("systemd-hwdb", "update",
-                        capture_output=True, check=True, text=True)
+                subprocess.run(
+                    "systemd-hwdb", "update",
+                    capture_output=True,
+                    check=True,
+                    text=True,
+                )
             print("Finished, please unplug and replug your device")
         except PermissionError as e:
             print(f"{e}, please run me as root")

_service:tar_scm:libwacom-2.6.0.tar.xz/tools/list-local-devices.c -> _service:tar_scm:libwacom-2.7.0.tar.xz/tools/list-local-devices.c Changed

@@ -90,9 +90,26 @@
 }
 
 static void
-print_str(gpointer data, gpointer user_data)
+print_devnode(gpointer data, gpointer user_data)
 {
-	printf("  - %s\n", (char *)data);
+	const gchar *devnode = data;
+	gchar *name = NULL;
+	gsize size;
+	GError *error = NULL;
+
+	gchar *basename = g_path_get_basename(devnode);
+	char *path = g_strdup_printf("/sys/class/input/%s/device/name", basename);
+
+	g_free(basename);
+	if (g_file_get_contents(path, &name, &size, &error)) {
+		printf("  - %s: '%.*s'\n", devnode, (int)(size - 1), name);
+	} else {
+		fprintf(stderr, "%s\n", error->message);
+	}
+	if (error)
+		g_error_free(error);
+	g_free(name);
+	g_free(path);
 }
 
 static void
@@ -119,7 +136,7 @@
 	printf("  vid: '0x%04x'\n", vid);
 	printf("  pid: '0x%04x'\n", pid);
 	printf("  nodes: \n");
-	g_list_foreach(d->nodes, print_str, NULL);
+	g_list_foreach(d->nodes, print_devnode, NULL);
 }
 
 static void
@@ -187,7 +204,11 @@
 		db = libwacom_database_new_for_path(database_path);
 		g_free (database_path);
 	} else {
+#ifdef DATABASEPATH
+		db = libwacom_database_new_for_path(DATABASEPATH);
+#else
 		db = libwacom_database_new();
+#endif
 	}
 
 	if (!db) {

Changes of Revision 9