Skip to content

Revert "Update for unification of monitor processing" #221

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Jun 3, 2022
Merged

Revert "Update for unification of monitor processing" #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36d398d
Revert "Update for unification of monitor processing"
metalefty May 31, 2022
90843da
Fix CI, test xorgxrdp v0.9 with xrdp v0.9
metalefty May 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- run: sudo scripts/install_xorgxrdp_build_dependencies_with_apt.sh ${{ matrix.arch }} --allow-downgrades --allow-remove-essential --allow-change-held-packages
- run: git clone --depth 1 --branch=devel https://github.com/neutrinolabs/xrdp.git ${{ github.workspace}}/xrdp
- run: git clone --depth 1 --branch=v0.9 https://github.com/neutrinolabs/xrdp.git ${{ github.workspace}}/xrdp
- run: ./bootstrap
- run: ./configure ${{ matrix.CONF_FLAGS }}
- run: make CFLAGS="$CFLAGS -O2 -Wall -Wwrite-strings -Werror"
Expand Down
18 changes: 0 additions & 18 deletions module/rdpClientCon.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -971,32 +971,14 @@ rdpClientConProcessMsgClientInfo(rdpPtr dev, rdpClientCon *clientCon)
{
LLOGLN(0, (" client can not do new(color) cursor"));
}
/*
TODO: Temporary workaround intended to support two different versions of the xrdp_client_info.h
header due to a customer request. This should be removed as soon as convenient, probably before the next
release. See https://github.com/neutrinolabs/xorgxrdp/issues/217
*/
#if CLIENT_INFO_CURRENT_VERSION == 20210723
if (clientCon->client_info.monitorCount > 0)
#else
if (clientCon->client_info.display_sizes.monitorCount > 0)
#endif
{
LLOGLN(0, (" client can do multimon"));
#if CLIENT_INFO_CURRENT_VERSION == 20210723
LLOGLN(0, (" client monitor data, monitorCount=%d", clientCon->client_info.monitorCount));
#else
LLOGLN(0, (" client monitor data, monitorCount=%d", clientCon->client_info.display_sizes.monitorCount));
#endif
clientCon->doMultimon = 1;
dev->doMultimon = 1;
#if CLIENT_INFO_CURRENT_VERSION == 20210723
memcpy(dev->minfo, clientCon->client_info.minfo, sizeof(dev->minfo));
dev->monitorCount = clientCon->client_info.monitorCount;
#else
memcpy(dev->minfo, clientCon->client_info.display_sizes.minfo, sizeof(dev->minfo));
dev->monitorCount = clientCon->client_info.display_sizes.monitorCount;
#endif

box.x1 = dev->minfo[0].left;
box.y1 = dev->minfo[0].top;
Expand Down