-
Notifications
You must be signed in to change notification settings - Fork 107
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
Update for unification of monitor processing #212
Update for unification of monitor processing #212
Conversation
@matt335672 @metalefty I'm not sure why the build checks fail. The probably will because of the dependency on xrdp, but additionally, it looks like something is wrong with the build environment. Embarrassingly, I also can't find the "retry/re-run" option. |
ff96ec1
to
b9de2ee
Compare
Ah I figured it out. Also needed this: neutrinolabs/xrdp@341a325 |
Decided to separate out the fix for the checks to keep the commits more atomic: #213 |
b9de2ee
to
27ef6aa
Compare
Hi @Nexarian I've pulled your other fix in, so if you re-base this it should get through the CI now. |
27ef6aa
to
77c2d81
Compare
@matt335672 It now fails as expected! |
That's fine - we can merge this at the same time as the other changes in neutrinolabs/xrdp#1895. |
8d4fe02
to
a4a9224
Compare
@matt335672 @metalefty Take another look, and hopefully this can be merged along with neutrinolabs/xrdp#1895 |
That'll work, and I'm sort of Okay with it, but rather than having three explicit checks against /* See <add suitable reference> */
#if CLIENT_INFO_CURRENT_VERSION > 20210723
# define CLIENT_INFO_HAS_DISPLAY_SIZES
#endif then :- #if CLIENT_INFO_HAS_DISPLAY_SIZES
if (clientCon->client_info.display_sizes.monitorCount > 0)
#else
if (clientCon->client_info.monitorCount > 0)
#endif etc. What do people think? Is that overthinking it? |
I believe it is overthinking it, largely because:
My change is a surgical fix to directly fix this issue, and only that. Doing more risks moving the surgery from "minimally invasive" to "actually invasive." I also expect/suspect we'd want to remove this fix when the next release happens, and this is here only for the interim. |
OK - that's fine. You've convinced me. Do you want to add a comment somewhere along those lines? The comment will obviously also be deleted when we remove this fix! |
51c0cb5
to
600095a
Compare
@matt335672 Alright, updated. See the issue I've linked to! |
@Nexarian, @metalefty - I've added an additional Wiki page for xorgxrdp here:- https://github.com/neutrinolabs/xorgxrdp/wiki/NEWS This serves the same purpose as the NEWS page for xrdp. We can collect the merged changes as we go along so it makes the actual release process easier. |
Related to neutrinolabs/xrdp#1895. Need to update to reflect the changes to xrdp_client_info.h