diff options
| author | marha <marha@users.sourceforge.net> | 2013-10-31 08:40:01 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-10-31 08:40:01 +0100 |
| commit | e4ef724e06621be9325fc41ed886fd404467fdc0 (patch) | |
| tree | be445314647f682fbb4a1e8b94aeb6ee79cede5f /xorg-server/hw/kdrive | |
| parent | 270d3a1aa4137dc15d7b7e5a0958cc8c0bef9a1a (diff) | |
| download | vcxsrv-e4ef724e06621be9325fc41ed886fd404467fdc0.tar.gz vcxsrv-e4ef724e06621be9325fc41ed886fd404467fdc0.tar.bz2 vcxsrv-e4ef724e06621be9325fc41ed886fd404467fdc0.zip | |
fontconfig glproto libX11 mesa xserver xkeyboard-config git update 31 oct 2013
xserver commit 902ff0b3497d202b86bf9a411e17db7b694d6eaa
xkeyboard-config commit 70bbf18d6cddb7271db1b2e042765ace3c4ac485
libX11 commit 6cb02b166361200da35ba14f52cd9aaa493eb0ea
glproto commit aacc7a51b6161c765b04524e0d2ab31e5e586834
fontconfig commit 525a135ccf53e4bf3363c3143d9cfdf15fba55ab
mesa commit b16b3c8703f198ca0f025b730d582600df79c19c
Diffstat (limited to 'xorg-server/hw/kdrive')
| -rw-r--r-- | xorg-server/hw/kdrive/ephyr/ephyr.c | 2 | ||||
| -rw-r--r-- | xorg-server/hw/kdrive/src/kinput.c | 11 |
2 files changed, 6 insertions, 7 deletions
diff --git a/xorg-server/hw/kdrive/ephyr/ephyr.c b/xorg-server/hw/kdrive/ephyr/ephyr.c index a603ef734..91e949d79 100644 --- a/xorg-server/hw/kdrive/ephyr/ephyr.c +++ b/xorg-server/hw/kdrive/ephyr/ephyr.c @@ -732,8 +732,6 @@ ephyrScreenFini(KdScreenInfo * screen) if (scrpriv->shadow) { KdShadowFbFree(screen); } - free(screen->driver); - screen->driver = NULL; } /* diff --git a/xorg-server/hw/kdrive/src/kinput.c b/xorg-server/hw/kdrive/src/kinput.c index 527c7a2ef..d845830cc 100644 --- a/xorg-server/hw/kdrive/src/kinput.c +++ b/xorg-server/hw/kdrive/src/kinput.c @@ -308,21 +308,22 @@ KdEnableInput(void) kdInputEnabled = TRUE; + ev.any.time = GetTimeInMillis(); + for (ki = kdKeyboards; ki; ki = ki->next) { if (ki->driver && ki->driver->Enable) (*ki->driver->Enable) (ki); + /* reset screen saver */ + NoticeEventTime (&ev, ki->dixdev); } for (pi = kdPointers; pi; pi = pi->next) { if (pi->driver && pi->driver->Enable) (*pi->driver->Enable) (pi); + /* reset screen saver */ + NoticeEventTime (&ev, pi->dixdev); } - /* reset screen saver */ - ev.any.time = GetTimeInMillis(); - NoticeEventTime(&ev, pi->dixdev); - NoticeEventTime(&ev, ki->dixdev); - OsReleaseSIGIO(); } |