Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make hyprctl setcursor better (support XCursor themes, also give fail message) #6097

Merged
merged 3 commits into from
May 28, 2024

Conversation

ikalco
Copy link
Contributor

@ikalco ikalco commented May 16, 2024

Describe your PR, what does it fix/add?

makes it so that hyprctl setcursor can be used to change cursor theme between Hyprcursor and Xcursor

also addresses these issues

Is there anything you want to mention? (unchecked code, possible bugs, found problems, breaking compatibility, etc.)

This PR also requires a change in hyprcursor, see hyprwm/hyprcursor#43

The git blame for these lines is for a bug fix, but I believe this was left over when CursorManager was later changed?
either way code should still work the same, just a little less efficient i guess

if (std::round(highestScale * m_iSize) == m_sCurrentStyleInfo.size)
return;

Is it ready for merging, or does it need work?

No, I need to get hyprcursor PR merged first (hyprwm/hyprcursor#43)
tested on my machine

  • switching between xcursor and hyprcursor
  • and between xcursor and xcursor
  • and hyprcursor and hyprcursor
  • and different sizes for both

@vaxerski
Copy link
Member

shit aint compilin doe

@ikalco
Copy link
Contributor Author

ikalco commented May 16, 2024

You gotta compile hyprcursor and make Hyprland compile with new header and lib.
I just cmake installed the other PR and then compiled and ran Hyprland

Is it ready for merging, or does it need work?

No, I need to get hyprcursor PR merged first

@vaxerski
Copy link
Member

sorry I skim over long ass descriptions havent caught that, mark it as draft if it depends on something and link the deps

@ikalco ikalco marked this pull request as draft May 16, 2024 22:17
@ikalco ikalco marked this pull request as ready for review May 21, 2024 21:57
@ikalco
Copy link
Contributor Author

ikalco commented May 21, 2024

ummm, how do I make build work with hyprcursor-git or jus wait

@vaxerski
Copy link
Member

remind me later tomorrow if I forget to make a new hc release, then we bump the nix flake and wait for arc lonix

@ikalco
Copy link
Contributor Author

ikalco commented May 23, 2024

reminder

@vaxerski
Copy link
Member

thanks! done. @fufexan can you bump the flake here? then we just wait for arc

@ikalco
Copy link
Contributor Author

ikalco commented May 25, 2024

should be gtg now

src/managers/CursorManager.cpp Show resolved Hide resolved
src/managers/CursorManager.cpp Outdated Show resolved Hide resolved
Copy link
Member

@vaxerski vaxerski left a comment

Choose a reason for hiding this comment

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

lgtm

@vaxerski vaxerski merged commit 73b133d into hyprwm:main May 28, 2024
10 checks passed
cdubthecoolcat pushed a commit to cdubthecoolcat/Hyprland that referenced this pull request May 29, 2024
…sage) (hyprwm#6097)

* add support for changing to X cursor themes

* use new hyprcursor abi for options

* remove unneeded struct
@ikalco ikalco deleted the switch_to_xcursor_themes branch May 29, 2024 04:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants