From 71372d36e1a3f0230b88808f70d35446fda12260 Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 15 Apr 2011 14:48:46 +0000 Subject: xserver xkeyboard-config libX11 mesa git update 15 April 2011 --- xorg-server/hw/xfree86/dri2/dri2.c | 22 ++++---- .../xkeyboard-config/rules/base.extras.xml.in | 24 +++++++++ xorg-server/xkeyboard-config/rules/base.xml.in | 14 ----- xorg-server/xkeyboard-config/symbols/ca | 61 ++++++++++++---------- xorg-server/xkeyboard-config/symbols/lv | 18 +++---- 5 files changed, 78 insertions(+), 61 deletions(-) (limited to 'xorg-server') diff --git a/xorg-server/hw/xfree86/dri2/dri2.c b/xorg-server/hw/xfree86/dri2/dri2.c index 10be59953..5c42a51df 100644 --- a/xorg-server/hw/xfree86/dri2/dri2.c +++ b/xorg-server/hw/xfree86/dri2/dri2.c @@ -358,7 +358,7 @@ allocate_or_reuse_buffer(DrawablePtr pDraw, DRI2ScreenPtr ds, static void update_dri2_drawable_buffers(DRI2DrawablePtr pPriv, DrawablePtr pDraw, - DRI2BufferPtr *buffers, int *out_count, int *width, int *height) + DRI2BufferPtr *buffers, int out_count, int *width, int *height) { DRI2ScreenPtr ds = DRI2GetScreen(pDraw->pScreen); int i; @@ -374,7 +374,7 @@ update_dri2_drawable_buffers(DRI2DrawablePtr pPriv, DrawablePtr pDraw, } pPriv->buffers = buffers; - pPriv->bufferCount = *out_count; + pPriv->bufferCount = out_count; pPriv->width = pDraw->width; pPriv->height = pDraw->height; *width = pPriv->width; @@ -409,6 +409,8 @@ do_get_buffers(DrawablePtr pDraw, int *width, int *height, && (pPriv->serialNumber == DRI2DrawableSerial(pDraw)); buffers = calloc((count + 1), sizeof(buffers[0])); + if (!buffers) + goto err_out; for (i = 0; i < count; i++) { const unsigned attachment = *(attachments++); @@ -475,7 +477,7 @@ do_get_buffers(DrawablePtr pDraw, int *width, int *height, *out_count = i; - update_dri2_drawable_buffers(pPriv, pDraw, buffers, out_count, width, height); + update_dri2_drawable_buffers(pPriv, pDraw, buffers, *out_count, width, height); /* If the client is getting a fake front-buffer, pre-fill it with the * contents of the real front-buffer. This ensures correct operation of @@ -501,15 +503,17 @@ err_out: *out_count = 0; - for (i = 0; i < count; i++) { + if (buffers) { + for (i = 0; i < count; i++) { if (buffers[i] != NULL) - (*ds->DestroyBuffer)(pDraw, buffers[i]); - } + (*ds->DestroyBuffer)(pDraw, buffers[i]); + } - free(buffers); - buffers = NULL; + free(buffers); + buffers = NULL; + } - update_dri2_drawable_buffers(pPriv, pDraw, buffers, out_count, width, height); + update_dri2_drawable_buffers(pPriv, pDraw, buffers, *out_count, width, height); return buffers; } diff --git a/xorg-server/xkeyboard-config/rules/base.extras.xml.in b/xorg-server/xkeyboard-config/rules/base.extras.xml.in index 60eafdd9d..19f8fade7 100644 --- a/xorg-server/xkeyboard-config/rules/base.extras.xml.in +++ b/xorg-server/xkeyboard-config/rules/base.extras.xml.in @@ -12,6 +12,30 @@ + + + ca + <_shortDescription>fr + <_description>French (Canada) + fr + + + + + kut + <_shortDescription>kut + <_description>Kutenai + + + + + shs + <_shortDescription>shs + <_description>Secwepemctsin + + + + ir diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in index 3f26331cb..5979d36ac 100644 --- a/xorg-server/xkeyboard-config/rules/base.xml.in +++ b/xorg-server/xkeyboard-config/rules/base.xml.in @@ -2177,20 +2177,6 @@ - - - shs - <_shortDescription>shs - <_description>Secwepemctsin - - - - - kut - <_shortDescription>kut - <_description>Kutenai - - eng diff --git a/xorg-server/xkeyboard-config/symbols/ca b/xorg-server/xkeyboard-config/symbols/ca index cfb7b25e5..ab9cef19d 100644 --- a/xorg-server/xkeyboard-config/symbols/ca +++ b/xorg-server/xkeyboard-config/symbols/ca @@ -451,31 +451,6 @@ xkb_symbols "multix" { include "level5(rctrl_switch)" }; -// Secwepemctsin keyboard for X11 -// written by Neskie Manuel - -partial alphanumeric_keys -xkb_symbols "shs" { - - include "us" - - name[Group1]= "Secwepemctsin"; - - //Using Dead key to get COMBINING COMMA ABOVE for ejectives on - //q, l, t, s, m, g, k, p, w, y, r - //XCompose key is used for the other accute and grave. - - key { [ comma, less, U0313 ] }; - key { [ a, A, aacute, Aacute ] }; - key { [ e, E, eacute, Eacute ] }; - key { [ u, U, uacute, Uacute ] }; - key { [ i, I, iacute, Iacute ] }; - key { [ o, O, oacute, Oacute ] }; - - include "level3(ralt_switch)" - include "compose(rctrl)" -}; - // OLPC Section xkb_symbols "olpc" { @@ -491,6 +466,14 @@ xkb_symbols "olpc" { key { [ guillemotleft, guillemotright, degree, VoidSymbol ] }; }; +partial alphanumeric_keys +xkb_symbols "eng" { + name[Group1] = "English (Canada)"; + include "us(basic)" +}; + +// EXTRAS: + partial alphanumeric_keys xkb_symbols "kut" { @@ -520,8 +503,28 @@ xkb_symbols "kut" { key { [ semicolon, colon,U02BE,U02BE ] }; }; -partial alphanumeric_keys -xkb_symbols "eng" { - name[Group1] = "English (Canada)"; - include "us(basic)" +// Secwepemctsin keyboard for X11 +// written by Neskie Manuel + +partial alphanumeric_keys +xkb_symbols "shs" { + + include "us" + + name[Group1]= "Secwepemctsin"; + + //Using Dead key to get COMBINING COMMA ABOVE for ejectives on + //q, l, t, s, m, g, k, p, w, y, r + //XCompose key is used for the other accute and grave. + + key { [ comma, less, U0313 ] }; + key { [ a, A, aacute, Aacute ] }; + key { [ e, E, eacute, Eacute ] }; + key { [ u, U, uacute, Uacute ] }; + key { [ i, I, iacute, Iacute ] }; + key { [ o, O, oacute, Oacute ] }; + + include "level3(ralt_switch)" + include "compose(rctrl)" }; + diff --git a/xorg-server/xkeyboard-config/symbols/lv b/xorg-server/xkeyboard-config/symbols/lv index 1e7fc1fcc..97e4220fc 100644 --- a/xorg-server/xkeyboard-config/symbols/lv +++ b/xorg-server/xkeyboard-config/symbols/lv @@ -42,7 +42,7 @@ //============================================================================ // Latvian QWERTY layout -// http://en.wikipedia.org/wiki/QWERTY +// http://en.wikipedia.org/wiki/QWERTY // partial default alphanumeric_keys modifier_keys xkb_symbols "basic" { @@ -262,7 +262,7 @@ xkb_symbols "modern" { name[Group1]= "Latvian (modern)"; - key {[ grave, asciitilde, acute, asciitilde ]}; + key {[ grave, asciitilde, acute, copyright ]}; key {[ 1, exclam, onesuperior, exclamdown ]}; key {[ 2, at, twosuperior, oneeighth ]}; key {[ 3, numbersign, threesuperior, sterling ]}; @@ -273,8 +273,8 @@ xkb_symbols "modern" { key {[ 8, asterisk, bracketleft, trademark ]}; key {[ 9, parenleft, bracketright, plusminus ]}; key {[ 0, parenright, braceright, degree ]}; - key {[ minus, underscore, backslash, endash ]}; - key {[ equal, plus, bar, emdash ]}; + key {[ minus, underscore, backslash, questiondown ]}; + key {[ equal, plus, endash, emdash ]}; key {[ emacron, Emacron, emacron, Emacron ]}; key {[ o, O, omacron, Omacron ]}; @@ -285,8 +285,8 @@ xkb_symbols "modern" { key {[ d, D, d, D ]}; key {[ imacron, Imacron, imacron, Imacron ]}; key {[ l, L, lcedilla, Lcedilla ]}; - key {[ g, G, gcedilla, Gcedilla ]}; - key {[ bracketleft, braceleft, guillemotleft, leftdoublequotemark ]}; + key {[ g, G, gcedilla, Gcedilla ]}; + Key {[ bracketleft, braceleft, guillemotleft, leftdoublequotemark ]}; key {[ bracketright, braceright, guillemotright, rightdoublequotemark ]}; key {[ e, E, e, E ]}; @@ -299,8 +299,8 @@ xkb_symbols "modern" { key {[ i, I, i, I ]}; key {[ t, T, t, T ]}; key {[ r, R, rcedilla, Rcedilla ]}; - key {[ m, M, m, M ]}; - key {[ slash, question, backslash, bar ]}; + key {[ m, M, bar, M ]}; + key {[ slash, question, backslash, U263A ]}; key {[ q, Q, q, Q ]}; key {[ x, X, q, Q ]}; @@ -310,7 +310,7 @@ xkb_symbols "modern" { key {[ w, W, w, W ]}; key {[ f, F, f, F ]}; key {[ y, Y, y, Y ]}; - key {[ h, H, h, H ]}; + key {[ h, H, h, H ]}; key {[ comma, semicolon, less, multiply ]}; key {[ period, colon, greater, division ]}; key {[ space, space, apostrophe ]}; -- cgit v1.2.3