From: Vitaly Lipatov Date: Fri, 2 May 2008 16:44:10 +0000 (+0400) Subject: reformat code (fix spaces) X-Git-Tag: school-0.7~7^2~66 X-Git-Url: http://git.etersoft.ru/projects/?a=commitdiff_plain;h=1d770dbb94079120cf2d675cd20fd814afb316e2;p=wine%2Feterwine.git reformat code (fix spaces) --- diff --git a/dlls/winex11.drv/ucs2keysym.c b/dlls/winex11.drv/ucs2keysym.c index c0add4ab02..dd31fb6657 100644 --- a/dlls/winex11.drv/ucs2keysym.c +++ b/dlls/winex11.drv/ucs2keysym.c @@ -1,14 +1,14 @@ /* * This module converts the corresponding ISO 10646 (UCS, Unicode) values * into keysym values. - * + * * The array keysymtab[] contains pairs of Unicode value values for graphical * characters and the corresponding X11 keysym. The function * ucs2keysym() maps Unicode a onto a keysym value using a binary search, * therefore keysymtab[] must remain SORTED by Unicode value. * * Author of keysymtab[]: Markus G. Kuhn , University of Cambridge, April 2001 - * + * * Special thanks to Richard Verhoeven for preparing * an initial draft of the mapping table. * @@ -20,7 +20,7 @@ #include "wine/winuser16.h" static const struct codepair { -unsigned short keysym; + unsigned short keysym; unsigned short ucs; } keysymtab[] = { @@ -526,7 +526,7 @@ unsigned short keysym; { 0x047e, 0x203e }, /* overline ? OVERLINE */ { 0x0eff, 0x20a9 }, /* Korean_Won ? WON SIGN */ { 0x13a4, 0x20ac }, /* Euro ? EURO SIGN */ - { 0x20ac, 0x20ac }, /* EuroSign ? EURO SIGN */ + { 0x20ac, 0x20ac }, /* EuroSign ? EURO SIGN */ { 0x0ab8, 0x2105 }, /* careof ? CARE OF */ { 0x06b0, 0x2116 }, /* numerosign ? NUMERO SIGN */ { 0x0afb, 0x2117 }, /* phonographcopyright ? SOUND RECORDING COPYRIGHT */ @@ -801,30 +801,30 @@ unsigned short keysym; KeySym X11DRV_ucs2keysym(WCHAR wChar) { - int min = 0; - int max = sizeof(keysymtab) / sizeof(struct codepair) - 1; - int mid; - char cChar[4]; + int min = 0; + int max = sizeof(keysymtab) / sizeof(keysymtab[0]) - 1; + int mid; + char cChar[4]; - /* binary search in table */ - if(wChar <= 0x07f) - { + if(wChar <= 0x07f) + { WideCharToMultiByte(CP_ACP, 0, &wChar, 1, &cChar[0], 4, NULL, NULL); - return (unsigned char)cChar[0]; - } + return (KeySym)cChar[0]; + } - while (max >= min) - { - mid = (min + max) / 2 ; - if (keysymtab[mid].ucs < wChar) - min = mid + 1; - else if (keysymtab[mid].ucs > wChar) - max = mid - 1; - else /* found it */ - return keysymtab[mid].keysym; - } + /* binary search in table */ + while (max >= min) + { + mid = (min + max) / 2; + if (keysymtab[mid].ucs < wChar) + min = mid + 1; + else if (keysymtab[mid].ucs > wChar) + max = mid - 1; + else /* ==, found it */ + return keysymtab[mid].keysym; + } - /* no matching keysym value found */ - return -1; + /* no matching keysym value found */ + return -1; }