diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-09-06 19:44:39 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-09-06 19:44:39 +0000 |
| commit | 9401e5643e90e23287b785e5fc238bb7c7f2d896 (patch) | |
| tree | 759a23118c7bb4a1cddc87b3ad5c63f459a64bd2 /xserver/hw/kdrive/fake/fake.c | |
| parent | 6d29d2deb77299e537a0daf2babf0e217ce51376 (diff) | |
update to xserver 1.6.4rc1. Tested by many, ok oga@.
Diffstat (limited to 'xserver/hw/kdrive/fake/fake.c')
| -rw-r--r-- | xserver/hw/kdrive/fake/fake.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/xserver/hw/kdrive/fake/fake.c b/xserver/hw/kdrive/fake/fake.c index 110c21ed9..ff597981d 100644 --- a/xserver/hw/kdrive/fake/fake.c +++ b/xserver/hw/kdrive/fake/fake.c @@ -1,6 +1,4 @@ /* - * $Id: fake.c,v 1.1 2006/11/26 18:21:49 matthieu Exp $ - * * Copyright © 2004 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -123,10 +121,9 @@ fakeScreenInit (KdScreenInfo *screen) { FakeScrPriv *scrpriv; - scrpriv = xalloc (sizeof (FakeScrPriv)); + scrpriv = xcalloc (1, sizeof (FakeScrPriv)); if (!scrpriv) return FALSE; - memset (scrpriv, '\0', sizeof (FakeScrPriv)); screen->driver = scrpriv; if (!fakeScreenInitialize (screen, scrpriv)) { @@ -158,7 +155,7 @@ Bool fakeMapFramebuffer (KdScreenInfo *screen) { FakeScrPriv *scrpriv = screen->driver; - KdMouseMatrix m; + KdPointerMatrix m; FakePriv *priv = screen->card->driver; if (scrpriv->randr != RR_Rotate_0) @@ -166,9 +163,9 @@ fakeMapFramebuffer (KdScreenInfo *screen) else scrpriv->shadow = FALSE; - KdComputeMouseMatrix (&m, scrpriv->randr, screen->width, screen->height); + KdComputePointerMatrix (&m, scrpriv->randr, screen->width, screen->height); - KdSetMouseMatrix (&m); + KdSetPointerMatrix (&m); priv->bytes_per_line = ((screen->width * screen->fb[0].bitsPerPixel + 31) >> 5) << 2; if (priv->base) @@ -326,8 +323,6 @@ fakeRandRSetConfig (ScreenPtr pScreen, scrpriv->randr = KdAddRotation (screen->randr, randr); - KdOffscreenSwapOut (screen->pScreen); - fakeUnmapFramebuffer (screen); if (!fakeMapFramebuffer (screen)) |