Skip to content

N
nx-libs
Commit 905c74da authored by Mike Gabriel's avatar Mike Gabriel
Browse files
Options

Merge pull request #52 from woglinde/3.6.x

Library clean-up: Drop libxkbui, has been built previously but none of its symbols have been used in NX.
parents 4674a4ae a287e9db
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 361 deletions
nx-X11/config/cf/X11.tmpl
View file @ 905c74da
......@@ -199,9 +199,6 @@ XORGRELSTRING = XorgManVersionString
#ifndef BuildXKBlib
#define BuildXKBlib (BuildXKB && !BuildServersOnly)
#endif
#ifndef BuildXKBuilib
#define BuildXKBuilib (BuildXKB && !BuildServersOnly)
#endif
#ifndef BuildXKBfilelib
#define BuildXKBfilelib (BuildXKB && !BuildServersOnly)
#endif
......@@ -1823,50 +1820,6 @@ ProjectUnsharedLibReferences(XKBFILE,NX_xkbfile,$(XKBFILELIBSRC),XBuildLibDir)
# endif
#endif /* BuildXKBlib */
#if BuildXKBlib
# ifndef SharedLibxkbui
# define SharedLibxkbui HasSharedLibraries
# endif
# ifndef NormalLibxkbui
# define NormalLibxkbui (!SharedLibxkbui || ForceNormalLib)
# endif
# ifndef DebugLibxkbui
# define DebugLibxkbui NO
# endif
# ifndef ProfileLibxkbui
# define ProfileLibxkbui NO
# endif
#else
# ifndef SharedLibxkbui
# define SharedLibxkbui NO
# endif
# ifndef NormalLibxkbui
# define NormalLibxkbui NO
# endif
# ifndef DebugLibxkbui
# define DebugLibxkbui NO
# endif
# ifndef ProfileLibxkbui
# define ProfileLibxkbui NO
# endif
#endif
XKBUILIBSRC = $(LIBSRC)/xkbui
#if SharedLibxkbui
# ifndef SharedxkbuiRev
# define SharedxkbuiRev 1.0
# endif
SharedLibReferences(XKBUI,NX_xkbui,$(XKBUISRC),SOXKBUIREV, SharedxkbuiRev)
#else
ProjectUnsharedLibReferences(XKBUI,NX_xkbui,$(XKBUILIBSRC),XBuildLibDir)
#endif
#ifndef XkbuiLibs
# define XkbuiLibs $(XKBUILIB)
#endif
#ifndef XkbuiDepLibs
# define XkbuiDepLibs $(DEPXKBFILELIB)
#endif
#ifndef NeedDefaultDepLibs
#define NeedDefaultDepLibs YES
#endif
......
nx-X11/config/cf/lnxLib.tmpl
View file @ 905c74da
......@@ -19,7 +19,6 @@ XCOMM $XFree86: xc/config/cf/lnxLib.tmpl,v 3.19 2003/10/15 22:47:48 herrb Exp $
#define SharedXxf86miscReqs $(LDPRELIB) $(XLIB)
#define SharedXxf86vmReqs $(LDPRELIB) $(XLIB)
#define SharedxkbfileReqs $(LDPRELIB) $(XONLYLIB)
#define SharedxkbuiReqs $(LDPRELIB) $(XKBFILELIB) $(XONLYLIB)
#define SharedXfixesReqs $(LDPRELIB) $(XLIB)
#define SharedXdamageReqs $(LDPRELIB) $(XLIB)
#define SharedXcompositeReqs $(LDPRELIB) $(XDAMAGELIB) $(XFIXESLIB) $(XLIB)
......
nx-X11/config/cf/xfree86.cf
View file @ 905c74da
......@@ -160,7 +160,6 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $
#define BuildXF86VidModeLibrary YES
#define BuildXKBlib YES
#define BuildXKBfilelib YES
#define BuildXKBuilib YES
#endif
/*
......
nx-X11/config/cf/xorg.cf
View file @ 905c74da
......@@ -196,7 +196,6 @@ NX_VERSION_CURRENT_STRING = nxVersionString
#define BuildXF86VidModeLibrary YES
#define BuildXKBlib YES
#define BuildXKBfilelib YES
#define BuildXKBuilib YES
#endif
/*
......
nx-X11/lib/Imakefile
View file @ 905c74da
......@@ -15,10 +15,6 @@ NULL =
XKBLIBDIR = xkbfile
#endif
#if BuildXKBuilib
XKBUILIBDIR = xkbui
#endif
#if BuildXF86MiscLibrary
XF86MISCLIBDIR = Xxf86misc
#endif
......@@ -87,7 +83,6 @@ LINTSUBDIRS = \
$(XF86RUSHLIBDIR) \
$(XTSTLIBDIR) \
$(XKBLIBDIR) \
$(XKBUILIBDIR) \
$(XINERAMADIR) \
$(RENDERLIBDIR) \
$(XFIXESLIBDIR) \
......
nx-X11/lib/xkbui/Imakefile deleted 100644 → 0
View file @ 4674a4ae
XCOMM $XConsortium: Imakefile /main/1 1995/11/30 19:00:42 kaleb $
XCOMM $XFree86: xc/lib/xkbui/Imakefile,v 3.4 2003/10/15 21:23:38 herrb Exp $
#define DoNormalLib NormalLibxkbui
#define DoSharedLib SharedLibxkbui
#define DoExtraLib SharedLibxkbui
#define DoDebugLib DebugLibxkbui
#define DoProfileLib ProfileLibxkbui
#define HasSharedData NO
#define LibName NX_xkbui
#define SoRev SOXKBUIREV
#define IncSubdir X11
#define IncSubSubdir extensions
#ifdef SharedxkbuiReqs
REQUIREDLIBS = SharedxkbuiReqs
#endif
SRCS = XKBui.c
OBJS = XKBui.o
HEADERS = XKBui.h
INCLUDES = -I. -I$(EXTINCSRC) -I../xkbfile
#include <Library.tmpl>
DependTarget()
nx-X11/lib/xkbui/XKBui.h deleted 100644 → 0
View file @ 4674a4ae
#ifndef XKBUI_H
#define XKBUI_H 1
/* $XConsortium: XKBui.h /main/2 1995/12/07 21:18:19 kaleb $ */
/************************************************************
Copyright (c) 1996 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$ */
#include <X11/Xlib.h>
#include <X11/XKBlib.h>
#include <X11/extensions/XKBgeom.h>
typedef struct _XkbUI_View *XkbUI_ViewPtr;
typedef struct _XkbUI_ViewOpts {
unsigned int present;
unsigned int fg;
unsigned int bg;
unsigned int label_mode;
unsigned int color_mode;
XRectangle viewport;
unsigned int margin_width;
unsigned int margin_height;
Colormap cmap;
} XkbUI_ViewOptsRec,*XkbUI_ViewOptsPtr;
/*
* legal values for present field of a view options
*/
#define XkbUI_BackgroundMask (1<<0)
#define XkbUI_ForegroundMask (1<<1)
#define XkbUI_LabelModeMask (1<<2)
#define XkbUI_ColorModeMask (1<<3)
#define XkbUI_WidthMask (1<<4)
#define XkbUI_HeightMask (1<<5)
#define XkbUI_XOffsetMask (1<<6)
#define XkbUI_YOffsetMask (1<<7)
#define XkbUI_ColormapMask (1<<8)
#define XkbUI_MarginWidthMask (1<<9)
#define XkbUI_MarginHeightMask (1<<10)
#define XkbUI_SizeMask (XkbUI_WidthMask|XkbUI_HeightMask)
#define XkbUI_OffsetMask (XkbUI_XOffsetMask|XkbUI_YOffsetMask)
#define XkbUI_MarginMask (XkbUI_MarginWidthMask|XkbUI_MarginHeightMask)
#define XkbUI_AllViewOptsMask (0x7ff)
/*
* legal values for the label_mode of a view options
*/
#define XkbUI_NoLabels 0
#define XkbUI_KeyCodes 1
#define XkbUI_KeyNames 2
#define XkbUI_StateSyms 3
#define XkbUI_MultiSyms 4
typedef struct _XkbUI_Select {
unsigned type;
XkbSectionPtr section;
XkbKeyPtr key;
XkbDoodadPtr doodad;
} XkbUI_SelectRec,*XkbUI_SelectPtr;
/*
* legal values for 'type' field of a selection report
*/
#define XkbUI_Keys 0
#define XkbUI_Indicators 1
#define XkbUI_TextLabels 2
#define XkbUI_SolidShapes 3
#define XkbUI_Outlines 4
#define XkbUI_Logos 5
#define XkbUI_Sections 6
/*
* legal values for 'which' field of a select call
*/
#define XkbUI_KeysMask (1<<0)
#define XkbUI_IndicatorsMask (1<<1)
#define XkbUI_TextLabelsMask (1<<2)
#define XkbUI_SolidShapesMask (1<<3)
#define XkbUI_OutlinesMask (1<<4)
#define XkbUI_LogosMask (1<<5)
#define XkbUI_SectionsMask (1<<6)
/*
* legal values for key appearance flag
*/
#define XkbUI_KeyDown (1<<0)
#define XkbUI_Highlight (1<<1)
_XFUNCPROTOBEGIN
extern XkbUI_ViewPtr XkbUI_SimpleInit(
Display * /* dpy */,
Window /* win */,
int /* width */,
int /* height */
);
extern XkbUI_ViewPtr XkbUI_Init(
Display * /* dpy */,
Window /* win */,
int /* width */,
int /* height */,
XkbDescPtr /* xkb */,
XkbUI_ViewOptsPtr /* view */
);
extern Status XkbUI_SetViewOpts(
XkbUI_ViewPtr /* view */,
XkbUI_ViewOptsPtr /* opts */
);
extern Status XbUI_GetViewOpts(
XkbUI_ViewPtr /* view */,
XkbUI_ViewOptsPtr /* opts_rtrn */
);
extern Status XkbUI_SetCanvasSize(
XkbUI_ViewPtr /* view */,
int /* width */,
int /* height */
);
extern Status XkbUI_GetCanvasSize(
XkbUI_ViewPtr /* view */,
int * /* width_rtrn */,
int * /* height_rtrn */
);
extern Bool XkbUI_SetKeyAppearance(
XkbUI_ViewPtr /* view */,
KeyCode /* kc */,
unsigned /* flags */
);
extern Bool XkbUI_SetKeyAppearanceByName(
XkbUI_ViewPtr /* view */,
XkbKeyNamePtr /* name */,
unsigned /* flags */
);
extern Bool XkbUI_ResetKeyAppearance(
XkbUI_ViewPtr /* view */,
unsigned int /* mask */,
unsigned int /* values */
);
extern Bool XkbUI_DrawRegion(
XkbUI_ViewPtr /* view */,
XRectangle * /* viewport */
);
extern Bool XkbUI_DrawChanged(
XkbUI_ViewPtr /* view */,
XRectangle * /* viewport */,
XkbChangesPtr /* changes */,
int /* num_keys */,
XkbKeyNamePtr /* keys */
);
extern Bool XkbUI_Select(
XkbUI_ViewPtr /* view */,
XPoint * /* coord */,
unsigned int /* which */,
XkbSectionPtr /* section */
);
_XFUNCPROTOEND
#endif /* XKBUI_H */
nx-X11/lib/xkbui/XKBuiPriv.h deleted 100644 → 0
View file @ 4674a4ae
#ifndef XKBUIPRIV_H
#define XKBUIPRIV_H 1
/* $XConsortium: XKBuiPriv.h /main/2 1995/12/07 21:18:19 kaleb $ */
/************************************************************
Copyright (c) 1996 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.
********************************************************/
#include "XKBui.h"
typedef struct _XkbUI_Point {
double x;
double y;
} XkbUI_PointRec,*XkbUI_PointPtr;
typedef struct _XkbUI_View {
Display * dpy;
XkbDescPtr xkb;
Window win;
GC gc;
XkbUI_ViewOptsRec opts;
unsigned int canvas_width;
unsigned int canvas_height;
unsigned char state[XkbMaxLegalKeyCode];
double xscale;
double yscale;
} XkbUI_ViewRec;
#define _XkbAlloc(s) malloc((s))
#define _XkbCalloc(n,s) calloc((n),(s))
#define _XkbRealloc(o,s) realloc((o),(s))
#define _XkbTypedAlloc(t) ((t *)malloc(sizeof(t)))
#define _XkbTypedCalloc(n,t) ((t *)calloc((n),sizeof(t)))
#define _XkbTypedRealloc(o,n,t) \
((o)?(t *)realloc((o),(n)*sizeof(t)):_XkbTypedCalloc(n,t))
#define _XkbClearElems(a,f,l,t) bzero(&(a)[f],((l)-(f)+1)*sizeof(t))
#define _XkbFree(p) free(p)
/*
* private values for key appearance flags
* must not conflict with values from XKBui.h
*/
#define XkbUI_Obscured (1<<7)
_XFUNCPROTOBEGIN
_XFUNCPROTOEND
#endif /* XKBUIPRIV_H */
nx-X11/lib/xkbui/xkbui-def.cpp deleted 100644 → 0
View file @ 4674a4ae
LIBRARY xkbui
VERSION LIBRARY_VERSION
EXPORTS
XbUI_GetViewOpts
XkbUI_DrawChanged
XkbUI_DrawRegion
XkbUI_GetCanvasSize
XkbUI_Init
XkbUI_ResetKeyAppearance
XkbUI_Select
XkbUI_SetCanvasSize
XkbUI_SetKeyAppearance
XkbUI_SetKeyAppearanceByName
XkbUI_SetViewOpts
XkbUI_SimpleInit
/* $XFree86$ */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment