libx11: Changes to 'upstream-unstable'
configure.ac | 10
include/X11/Xregion.h | 7
modules/im/ximcp/imCallbk.c | 17
modules/im/ximcp/imDefIc.c | 79 +
modules/im/ximcp/imDefIm.c | 40
modules/im/ximcp/imDefLkup.c | 33
modules/im/ximcp/imDispch.c | 2
modules/im/ximcp/imExten.c | 6
modules/im/ximcp/imInsClbk.c | 2
modules/im/ximcp/imInt.c | 4
modules/im/ximcp/imLcIc.c | 2
modules/im/ximcp/imLcIm.c | 2
modules/im/ximcp/imLcPrs.c | 35
modules/im/ximcp/imRm.c | 60 -
modules/im/ximcp/imRmAttr.c | 12
modules/im/ximcp/imThaiIc.c | 10
modules/im/ximcp/imThaiIm.c | 2
modules/im/ximcp/imTrX.c | 2
modules/im/ximcp/imTrans.c | 10
modules/im/ximcp/imTransR.c | 8
modules/lc/def/lcDefConv.c | 8
modules/lc/gen/lcGenConv.c | 28
modules/lc/xlocale/lcEuc.c | 4
modules/lc/xlocale/lcJis.c | 8
modules/lc/xlocale/lcSjis.c | 4
modules/om/generic/omGeneric.c | 57 -
nls/en_US.UTF-8/Compose.pre | 8
src/Context.c | 12
src/FetchName.c | 4
src/Font.c | 66 -
src/FontInfo.c | 18
src/FontNames.c | 4
src/FreeEData.c | 4
src/FreeGC.c | 2
src/GetFPath.c | 4
src/GetHints.c | 24
src/GetNrmHint.c | 4
src/GetRGBCMap.c | 10
src/GetStCmap.c | 6
src/GetWMCMapW.c | 2
src/GetWMProto.c | 2
src/ImUtil.c | 8
src/InitExt.c | 2
src/IntAtom.c | 6
src/KeyBind.c | 12
src/ListExt.c | 6
src/Makefile.am | 5
src/ModMap.c | 8
src/OpenDis.c | 20
src/PolyReg.c | 6
src/PutImage.c | 6
src/QuColors.c | 2
src/Quarks.c | 2
src/RdBitF.c | 4
src/Region.c | 28
src/RegstFlt.c | 4
src/SetFPath.c | 2
src/SetHints.c | 2
src/SetRGBCMap.c | 2
src/StBytes.c | 2
src/TextToStr.c | 4
src/VisUtil.c | 4
src/Xrm.c | 28
src/locking.c | 12
src/udcInf.c | 715 --------------
src/util/Makefile.am | 4
src/xcms/CCC.c | 5
src/xcms/CvCols.c | 6
src/xcms/IdOfPr.c | 2
src/xcms/LRGB.c | 36
src/xcms/SetGetCols.c | 10
src/xcms/StCols.c | 4
src/xcms/cmsCmap.c | 11
src/xcms/cmsColNm.c | 8
src/xcms/cmsInt.c | 11
src/xkb/XKB.c | 766 +++++++--------
src/xkb/XKBAlloc.c | 642 ++++++------
src/xkb/XKBBell.c | 123 +-
src/xkb/XKBBind.c | 1080 +++++++++++----------
src/xkb/XKBCompat.c | 295 +++--
src/xkb/XKBCtrls.c | 347 +++---
src/xkb/XKBCvt.c | 294 +++--
src/xkb/XKBExtDev.c | 1180 ++++++++++++-----------
src/xkb/XKBGAlloc.c | 1206 ++++++++++++------------
src/xkb/XKBGeom.c | 1042 ++++++++++----------
src/xkb/XKBGetByName.c | 286 ++---
src/xkb/XKBGetMap.c | 1101 +++++++++++-----------
src/xkb/XKBList.c | 333 +++---
src/xkb/XKBMAlloc.c | 1646 ++++++++++++++++-----------------
src/xkb/XKBMisc.c | 1640 +++++++++++++++++---------------
src/xkb/XKBNames.c | 1397 ++++++++++++++--------------
src/xkb/XKBRdBuf.c | 173 +--
src/xkb/XKBSetGeom.c | 606 ++++++------
src/xkb/XKBSetMap.c | 769 +++++++--------
src/xkb/XKBUse.c | 1363 +++++++++++++--------------
src/xkb/XKBleds.c | 377 +++----
src/xkb/XKBlibint.h | 362 +++----
src/xlibi18n/ICWrap.c | 14
src/xlibi18n/IMWrap.c | 2
src/xlibi18n/XDefaultIMIF.c | 12
src/xlibi18n/XDefaultOMIF.c | 33
src/xlibi18n/XlcDL.c | 29
src/xlibi18n/XlcPubI.h | 4
src/xlibi18n/lcCT.c | 18
src/xlibi18n/lcCharSet.c | 10
src/xlibi18n/lcConv.c | 10
src/xlibi18n/lcDB.c | 29
src/xlibi18n/lcDynamic.c | 4
src/xlibi18n/lcFile.c | 146 +-
src/xlibi18n/lcGeneric.c | 89 -
src/xlibi18n/lcPrTxt.c | 10
src/xlibi18n/lcPubWrap.c | 2
src/xlibi18n/lcPublic.c | 5
src/xlibi18n/lcRM.c | 10
src/xlibi18n/lcTxtPr.c | 4
src/xlibi18n/lcUTF8.c | 20
src/xlibi18n/lcUniConv/8bit_tab_to_h.c | 6
src/xlibi18n/lcUniConv/cjk_tab_to_h.c | 14
src/xlibi18n/lcWrap.c | 16
src/xlibi18n/mbWMProps.c | 4
src/xlibi18n/mbWrap.c | 12
src/xlibi18n/utf8WMProps.c | 4
src/xlibi18n/utf8Wrap.c | 12
123 files changed, 9404 insertions(+), 9752 deletions(-)
New commits:
commit 18a5278b008e9faa59b346fcab18a8d74b875fda
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Sep 28 17:33:52 2013 -0400
makekeys: don't need to use target-specific CFLAGS
It's the only thing built in that directory, so we can use AM_CFLAGS
and AM_CPPFLAGS as usual.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index dfe91f1..79962d4 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -1,11 +1,11 @@
noinst_PROGRAMS=makekeys
-makekeys_CFLAGS = \
+AM_CFLAGS = \
$(X11_CFLAGS) \
$(CWARNFLAGS)
-makekeys_CPPFLAGS = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/include
CC = @CC_FOR_BUILD@
commit 5dcb40f28d59587597d2ff6e6ac64c71cfe6ff7b
Author: James Cloos <cloos@jhcloos.com>
Date: Tue Sep 17 12:50:42 2013 -0400
nls/en_US.UTF-8/Compose.pre: Fix typo.
Fix typo added in 215ce6a67863, s/actute/acute/.
Fixes bug #69476. Reported by Jean Krohn.
Signed-off-by: James Cloos <cloos@jhcloos.com>
diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index a741332..7314d7f 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -743,7 +743,7 @@ XCOMM Part 3
<Multi_key> <i> <quotedbl> : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS
<Multi_key> <diaeresis> <i> : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS
<Multi_key> <i> <diaeresis> : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS
-<dead_actute> <j> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
+<dead_acute> <j> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
<Multi_key> <apostrophe> <j> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
<Multi_key> <j> <apostrophe> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
<Multi_key> <acute> <j> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
commit cb107760df33ffc8630677e66e2e50aa37950a5c
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Sep 8 18:37:01 2013 -0700
libX11 1.6.2
diff --git a/configure.ac b/configure.ac
index 33613dd..8ad1f00 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libX11], [1.6.1],
+AC_INIT([libX11], [1.6.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libX11])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([src/config.h include/X11/XlibConf.h])
commit 215ce6a67863de7acfd6dd3562b4fd97ef87b411
Author: Benno Schulenberg <bensberg@justemail.net>
Date: Sun Sep 1 12:38:30 2013 +0200
nls: Adding more accessible compose sequences for J́ and j́.
Few keyboards have an <acute> key, so this adds the much more
accessible and usual compose sequences with <apostrophe>, ánd
the most comfortable ones with <dead_acute>.
Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
Signed-off-by: James Cloos <cloos@jhcloos.com>
diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index ab82376..a741332 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -618,6 +618,10 @@ XCOMM Part 3
<Multi_key> <I> <quotedbl> : "Ï" Idiaeresis # LATIN CAPITAL LETTER I WITH DIAERESIS
<Multi_key> <diaeresis> <I> : "Ï" Idiaeresis # LATIN CAPITAL LETTER I WITH DIAERESIS
<Multi_key> <I> <diaeresis> : "Ï" Idiaeresis # LATIN CAPITAL LETTER I WITH DIAERESIS
+<dead_acute> <J> : "J́" # LATIN CAPITAL LETTER J U004A with COMBINING ACUTE ACCENT U0301
+<Multi_key> <apostrophe> <J> : "J́" # LATIN CAPITAL LETTER J U004A with COMBINING ACUTE ACCENT U0301
+<Multi_key> <J> <apostrophe> : "J́" # LATIN CAPITAL LETTER J U004A with COMBINING ACUTE ACCENT U0301
+<Multi_key> <acute> <J> : "J́" # LATIN CAPITAL LETTER J U004A with COMBINING ACUTE ACCENT U0301
<Multi_key> <J> <acute> : "J́" # LATIN CAPITAL LETTER J U004A with COMBINING ACUTE ACCENT U0301
<Multi_key> <D> <H> : "Ð" ETH # LATIN CAPITAL LETTER ETH
<dead_tilde> <N> : "Ñ" Ntilde # LATIN CAPITAL LETTER N WITH TILDE
@@ -739,6 +743,10 @@ XCOMM Part 3
<Multi_key> <i> <quotedbl> : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS
<Multi_key> <diaeresis> <i> : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS
<Multi_key> <i> <diaeresis> : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS
+<dead_actute> <j> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
+<Multi_key> <apostrophe> <j> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
+<Multi_key> <j> <apostrophe> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
+<Multi_key> <acute> <j> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
<Multi_key> <j> <acute> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
<Multi_key> <d> <h> : "ð" eth # LATIN SMALL LETTER ETH
<dead_tilde> <n> : "ñ" ntilde # LATIN SMALL LETTER N WITH TILDE
commit e9b14d10d0258bfcc273ff8bc84cd349dccda62c
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Aug 24 17:27:43 2013 -0700
Bug 68413 - [Bisected]Error in `xterm': realloc(): invalid next size
Pass *new* size to realloc, not old size.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/modules/im/ximcp/imLcPrs.c b/modules/im/ximcp/imLcPrs.c
index 34cfcad..e9d5f7b 100644
--- a/modules/im/ximcp/imLcPrs.c
+++ b/modules/im/ximcp/imLcPrs.c
@@ -644,7 +644,7 @@ parseline(
}
while (b->utf8used + l + 1 > b->utf8size) {
DTCharIndex newsize = b->utf8size ? b->utf8size * 1.5 : 1024;
- char *newutf8 = Xrealloc (b->utf8, b->utf8size);
+ char *newutf8 = Xrealloc (b->utf8, newsize);
if (newutf8 == NULL)
goto error;
b->utf8 = newutf8;
commit c2b8e30790c21d6386767265263b3294ce1b1f9a
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Aug 16 21:04:02 2013 -0700
Stop checking for HAVE_DIX_CONFIG_H on the client side
Leftover from when these XKB files were shared with the server sources
and could be compiled in either the client or server, with the different
autoconf config files in each.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/src/xkb/XKBAlloc.c b/src/xkb/XKBAlloc.c
index aa6f632..5cfef0f 100644
--- a/src/xkb/XKBAlloc.c
+++ b/src/xkb/XKBAlloc.c
@@ -24,9 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#elif defined(HAVE_CONFIG_H)
+#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
diff --git a/src/xkb/XKBGAlloc.c b/src/xkb/XKBGAlloc.c
index 5ea91b9..63bb2db 100644
--- a/src/xkb/XKBGAlloc.c
+++ b/src/xkb/XKBGAlloc.c
@@ -24,9 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#elif defined(HAVE_CONFIG_H)
+#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
diff --git a/src/xkb/XKBMAlloc.c b/src/xkb/XKBMAlloc.c
index 3b75dae..f27fe4e 100644
--- a/src/xkb/XKBMAlloc.c
+++ b/src/xkb/XKBMAlloc.c
@@ -24,9 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#elif defined(HAVE_CONFIG_H)
+#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
diff --git a/src/xkb/XKBMisc.c b/src/xkb/XKBMisc.c
index 166842f..a6c916c 100644
--- a/src/xkb/XKBMisc.c
+++ b/src/xkb/XKBMisc.c
@@ -24,9 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#elif defined(HAVE_CONFIG_H)
+#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
commit 84276609b2f0aec74fb464c428c7db5714b0fcfc
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Aug 16 18:27:28 2013 -0700
Rearrange some variable declarations & initializations in XKB
Little things noticed during XKB restyling that seemed to make the
code easier to read.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/src/xkb/XKBAlloc.c b/src/xkb/XKBAlloc.c
index 3693c9b..aa6f632 100644
--- a/src/xkb/XKBAlloc.c
+++ b/src/xkb/XKBAlloc.c
@@ -132,9 +132,8 @@ XkbAllocNames(XkbDescPtr xkb, unsigned which, int nTotalRG, int nTotalAliases)
if ((which & XkbKTLevelNamesMask) && (xkb->map != NULL) &&
(xkb->map->types != NULL)) {
register int i;
- XkbKeyTypePtr type;
+ XkbKeyTypePtr type = xkb->map->types;
- type = xkb->map->types;
for (i = 0; i < xkb->map->num_types; i++, type++) {
if (type->level_names == NULL) {
type->level_names = _XkbTypedCalloc(type->num_levels, Atom);
diff --git a/src/xkb/XKBBind.c b/src/xkb/XKBBind.c
index f520b18..29870b5 100644
--- a/src/xkb/XKBBind.c
+++ b/src/xkb/XKBBind.c
@@ -450,23 +450,24 @@ XRefreshKeyboardMapping(register XMappingEvent * event)
fprintf(stderr, " symbols: %d..%d\n", first, last);
}
if (changes.changed & XkbKeyActionsMask) {
- int last, first = changes.first_key_act;
+ int first = changes.first_key_act;
+ int last = changes.first_key_act + changes.num_key_acts - 1;
- last = changes.first_key_act + changes.num_key_acts - 1;
fprintf(stderr, " acts: %d..%d\n", first, last);
}
if (changes.changed & XkbKeyBehaviorsMask) {
- int last, first = changes.first_key_behavior;
- last = first + changes.num_key_behaviors - 1;
+ int first = changes.first_key_behavior;
+ int last = first + changes.num_key_behaviors - 1;
+
fprintf(stderr, " behaviors: %d..%d\n", first, last);
}
if (changes.changed & XkbVirtualModsMask) {
fprintf(stderr, "virtual mods: 0x%04x\n", changes.vmods);
}
if (changes.changed & XkbExplicitComponentsMask) {
- int last, first = changes.first_key_explicit;
+ int first = changes.first_key_explicit;
+ int last = first + changes.num_key_explicit - 1;
- last = first + changes.num_key_explicit - 1;
fprintf(stderr, " explicit: %d..%d\n", first, last);
}
#endif
@@ -643,10 +644,9 @@ XkbTranslateKeySym(register Display *dpy,
if ((!xkb->cvt.KSToUpper) && (mods & LockMask)) {
register int i;
int change;
- char ch;
for (i = change = 0; i < n; i++) {
- ch = toupper(buffer[i]);
+ char ch = toupper(buffer[i]);
change = (change || (buffer[i] != ch));
buffer[i] = ch;
}
diff --git a/src/xkb/XKBCompat.c b/src/xkb/XKBCompat.c
index 1dcad49..227791b 100644
--- a/src/xkb/XKBCompat.c
+++ b/src/xkb/XKBCompat.c
@@ -195,9 +195,8 @@ _XkbWriteSetCompatMap(Display *dpy, xkbSetCompatMapReq *req, XkbDescPtr xkb)
buf += nSI * SIZEOF(xkbSymInterpretWireDesc);
}
if (groups & XkbAllGroupsMask) {
- xkbModsWireDesc *out;
+ xkbModsWireDesc *out = (xkbModsWireDesc *) buf;
- out = (xkbModsWireDesc *) buf;
for (i = 0, bit = 1; i < XkbNumKbdGroups; i++, bit <<= 1) {
if ((groups & bit) != 0) {
out->mask = xkb->compat->groups[i].mask;
diff --git a/src/xkb/XKBExtDev.c b/src/xkb/XKBExtDev.c
index b111364..4065dcd 100644
--- a/src/xkb/XKBExtDev.c
+++ b/src/xkb/XKBExtDev.c
@@ -68,9 +68,8 @@ XkbNoteDeviceChanges(XkbDeviceChangesPtr old,
XkbDeviceLedChangesPtr this;
if (old->changed & XkbXI_IndicatorsMask) {
- XkbDeviceLedChangesPtr found;
+ XkbDeviceLedChangesPtr found = NULL;
- found = NULL;
for (this = &old->leds; this && (!found); this = this->next) {
if ((this->led_class == new->led_class) &&
(this->led_id == new->led_id)) {
@@ -607,9 +606,8 @@ _XkbWriteLedInfo(char *wire, unsigned changed, XkbDeviceLedInfoPtr devli)
lwire->state = devli->state;
wire = (char *) &lwire[1];
if (namesNeeded) {
- CARD32 *awire;
+ CARD32 *awire = (CARD32 *) wire;
- awire = (CARD32 *) wire;
for (i = 0, bit = 1; i < XkbNumIndicators; i++, bit <<= 1) {
if (namesNeeded & bit) {
*awire = (CARD32) devli->names[i];
@@ -619,14 +617,12 @@ _XkbWriteLedInfo(char *wire, unsigned changed, XkbDeviceLedInfoPtr devli)
wire = (char *) awire;
}
if (mapsNeeded) {
- xkbIndicatorMapWireDesc *mwire;
+ xkbIndicatorMapWireDesc *mwire = (xkbIndicatorMapWireDesc *) wire;
- mwire = (xkbIndicatorMapWireDesc *) wire;
for (i = 0, bit = 1; i < XkbNumIndicators; i++, bit <<= 1) {
if (mapsNeeded & bit) {
- XkbIndicatorMapPtr map;
+ XkbIndicatorMapPtr map = &devli->maps[i];
- map = &devli->maps[i];
mwire->flags = map->flags;
mwire->whichGroups = map->which_groups;
mwire->groups = map->groups;
@@ -650,13 +646,11 @@ _XkbWriteSetDeviceInfo(char *wire,
SetLedStuff *stuff,
XkbDeviceInfoPtr devi)
{
- char *start;
+ char *start = wire;
- start = wire;
if (changes->changed & XkbXI_ButtonActionsMask) {
- int size;
+ int size = changes->num_btns * SIZEOF(xkbActionWireDesc);
- size = changes->num_btns * SIZEOF(xkbActionWireDesc);
memcpy(wire, (char *) &devi->btn_acts[changes->first_btn], size);
wire += size;
}
diff --git a/src/xkb/XKBGeom.c b/src/xkb/XKBGeom.c
index 631c64d..6a1c74a 100644
--- a/src/xkb/XKBGeom.c
+++ b/src/xkb/XKBGeom.c
@@ -261,13 +261,11 @@ _XkbReadGeomProperties(XkbReadBufferPtr buf,
return Success;
if ((rtrn = XkbAllocGeomProps(geom, rep->nProperties)) == Success) {
register int i;
- register Bool ok;
- char *name, *value;
+ register Bool ok = True;
- ok = True;
for (i = 0; (i < rep->nProperties) && ok; i++) {
- name = NULL;
- value = NULL;
+ char *name = NULL;
+ char *value = NULL;
ok = _XkbGetReadBufferCountedString(buf, &name) && ok;
ok = _XkbGetReadBufferCountedString(buf, &value) && ok;
ok = ok && (XkbAddGeomProperty(geom, name, value) != NULL);
@@ -317,10 +315,9 @@ _XkbReadGeomColors(XkbReadBufferPtr buf,
return Success;
if ((rtrn = XkbAllocGeomColors(geom, rep->nColors)) == Success) {
register int i;
- char *spec;
for (i = 0; i < rep->nColors; i++) {
- spec = NULL;
+ char *spec = NULL;
if (!_XkbGetReadBufferCountedString(buf, &spec))
rtrn = BadLength;
else if (XkbAddGeomColor(geom, spec, geom->num_colors) == NULL)
@@ -531,10 +528,11 @@ _XkbReadGeomSections(XkbReadBufferPtr buf,
section->priority = sectionWire->priority;
if (sectionWire->nRows > 0) {
register int r;
- XkbRowPtr row;
- xkbRowWireDesc *rowWire;
for (r = 0; r < sectionWire->nRows; r++) {
+ XkbRowPtr row;
+ xkbRowWireDesc *rowWire;
+
rowWire = (xkbRowWireDesc *)
_XkbGetReadBufferPtr(buf, SIZEOF(xkbRowWireDesc));
if (!rowWire)
@@ -547,10 +545,11 @@ _XkbReadGeomSections(XkbReadBufferPtr buf,
row->vertical = rowWire->vertical;
if (rowWire->nKeys > 0) {
register int k;
- XkbKeyPtr key;
- xkbKeyWireDesc *keyWire;
for (k = 0; k < rowWire->nKeys; k++) {
+ XkbKeyPtr key;
+ xkbKeyWireDesc *keyWire;
+
keyWire = (xkbKeyWireDesc *)
_XkbGetReadBufferPtr(buf, SIZEOF(xkbKeyWireDesc));
if (!keyWire)
diff --git a/src/xkb/XKBGetMap.c b/src/xkb/XKBGetMap.c
index 1ed1b9e..2278c75 100644
--- a/src/xkb/XKBGetMap.c
+++ b/src/xkb/XKBGetMap.c
@@ -211,13 +211,13 @@ _XkbReadKeySyms(XkbReadBufferPtr buf, XkbDescPtr xkb, xkbGetMapReply *rep)
map->num_syms = offset;
}
else {
- xkbSymMapWireDesc *newMap;
- XkbSymMapPtr oldMap;
- KeySym *newSyms;
- int tmp;
+ XkbSymMapPtr oldMap = &map->key_sym_map[rep->firstKeySym];
- oldMap = &map->key_sym_map[rep->firstKeySym];
for (i = 0; i < (int) rep->nKeySyms; i++, oldMap++) {
+ xkbSymMapWireDesc *newMap;
+ KeySym *newSyms;
+ int tmp;
+
newMap = (xkbSymMapWireDesc *)
_XkbGetReadBufferPtr(buf, SIZEOF(xkbSymMapWireDesc));
if (newMap == NULL)
@@ -310,7 +310,6 @@ static Status
_XkbReadKeyBehaviors(XkbReadBufferPtr buf, XkbDescPtr xkb, xkbGetMapReply *rep)
{
register int i;
- xkbBehaviorWireDesc *wire;
if (rep->totalKeyBehaviors > 0) {
int size = xkb->max_key_code + 1;
@@ -327,6 +326,8 @@ _XkbReadKeyBehaviors(XkbReadBufferPtr buf, XkbDescPtr xkb, xkbGetMapReply *rep)
(rep->nKeyBehaviors * sizeof(XkbBehavior)));
}
for (i = 0; i < rep->totalKeyBehaviors; i++) {
+ xkbBehaviorWireDesc *wire;
+
wire = (xkbBehaviorWireDesc *) _XkbGetReadBufferPtr(buf,
SIZEOF(xkbBehaviorWireDesc));
if (wire == NULL || wire->key >= size)
diff --git a/src/xkb/XKBList.c b/src/xkb/XKBList.c
index d7aa676..55a37b8 100644
--- a/src/xkb/XKBList.c
+++ b/src/xkb/XKBList.c
@@ -193,9 +193,8 @@ XkbListComponents(Display *dpy,
return list;
}
if (_XkbInitReadBuffer(dpy, &buf, extraLen)) {
- Status status;
+ Status status = Success;
- status = Success;
list = _XkbTypedCalloc(1, XkbComponentListRec);
if (!list) {
_XkbFreeReadBuffer(&buf);
diff --git a/src/xkb/XKBMAlloc.c b/src/xkb/XKBMAlloc.c
index bffe7e8..3b75dae 100644
--- a/src/xkb/XKBMAlloc.c
+++ b/src/xkb/XKBMAlloc.c
@@ -297,9 +297,7 @@ XkbAddKeyType(XkbDescPtr xkb,
if ((map) && (map->types)) {
for (i = 0; i < map->num_types; i++) {
if (map->types[i].name == name) {
- Status status;
-
- status =
+ Status status =
XkbResizeKeyType(xkb, i, map_count, want_preserve,
num_lvls);
return (status == Success ? &map->types[i] : NULL);
diff --git a/src/xkb/XKBNames.c b/src/xkb/XKBNames.c
index 5434916..3f2fd39 100644
--- a/src/xkb/XKBNames.c
+++ b/src/xkb/XKBNames.c
@@ -116,14 +116,14 @@ _XkbReadGetNamesReply(Display *dpy,
if (rep->which & XkbKTLevelNamesMask) {
CARD8 *nLevels;
XkbClientMapPtr map = xkb->map;
- XkbKeyTypePtr type;
nLevels =
(CARD8 *) _XkbGetReadBufferPtr(&buf, XkbPaddedSize(rep->nTypes));
if (nLevels == NULL)
goto BAILOUT;
if (map != NULL) {
- type = map->types;
+ XkbKeyTypePtr type = map->types;
+
for (i = 0; i < (int) rep->nTypes; i++, type++) {
if (i >= map->num_types) {
if (!_XkbSkipReadBufferData(&buf, nLevels[i] * 4))
@@ -577,14 +577,14 @@ XkbChangeNames(Display *dpy, XkbDescPtr xkb, XkbNameChangesPtr changes)
names = xkb->names;
if (which & (XkbKTLevelNamesMask | XkbKeyTypeNamesMask)) {
register int i;
- XkbKeyTypePtr type;
if ((xkb->map == NULL) || (xkb->map->types == NULL) || (nTypes == 0) ||
(firstType + nTypes > xkb->map->num_types) ||
(firstLvlType + nLvlTypes > xkb->map->num_types))
return False;
if (which & XkbKTLevelNamesMask) {
- type = &xkb->map->types[firstLvlType];
+ XkbKeyTypePtr type = &xkb->map->types[firstLvlType];
+
for (i = nLvlNames = 0; i < nLvlTypes; i++, type++) {
if (type->level_names != NULL)
nLvlNames += type->num_levels;
diff --git a/src/xkb/XKBSetGeom.c b/src/xkb/XKBSetGeom.c
index 696ec1e..7ac37ca 100644
--- a/src/xkb/XKBSetGeom.c
+++ b/src/xkb/XKBSetGeom.c
@@ -245,10 +245,10 @@ static char *
_WriteGeomDoodads(char *wire, int num_doodads, XkbDoodadPtr doodad)
{
register int i;
- xkbDoodadWireDesc *doodadWire;
for (i = 0; i < num_doodads; i++, doodad++) {
- doodadWire = (xkbDoodadWireDesc *) wire;
+ xkbDoodadWireDesc *doodadWire = (xkbDoodadWireDesc *) wire;
+
wire = (char *) &doodadWire[1];
bzero(doodadWire, SIZEOF(xkbDoodadWireDesc));
doodadWire->any.name = doodad->any.name;
@@ -292,25 +292,22 @@ _WriteGeomOverlay(char *wire, XkbOverlayPtr ol)
{
register int r;
XkbOverlayRowPtr row;
- xkbOverlayWireDesc *olWire;
+ xkbOverlayWireDesc *olWire = (xkbOverlayWireDesc *) wire;
- olWire = (xkbOverlayWireDesc *) wire;
olWire->name = ol->name;
olWire->nRows = ol->num_rows;
wire = (char *) &olWire[1];
for (r = 0, row = ol->rows; r < ol->num_rows; r++, row++) {
unsigned int k;
XkbOverlayKeyPtr key;
- xkbOverlayRowWireDesc *rowWire;
+ xkbOverlayRowWireDesc *rowWire = (xkbOverlayRowWireDesc *) wire;
- rowWire = (xkbOverlayRowWireDesc *) wire;
rowWire->rowUnder = row->row_under;
rowWire->nKeys = row->num_keys;
wire = (char *) &rowWire[1];
for (k = 0, key = row->keys; k < row->num_keys; k++, key++) {
- xkbOverlayKeyWireDesc *keyWire;
+ xkbOverlayKeyWireDesc *keyWire = (xkbOverlayKeyWireDesc *) wire;
- keyWire = (xkbOverlayKeyWireDesc *) wire;
memcpy(keyWire->over, key->over.name, XkbKeyNameLength);
memcpy(keyWire->under, key->under.name, XkbKeyNameLength);
wire = (char *) &keyWire[1];
@@ -324,11 +321,11 @@ _WriteGeomSections(char *wire, XkbGeometryPtr geom)
{
register int i;
XkbSectionPtr section;
- xkbSectionWireDesc *sectionWire;
for (i = 0, section = geom->sections; i < geom->num_sections;
i++, section++) {
- sectionWire = (xkbSectionWireDesc *) wire;
+ xkbSectionWireDesc *sectionWire = (xkbSectionWireDesc *) wire;
+
sectionWire->name = section->name;
sectionWire->top = section->top;
sectionWire->left = section->left;
@@ -344,10 +341,10 @@ _WriteGeomSections(char *wire, XkbGeometryPtr geom)
if (section->rows) {
int r;
XkbRowPtr row;
- xkbRowWireDesc *rowWire;
for (r = 0, row = section->rows; r < section->num_rows; r++, row++) {
- rowWire = (xkbRowWireDesc *) wire;
+ xkbRowWireDesc *rowWire = (xkbRowWireDesc *) wire;
+
rowWire->top = row->top;
rowWire->left = row->left;
rowWire->nKeys = row->num_keys;
@@ -357,9 +354,8 @@ _WriteGeomSections(char *wire, XkbGeometryPtr geom)
if (row->keys) {
int k;
XkbKeyPtr key;
- xkbKeyWireDesc *keyWire;
+ xkbKeyWireDesc *keyWire = (xkbKeyWireDesc *) wire;
- keyWire = (xkbKeyWireDesc *) wire;
for (k = 0, key = row->keys; k < row->num_keys; k++, key++) {
memcpy(keyWire[k].name, key->name.name,
XkbKeyNameLength);
diff --git a/src/xkb/XKBSetMap.c b/src/xkb/XKBSetMap.c
index a54ad20..6e1e707 100644
--- a/src/xkb/XKBSetMap.c
+++ b/src/xkb/XKBSetMap.c
@@ -59,14 +59,14 @@ _XkbWriteKeyTypes(Display *dpy, XkbDescPtr xkb, xkbSetMapReq *req)
{
char *buf;
XkbKeyTypePtr type;
- int i, n, sz;
+ int i, n;
xkbKeyTypeWireDesc *desc;
if ((req->present & XkbKeyTypesMask) == 0)
return;
type = &xkb->map->types[req->firstType];
for (i = 0; i < req->nTypes; i++, type++) {
- sz = SIZEOF(xkbKeyTypeWireDesc);
+ int sz = SIZEOF(xkbKeyTypeWireDesc);
sz += type->map_count * SIZEOF(xkbKTSetMapEntryWireDesc);
if (type->preserve)
sz += type->map_count * SIZEOF(xkbModsWireDesc);
@@ -79,9 +79,8 @@ _XkbWriteKeyTypes(Display *dpy, XkbDescPtr xkb, xkbSetMapReq *req)
desc->preserve = (type->preserve != NULL);
buf = (char *) &desc[1];
if (desc->nMapEntries > 0) {
- xkbKTSetMapEntryWireDesc *wire;
+ xkbKTSetMapEntryWireDesc *wire = (xkbKTSetMapEntryWireDesc *) buf;
- wire = (xkbKTSetMapEntryWireDesc *) buf;
for (n = 0; n < type->map_count; n++, wire++) {
wire->level = type->map[n].level;
wire->realMods = type->map[n].mods.real_mods;
@@ -89,9 +88,8 @@ _XkbWriteKeyTypes(Display *dpy, XkbDescPtr xkb, xkbSetMapReq *req)
}
buf = (char *) wire;
if (type->preserve) {
- xkbModsWireDesc *pwire;
+ xkbModsWireDesc *pwire = (xkbModsWireDesc *) buf;
- pwire = (xkbModsWireDesc *) buf;
for (n = 0; n < type->map_count; n++, pwire++) {
pwire->realMods = type->preserve[n].real_mods;
pwire->virtualMods = type->preserve[n].vmods;
diff --git a/src/xkb/XKBUse.c b/src/xkb/XKBUse.c
index 9d17572..3194137 100644
--- a/src/xkb/XKBUse.c
+++ b/src/xkb/XKBUse.c
@@ -263,9 +263,8 @@ wire_to_event(Display *dpy, XEvent *re, xEvent *event)
if ((xkbi->selected_events & XkbMapNotifyMask) &&
(xkbi->selected_map_details & mn->changed)) {
- XkbMapNotifyEvent *mev;
+ XkbMapNotifyEvent *mev = (XkbMapNotifyEvent *) re;
- mev = (XkbMapNotifyEvent *) re;
mev->type = XkbEventCode + xkbi->codes->first_event;
mev->xkb_type = XkbMapNotify;
mev->serial = _XSetLastRequestRead(dpy, (xGenericReply *) event);
@@ -318,9 +317,8 @@ wire_to_event(Display *dpy, XEvent *re, xEvent *event)
{
if (xkbi->selected_events & XkbControlsNotifyMask) {
xkbControlsNotify *cn = (xkbControlsNotify *) event;
- XkbControlsNotifyEvent *cev;
+ XkbControlsNotifyEvent *cev = (XkbControlsNotifyEvent *) re;
- cev = (XkbControlsNotifyEvent *) re;
cev->type = XkbEventCode + xkbi->codes->first_event;
cev->xkb_type = XkbControlsNotify;
cev->serial = _XSetLastRequestRead(dpy, (xGenericReply *) event);
@@ -344,9 +342,8 @@ wire_to_event(Display *dpy, XEvent *re, xEvent *event)
{
if (xkbi->selected_events & XkbIndicatorMapNotifyMask) {
xkbIndicatorNotify *in = (xkbIndicatorNotify *) event;
- XkbIndicatorNotifyEvent *iev;
+ XkbIndicatorNotifyEvent *iev = (XkbIndicatorNotifyEvent *) re;
- iev = (XkbIndicatorNotifyEvent *) re;
iev->type = XkbEventCode + xkbi->codes->first_event;
iev->xkb_type = XkbIndicatorMapNotify;
iev->serial = _XSetLastRequestRead(dpy, (xGenericReply *) event);
@@ -364,9 +361,8 @@ wire_to_event(Display *dpy, XEvent *re, xEvent *event)
{
if (xkbi->selected_events & XkbIndicatorStateNotifyMask) {
xkbIndicatorNotify *in = (xkbIndicatorNotify *) event;
- XkbIndicatorNotifyEvent *iev;
+ XkbIndicatorNotifyEvent *iev = (XkbIndicatorNotifyEvent *) re;
- iev = (XkbIndicatorNotifyEvent *) re;
iev->type = XkbEventCode + xkbi->codes->first_event;
iev->xkb_type = XkbIndicatorStateNotify;
iev->serial = _XSetLastRequestRead(dpy, (xGenericReply *) event);
@@ -384,9 +380,8 @@ wire_to_event(Display *dpy, XEvent *re, xEvent *event)
{
if (xkbi->selected_events & XkbBellNotifyMask) {
xkbBellNotify *bn = (xkbBellNotify *) event;
- XkbBellNotifyEvent *bev;
+ XkbBellNotifyEvent *bev = (XkbBellNotifyEvent *) re;
- bev = (XkbBellNotifyEvent *) re;
bev->type = XkbEventCode + xkbi->codes->first_event;
bev->xkb_type = XkbBellNotify;
bev->serial = _XSetLastRequestRead(dpy, (xGenericReply *) event);
@@ -410,9 +405,8 @@ wire_to_event(Display *dpy, XEvent *re, xEvent *event)
{
if (xkbi->selected_events & XkbAccessXNotifyMask) {
xkbAccessXNotify *axn = (xkbAccessXNotify *) event;
- XkbAccessXNotifyEvent *axev;
+ XkbAccessXNotifyEvent *axev = (XkbAccessXNotifyEvent *) re;
- axev = (XkbAccessXNotifyEvent *) re;
axev->type = XkbEventCode + xkbi->codes->first_event;
axev->xkb_type = XkbAccessXNotify;
axev->serial = _XSetLastRequestRead(dpy, (xGenericReply *) event);
@@ -432,9 +426,8 @@ wire_to_event(Display *dpy, XEvent *re, xEvent *event)
{
if (xkbi->selected_events & XkbNamesNotifyMask) {
xkbNamesNotify *nn = (xkbNamesNotify *) event;
- XkbNamesNotifyEvent *nev;
+ XkbNamesNotifyEvent *nev = (XkbNamesNotifyEvent *) re;
- nev = (XkbNamesNotifyEvent *) re;
nev->type = XkbEventCode + xkbi->codes->first_event;
nev->xkb_type = XkbNamesNotify;
nev->serial = _XSetLastRequestRead(dpy, (xGenericReply *) event);
@@ -462,9 +455,8 @@ wire_to_event(Display *dpy, XEvent *re, xEvent *event)
{
if (xkbi->selected_events & XkbCompatMapNotifyMask) {
xkbCompatMapNotify *cmn = (xkbCompatMapNotify *) event;
- XkbCompatMapNotifyEvent *cmev;
+ XkbCompatMapNotifyEvent *cmev = (XkbCompatMapNotifyEvent *) re;
- cmev = (XkbCompatMapNotifyEvent *) re;
cmev->type = XkbEventCode + xkbi->codes->first_event;
cmev->xkb_type = XkbCompatMapNotify;
cmev->serial = _XSetLastRequestRead(dpy, (xGenericReply *) event);
@@ -484,9 +476,8 @@ wire_to_event(Display *dpy, XEvent *re, xEvent *event)
{
if (xkbi->selected_events & XkbActionMessageMask) {
xkbActionMessage *am = (xkbActionMessage *) event;
- XkbActionMessageEvent *amev;
+ XkbActionMessageEvent *amev = (XkbActionMessageEvent *) re;
- amev = (XkbActionMessageEvent *) re;
amev->type = XkbEventCode + xkbi->codes->first_event;
amev->xkb_type = XkbActionMessage;
amev->serial = _XSetLastRequestRead(dpy, (xGenericReply *) event);
@@ -509,9 +500,9 @@ wire_to_event(Display *dpy, XEvent *re, xEvent *event)
{
if (xkbi->selected_events & XkbExtensionDeviceNotifyMask) {
xkbExtensionDeviceNotify *ed = (xkbExtensionDeviceNotify *) event;
- XkbExtensionDeviceNotifyEvent *edev;
+ XkbExtensionDeviceNotifyEvent *edev
+ = (XkbExtensionDeviceNotifyEvent *) re;
- edev = (XkbExtensionDeviceNotifyEvent *) re;
edev->type = XkbEventCode + xkbi->codes->first_event;
edev->xkb_type = XkbExtensionDeviceNotify;
edev->serial = _XSetLastRequestRead(dpy, (xGenericReply *) event);
@@ -538,9 +529,8 @@ wire_to_event(Display *dpy, XEvent *re, xEvent *event)
if ((xkbi->selected_events & XkbNewKeyboardNotifyMask) &&
(xkbi->selected_nkn_details & nkn->changed)) {
- XkbNewKeyboardNotifyEvent *nkev;
+ XkbNewKeyboardNotifyEvent *nkev = (XkbNewKeyboardNotifyEvent *) re;
- nkev = (XkbNewKeyboardNotifyEvent *) re;
nkev->type = XkbEventCode + xkbi->codes->first_event;
nkev->xkb_type = XkbNewKeyboardNotify;
nkev->serial = _XSetLastRequestRead(dpy, (xGenericReply *) event);
@@ -763,9 +753,8 @@ XkbUseExtension(Display *dpy, int *major_rtrn, int *minor_rtrn)
req->wantedMajor = XkbMajorVersion;
req->wantedMinor = XkbMinorVersion;
if (!_XReply(dpy, (xReply *) &rep, 0, xFalse) || !rep.supported) {
- Bool fail;
+ Bool fail = True;
- fail = True;
if (debugMsg)
fprintf(stderr,
"XKEYBOARD version mismatch (want %d.%02d, got %d.%02d)\n",
commit b90b7e859cf45ec76921fa21bbfc1f3840d6e8d1
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Aug 11 13:29:33 2013 -0700
Reindent XKB code to X.Org standard style
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/src/xkb/XKB.c b/src/xkb/XKB.c
index f926cb9..8a97959 100644
--- a/src/xkb/XKB.c
+++ b/src/xkb/XKB.c
@@ -32,45 +32,47 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <X11/extensions/XKBproto.h>
#include "XKBlibint.h"
-XkbInternAtomFunc _XkbInternAtomFunc= XInternAtom;
-XkbGetAtomNameFunc _XkbGetAtomNameFunc= XGetAtomName;
+XkbInternAtomFunc _XkbInternAtomFunc = XInternAtom;
+XkbGetAtomNameFunc _XkbGetAtomNameFunc = XGetAtomName;
Bool
-XkbQueryExtension( Display *dpy,
- int * opcodeReturn,
- int * eventBaseReturn,
- int * errorBaseReturn,
- int * majorReturn,
- int * minorReturn)
+XkbQueryExtension(Display *dpy,
+ int *opcodeReturn,
+ int *eventBaseReturn,
+ int *errorBaseReturn,
+ int *majorReturn,
+ int *minorReturn)
{
- if (!XkbUseExtension(dpy,majorReturn,minorReturn))
- return False;
+ if (!XkbUseExtension(dpy, majorReturn, minorReturn))
+ return False;
if (opcodeReturn)
- *opcodeReturn = dpy->xkb_info->codes->major_opcode;
+ *opcodeReturn = dpy->xkb_info->codes->major_opcode;
if (eventBaseReturn)
- *eventBaseReturn = dpy->xkb_info->codes->first_event;
+ *eventBaseReturn = dpy->xkb_info->codes->first_event;
if (errorBaseReturn)
- *errorBaseReturn = dpy->xkb_info->codes->first_error;
+ *errorBaseReturn = dpy->xkb_info->codes->first_error;
if (majorReturn)
- *majorReturn = dpy->xkb_info->srv_major;
+ *majorReturn = dpy->xkb_info->srv_major;
if (minorReturn)
- *minorReturn = dpy->xkb_info->srv_minor;
+ *minorReturn = dpy->xkb_info->srv_minor;
return True;
}
Bool
-XkbLibraryVersion(int *libMajorRtrn,int *libMinorRtrn)
+XkbLibraryVersion(int *libMajorRtrn, int *libMinorRtrn)
{
-int supported;
+ int supported;
if (*libMajorRtrn != XkbMajorVersion) {
- /* version 0.65 is (almost) compatible with 1.00 */
- if ((XkbMajorVersion==1)&&(((*libMajorRtrn)==0)&&((*libMinorRtrn)==65)))
- supported= True;
- else supported= False;
+ /* version 0.65 is (almost) compatible with 1.00 */
+ if ((XkbMajorVersion == 1) &&
+ (((*libMajorRtrn) == 0) && ((*libMinorRtrn) == 65)))
+ supported = True;
+ else
+ supported = False;
}
else {
- supported = True;
+ supported = True;
Reply to: