Skip to content

Commit

Permalink
support set monitor info and scale
Browse files Browse the repository at this point in the history
  • Loading branch information
@okhowang
okhowang committed Sep 23, 2020
1 parent 278e60a commit a6d1677
Show file tree
Hide file tree
Showing 3 changed files with 81 additions and 39 deletions.
12 changes: 8 additions & 4 deletions module/rdpClientCon.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -983,14 +983,18 @@ rdpClientConProcessMsgClientInfo(rdpPtr dev, rdpClientCon *clientCon)
dev->minfo[index].top -= box.y1;
dev->minfo[index].right -= box.x1;
dev->minfo[index].bottom -= box.y1;
LLOGLN(0, (" left %d top %d right %d bottom %d",
LLOGLN(0, (" left %d top %d right %d bottom %d pWidth %d pHeight %d "
"orientation %d",
dev->minfo[index].left,
dev->minfo[index].top,
dev->minfo[index].right,
dev->minfo[index].bottom));
dev->minfo[index].bottom,
dev->minfo[index].physical_width,
dev->minfo[index].physical_height,
dev->minfo[index].orientation));
}

rdpRRSetRdpOutputs(dev);
rdpRRSetRdpOutputs(dev, clientCon);
RRTellChanged(dev->pScreen);
}
else
Expand All @@ -999,7 +1003,7 @@ rdpClientConProcessMsgClientInfo(rdpPtr dev, rdpClientCon *clientCon)
clientCon->doMultimon = 0;
dev->doMultimon = 0;
dev->monitorCount = 0;
rdpRRSetRdpOutputs(dev);
rdpRRSetRdpOutputs(dev, clientCon);
RRTellChanged(dev->pScreen);
}

Expand Down
106 changes: 72 additions & 34 deletions module/rdpRandR.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,16 @@ RandR draw calls
#include <fb.h>
#include <micmap.h>
#include <mi.h>
#include <pixman.h>
#include <xorg/rrtransform.h>
#include <xorg/picturestr.h>

#include "rdp.h"
#include "rdpDraw.h"
#include "rdpReg.h"
#include "rdpMisc.h"
#include "rdpRandR.h"
#include "rdpClientCon.h"

#if defined(XORGXRDP_GLAMOR)
#include <glamor.h>
Expand Down Expand Up @@ -364,9 +368,32 @@ rdpRRSetPanning(ScreenPtr pScreen, RRCrtcPtr crtc, BoxPtr totalArea,
return TRUE;
}

static void
rdpRRSetOutputPhysicalSize(const char* func, RROutputPtr output, struct monitor_info *monitor)
{
if (monitor->physical_height == 0 || monitor->physical_width == 0)
return;
if (!RROutputSetPhysicalSize(output, monitor->physical_width, monitor->physical_height))
LLOGLN(0, ("%s: RROutputSetPhysicalSize failed", func));
}

static Rotation
rdpGetRotation(uint32_t orientation) {
switch(orientation) {
case 90:
return RR_Rotate_90;
case 180:
return RR_Rotate_180;
case 270:
return RR_Rotate_270;
default:
return RR_Rotate_0;
}
}

/******************************************************************************/
static RROutputPtr
rdpRRAddOutput(rdpPtr dev, const char *aname, int x, int y, int width, int height)
rdpRRAddOutput(rdpPtr dev, const char *aname, struct monitor_info *monitor)
{
RRModePtr mode;
RRCrtcPtr crtc;
Expand All @@ -375,6 +402,10 @@ rdpRRAddOutput(rdpPtr dev, const char *aname, int x, int y, int width, int heigh
char name[64];
const int vfreq = 50;
int i;
int width = (monitor->right - monitor->left + 1);
int height = (monitor->bottom - monitor->top + 1);
int x = monitor->left;
int y = monitor->top;

sprintf (name, "%dx%d", width, height);
memset (&modeInfo, 0, sizeof(modeInfo));
Expand Down Expand Up @@ -416,6 +447,7 @@ rdpRRAddOutput(rdpPtr dev, const char *aname, int x, int y, int width, int heigh
RRModeDestroy(mode);
return 0;
}
rdpRRSetOutputPhysicalSize(__func__, output, monitor);
if (!RROutputSetClones(output, NULL, 0))
{
LLOGLN(0, ("rdpRRAddOutput: RROutputSetClones failed"));
Expand All @@ -432,19 +464,23 @@ rdpRRAddOutput(rdpPtr dev, const char *aname, int x, int y, int width, int heigh
{
LLOGLN(0, ("rdpRRAddOutput: RROutputSetConnection failed"));
}
RRCrtcNotify(crtc, mode, x, y, RR_Rotate_0, NULL, 1, &output);
RRCrtcNotify(crtc, mode, x, y, rdpGetRotation(monitor->orientation),
NULL, 1, &output);
return output;
}

/******************************************************************************/
static RROutputPtr
rdpRRUpdateOutput(RROutputPtr output, RRCrtcPtr crtc,
int x, int y, int width, int height)
rdpRRUpdateOutput(RROutputPtr output, RRCrtcPtr crtc, struct monitor_info *monitor)
{
RRModePtr mode;
xRRModeInfo modeInfo;
char name[64];
const int vfreq = 50;
int width = monitor->right - monitor->left + 1;
int height = monitor->bottom - monitor->top + 1;
int x = monitor->left;
int y = monitor->top;

LLOGLN(0, ("rdpRRUpdateOutput:"));
sprintf (name, "%dx%d", width, height);
Expand All @@ -465,7 +501,9 @@ rdpRRUpdateOutput(RROutputPtr output, RRCrtcPtr crtc,
{
LLOGLN(0, ("rdpRRUpdateOutput: RROutputSetModes failed"));
}
RRCrtcNotify(crtc, mode, x, y, RR_Rotate_0, NULL, 1, &output);
rdpRRSetOutputPhysicalSize(__func__, output, monitor);
RRCrtcNotify(crtc, mode, x, y, rdpGetRotation(monitor->orientation),
NULL, 1, &output);
RROutputChanged(output, 1);
return output;
}
Expand Down Expand Up @@ -516,14 +554,10 @@ rdpRRRemoveExtra(rrScrPrivPtr pRRScrPriv, int count)

/******************************************************************************/
int
rdpRRSetRdpOutputs(rdpPtr dev)
rdpRRSetRdpOutputs(rdpPtr dev, rdpClientCon *clientCon)
{
rrScrPrivPtr pRRScrPriv;
int index;
int left;
int top;
int width;
int height;
char text[256];
RROutputPtr output;

Expand All @@ -532,29 +566,35 @@ rdpRRSetRdpOutputs(rdpPtr dev)
pRRScrPriv->numCrtcs, pRRScrPriv->numOutputs, dev->monitorCount));
if (dev->monitorCount <= 0)
{
left = 0;
top = 0;
width = dev->width;
height = dev->height;
struct monitor_info monitor;
memset(&monitor, 0, sizeof(monitor));
monitor.top = 0;
monitor.left = 0;
monitor.right = dev->width - 1;
monitor.bottom = dev->height - 1;
monitor.physical_width = clientCon->client_info.physical_width;
monitor.physical_height = clientCon->client_info.physical_height;
monitor.orientation = clientCon->client_info.orientation;
monitor.desktop_scale_factor = clientCon->client_info.desktop_scale_factor;
monitor.device_scale_factor = clientCon->client_info.device_scale_factor;

if (pRRScrPriv->numCrtcs > 0)
{
/* update */
LLOGLN(0, ("rdpRRSetRdpOutputs: update output %d "
"left %d top %d width %d height %d",
0, left, top, width, height));
"left %d top %d right %d bottom %d",
0, monitor.left, monitor.top, monitor.right, monitor.bottom));
output = rdpRRUpdateOutput(pRRScrPriv->outputs[0],
pRRScrPriv->crtcs[0],
left, top, width, height);
pRRScrPriv->crtcs[0], &monitor);
}
else
{
/* add */
LLOGLN(0, ("rdpRRSetRdpOutputs: add output %d "
"left %d top %d width %d height %d",
0, left, top, width, height));
"left %d top %d right %d bottom %d",
0, monitor.left, monitor.top, monitor.right, monitor.bottom));
snprintf(text, 255, "rdp%d", 0);
output = rdpRRAddOutput(dev, text,
left, top, width, height);
output = rdpRRAddOutput(dev, text, &monitor);
}
if (output == NULL)
{
Expand All @@ -568,29 +608,28 @@ rdpRRSetRdpOutputs(rdpPtr dev)
{
for (index = 0; index < dev->monitorCount; index++)
{
left = dev->minfo[index].left;
top = dev->minfo[index].top;
width = dev->minfo[index].right - dev->minfo[index].left + 1;
height = dev->minfo[index].bottom - dev->minfo[index].top + 1;
if (index < pRRScrPriv->numCrtcs)
{
/* update */
LLOGLN(0, ("rdpRRSetRdpOutputs: update output %d "
"left %d top %d width %d height %d",
index, left, top, width, height));
"left %d top %d right %d bottom %d scale %d",
index, dev->minfo[index].left, dev->minfo[index].top,
dev->minfo[index].right, dev->minfo[index].bottom,
dev->minfo[index].desktop_scale_factor));
output = rdpRRUpdateOutput(pRRScrPriv->outputs[index],
pRRScrPriv->crtcs[index],
left, top, width, height);
&dev->minfo[index]);
}
else
{
/* add */
LLOGLN(0, ("rdpRRSetRdpOutputs: add output %d "
"left %d top %d width %d height %d",
index, left, top, width, height));
"left %d top %d right %d bottom %d scale %d",
index, dev->minfo[index].left, dev->minfo[index].top,
dev->minfo[index].right, dev->minfo[index].bottom,
dev->minfo[index].desktop_scale_factor));
snprintf(text, 255, "rdp%d", index);
output = rdpRRAddOutput(dev, text,
left, top, width, height);
output = rdpRRAddOutput(dev, text, &dev->minfo[index]);
}
if ((output != 0) && (dev->minfo[index].is_primary))
{
Expand All @@ -607,4 +646,3 @@ rdpRRSetRdpOutputs(rdpPtr dev)
}
return 0;
}

2 changes: 1 addition & 1 deletion module/rdpRandR.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,6 @@ extern _X_EXPORT Bool
rdpRRSetPanning(ScreenPtr pScrn, RRCrtcPtr crtc, BoxPtr totalArea,
BoxPtr trackingArea, INT16* border);
extern _X_EXPORT int
rdpRRSetRdpOutputs(rdpPtr dev);
rdpRRSetRdpOutputs(rdpPtr dev, rdpClientCon *clientCon);

#endif

0 comments on commit a6d1677

Please sign in to comment.