diff options
Diffstat (limited to 'xorg-server/dix')
| -rw-r--r-- | xorg-server/dix/dispatch.c | 5 | ||||
| -rw-r--r-- | xorg-server/dix/events.c | 2 | ||||
| -rw-r--r-- | xorg-server/dix/window.c | 6 |
3 files changed, 9 insertions, 4 deletions
diff --git a/xorg-server/dix/dispatch.c b/xorg-server/dix/dispatch.c index 4fecfea7b..8dcd9cbcf 100644 --- a/xorg-server/dix/dispatch.c +++ b/xorg-server/dix/dispatch.c @@ -220,8 +220,9 @@ UpdateCurrentTimeIf(void) #undef SMART_DEBUG -#define SMART_SCHEDULE_DEFAULT_INTERVAL 20 /* ms */ -#define SMART_SCHEDULE_MAX_SLICE 200 /* ms */ +/* in milliseconds */ +#define SMART_SCHEDULE_DEFAULT_INTERVAL 5 +#define SMART_SCHEDULE_MAX_SLICE 15 #if defined(WIN32) && !defined(__CYGWIN__) Bool SmartScheduleDisable = TRUE; diff --git a/xorg-server/dix/events.c b/xorg-server/dix/events.c index 4632bb7db..4aaa54c85 100644 --- a/xorg-server/dix/events.c +++ b/xorg-server/dix/events.c @@ -4696,7 +4696,7 @@ DeviceEnterLeaveEvent(DeviceIntPtr mouse, filter = GetEventFilter(mouse, (xEvent *) event); - if (grab && grab->type == XI2) { + if (grab && grab->grabtype == XI2) { Mask mask; mask = xi2mask_isset(grab->xi2mask, mouse, type); diff --git a/xorg-server/dix/window.c b/xorg-server/dix/window.c index 92df1eb4c..0e9109e89 100644 --- a/xorg-server/dix/window.c +++ b/xorg-server/dix/window.c @@ -530,7 +530,11 @@ CreateRootWindow(ScreenPtr pScreen) if (disableBackingStore) pScreen->backingStoreSupport = NotUseful; if (enableBackingStore) - pScreen->backingStoreSupport = Always; + pScreen->backingStoreSupport = WhenMapped; +#ifdef COMPOSITE + if (noCompositeExtension) + pScreen->backingStoreSupport = NotUseful; +#endif pScreen->saveUnderSupport = NotUseful; |