diff options
| author | Matthieu Herrb <matthieu.herrb@laas.fr> | 2012-11-16 16:11:02 +0100 |
|---|---|---|
| committer | Matthieu Herrb <matthieu.herrb@laas.fr> | 2012-11-16 16:11:02 +0100 |
| commit | 8a39ebc087cc325832a9d9f1cbb7ce55d18aab07 (patch) | |
| tree | 4291baca350ca30ac4b48aa135b0c36292ac6d3f /hw/xfree86 | |
| parent | 78e32d069615ae6a9feea5c80bf455e9289a5748 (diff) | |
| parent | 01aac1f533d211c90a50127cc82a56bebb44dd0d (diff) | |
Merge remote-tracking branch 'origin/server-1.12-branch' into obsd-server-1.12-branchobsd-server-1.12-branch
Diffstat (limited to 'hw/xfree86')
| -rw-r--r-- | hw/xfree86/common/xf86.h | 3 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86Helper.c | 6 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86Module.h | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h index fc4c34e92..7b1fc84f0 100644 --- a/hw/xfree86/common/xf86.h +++ b/hw/xfree86/common/xf86.h @@ -451,4 +451,7 @@ VidModeExtensionInit(ScreenPtr pScreen); #endif /* _NO_XF86_PROTOTYPES */ +/* Update the internal total dimensions of all ScreenRecs together */ +extern _X_EXPORT void +xf86UpdateDesktopDimensions(void); #endif /* _XF86_H */ diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c index 8c948cf6f..0787171fb 100644 --- a/hw/xfree86/common/xf86Helper.c +++ b/hw/xfree86/common/xf86Helper.c @@ -1834,3 +1834,9 @@ xf86MotionHistoryAllocate(InputInfoPtr pInfo) { AllocateMotionHistory(pInfo->dev); } + +void +xf86UpdateDesktopDimensions(void) +{ + update_desktop_dimensions(); +} diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h index 0036c5935..b5e030fc4 100644 --- a/hw/xfree86/common/xf86Module.h +++ b/hw/xfree86/common/xf86Module.h @@ -82,7 +82,7 @@ typedef enum { * mask is 0xFFFF0000. */ #define ABI_ANSIC_VERSION SET_ABI_VERSION(0, 4) -#define ABI_VIDEODRV_VERSION SET_ABI_VERSION(12, 1) +#define ABI_VIDEODRV_VERSION SET_ABI_VERSION(12, 2) #define ABI_XINPUT_VERSION SET_ABI_VERSION(16, 0) #define ABI_EXTENSION_VERSION SET_ABI_VERSION(6, 0) #define ABI_FONT_VERSION SET_ABI_VERSION(0, 6) |