ChangeLog | 496 + Makefile.am | 2 acinclude.m4 | 3 configure.ac | 86 cpprules.in | 2 debian/changelog | 46 debian/control | 5 debian/libx11-6.symbols | 1236 +++ debian/libx11-xcb1.install | 3 debian/patches/006_tailor_pt_BR.UTF-8_Compose.diff | 73 debian/rules | 4 include/X11/Xlib-xcb.h | 5 include/X11/Xlib.h | 23 include/X11/Xlibint.h | 72 man/AllPlanes.man | 8 man/BlackPixelOfScreen.man | 6 man/Compose.man | 158 man/DisplayOfCCC.man | 10 man/ImageByteOrder.man | 8 man/IsCursorKey.man | 6 man/Makefile.am | 1017 +- man/XAddHost.man | 2 man/XAllocClassHint.man | 28 man/XAllocColor.man | 6 man/XAllocIconSize.man | 28 man/XAllocSizeHints.man | 28 man/XAllocStandardColormap.man | 8 man/XAllocWMHints.man | 28 man/XAnyEvent.man | 50 man/XButtonEvent.man | 50 man/XChangeKeyboardControl.man | 4 man/XChangeKeyboardMapping.man | 4 man/XChangeSaveSet.man | 2 man/XChangeWindowAttributes.man | 14 man/XCirculateEvent.man | 50 man/XCirculateRequestEvent.man | 50 man/XClearArea.man | 2 man/XClientMessageEvent.man | 52 man/XColormapEvent.man | 52 man/XConfigureEvent.man | 50 man/XConfigureRequestEvent.man | 50 man/XConfigureWindow.man | 12 man/XCopyArea.man | 2 man/XCreateColormap.man | 10 man/XCreateFontCursor.man | 6 man/XCreateFontSet.man | 6 man/XCreateGC.man | 32 man/XCreateIC.man | 8 man/XCreateOC.man | 4 man/XCreatePixmap.man | 2 man/XCreateRegion.man | 4 man/XCreateWindow.man | 14 man/XCreateWindowEvent.man | 50 man/XCrossingEvent.man | 50 man/XDefineCursor.man | 4 man/XDestroyWindow.man | 12 man/XDestroyWindowEvent.man | 50 man/XDrawArc.man | 6 man/XDrawImageString.man | 8 man/XDrawLine.man | 6 man/XDrawPoint.man | 6 man/XDrawRectangle.man | 6 man/XDrawString.man | 6 man/XDrawText.man | 6 man/XEmptyRegion.man | 4 man/XErrorEvent.man | 52 man/XExposeEvent.man | 50 man/XExtentsOfFontSet.man | 6 man/XFillRectangle.man | 6 man/XFilterEvent.man | 2 man/XFlush.man | 8 man/XFocusChangeEvent.man | 50 man/XFontSetExtents.man | 6 man/XFontsOfFontSet.man | 10 man/XGetEventData.man | 223 man/XGetVisualInfo.man | 2 man/XGetWindowAttributes.man | 4 man/XGetWindowProperty.man | 4 man/XGetXCBConnection.man | 4 man/XGrabButton.man | 8 man/XGrabKey.man | 8 man/XGrabKeyboard.man | 8 man/XGrabPointer.man | 8 man/XGrabServer.man | 8 man/XGraphicsExposeEvent.man | 52 man/XGravityEvent.man | 50 man/XIconifyWindow.man | 14 man/XIfEvent.man | 8 man/XInitImage.man | 2 man/XInstallColormap.man | 8 man/XInternAtom.man | 4 man/XIntersectRegion.man | 6 man/XKeymapEvent.man | 50 man/XListFonts.man | 4 man/XLoadFont.man | 6 man/XLookupKeysym.man | 10 man/XMapEvent.man | 50 man/XMapRequestEvent.man | 50 man/XMapWindow.man | 12 man/XNextEvent.man | 8 man/XOpenDisplay.man | 6 man/XOpenIM.man | 8 man/XOpenOM.man | 4 man/XParseGeometry.man | 2 man/XPolygonRegion.man | 6 man/XPropertyEvent.man | 52 man/XPutBackEvent.man | 8 man/XQueryBestSize.man | 16 man/XQueryColor.man | 6 man/XQueryPointer.man | 4 man/XQueryTree.man | 15 man/XRaiseWindow.man | 12 man/XReadBitmapFile.man | 4 man/XRecolorCursor.man | 6 man/XReparentEvent.man | 50 man/XReparentWindow.man | 2 man/XResizeRequestEvent.man | 50 man/XSelectionClearEvent.man | 52 man/XSelectionEvent.man | 50 man/XSelectionRequestEvent.man | 52 man/XSendEvent.man | 8 man/XSetArcMode.man | 18 man/XSetClipOrigin.man | 18 man/XSetCommand.man | 26 man/XSetErrorHandler.man | 4 man/XSetEventQueueOwner.man | 4 man/XSetFillStyle.man | 16 man/XSetFont.man | 16 man/XSetFontPath.man | 4 man/XSetICFocus.man | 8 man/XSetICValues.man | 8 man/XSetInputFocus.man | 2 man/XSetLineAttributes.man | 16 man/XSetPointerMapping.man | 4 man/XSetState.man | 16 man/XSetTextProperty.man | 26 man/XSetTile.man | 16 man/XSetTransientForHint.man | 26 man/XSetWMClientMachine.man | 26 man/XSetWMColormapWindows.man | 28 man/XSetWMIconName.man | 28 man/XSetWMName.man | 28 man/XSetWMProperties.man | 30 man/XSetWMProtocols.man | 28 man/XStoreBytes.man | 2 man/XStoreColors.man | 6 man/XStringListToTextProperty.man | 28 man/XStringToKeysym.man | 2 man/XSynchronize.man | 2 man/XTextExtents.man | 4 man/XTextWidth.man | 4 man/XUnmapEvent.man | 50 man/XUnmapWindow.man | 12 man/XVisibilityEvent.man | 50 man/XWarpPointer.man | 2 man/XcmsAllocColor.man | 4 man/XcmsCCCOfColormap.man | 10 man/XcmsCIELabQueryMaxC.man | 6 man/XcmsCIELuvQueryMaxC.man | 6 man/XcmsColor.man | 6 man/XcmsConvertColors.man | 10 man/XcmsCreateCCC.man | 10 man/XcmsDefaultCCC.man | 10 man/XcmsQueryBlack.man | 6 man/XcmsQueryColor.man | 6 man/XcmsSetWhitePoint.man | 10 man/XcmsStoreColor.man | 4 man/XcmsTekHVCQueryMaxC.man | 6 man/XmbDrawImageString.man | 10 man/XmbDrawString.man | 10 man/XmbDrawText.man | 10 man/XmbLookupString.man | 3 man/XmbResetIC.man | 8 man/XmbTextEscapement.man | 4 man/XmbTextExtents.man | 4 man/XmbTextListToTextProperty.man | 4 man/XmbTextPerCharExtents.man | 4 man/XrmEnumerateDatabase.man | 6 man/XrmGetFileDatabase.man | 6 man/XrmGetResource.man | 8 man/XrmInitialize.man | 8 man/XrmMergeDatabases.man | 6 man/XrmPutResource.man | 8 man/XrmUniqueQuark.man | 8 man/xkb/Makefile.am | 2 man/xkb/XkbActionCtrls.man | 9 man/xkb/XkbAddDeviceLedInfo.man | 15 man/xkb/XkbAddGeomColor.man | 15 man/xkb/XkbAddGeomDoodad.man | 15 man/xkb/XkbAddGeomKey.man | 7 man/xkb/XkbAddGeomKeyAlias.man | 15 man/xkb/XkbAddGeomOutline.man | 11 man/xkb/XkbAddGeomOverlay.man | 15 man/xkb/XkbAddGeomOverlayKey.man | 15 man/xkb/XkbAddGeomOverlayRow.man | 15 man/xkb/XkbAddGeomProperty.man | 15 man/xkb/XkbAddGeomRow.man | 11 man/xkb/XkbAddGeomSection.man | 23 man/xkb/XkbAddGeomShape.man | 15 man/xkb/XkbAddSymInterpret.man | 19 man/xkb/XkbAllocClientMap.man | 15 man/xkb/XkbAllocCompatMap.man | 15 man/xkb/XkbAllocControls.man | 11 man/xkb/XkbAllocDeviceInfo.man | 15 man/xkb/XkbAllocDeviceLedInfo.man | 11 man/xkb/XkbAllocGeomColors.man | 11 man/xkb/XkbAllocGeomDoodads.man | 11 man/xkb/XkbAllocGeomKeyAliases.man | 11 man/xkb/XkbAllocGeomKeys.man | 11 man/xkb/XkbAllocGeomOutlines.man | 11 man/xkb/XkbAllocGeomOverlayKey.man | 11 man/xkb/XkbAllocGeomOverlayRows.man | 13 man/xkb/XkbAllocGeomOverlays.man | 11 man/xkb/XkbAllocGeomPoints.man | 11 man/xkb/XkbAllocGeomProps.man | 11 man/xkb/XkbAllocGeomRows.man | 11 man/xkb/XkbAllocGeomSectionDoodads.man | 14 man/xkb/XkbAllocGeomSections.man | 11 man/xkb/XkbAllocGeomShapes.man | 11 man/xkb/XkbAllocGeometry.man | 11 man/xkb/XkbAllocIndicatorMaps.man | 7 man/xkb/XkbAllocKeyboard.man | 5 man/xkb/XkbAllocNames.man | 19 man/xkb/XkbAllocServerMap.man | 15 man/xkb/XkbApplyCompatMapToKey.man | 15 man/xkb/XkbBell.man | 21 man/xkb/XkbBellEvent.man | 19 man/xkb/XkbChangeControls.man | 15 man/xkb/XkbChangeDeviceInfo.man | 15 man/xkb/XkbChangeEnabledControls.man | 19 man/xkb/XkbChangeIndicators.man | 19 man/xkb/XkbChangeMap.man | 15 man/xkb/XkbChangeNames.man | 15 man/xkb/XkbChangeTypesOfKey.man | 27 man/xkb/XkbComputeRowBounds.man | 15 man/xkb/XkbComputeSectionBounds.man | 11 man/xkb/XkbComputeShapeBounds.man | 7 man/xkb/XkbComputeShapeTop.man | 11 man/xkb/XkbCopyKeyType.man | 11 man/xkb/XkbCopyKeyTypes.man | 15 man/xkb/XkbDeviceBell.man | 33 man/xkb/XkbDeviceBellEvent.man | 33 man/xkb/XkbFindOverlayForKey.man | 15 man/xkb/XkbForceBell.man | 13 man/xkb/XkbForceDeviceBell.man | 29 man/xkb/XkbFreeClientMap.man | 15 man/xkb/XkbFreeCompatMap.man | 15 man/xkb/XkbFreeComponentList.man | 7 man/xkb/XkbFreeControls.man | 15 man/xkb/XkbFreeDeviceInfo.man | 15 man/xkb/XkbFreeGeomColors.man | 19 man/xkb/XkbFreeGeomDoodads.man | 15 man/xkb/XkbFreeGeomKeyAliases.man | 19 man/xkb/XkbFreeGeomKeys.man | 19 man/xkb/XkbFreeGeomOutlines.man | 19 man/xkb/XkbFreeGeomOverlayKeys.man | 19 man/xkb/XkbFreeGeomOverlayRows.man | 19 man/xkb/XkbFreeGeomOverlays.man | 19 man/xkb/XkbFreeGeomPoints.man | 19 man/xkb/XkbFreeGeomProperties.man | 19 man/xkb/XkbFreeGeomRows.man | 19 man/xkb/XkbFreeGeomSections.man | 19 man/xkb/XkbFreeGeomShapes.man | 19 man/xkb/XkbFreeGeometry.man | 15 man/xkb/XkbFreeIndicatorMaps.man | 7 man/xkb/XkbFreeKeyboard.man | 15 man/xkb/XkbFreeNames.man | 15 man/xkb/XkbFreeServerMap.man | 15 man/xkb/XkbGetAccessXTimeout.man | 31 man/xkb/XkbGetAutoRepeatRate.man | 19 man/xkb/XkbGetAutoResetControls.man | 15 man/xkb/XkbGetBounceKeysDelay.man | 15 man/xkb/XkbGetCompatMap.man | 15 man/xkb/XkbGetControls.man | 15 man/xkb/XkbGetControlsChanges.man | 15 man/xkb/XkbGetDetectableAutorepeat.man | 11 man/xkb/XkbGetDeviceButtonActions.man | 23 man/xkb/XkbGetDeviceInfo.man | 25 man/xkb/XkbGetDeviceInfoChanges.man | 15 man/xkb/XkbGetDeviceLedInfo.man | 23 man/xkb/XkbGetGeometry.man | 11 man/xkb/XkbGetIndicatorChanges.man | 19 man/xkb/XkbGetIndicatorMap.man | 15 man/xkb/XkbGetIndicatorState.man | 15 man/xkb/XkbGetKeyActions.man | 19 man/xkb/XkbGetKeyBehaviors.man | 19 man/xkb/XkbGetKeyExplicitComponents.man | 22 man/xkb/XkbGetKeyModifierMap.man | 19 man/xkb/XkbGetKeySyms.man | 19 man/xkb/XkbGetKeyTypes.man | 19 man/xkb/XkbGetKeyVirtualModMap.man | 19 man/xkb/XkbGetKeyboard.man | 15 man/xkb/XkbGetKeyboardByName.man | 27 man/xkb/XkbGetMap.man | 15 man/xkb/XkbGetNameChanges.man | 15 man/xkb/XkbGetNamedGeometry.man | 17 man/xkb/XkbGetNamedIndicator.man | 31 man/xkb/XkbGetNames.man | 15 man/xkb/XkbGetSlowKeysDelay.man | 15 man/xkb/XkbGetState.man | 15 man/xkb/XkbGetStickyKeysOptions.man | 15 man/xkb/XkbGetUpdatedMap.man | 15 man/xkb/XkbGetVirtualMods.man | 15 man/xkb/XkbGetXlibControls.man | 7 man/xkb/XkbIgnoreExtension.man | 9 man/xkb/XkbInitCanonicalKeyTypes.man | 15 man/xkb/XkbKeyAction.man | 15 man/xkb/XkbKeyActionEntry.man | 21 man/xkb/XkbKeyActionsPtr.man | 13 man/xkb/XkbKeyGroupInfo.man | 13 man/xkb/XkbKeyGroupWidth.man | 17 man/xkb/XkbKeyGroupsWidth.man | 13 man/xkb/XkbKeyHasActions.man | 13 man/xkb/XkbKeyNumActions.man | 13 man/xkb/XkbKeyNumGroups.man | 13 man/xkb/XkbKeyNumSyms.man | 13 man/xkb/XkbKeySymEntry.man | 21 man/xkb/XkbKeySymsOffset.man | 13 man/xkb/XkbKeySymsPtr.man | 13 man/xkb/XkbKeyType.man | 15 man/xkb/XkbKeyTypeIndex.man | 15 man/xkb/XkbKeyTypesForCoreSymbols.man | 27 man/xkb/XkbKeycodeToKeysym.man | 19 man/xkb/XkbKeysymToModifiers.man | 11 man/xkb/XkbLatchGroup.man | 15 man/xkb/XkbLatchModifiers.man | 19 man/xkb/XkbLibraryVersion.man | 11 man/xkb/XkbListComponents.man | 19 man/xkb/XkbLockGroup.man | 15 man/xkb/XkbLockModifiers.man | 19 man/xkb/XkbLookupKeyBinding.man | 31 man/xkb/XkbLookupKeySym.man | 25 man/xkb/XkbModActionVMods.man | 9 man/xkb/XkbNoteControlsChanges.man | 15 man/xkb/XkbNoteDeviceChanges.man | 15 man/xkb/XkbNoteIndicatorChanges.man | 15 man/xkb/XkbNoteNameChanges.man | 15 man/xkb/XkbOpenDisplay.man | 29 man/xkb/XkbOutOfRangeGroupInfo.man | 9 man/xkb/XkbOutOfRangeGroupNumber.man | 9 man/xkb/XkbPtrActionX.man | 9 man/xkb/XkbPtrActionY.man | 9 man/xkb/XkbQueryExtension.man | 27 man/xkb/XkbRefreshKeyboardMapping.man | 9 man/xkb/XkbResizeDeviceButtonActions.man | 11 man/xkb/XkbResizeKeyActions.man | 15 man/xkb/XkbResizeKeySyms.man | 15 man/xkb/XkbResizeKeyType.man | 23 man/xkb/XkbSAActionSetCtrls.man | 15 man/xkb/XkbSAGroup.man | 9 man/xkb/XkbSAPtrDfltValue.man | 9 man/xkb/XkbSARedirectSetVMods.man | 13 man/xkb/XkbSARedirectSetVModsMask.man | 13 man/xkb/XkbSARedirectVMods.man | 9 man/xkb/XkbSARedirectVModsMask.man | 9 man/xkb/XkbSAScreen.man | 7 man/xkb/XkbSASetGroup.man | 15 man/xkb/XkbSASetPtrDfltValue.man | 13 man/xkb/XkbSASetScreen.man | 13 man/xkb/XkbSelectEventDetails.man | 23 man/xkb/XkbSelectEvents.man | 19 man/xkb/XkbSetAccessXTimeout.man | 31 man/xkb/XkbSetAutoRepeatRate.man | 19 man/xkb/XkbSetAutoResetControls.man | 19 man/xkb/XkbSetBounceKeysDelay.man | 15 man/xkb/XkbSetCompatMap.man | 19 man/xkb/XkbSetControls.man | 15 man/xkb/XkbSetDebuggingFlags.man | 35 man/xkb/XkbSetDetectableAutorepeat.man | 15 man/xkb/XkbSetDeviceButtonActions.man | 27 man/xkb/XkbSetDeviceInfo.man | 15 man/xkb/XkbSetIgnoreLockMods.man | 27 man/xkb/XkbSetIndicatorMap.man | 15 man/xkb/XkbSetMap.man | 15 man/xkb/XkbSetModActionVMods.man | 13 man/xkb/XkbSetNamedIndicator.man | 31 man/xkb/XkbSetNames.man | 23 man/xkb/XkbSetPtrActionX.man | 13 man/xkb/XkbSetPtrActionY.man | 13 man/xkb/XkbSetServerInternalMods.man | 27 man/xkb/XkbSetXlibControls.man | 15 man/xkb/XkbTranslateKeyCode.man | 25 man/xkb/XkbTranslateKeySym.man | 27 man/xkb/XkbUpdateMapFromCore.man | 27 man/xkb/XkbVirtualModsToReal.man | 15 modules/im/ximcp/Makefile.am | 6 modules/lc/Utf8/Makefile.am | 6 modules/lc/def/Makefile.am | 8 modules/lc/gen/Makefile.am | 8 modules/lc/xlocale/Makefile.am | 8 modules/om/generic/Makefile.am | 6 nls/Makefile.am | 6 nls/compose-check.pl | 163 nls/el_GR.UTF-8/Compose.pre | 8 nls/en_US.UTF-8/Compose.pre | 210 nls/iso8859-2/Compose.pre | 4 nls/localerules.in | 5 nls/pt_BR.UTF-8/Compose.pre | 64 specs/Makefile.am | 3 specs/XIM/Makefile.am | 33 specs/XIM/xim.ms | 4279 +++++++++++ specs/i18n/Framework.ms | 1567 ++++ specs/i18n/LocaleDB.ms | 502 + specs/i18n/Makefile.am | 33 specs/i18n/Trans.ms | 1148 +++ specs/libX11/AppA | 604 + specs/libX11/AppB | 101 specs/libX11/AppC | 2230 ++++++ specs/libX11/AppD | 1183 +++ specs/libX11/CH01 | 663 + specs/libX11/CH02 | 2052 +++++ specs/libX11/CH03 | 3121 ++++++++ specs/libX11/CH04 | 1595 ++++ specs/libX11/CH05 | 518 + specs/libX11/CH06 | 4773 +++++++++++++ specs/libX11/CH07 | 2357 ++++++ specs/libX11/CH08 | 3468 +++++++++ specs/libX11/CH09 | 1290 +++ specs/libX11/CH10 | 3886 ++++++++++ specs/libX11/CH11 | 1664 ++++ specs/libX11/CH12 | 2680 +++++++ specs/libX11/CH13 | 7673 +++++++++++++++++++++ specs/libX11/CH14 | 3590 +++++++++ specs/libX11/CH15 | 1628 ++++ specs/libX11/CH16 | 2364 ++++++ specs/libX11/Makefile.am | 62 specs/libX11/abstract.t | 106 specs/libX11/credits.t | 216 specs/libX11/glossary | 1484 ++++ specs/libX11/indexmacros.t | 3 specs/libX11/libX11.ms | 24 specs/libX11/postproc | 17 specs/macros.t | 226 specs/troffrules.in | 68 src/ChkIfEv.c | 1 src/ChkMaskEv.c | 4 src/ChkTypEv.c | 4 src/ChkTypWEv.c | 4 src/ChkWinEv.c | 4 src/ConnDis.c | 2 src/CrGlCur.c | 2 src/FreeEventData.c | 42 src/GetEventData.c | 42 src/IfEvent.c | 1 src/InitExt.c | 43 src/Makefile.am | 11 src/MaskEvent.c | 4 src/NextEvent.c | 4 src/OpenDis.c | 46 src/PeekEvent.c | 5 src/PeekIfEv.c | 5 src/PutBEvent.c | 18 src/SetLocale.c | 4 src/WinEvent.c | 4 src/XKeysymDB | 1 src/XlibInt.c | 183 src/utlist.h | 116 src/xcb_io.c | 7 src/xcms/Makefile.am | 6 src/xkb/Makefile.am | 6 src/xlibi18n/Makefile.am | 6 461 files changed, 63384 insertions(+), 4256 deletions(-)
New commits: commit 4700753ef8493b95268de1f588ae688e741bd002 Author: Timo Aaltonen <[email protected]> Date: Mon Nov 23 12:52:11 2009 +0200 Bump the build-dep on xutils-dev (>= 1:7.5~1). diff --git a/debian/changelog b/debian/changelog index 31ba3f5..2705e67 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ libx11 (2:1.3.2-1) UNRELEASED; urgency=low [ Timo Aaltonen ] * New upstream release. + * Bump the build-dep on xutils-dev (>= 1:7.5~1). -- Timo Aaltonen <[email protected]> Mon, 23 Nov 2009 12:50:15 +0200 diff --git a/debian/control b/debian/control index 015abea..391b704 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,7 @@ Build-Depends: quilt, automake, libtool, - xutils-dev (>= 1:7.4+4) + xutils-dev (>= 1:7.5~1) Standards-Version: 3.8.3 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libx11 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libx11.git commit 015e45276243f1c70e21796baeceec085fc72373 Author: Timo Aaltonen <[email protected]> Date: Mon Nov 23 12:51:02 2009 +0200 Update the changelogs. diff --git a/ChangeLog b/ChangeLog index 79e6b70..c2576c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,168 @@ +commit aad10032651cdc2a53b359035954454a28d6db67 +Author: Alan Coopersmith <[email protected]> +Date: Fri Oct 23 13:55:14 2009 -0700 + + libX11 1.3.2 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 6303ada89cb228c0f9656036f798703afb42fc29 +Author: Peter Hutterer <[email protected]> +Date: Wed Oct 21 12:42:07 2009 +1000 + + Add smiley faces to compose sequences. + + I wonder how we could have lasted that long without them. + + Signed-off-by: Peter Hutterer <[email protected]> + Acked-by: Daniel Stone <[email protected]> + Acked-By: James Cloos <[email protected]> + +commit 0e104ebd8628803c27e36b16922ad1edd891325a +Author: Alan Coopersmith <[email protected]> +Date: Thu Oct 22 23:12:30 2009 -0700 + + Add man page for Compose file format + + Based on grammar description in modules/im/ximcp/imLcPrs.c and + note on XFree86 changes formerly found in xorg-docs RELNOTES.sgml + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 9c95f2af7c442b3a59b1a30cf804f1ef4e7fc5b5 +Author: Jeremy Huddleston <[email protected]> +Date: Tue Oct 20 12:46:03 2009 -0700 + + Add extra configuration and sanity checks for groff and ps2pdf + + 1) Add AC_ARG_VAR for GROFF and PS2PDF to inform users of these + environment variables. + 2) Check that groff -ms works + + Some distributions ship the ms macros as a separate package which may + not be installed together with groff, so we need to make sure that groff + works and the required macros are actually installed before attempting + to build the specs. + + Signed-off-by: Jeremy Huddleston <[email protected]> + Signed-off-by: Dan Nicholson <[email protected]> + Signed-off-by: Yaakov Selkowitz <[email protected]> + +commit d3f801fd2f9198eaad6797414dba652f9c006c6d +Author: Yaakov Selkowitz <[email protected]> +Date: Sun Oct 18 17:34:53 2009 -0500 + + Fix VPATH build of libX11 specs + + Signed-off-by: Yaakov Selkowitz <[email protected]> + +commit ad15e1a89d30ccc11d80745897b83def1448e8c0 +Author: Alan Coopersmith <[email protected]> +Date: Sat Oct 17 16:14:34 2009 -0700 + + libX11 1.3.1 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 0cbf98c17a7484bb58b2464b98d63bb3b4ea2594 +Author: Alan Coopersmith <[email protected]> +Date: Sat Oct 17 16:28:25 2009 -0700 + + Fix make distcheck + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 082e62ad268ef16a3bebc5a3c9fa008dbdc483ed +Author: Alan Coopersmith <[email protected]> +Date: Fri Oct 16 19:25:35 2009 -0700 + + Use $(AM_V_GEN) to silence echo commands for generating shadow man pages + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 4e66da0783b2e5e3b288aaecd3c89396ed425c20 +Author: Alan Coopersmith <[email protected]> +Date: Wed Oct 14 16:18:24 2009 -0700 + + Move libX11 & XIM/locale specs from xorg-docs + + If groff is found, and --disable-specs is not passed to configure, + specs will be converted to text, html and ps (or pdf if ps2pdf is + found) and installed to $(docdir) + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 5d3d817a42ddcc8d0c6efd33efd1442fe14f5c6b +Author: Yaakov Selkowitz <[email protected]> +Date: Tue Oct 13 19:15:51 2009 -0500 + + Provide _Xsetlocale compat wrappers on Cygwin + + Previous versions of Cygwin did not have proper locale support, so Cygwin/X + defined X_LOCALE, using _Xsetlocale instead. Cygwin 1.7 has added locale + support, but we can't remove the _Xsetlocale entry point without breaking + ABI. + + Signed-off-by: Yaakov Selkowitz <[email protected]> + +commit 2c8b3a877a713bb66a6316a7051b43c46af6e1a0 +Author: Yaakov Selkowitz <[email protected]> +Date: Tue Oct 13 19:15:49 2009 -0500 + + dolt: add Cygwin to supported platforms + + Signed-off-by: Yaakov Selkowitz <[email protected]> + +commit a2c8e3e34b15b57ff881a52101fc961a602f35e4 +Author: Alan Coopersmith <[email protected]> +Date: Wed Oct 14 13:23:30 2009 -0700 + + Recognize XSUNBUFFERSIZE alias for XLIBBUFFERSIZE on Solaris + + Also fix indenting of the XLIBBUFFERSIZE code to match surrounding code + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 34ddfca7b7d58240b0fe74bec6b2e0652d15c051 +Author: Jon TURNEY <[email protected]> +Date: Tue Feb 10 17:47:25 2009 +0000 + + Include sys/select.h for select() and struct timeval, if it exists + + This is a cygwin build fix + +commit 383165916ddac91740d4c780174d4c0d07cdb994 +Author: Xake <[email protected]> +Date: Sun Sep 27 11:16:36 2009 +0200 + + Use AM_V_GEN instead of customized macros for AM_SILENT_RULES + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 854269d55cdda8caf425515bfed2855e211a5ada +Author: Julien Cristau <[email protected]> +Date: Tue Oct 6 16:11:24 2009 +0200 + + configure: quote argument to m4_pattern_forbid + + Without this, configure spits out + ../configure: line 12364: ac_fn_c_check_member: command not found + ../configure: line 12378: ac_fn_c_check_type: command not found + + Also anchor the pattern to make it stricter. + + Signed-off-by: Julien Cristau <[email protected]> + +commit 3bb020587ce74e0737ec7aceb20041f1e77d3b87 +Author: Jeremy Huddleston <[email protected]> +Date: Thu Oct 1 22:20:38 2009 -0700 + + Split CFLAGS into CPPFLAGS and CFLAGS + + On some build systems, CPPFLAGS is set to "-I/some/prefix/include". If older + X11 headers are in /some/prefix/include, they will be preferred over the + shipped headers. This corrects that problem. + commit d54caf1c9c55af8247621b7ba6afb20b23699839 Author: Peter Hutterer <[email protected]> Date: Fri Oct 2 10:59:08 2009 +1000 diff --git a/debian/changelog b/debian/changelog index 52e057a..31ba3f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -libx11 (2:1.3-2) UNRELEASED; urgency=low +libx11 (2:1.3.2-1) UNRELEASED; urgency=low + [ Julien Cristau ] * libx11-6.symbols: _XkbReadBufferCopy32, _XkbReadCopyData32 and _XkbWriteCopyData32 are only present on 64-bit architectures. * Unmark the following symbols as private, they're being used: @@ -9,7 +10,10 @@ libx11 (2:1.3-2) UNRELEASED; urgency=low - _XInitKeysymDB - _Xevent_to_mask - -- Julien Cristau <[email protected]> Tue, 13 Oct 2009 14:41:38 +0200 + [ Timo Aaltonen ] + * New upstream release. + + -- Timo Aaltonen <[email protected]> Mon, 23 Nov 2009 12:50:15 +0200 libx11 (2:1.3-1) experimental; urgency=low commit aad10032651cdc2a53b359035954454a28d6db67 Author: Alan Coopersmith <[email protected]> Date: Fri Oct 23 13:55:14 2009 -0700 libX11 1.3.2 Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/configure.ac b/configure.ac index cdb6817..d622697 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ(2.60) AC_INIT([libX11], - 1.3.1, + 1.3.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libX11) AC_CONFIG_SRCDIR([Makefile.am]) commit 6303ada89cb228c0f9656036f798703afb42fc29 Author: Peter Hutterer <[email protected]> Date: Wed Oct 21 12:42:07 2009 +1000 Add smiley faces to compose sequences. I wonder how we could have lasted that long without them. Signed-off-by: Peter Hutterer <[email protected]> Acked-by: Daniel Stone <[email protected]> Acked-By: James Cloos <[email protected]> diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre index 1edfdeb..044cae1 100644 --- a/nls/en_US.UTF-8/Compose.pre +++ b/nls/en_US.UTF-8/Compose.pre @@ -218,6 +218,9 @@ XCOMM Other symbols <Multi_key> <C> <C> <C> <P> : "☭" U262D # HAMMER AND SICKLE <Multi_key> <less> <3> : "♥" U2665 # BLACK HEART SUIT +<Multi_key> <colon> <parenright> : "☺" U263A # WHITE SMILING FACE +<Multi_key> <colon> <parenleft> : "☹" U2639 # WHITE FROWNING FACE + XCOMM Part 2 XCOMM Compose map for Korean Hangul(Choseongul) Conjoining Jamos automatically commit 0e104ebd8628803c27e36b16922ad1edd891325a Author: Alan Coopersmith <[email protected]> Date: Thu Oct 22 23:12:30 2009 -0700 Add man page for Compose file format Based on grammar description in modules/im/ximcp/imLcPrs.c and note on XFree86 changes formerly found in xorg-docs RELNOTES.sgml Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/man/Compose.man b/man/Compose.man new file mode 100644 index 0000000..213d6d4 --- /dev/null +++ b/man/Compose.man @@ -0,0 +1,158 @@ +.\" Copyright 2009 Sun Microsystems, Inc. All rights reserved. +.\" +.\" Permission is hereby granted, free of charge, to any person obtaining a +.\" copy of this software and associated documentation files (the +.\" "Software"), to deal in the Software without restriction, including +.\" without limitation the rights to use, copy, modify, merge, publish, +.\" distribute, and/or sell copies of the Software, and to permit persons +.\" to whom the Software is furnished to do so, provided that the above +.\" copyright notice(s) and this permission notice appear in all copies of +.\" the Software and that both the above copyright notice(s) and this +.\" permission notice appear in supporting documentation. +.\" +.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +.\" OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +.\" HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +.\" INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +.\" FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +.\" NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +.\" WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +.\" +.\" Except as contained in this notice, the name of a copyright holder +.\" shall not be used in advertising or otherwise to promote the sale, use +.\" or other dealings in this Software without prior written authorization +.\" of the copyright holder. +.\" +.\" shorthand for double quote that works everywhere. +.ds q \N'34' +.ds xL Xlib \- C Language X Interface +.TH Compose __filemansuffix__ __vendorversion__ +.SH NAME +Compose \- X client mappings for multi-key input sequences +.SH DESCRIPTION +The X library, libX11, provides a simple input method for characters +beyond those represented on typical keyboards using sequences of key +strokes that are combined to enter a single character. +.PP +The compose file is searched for in the following order: +.IP - +If the environment variable +.B $XCOMPOSEFILE +is set, its value is used as the name of the Compose file. +.IP - +If the user's home directory has a file named +.IR .XCompose , +it is used as the Compose file. +.IP - +The system provided compose file is used by mapping the locale to a compose +file from the list in +.IR __xlocaledir__/compose.dir . +.PP +Compose files can use an +.RB \*q include \*q +instruction. This allows local modifications to be made to existing compose +files without including all of the content directly. For example, the +system's iso8859-1 compose file can be included with a line like this: +.RS 4 +.BI "include \*q" __xlocaledir__/iso8859-1/Compose \*q +.RE +.PP +There are two substitutions that can be made in the file name of the +include instruction. +.I %H +expands to the user's home directory (the +.B $HOME +environment variable), and +.I %L +expands to the name of the locale specific Compose file (i.e., +.RI \*q __xlocaledir__/<localename>/Compose \*q). +.PP +For example, you can include in your compose file the default Compose file +by using: +.RS +.B "include \*q%L\*q" +.RE +and then rewrite only the few rules that you need to change. New +compose rules can be added, and previous ones replaced. +.SH FILE FORMAT +.\" Based on grammar description in modules/im/ximcp/imLcPrs.c +Compose files are plain text files, with a separate line for each compose +sequence. Comments begin with \fB#\fP characters. Each compose sequence +specifies one or more events and a resulting input sequence, with an optional +comment at the end of the line: +.RS +\fIEVENT\fP [\fIEVENT\fP...] \fB:\fP \fIRESULT\fP [\fB#\fP \fICOMMENT\fP] +.RE +.PP +Each event consists of a specified input keysym, and optional modifier states: +.RS +[\fIMODIFIER_LIST\fP] \fB<\fP\fIkeysym\fP\fB>\fP +.RE +.PP +Each modifier consists of a specified modifier and a state: +.RS +(\fB!\fP \fIMODIFIER\fP ) | \fBNone\fP +.RE +Modifiers may be preceded by a +.RB \*q "~" \*q +character to indicate that the modifier must not be present. +.PP +The result specifies a string, keysym, or both, that the X client receives +as input when the sequence of events is input: +.RS +\fB\*q\fP\fISTRING\fP\fB\*q\fP | \fIkeysym\fP | \fB\*q\fP\fISTRING\fP\fB\*q\fP \fIkeysym\fP +.RE +.PP +Keysyms are specified without the \fBXK_\fP prefix. +.PP +Strings may be direct text encoded in the locale for which the compose file is +to be used, or an escaped octal or hexadecimal character code. Octal codes +are specified as \fB\*q\\123\*q\fP and hexadecimal codes as +\fB\*q\\0x123a\*q\fP. +It is not necessary to specify in the right part of a rule a locale encoded +string in addition to the keysym name. If the string is omitted, Xlib +figures it out from the keysym according to the current locale. +I.e., if a rule looks like: +.RS +\fB<dead_grave> <A> : \*q\\300\*q Agrave\fP +.RE +the result of the composition is always the letter with the "\\300" +code. But if the rule is: +.RS +\fB<dead_grave> <A> : Agrave\fP +.RE +the result depends on how Agrave is mapped in the current locale. +.SH ENVIRONMENT +.TP +.B XCOMPOSEFILE +File to use for compose sequences. +.TP +.B XCOMPOSECACHE +Directory to use for caching compiled compose files. +.SH FILES +.TP +.I $HOME/.Xcompose +User default compose file if XCOMPOSEFILE is not set. +.TP +.I __xlocaledir__/compose.dir +File listing the compose file path to use for each locale. +.TP +.I __xlocaledir__/<localemapping>/Compose +System default compose file for the locale, mapped via compose.dir. +.TP +.I /var/cache/libx11/compose/ +System-wide cache directory for compiled compose files. +.TP +.I $HOME/.compose-cache/ +Per-user cache directory for compiled compose files. +.SH SEE ALSO +.BR XLookupString (__libmansuffix__), +.BR XmbLookupString (__libmansuffix__), +.BR XwcLookupString (__libmansuffix__), +.BR Xutf8LookupString (__libmansuffix__), +.BR mkcomposecache (__appmansuffix__), +.BR locale (__miscmansuffix__). +.br +\fI\*(xL\fP diff --git a/man/Makefile.am b/man/Makefile.am index 045c7dc..c6aff51 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -194,30 +194,39 @@ libman_PRE = \ XmbTextExtents.man \ XmbTextPerCharExtents.man +filemandir = $(FILE_MAN_DIR) +fileman_PRE = Compose.man + # What we actually install if MANPAGES libman_DATA = $(libman_PRE:m...@lib_man_suffix@) \ $(all_shadows:=...@lib_man_suffix@) + +fileman_DATA = $(fileman_PRE:m...@file_man_suffix@) endif -EXTRA_DIST = $(libman_PRE) +EXTRA_DIST = $(libman_PRE) $(fileman_PRE) -CLEANFILES = $(libman_DATA) +CLEANFILES = $(libman_DATA) $(fileman_DATA) include $(top_srcdir)/cpprules.in -SUFFIXES += .$(LIB_MAN_SUFFIX) .man +SUFFIXES += .$(LIB_MAN_SUFFIX) .$(FILE_MAN_SUFFIX) .man XORGRELSTRING = @PACKAGE_STRING@ XORGMANNAME = X Version 11 MANDEFS = -D__libmansuffix__=$(LIB_MAN_SUFFIX) \ + -D__appmansuffix__=$(APP_MAN_SUFFIX) \ + -D__filemansuffix__=$(FILE_MAN_SUFFIX) \ + -D__miscmansuffix__=$(MISC_MAN_SUFFIX) \ + -D__xlocaledir__="$(X11_LOCALEDATADIR)" \ -D__xorgversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\"" CPP_MAN_FLAGS = $(MANDEFS) $(EXTRAMANDEFS) -.man.$(LIB_MAN_SUFFIX): +.man.$(LIB_MAN_SUFFIX) .man.$(FILE_MAN_SUFFIX): $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_MAN_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ # Generate man page shadow files (Replaces InstallManPageAliases from Imake) diff --git a/man/XLookupKeysym.man b/man/XLookupKeysym.man index 4449f2a..9167ea0 100644 --- a/man/XLookupKeysym.man +++ b/man/XLookupKeysym.man @@ -267,6 +267,10 @@ Note that you can rebind a KeySym that may not exist. .SH "SEE ALSO" XButtonEvent(__libmansuffix__), XMapEvent(__libmansuffix__), -XStringToKeysym(__libmansuffix__) +XStringToKeysym(__libmansuffix__), +XmbLookupString(__libmansuffix__), +XwcLookupString(__libmansuffix__), +Xutf8LookupString(__libmansuffix__), +Compose(__filemansuffix__) .br \fI\*(xL\fP diff --git a/man/XmbLookupString.man b/man/XmbLookupString.man index c5c1ef4..ac1e73a 100644 --- a/man/XmbLookupString.man +++ b/man/XmbLookupString.man @@ -306,6 +306,7 @@ release. Its presence is indicated by the macro .ZN X_HAVE_UTF8_STRING . .SH "SEE ALSO" -XLookupKeysym(__libmansuffix__) +XLookupKeysym(__libmansuffix__), +Compose(__filemansuffix__) .br -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
