diff options
| author | marha <marha@users.sourceforge.net> | 2014-08-30 13:45:43 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-08-30 13:45:43 +0200 |
| commit | 3293021e6f582c7348667e7638941620134525e1 (patch) | |
| tree | 5d8d3da8242ff7828fb6964bed19b13d74d48704 /xorg-server/hw/kdrive/ephyr/ephyr.c | |
| parent | 0a9ab140bb01b96888e313466a73e26e5156f22d (diff) | |
| parent | e21655632e3fd40b7f6a5cc3c7f3c379d54557c4 (diff) | |
| download | vcxsrv-3293021e6f582c7348667e7638941620134525e1.tar.gz vcxsrv-3293021e6f582c7348667e7638941620134525e1.tar.bz2 vcxsrv-3293021e6f582c7348667e7638941620134525e1.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/hw/kdrive/ephyr/ephyrinit.c
Diffstat (limited to 'xorg-server/hw/kdrive/ephyr/ephyr.c')
| -rw-r--r-- | xorg-server/hw/kdrive/ephyr/ephyr.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/xorg-server/hw/kdrive/ephyr/ephyr.c b/xorg-server/hw/kdrive/ephyr/ephyr.c index 76cc47efd..ae095c883 100644 --- a/xorg-server/hw/kdrive/ephyr/ephyr.c +++ b/xorg-server/hw/kdrive/ephyr/ephyr.c @@ -114,13 +114,16 @@ Bool ephyrScreenInitialize(KdScreenInfo *screen) { EphyrScrPriv *scrpriv = screen->driver; + int x = 0, y = 0; int width = 640, height = 480; CARD32 redMask, greenMask, blueMask; - if (hostx_want_screen_size(screen, &width, &height) + if (hostx_want_screen_geometry(screen, &width, &height, &x, &y) || !screen->width || !screen->height) { screen->width = width; screen->height = height; + screen->x = x; + screen->y = y; } if (EphyrWantGrayScale) @@ -245,7 +248,8 @@ ephyrMapFramebuffer(KdScreenInfo * screen) buffer_height = ephyrBufferHeight(screen); priv->base = - hostx_screen_init(screen, screen->width, screen->height, buffer_height, + hostx_screen_init(screen, screen->x, screen->y, + screen->width, screen->height, buffer_height, &priv->bytes_per_line, &screen->fb.bitsPerPixel); if ((scrpriv->randr & RR_Rotate_0) && !(scrpriv->randr & RR_Reflect_All)) { |