From 3562e78743202e43aec8727005182a2558117eca Mon Sep 17 00:00:00 2001 From: marha Date: Sun, 28 Jun 2009 22:07:26 +0000 Subject: Checked in the following released items: xkeyboard-config-1.4.tar.gz ttf-bitstream-vera-1.10.tar.gz font-alias-1.0.1.tar.gz font-sun-misc-1.0.0.tar.gz font-sun-misc-1.0.0.tar.gz font-sony-misc-1.0.0.tar.gz font-schumacher-misc-1.0.0.tar.gz font-mutt-misc-1.0.0.tar.gz font-misc-misc-1.0.0.tar.gz font-misc-meltho-1.0.0.tar.gz font-micro-misc-1.0.0.tar.gz font-jis-misc-1.0.0.tar.gz font-isas-misc-1.0.0.tar.gz font-dec-misc-1.0.0.tar.gz font-daewoo-misc-1.0.0.tar.gz font-cursor-misc-1.0.0.tar.gz font-arabic-misc-1.0.0.tar.gz font-winitzki-cyrillic-1.0.0.tar.gz font-misc-cyrillic-1.0.0.tar.gz font-cronyx-cyrillic-1.0.0.tar.gz font-screen-cyrillic-1.0.1.tar.gz font-xfree86-type1-1.0.1.tar.gz font-adobe-utopia-type1-1.0.1.tar.gz font-ibm-type1-1.0.0.tar.gz font-bitstream-type1-1.0.0.tar.gz font-bitstream-speedo-1.0.0.tar.gz font-bh-ttf-1.0.0.tar.gz font-bh-type1-1.0.0.tar.gz font-bitstream-100dpi-1.0.0.tar.gz font-bh-lucidatypewriter-100dpi-1.0.0.tar.gz font-bh-100dpi-1.0.0.tar.gz font-adobe-utopia-100dpi-1.0.1.tar.gz font-adobe-100dpi-1.0.0.tar.gz font-util-1.0.1.tar.gz font-bitstream-75dpi-1.0.0.tar.gz font-bh-lucidatypewriter-75dpi-1.0.0.tar.gz font-adobe-utopia-75dpi-1.0.1.tar.gz font-bh-75dpi-1.0.0.tar.gz bdftopcf-1.0.1.tar.gz font-adobe-75dpi-1.0.0.tar.gz mkfontscale-1.0.6.tar.gz openssl-0.9.8k.tar.gz bigreqsproto-1.0.2.tar.gz xtrans-1.2.2.tar.gz resourceproto-1.0.2.tar.gz inputproto-1.4.4.tar.gz compositeproto-0.4.tar.gz damageproto-1.1.0.tar.gz zlib-1.2.3.tar.gz xkbcomp-1.0.5.tar.gz freetype-2.3.9.tar.gz pthreads-w32-2-8-0-release.tar.gz pixman-0.12.0.tar.gz kbproto-1.0.3.tar.gz evieext-1.0.2.tar.gz fixesproto-4.0.tar.gz recordproto-1.13.2.tar.gz randrproto-1.2.2.tar.gz scrnsaverproto-1.1.0.tar.gz renderproto-0.9.3.tar.gz xcmiscproto-1.1.2.tar.gz fontsproto-2.0.2.tar.gz xextproto-7.0.3.tar.gz xproto-7.0.14.tar.gz libXdmcp-1.0.2.tar.gz libxkbfile-1.0.5.tar.gz libfontenc-1.0.4.tar.gz libXfont-1.3.4.tar.gz libX11-1.1.5.tar.gz libXau-1.0.4.tar.gz libxcb-1.1.tar.gz xorg-server-1.5.3.tar.gz --- libxkbfile/src/srvmisc.c | 216 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 216 insertions(+) create mode 100644 libxkbfile/src/srvmisc.c (limited to 'libxkbfile/src/srvmisc.c') diff --git a/libxkbfile/src/srvmisc.c b/libxkbfile/src/srvmisc.c new file mode 100644 index 000000000..3e4c73c98 --- /dev/null +++ b/libxkbfile/src/srvmisc.c @@ -0,0 +1,216 @@ +/* $Xorg: srvmisc.c,v 1.3 2000/08/17 19:46:43 cpqbld Exp $ */ +/************************************************************ + Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. + + Permission to use, copy, modify, and distribute this + software and its documentation for any purpose and without + fee is hereby granted, provided that the above copyright + notice appear in all copies and that both that copyright + notice and this permission notice appear in supporting + documentation, and that the name of Silicon Graphics not be + used in advertising or publicity pertaining to distribution + of the software without specific prior written permission. + Silicon Graphics makes no representation about the suitability + of this software for any purpose. It is provided "as is" + without any express or implied warranty. + + SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS + SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON + GRAPHICS BE LIABLE FOR 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. + + ********************************************************/ +/* $XFree86: xc/lib/xkbfile/srvmisc.c,v 3.4 2001/10/28 03:32:47 tsi Exp $ */ + +#ifdef HAVE_CONFIG_H +#include +#endif +#include +#include +#include +#include +#include +#include + +#include "XKMformat.h" +#include "XKBfileInt.h" + +Bool +XkbWriteToServer(XkbFileInfo *result) +{ +XkbDescPtr xkb; +Display * dpy; + + if ((result==NULL)||(result->xkb==NULL)||(result->xkb->dpy==NULL)) + return False; + xkb= result->xkb; + dpy= xkb->dpy; + if (!XkbSetMap(dpy,XkbAllMapComponentsMask,xkb)) + return False; + if (!XkbSetIndicatorMap(dpy,~0,xkb)) + return False; +#ifdef NOTYET + if (!XkbSetControls(dpy,XkbAllControlsMask,xkb)) + return False; +#endif + if (!XkbSetCompatMap(dpy,XkbAllCompatMask,xkb,True)) + return False; + if (!XkbSetNames(dpy,XkbAllNamesMask,0,xkb->map->num_types,xkb)) + return False; + if (xkb->geom) { + if (XkbSetGeometry(dpy,xkb->device_spec,xkb->geom)!=Success) + return False; + } + return True; +#ifdef NOTYET + switch (result->type) { + case XkmSemanticsFile: + func= WriteCHdrSemantics; + break; + case XkmLayoutFile: + func= WriteCHdrLayout; + break; + case XkmKeymapFile: + func= WriteCHdrKeymap; + break; + default: + _XkbLibError(_XkbErrIllegalContents,"XkbWriteToServer",result->type); + break; + } + return ok; +#endif +} + +unsigned +XkbReadFromServer(Display *dpy,unsigned need,unsigned want,XkbFileInfo *result) +{ +unsigned which= need|want; +unsigned tmp = 0; + + if ((result==NULL)||(dpy==NULL)) + return which; + + if (which&XkmSymbolsMask) tmp= XkbAllMapComponentsMask; + else if (which&XkmTypesMask) tmp= XkbKeyTypesMask; + if (result->xkb==NULL) { + result->xkb= XkbGetMap(dpy,tmp,XkbUseCoreKbd); + if (!result->xkb) + return which; + else which&= ~(XkmSymbolsMask|XkmTypesMask|XkmVirtualModsMask); + } + else if ((tmp)&&(XkbGetUpdatedMap(dpy,tmp,result->xkb)==Success)) + which&= ~(XkmSymbolsMask|XkmTypesMask|XkmVirtualModsMask); + + if (which&XkmIndicatorsMask) { + if (XkbGetIndicatorMap(dpy,XkbAllIndicatorsMask,result->xkb)==Success) + which&= ~XkmIndicatorsMask; + } + + if (which&XkmCompatMapMask) { + if (XkbGetCompatMap(dpy,XkbAllCompatMask,result->xkb)==Success) + which&= ~XkmCompatMapMask; + } + if (which&XkmGeometryMask) { + if (XkbGetGeometry(dpy,result->xkb)==Success) + which&= ~XkmGeometryMask; + } + XkbGetNames(dpy,XkbAllNamesMask,result->xkb); + return which; +} + +Status +XkbChangeKbdDisplay(Display *newDpy,XkbFileInfo *result) +{ +register int i; +XkbDescPtr xkb; +Display * oldDpy; +Atom * atm; + + if ((result->xkb==NULL)||(result->xkb->dpy==newDpy)) + return Success; + xkb= result->xkb; + oldDpy= xkb->dpy; + if (xkb->names) { + XkbNamesPtr names= xkb->names; + names->keycodes= XkbChangeAtomDisplay(oldDpy,newDpy,names->keycodes); + names->geometry= XkbChangeAtomDisplay(oldDpy,newDpy,names->geometry); + names->symbols= XkbChangeAtomDisplay(oldDpy,newDpy,names->symbols); + names->types= XkbChangeAtomDisplay(oldDpy,newDpy,names->types); + names->compat= XkbChangeAtomDisplay(oldDpy,newDpy,names->compat); + names->phys_symbols= XkbChangeAtomDisplay(oldDpy,newDpy, + names->phys_symbols); + for (i=0,atm=names->vmods;iindicators;igroups;iradio_groups;inum_rg;i++,atm++) { + *atm= XkbChangeAtomDisplay(oldDpy,newDpy,*atm); + } + } + if (xkb->map) { + register int t; + XkbKeyTypePtr type; + for (t=0,type=xkb->map->types;tmap->num_types;t++,type++) { + type->name= XkbChangeAtomDisplay(oldDpy,newDpy,type->name); + if (type->level_names!=NULL) { + for (i=0,atm=type->level_names;inum_levels;i++,atm++) { + *atm= XkbChangeAtomDisplay(oldDpy,newDpy,*atm); + } + } + } + } + if (xkb->geom) { + XkbGeometryPtr geom= xkb->geom; + geom->name= XkbChangeAtomDisplay(oldDpy,newDpy,geom->name); + if (geom->shapes) { + register int s; + XkbShapePtr shape; + for (s=0,shape=geom->shapes;snum_shapes;s++,shape++) { + shape->name= XkbChangeAtomDisplay(oldDpy,newDpy,shape->name); + } + } + if (geom->sections) { + register int s; + XkbSectionPtr section; + for (s=0,section=geom->sections;snum_sections;s++,section++){ + section->name=XkbChangeAtomDisplay(oldDpy,newDpy,section->name); + if (section->doodads) { + register int d; + XkbDoodadPtr doodad; + for (d=0,doodad=section->doodads;dnum_doodads; + d++,doodad++) { + doodad->any.name= XkbChangeAtomDisplay(oldDpy,newDpy, + doodad->any.name); + } + } + if (section->overlays) { + register int o; + register XkbOverlayPtr ol; + for (o=0,ol=section->overlays;onum_overlays; + o++,ol++) { + ol->name= XkbChangeAtomDisplay(oldDpy,newDpy,ol->name); + } + } + } + } + if (geom->doodads) { + register int d; + XkbDoodadPtr doodad; + for (d=0,doodad=geom->doodads;dnum_doodads;d++,doodad++) { + doodad->any.name= XkbChangeAtomDisplay(oldDpy,newDpy, + doodad->any.name); + } + } + } + xkb->dpy= newDpy; + return Success; +} -- cgit v1.2.3