DrathOrg/libratbag-plus
1
0
Fork 0
forked from drath/libratbag
Code Pull Requests Activity

tools: always print 'dpi' after resolutions

Browse Source 
We printed '500' but '500x500dpi', let's make this consistent.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer
2017-10-13 11:56:11 +10:00
committed by Benjamin Tissoires
parent b140bc2827
commit a58096fade
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/ratbag-command.c
View File

@@ -962,7 +962,7 @@ ratbag_cmd_resolution_dpi_get(const struct ratbag_cmd *cmd,
resolution = options->resolution;
dpi = ratbag_resolution_get_dpi(resolution);
printf("%d\n", dpi);
printf("%ddpi\n", dpi);
return SUCCESS;
}

2
tools/ratbagctl.in
View File

@@ -418,7 +418,7 @@ def func_dpi_get(r, args):
if RatbagdResolution.CAP_SEPARATE_XY_RESOLUTION in r.capabilities:
print("{}x{}dpi".format(r.resolution[0], r.resolution[1]))
else:
print(r.resolution[0])
print("{}dpi".format(r.resolution[0]))
def func_dpi_set(r, args):

8
tools/ratbagctl.test.in
View File

@@ -278,7 +278,7 @@ class TestRatbagCtlDPI(TestRatbagCtl):
def test_dpi_get(self):
command = "DPI get"
r = self.launch_good_test(command + " test_device")
self.assertEqual(int(r), 200)
self.assertEqual(int(r[:-3]), 200) # drop 'dpi' suffix
self.setProfile(1)
r = self.launch_good_test(command + " test_device")
self.assertEqual(r, "1300x1400dpi")
@@ -290,11 +290,11 @@ class TestRatbagCtlDPI(TestRatbagCtl):
command = "DPI set"
self.setProfile(0)
r = self.launch_good_test("DPI get test_device")
res = int(r) + 50
res = int(r[:-3]) + 50 # drop 'dpi' suffix
r = self.launch_good_test(command + " {} test_device".format(res))
self.assertEqual(r, '')
r = self.launch_good_test("DPI get test_device")
self.assertEqual(int(r), res)
self.assertEqual(int(r[:-3]), res) # drop 'dpi' suffix
self.launch_fail_test(command)
self.launch_fail_test(command + " X test_device")
self.launch_fail_test(command + " 100 test_device X")
@@ -325,7 +325,7 @@ class TestRatbagCtlDPI(TestRatbagCtl):
r = self.launch_good_test("Profile 1 Resolution 1 DPI get test_device")
self.assertEqual(r, "1200x1300dpi")
r = self.launch_good_test("Resolution 2 DPI get test_device")
self.assertEqual(int(r), 300)
self.assertEqual(int(r[:-3]), 300) # drop 'dpi' suffix
self.launch_fail_test("Profile 1 Profile 1 DPI get test_device")
self.launch_fail_test("Profile 1 Resolution 1 Resolution 2 DPI get test_device")