Remove dpi scaling of maximum width by Caellian · Pull Request #1877 · brndnmtthws/conky

Caellian · 2024-04-30T18:29:53Z

This PR removes dpi_scaleing of maximum width setting.

This seems incorrect because I expect maximum width to use absolute pixel value, otherwise meaning of maximum_width setting changes with DPI:

_{NOTE: Height difference is caused by font height, conky height can't be limited.}

This fixes #1528.

This PR also fixes a regression introduced in #1841, where I incorrectly assumed templated base class function would be overriden by display outputs so DPI scaling was completely disabled.

Other changes

This PR also:

sets workspace dimensions from WL output_geometry because workspace is used for some calculations in conky.cc.
- this requires more work for proper support as noted in comments, but it should make Wayland less broken.
adds conky xdg dir and script parent directory to Lua path so that scripts don't have to update it manually.

Testing

Use mock Xft dpi value and see whether example from [Bug]: use_xft = true breaks window sizing #1528 works better with/without this PR.

Set workspace dimensions from WL output_geometry Signed-off-by: Tin Švagelj <[email protected]>

netlify · 2024-04-30T18:30:08Z

✅ Deploy Preview for conkyweb canceled.

Name	Link
🔨 Latest commit	`6d194af`
🔍 Latest deploy log	https://app.netlify.com/sites/conkyweb/deploys/66314effc9a3a600082b3523

Signed-off-by: Tin Švagelj <[email protected]>

Caellian · 2024-04-30T20:11:30Z

src/conky.cc

+  // Extend lua package.path so scripts can use relative paths
+  {
+    struct stat file_stat {};
+
+    std::string path_ext;
+
+    // add XDG directory to lua path
+    auto xdg_path =
+        std::filesystem::path(to_real_path(XDG_CONFIG_FILE)).parent_path();
+    if (stat(xdg_path.c_str(), &file_stat) == 0) {
+      path_ext.push_back(';');
+      path_ext.append(xdg_path);
+      path_ext.append("/?.lua");
+    }
+
+    auto parent_path = current_config.parent_path();
+    if (xdg_path != parent_path && stat(path_ext.c_str(), &file_stat) == 0) {
+      path_ext.push_back(';');
+      path_ext.append(parent_path);
+      path_ext.append("/?.lua");
+    }
+
+    l.getglobal("package");
+    l.getfield(-1, "path");
+
+    auto path = l.tostring(-1);
+    path.append(path_ext);
+    l.pop();
+    l.pushstring(path.c_str());
+
+    l.setfield(-2, "path");
+    l.pop();
+  }


Adding $HOME/.config/conky and config parent directory to lua path before loading the script.

Caellian · 2024-04-30T20:12:27Z

src/display-x11.cc

+float display_output_x11::get_dpi_scale() {
+#ifdef BUILD_XFT
  if (use_xft.get(*state) && xft_dpi > 0) {
-    return (value * xft_dpi + (value > 0 ? 48 : -48)) / PIXELS_PER_INCH;


I believe (value > 0 ? 48 : -48) was rounding the result for int values before, so I replaced it with ceil and floor in new code. PIXELS_PER_INCH is 96.

Caellian · 2024-04-30T20:12:46Z

src/display-wayland.cc

+  // TODO: Add support for proper output management through:
+  // - xdg-output-unstable-v1
+  // Maybe also support (if XDG protocol not reported):
+  // - kde-output-management(-v2)
+  // - wlr-output-management-unstable-v1
+  workarea[0] = x;  // TODO: use xdg_output.logical_position
+  workarea[1] = y;
+  workarea[2] = physical_width;
+  workarea[3] = physical_height;


This is the workarea change.

brndnmtthws

Seems reasonable.

brndnmtthws · 2024-04-30T20:14:53Z

src/conky.cc


 /* path to config file */
-std::string current_config;
+std::filesystem::path current_config;


This was left over from #1877. Signed-off-by: Tin Švagelj <[email protected]>

This was left over from #1877.

Signed-off-by: Tin Švagelj <[email protected]>

Fix dpi scaling max_width

1efc24d

Set workspace dimensions from WL output_geometry Signed-off-by: Tin Švagelj <[email protected]>

github-actions bot added sources PR modifies project sources display: x11 related to X11 backend display: wayland related to Wayland backend labels Apr 30, 2024

Append script parent dir to lua package.path

5051e0a

Signed-off-by: Tin Švagelj <[email protected]>

Caellian force-pushed the fix/dpi-scaling branch from 11e4d54 to 5051e0a Compare April 30, 2024 19:09

Caellian added 3 commits April 30, 2024 21:50

Fix issues with selection and rounding

061fd11

Signed-off-by: Tin Švagelj <[email protected]>

Fix workarea access

d8fb65e

Signed-off-by: Tin Švagelj <[email protected]>

Fix display_output_x11::get_dpi_scale

6d194af

Signed-off-by: Tin Švagelj <[email protected]>

Caellian changed the title ~~Remove dpi scaling maximum width~~ Remove dpi scaling of maximum width Apr 30, 2024

Caellian marked this pull request as ready for review April 30, 2024 20:06

Caellian commented Apr 30, 2024

View reviewed changes

brndnmtthws approved these changes Apr 30, 2024

View reviewed changes

src/conky.cc

/* path to config file */

std::string current_config;

std::filesystem::path current_config;

Copy link

Owner

brndnmtthws Apr 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice

brndnmtthws added the bug related to incorrect existing implementation of some functionality label Apr 30, 2024

Caellian merged commit e1f3013 into main Apr 30, 2024

Caellian deleted the fix/dpi-scaling branch April 30, 2024 20:21

Caellian added the rendering related to code that handles rendering, excluding the used graphics API label Apr 30, 2024

Caellian added a commit that referenced this pull request May 18, 2024

Cleanup remaining dpi scaling of min & max width

72a5c1a

This was left over from #1877. Signed-off-by: Tin Švagelj <[email protected]>

This was referenced May 18, 2024

Remove dpi scaling of minimum_width & maximum_width #1926

Merged

[Bug]: conky pixel unit isn't scaled by screen DPI #1925

Closed

Caellian added a commit that referenced this pull request May 22, 2024

Cleanup remaining dpi scaling of min & max width (#1926)

7526e7e

This was left over from #1877.

Caellian mentioned this pull request May 25, 2024

[Bug]: Wrong hr line thickness #1930

Closed

Caellian added a commit that referenced this pull request May 30, 2024

Revert changes from #1926 & #1877

e67181b

Signed-off-by: Tin Švagelj <[email protected]>

Caellian mentioned this pull request May 30, 2024

Revert removal of dpi scaling #1949

Merged

Caellian added a commit that referenced this pull request Jun 1, 2024

Revert changes from #1926 & #1877 (#1949)

0bc625f

Signed-off-by: Tin Švagelj <[email protected]>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Remove dpi scaling of maximum width#1877

Remove dpi scaling of maximum width#1877
Caellian merged 5 commits intomainfrom
fix/dpi-scaling

Caellian commented Apr 30, 2024 •

edited

Loading

Uh oh!

netlify bot commented Apr 30, 2024 •

edited

Loading

Uh oh!

Caellian Apr 30, 2024

Uh oh!

Caellian Apr 30, 2024 •

edited

Loading

Uh oh!

Caellian Apr 30, 2024

Uh oh!

brndnmtthws left a comment

Uh oh!

brndnmtthws Apr 30, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

Caellian commented Apr 30, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Other changes

Testing

Uh oh!

netlify bot commented Apr 30, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ Deploy Preview for conkyweb canceled.

Uh oh!

Caellian Apr 30, 2024

Choose a reason for hiding this comment

Uh oh!

Caellian Apr 30, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Caellian Apr 30, 2024

Choose a reason for hiding this comment

Uh oh!

brndnmtthws left a comment

Choose a reason for hiding this comment

Uh oh!

brndnmtthws Apr 30, 2024

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Caellian commented Apr 30, 2024 •

edited

Loading

netlify bot commented Apr 30, 2024 •

edited

Loading

Caellian Apr 30, 2024 •

edited

Loading