diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2009-04-25 22:11:19 +1000 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2009-06-11 03:54:10 +1000 |
| commit | 305ab237f666936cd812c464bf43f86f6079838e (patch) | |
| tree | e3e1b7066e2eaf1491361e35f320dd93607aa79f /hw/kdrive/ephyr/ephyr.c | |
| parent | 4c8812b544ce5f319a7ac59a131c626c8509ef99 (diff) | |
KDrive: Warning fixes and cleanups
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Diffstat (limited to 'hw/kdrive/ephyr/ephyr.c')
| -rw-r--r-- | hw/kdrive/ephyr/ephyr.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c index 345ae5b91..296284a01 100644 --- a/hw/kdrive/ephyr/ephyr.c +++ b/hw/kdrive/ephyr/ephyr.c @@ -429,9 +429,7 @@ ephyrRandRGetInfo (ScreenPtr pScreen, Rotation *rotations) RRScreenSizePtr pSize; Rotation randr; int n = 0; - - EPHYR_LOG("mark"); - + struct { int width, height; } sizes[] = { { 1600, 1200 }, @@ -452,6 +450,8 @@ ephyrRandRGetInfo (ScreenPtr pScreen, Rotation *rotations) { 0, 0 } }; + EPHYR_LOG("mark"); + *rotations = RR_Rotate_All|RR_Reflect_All; if (!hostx_want_preexisting_window (screen) @@ -743,6 +743,7 @@ ephyrScreenFini (KdScreenInfo *screen) void ephyrUpdateModifierState(unsigned int state) { +#if 0 DeviceIntPtr pkeydev; KeyClassPtr keyc; int i; @@ -764,7 +765,7 @@ ephyrUpdateModifierState(unsigned int state) * * -daniels */ -#if 0 + keyc = pkeydev->key; state = state & 0xff; @@ -1120,13 +1121,8 @@ EphyrKeyboardInit (KdKeyboardInfo *ki) ErrorF("Couldn't load keymap from host\n"); return BadAlloc; } - ki->keySyms.minKeyCode = ephyrKeySyms.minKeyCode; - ki->keySyms.maxKeyCode = ephyrKeySyms.maxKeyCode; - ki->minScanCode = ki->keySyms.minKeyCode; - ki->maxScanCode = ki->keySyms.maxKeyCode; - ki->keySyms.mapWidth = ephyrKeySyms.mapWidth; - xfree(ki->keySyms.map); - ki->keySyms.map = ephyrKeySyms.map; + ki->minScanCode = ephyrKeySyms.minKeyCode; + ki->maxScanCode = ephyrKeySyms.maxKeyCode; ki->name = strdup("Xephyr virtual keyboard"); ephyrKbd = ki; return Success; @@ -1149,8 +1145,6 @@ EphyrKeyboardDisable (KdKeyboardInfo *ki) static void EphyrKeyboardFini (KdKeyboardInfo *ki) { - /* not xfree: we call malloc from hostx.c. */ - free(ki->keySyms.map); ephyrKbd = NULL; return; } |