andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge from CYGWIN Added layout "French (Canada)" as ca_enhanced Added Czech

Browse Source 
(QWERTY) layout
Merge from CYGWIN Print error code if winStoreColorsShadowDDNL fails
This commit is contained in:
Alexander Gottwald 2005-06-08 16:13:11 +00:00
parent d0d164e6da
commit e7fec996eb
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/xwin/ChangeLog
View File

@ -1,3 +1,13 @@
2005-06-08 Alexander Gottwald <ago at freedesktop dot org>
* winlayouts.h:
Merge from CYGWIN
Added layout "French (Canada)" as ca_enhanced
Added Czech (QWERTY) layout
* winshaddnl.c:
Merge from CYGWIN
Print error code if winStoreColorsShadowDDNL fails
2005-06-08 Alexander Gottwald <ago at freedesktop dot org>
* winmultiwindowwindow.c:

4
hw/xwin/winlayouts.h
View File

@ -41,6 +41,7 @@ typedef struct
WinKBLayoutRec winKBLayouts[] =
{
{ 0x405, -1, "pc105", "cz", NULL, NULL, "Czech"},
{0x10405, -1, "pc105", "cz_qwerty", NULL, NULL, "Czech (QWERTY)"},
{ 0x406, -1, "pc105", "dk", NULL, NULL, "Danish"},
{ 0x407, -1, "pc105", "de", NULL, NULL, "German (Germany)"},
{0x10407, -1, "pc105", "de", NULL, NULL, "German (Germany, IBM)"},
@ -54,6 +55,7 @@ WinKBLayoutRec winKBLayouts[] =
{ 0x40b, -1, "pc105", "fi", NULL, NULL, "Finnish"},
{ 0x40c, -1, "pc105", "fr", NULL, NULL, "French (Standard)"},
{ 0x80c, -1, "pc105", "be", NULL, NULL, "French (Belgian)"},
{ 0xc0c, -1, "pc105", "ca_enhanced", NULL, NULL, "French (Canada)"},
{ 0x100c, -1, "pc105", "fr_CH", NULL, NULL, "French (Switzerland)"},
{ 0x40e, -1, "pc105", "hu", NULL, NULL, "Hungarian"},
{ 0x410, -1, "pc105", "it", NULL, NULL, "Italian"},
@ -99,7 +101,7 @@ Support ID XKB Language
0x1004 Chinese (Singapore)
0x1404 Chinese (Macao SAR) (98/ME,2K/XP)
X 0x0405 cz Czech
Czech (QWERTY)
X cz_qwerty Czech (QWERTY)
Czech (Programmers)
X 0x0406 dk Danish
X 0x0407 de German (Standard)

2
hw/xwin/winshadddnl.c
View File

@ -1308,7 +1308,7 @@ winStoreColorsShadowDDNL (ColormapPtr pColormap,
+ pdefs[0].pixel);
if (FAILED (ddrval))
{
ErrorF ("winStoreColorsShadowDDNL - SetEntries () failed\n");
ErrorF ("winStoreColorsShadowDDNL - SetEntries () failed: %08x\n", ddrval);
return FALSE;
}