Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/mit/xorg/tools delete the xkbcomp tool now that not...
details: https://anonhg.NetBSD.org/src/rev/9b3fad08950c
branches: trunk
changeset: 351438:9b3fad08950c
user: snj <snj%NetBSD.org@localhost>
date: Mon Feb 13 07:37:19 2017 +0000
description:
delete the xkbcomp tool now that nothing uses it
diffstat:
external/mit/xorg/tools/Makefile | 4 +-
external/mit/xorg/tools/xkbcomp/Makefile | 45 -
external/mit/xorg/tools/xkbcomp/Makefile.xkbcomp | 7 -
external/mit/xorg/tools/xkbcomp/xkbcomp-KeyBind.c | 756 ----------------------
external/mit/xorg/tools/xkbcomp/xkbcomp-stubs.c | 182 -----
external/mit/xorg/tools/xkbcomp/xkbfile-xkbmisc.c | 8 -
6 files changed, 2 insertions(+), 1000 deletions(-)
diffs (truncated from 1036 to 300 lines):
diff -r 9cba16b937a9 -r 9b3fad08950c external/mit/xorg/tools/Makefile
--- a/external/mit/xorg/tools/Makefile Mon Feb 13 07:18:20 2017 +0000
+++ b/external/mit/xorg/tools/Makefile Mon Feb 13 07:37:19 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2015/07/23 07:36:54 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2017/02/13 07:37:19 snj Exp $
.include <bsd.own.mk>
@@ -11,7 +11,7 @@
# makekeys is now done src/tools
SUBDIR+=bdftopcf fc-cache ucs2any
-SUBDIR+=mkfontscale .WAIT xkbcomp
+SUBDIR+=mkfontscale
.include <bsd.buildinstall.mk>
.include <bsd.subdir.mk>
diff -r 9cba16b937a9 -r 9b3fad08950c external/mit/xorg/tools/xkbcomp/Makefile
--- a/external/mit/xorg/tools/xkbcomp/Makefile Mon Feb 13 07:18:20 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2013/05/31 23:43:05 mrg Exp $
-
-NOMAN= 1
-
-.include <bsd.own.mk>
-
-HOSTPROG= xkbcomp
-.PATH: ${X11SRCDIR.xkbcomp}
-.PATH: ${X11SRCDIR.X11}/src
-
-SRCS= xkbcomp.c xkbscan.c expr.c vmod.c indicators.c misc.c \
- keymap.c keycodes.c keytypes.c compat.c action.c alias.c \
- symbols.c geometry.c xkbpath.c listing.c \
- xkbparse.y parseutils.c utils.c
-
-SRCS+= xkbcomp-stubs.c xkbcomp-KeyBind.c
-
-.PATH: ${X11SRCDIR.xkbfile}/src
-SRCS+= xkbatom.c xkberrs.c xkbout.c xkmread.c xkbtext.c \
- cout.c xkmout.c
-
-SRCS+= xkbfile-xkbmisc.c
-
-.PATH: ${X11SRCDIR.X11}/src/xkb
-SRCS+= KeysymStr.c StrKeysym.c Quarks.c Xrm.c
-SRCS+= XKB.c XKBAlloc.c XKBGAlloc.c XKBMAlloc.c XKBMisc.c \
- XKBGeom.c XKBRdBuf.c
-
-HOST_CPPFLAGS+= -I${DESTDIR}${X11INCDIR} \
- -I${DESTDIR}${X11INCDIR}/X11 \
- -I. \
- -I${X11SRCDIR.X11}/src \
- -I${X11SRCDIR.X11}/src/xkb \
- -I${X11SRCDIR.xkbfile}/include/X11/extensions \
- -I${X11SRCDIR.${HOSTPROG}} \
- -DDFLT_XKB_CONFIG_ROOT=\"${X11LIBDIR}/xkb\" -DXKB \
- -DHAVE_STRCASECMP -DHAVE_STRDUP \
- -DPACKAGE_STRING="\"NetBSD tool xkbcomp 1.2.4\"" \
- -DPACKAGE_VERSION="\"1.2.4\""
-
-
-.include "${NETBSDSRCDIR}/external/mit/xorg/tools/makekeys/Makefile.makekeys"
-
-.include <bsd.x11.mk>
-.include <bsd.hostprog.mk>
diff -r 9cba16b937a9 -r 9b3fad08950c external/mit/xorg/tools/xkbcomp/Makefile.xkbcomp
--- a/external/mit/xorg/tools/xkbcomp/Makefile.xkbcomp Mon Feb 13 07:18:20 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-# $NetBSD: Makefile.xkbcomp,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
-
-XKBCOMPDIR!= cd ${NETBSDSRCDIR}/external/mit/xorg/tools/xkbcomp && ${PRINTOBJDIR}
-XKBCOMP= ${XKBCOMPDIR}/xkbcomp
-
-${XKBCOMP}:
- (cd ${NETBSDSRCDIR}/external/mit/xorg/tools/xkbcomp && ${MAKE})
diff -r 9cba16b937a9 -r 9b3fad08950c external/mit/xorg/tools/xkbcomp/xkbcomp-KeyBind.c
--- a/external/mit/xorg/tools/xkbcomp/xkbcomp-KeyBind.c Mon Feb 13 07:18:20 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,756 +0,0 @@
-/* $NetBSD: xkbcomp-KeyBind.c,v 1.1.1.1 2008/07/29 05:01:23 mrg Exp $ */
-
-/* $Xorg: KeyBind.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */
-/*
-
-Copyright 1985, 1987, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-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. IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/X11/KeyBind.c,v 1.5 2001/12/14 19:54:02 dawes Exp $ */
-
-/* Beware, here be monsters (still under construction... - JG */
-
-#define NEED_EVENTS
-#include <X11/Xlibint.h>
-#include <X11/Xutil.h>
-#define XK_MISCELLANY
-#define XK_LATIN1
-#define XK_LATIN2
-#define XK_LATIN3
-#define XK_LATIN4
-#define XK_CYRILLIC
-#define XK_GREEK
-#define XK_ARMENIAN
-#define XK_XKB_KEYS
-#include <X11/keysymdef.h>
-#include <stdio.h>
-
-#include "XKBlib.h"
-
-#ifdef USE_OWN_COMPOSE
-#include "imComp.h"
-
-#endif
-
-#ifdef XKB
-#define XKeycodeToKeysym _XKeycodeToKeysym
-#define XKeysymToKeycode _XKeysymToKeycode
-#define XLookupKeysym _XLookupKeysym
-#define XRefreshKeyboardMapping _XRefreshKeyboardMapping
-#define XLookupString _XLookupString
-/* XKBBind.c */
-#else
-#define XkbKeysymToModifiers _XKeysymToModifiers
-#endif
-
-#define AllMods (ShiftMask|LockMask|ControlMask| \
- Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask)
-
-#if 0 /* { */
-
-static void ComputeMaskFromKeytrans();
-int _XKeyInitialize();
-
-struct _XKeytrans {
- struct _XKeytrans *next;/* next on list */
- char *string; /* string to return when the time comes */
- int len; /* length of string (since NULL is legit)*/
- KeySym key; /* keysym rebound */
- unsigned int state; /* modifier state */
- KeySym *modifiers; /* modifier keysyms you want */
- int mlen; /* length of modifier list */
-};
-
-static KeySym
-#if NeedFunctionPrototypes
-KeyCodetoKeySym(register Display *dpy, KeyCode keycode, int col)
-#else
-KeyCodetoKeySym(dpy, keycode, col)
- register Display *dpy;
- KeyCode keycode;
- int col;
-#endif
-{
- register int per = dpy->keysyms_per_keycode;
- register KeySym *syms;
- KeySym lsym, usym;
-
- if ((col < 0) || ((col >= per) && (col > 3)) ||
- ((int)keycode < dpy->min_keycode) || ((int)keycode > dpy->max_keycode))
- return NoSymbol;
-
- syms = &dpy->keysyms[(keycode - dpy->min_keycode) * per];
- if (col < 4) {
- if (col > 1) {
- while ((per > 2) && (syms[per - 1] == NoSymbol))
- per--;
- if (per < 3)
- col -= 2;
- }
- if ((per <= (col|1)) || (syms[col|1] == NoSymbol)) {
- XConvertCase(syms[col&~1], &lsym, &usym);
- if (!(col & 1))
- return lsym;
- else if (usym == lsym)
- return NoSymbol;
- else
- return usym;
- }
- }
- return syms[col];
-}
-
-#if NeedFunctionPrototypes
-KeySym
-XKeycodeToKeysym(Display *dpy,
-#if NeedWidePrototypes
- unsigned int kc,
-#else
- KeyCode kc,
-#endif
- int col)
-#else
-KeySym
-XKeycodeToKeysym(dpy, kc, col)
- Display *dpy;
- KeyCode kc;
- int col;
-#endif
-{
- if ((! dpy->keysyms) && (! _XKeyInitialize(dpy)))
- return NoSymbol;
- return KeyCodetoKeySym(dpy, kc, col);
-}
-
-KeyCode
-XKeysymToKeycode(dpy, ks)
- Display *dpy;
- KeySym ks;
-{
- register int i, j;
-
- if ((! dpy->keysyms) && (! _XKeyInitialize(dpy)))
- return (KeyCode) 0;
- for (j = 0; j < dpy->keysyms_per_keycode; j++) {
- for (i = dpy->min_keycode; i <= dpy->max_keycode; i++) {
- if (KeyCodetoKeySym(dpy, (KeyCode) i, j) == ks)
- return i;
- }
- }
- return 0;
-}
-
-KeySym
-XLookupKeysym(event, col)
- register XKeyEvent *event;
- int col;
-{
- if ((! event->display->keysyms) && (! _XKeyInitialize(event->display)))
- return NoSymbol;
- return KeyCodetoKeySym(event->display, event->keycode, col);
-}
-
-static void
-ResetModMap(dpy)
- Display *dpy;
-{
- register XModifierKeymap *map;
- register int i, j, n;
- KeySym sym;
- register struct _XKeytrans *p;
-
- map = dpy->modifiermap;
- /* If any Lock key contains Caps_Lock, then interpret as Caps_Lock,
- * else if any contains Shift_Lock, then interpret as Shift_Lock,
- * else ignore Lock altogether.
- */
- dpy->lock_meaning = NoSymbol;
- /* Lock modifiers are in the second row of the matrix */
- n = 2 * map->max_keypermod;
- for (i = map->max_keypermod; i < n; i++) {
- for (j = 0; j < dpy->keysyms_per_keycode; j++) {
- sym = KeyCodetoKeySym(dpy, map->modifiermap[i], j);
- if (sym == XK_Caps_Lock) {
- dpy->lock_meaning = XK_Caps_Lock;
- break;
- } else if (sym == XK_Shift_Lock) {
- dpy->lock_meaning = XK_Shift_Lock;
- }
- else if (sym == XK_ISO_Lock) {
- dpy->lock_meaning = XK_Caps_Lock;
- break;
- }
- }
- }
- /* Now find any Mod<n> modifier acting as the Group or Numlock modifier */
- dpy->mode_switch = 0;
- dpy->num_lock = 0;
- n *= 4;
- for (i = 3*map->max_keypermod; i < n; i++) {
- for (j = 0; j < dpy->keysyms_per_keycode; j++) {
- sym = KeyCodetoKeySym(dpy, map->modifiermap[i], j);
- if (sym == XK_Mode_switch)
- dpy->mode_switch |= 1 << (i / map->max_keypermod);
- if (sym == XK_Num_Lock)
- dpy->num_lock |= 1 << (i / map->max_keypermod);
- }
- }
- for (p = dpy->key_bindings; p; p = p->next)
Home |
Main Index |
Thread Index |
Old Index