diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-09 08:56:06 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-09 08:56:06 +0200 |
| commit | e957ce706e896f5ed802d81f26a2663578f8153f (patch) | |
| tree | 862fdd3b107b8c1bea4b84d80e60ffb41c30217d /xorg-server | |
| parent | 6b15e563fb2212808ecff29bb72e0e941425b067 (diff) | |
| parent | c48e25635aaafefec0c7761d5310f7d2071fc50c (diff) | |
| download | vcxsrv-e957ce706e896f5ed802d81f26a2663578f8153f.tar.gz vcxsrv-e957ce706e896f5ed802d81f26a2663578f8153f.tar.bz2 vcxsrv-e957ce706e896f5ed802d81f26a2663578f8153f.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig xserver mesa xkeyboard-config git update 9 oct 2012
Diffstat (limited to 'xorg-server')
| -rw-r--r-- | xorg-server/hw/xfree86/common/xf86.h | 4 | ||||
| -rw-r--r-- | xorg-server/hw/xfree86/common/xf86Helper.c | 6 | ||||
| -rw-r--r-- | xorg-server/hw/xfree86/common/xf86Module.h | 2 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/symbols/il | 14 |
4 files changed, 22 insertions, 4 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86.h b/xorg-server/hw/xfree86/common/xf86.h index 179b87cf5..1514c2603 100644 --- a/xorg-server/hw/xfree86/common/xf86.h +++ b/xorg-server/hw/xfree86/common/xf86.h @@ -469,4 +469,8 @@ extern _X_EXPORT ScreenPtr xf86ScrnToScreen(ScrnInfoPtr pScrn); /* flags passed to xf86 allocate screen */ #define XF86_ALLOCATE_GPU_SCREEN 1 +/* Update the internal total dimensions of all ScreenRecs together */ +extern _X_EXPORT void +xf86UpdateDesktopDimensions(void); + #endif /* _XF86_H */ diff --git a/xorg-server/hw/xfree86/common/xf86Helper.c b/xorg-server/hw/xfree86/common/xf86Helper.c index f681a8577..721159d0b 100644 --- a/xorg-server/hw/xfree86/common/xf86Helper.c +++ b/xorg-server/hw/xfree86/common/xf86Helper.c @@ -1898,3 +1898,9 @@ xf86ScrnToScreen(ScrnInfoPtr pScrn) return screenInfo.screens[pScrn->scrnIndex]; } } + +void +xf86UpdateDesktopDimensions(void) +{ + update_desktop_dimensions(); +} diff --git a/xorg-server/hw/xfree86/common/xf86Module.h b/xorg-server/hw/xfree86/common/xf86Module.h index fd90aac54..1be7ba54d 100644 --- a/xorg-server/hw/xfree86/common/xf86Module.h +++ b/xorg-server/hw/xfree86/common/xf86Module.h @@ -80,7 +80,7 @@ typedef enum { * mask is 0xFFFF0000. */ #define ABI_ANSIC_VERSION SET_ABI_VERSION(0, 4) -#define ABI_VIDEODRV_VERSION SET_ABI_VERSION(14, 0) +#define ABI_VIDEODRV_VERSION SET_ABI_VERSION(14, 1) #define ABI_XINPUT_VERSION SET_ABI_VERSION(18, 0) #define ABI_EXTENSION_VERSION SET_ABI_VERSION(7, 0) #define ABI_FONT_VERSION SET_ABI_VERSION(0, 6) diff --git a/xorg-server/xkeyboard-config/symbols/il b/xorg-server/xkeyboard-config/symbols/il index eafb8cd75..6617d2dfc 100644 --- a/xorg-server/xkeyboard-config/symbols/il +++ b/xorg-server/xkeyboard-config/symbols/il @@ -126,8 +126,16 @@ xkb_symbols "lyx" { // Note the parens mirroring below: key <AD11> { [ bracketright, braceright ] }; key <AD12> { [ bracketleft, braceleft ] }; - key <AE09> { [ 9 , parenright ] }; - key <AE10> { [ 0 , parenleft ] }; + key <AE01> { [ 1, exclam ]}; + key <AE02> { [ 2, at ]}; + key <AE03> { [ 3, numbersign ]}; + key <AE04> { [ 4, dollar ]}; + key <AE05> { [ 5, percent ]}; + key <AE06> { [ 6, asciicircum ]}; + key <AE07> { [ 7, ampersand ]}; + key <AE08> { [ 8, asterisk ]}; + key <AE09> { [ 9, parenright ]}; + key <AE10> { [ 0, parenleft ]}; key <AE11> { [ minus , 0x10005be ] }; // H. Hiphen key <AE12> { [ equal , plus ] }; @@ -314,4 +322,4 @@ xkb_symbols "biblicalSIL" { key <AB10> { [ slash, question, U05F3 ] }; //slash question geresh P key <SPCE> { [ space, space, thinspace, nobreakspace ] };//space space thin space, nbsp -};
\ No newline at end of file +}; |