Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Lift xkb to xorg-xserver-7.1/1.1.0 state #648

Merged
merged 2 commits into from
Feb 27, 2018
Merged

Lift xkb to xorg-xserver-7.1/1.1.0 state #648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e6f87e
Lift xkb to xorg-xserver-7.1/1.1.0 state
uli42 Nov 5, 2017
00e3e95
Lift xkb to xorg-xserver-7.1/1.1.0 state - non-functional changes only
uli42 Feb 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 2 additions & 8 deletions nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,20 +724,14 @@ base directory for keyboard layout files. This option is not available
for setuid X servers (i.e., when the X server's real and effective uids
are different).
.TP 8
.B \-ar1 \fImilliseconds\fP
.B \-ardelay \fImilliseconds\fP
sets the autorepeat delay (length of time in milliseconds that a key must
be depressed before autorepeat starts).
.TP 8
.B \-ar2 \fImilliseconds\fP
.B \-arinterval \fImilliseconds\fP
sets the autorepeat interval (length of time in milliseconds that should
elapse between autorepeat-generated keystrokes).
.TP 8
.B \-noloadxkb
disables loading of an XKB keymap description on server startup.
.TP 8
.B \-xkbdb \fIfilename\fP
uses \fIfilename\fP for default keyboard keymaps.
.TP 8
.B \-xkbmap \fIfilename\fP
loads keyboard description in \fIfilename\fP on server startup.

Expand Down
20 changes: 4 additions & 16 deletions nx-X11/programs/Xserver/xkb/Imakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,20 @@ XKB_DDXDEFS = XkbServerDefines
NX_DEFINES = -DNXAGENT_SERVER
#endif

#if (defined(XorgServer) && XorgServer)
XF86INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC)
XF86_OBJS = xf86KillSrv.o xf86VT.o xf86Private.o
#endif

DDX_SRCS = ddxBeep.c ddxCtrls.c ddxFakeBtn.c ddxFakeMtn.c ddxInit.c \
ddxKeyClick.c ddxKillSrv.c ddxLEDs.c ddxVT.c ddxLoad.c \
ddxList.c ddxConfig.c ddxDevBtn.c ddxPrivate.c xkbconfig.c
ddxList.c ddxDevBtn.c ddxPrivate.c xkbconfig.c
DDX_OBJS = ddxBeep.o ddxCtrls.o ddxFakeBtn.o ddxFakeMtn.o ddxInit.o \
ddxKeyClick.o ddxKillSrv.o ddxLEDs.o ddxVT.o ddxLoad.o \
ddxList.o ddxConfig.o ddxDevBtn.o ddxPrivate.o xkbconfig.o
ddxList.o ddxDevBtn.o ddxPrivate.o xkbconfig.o
SRCS = xkb.c xkbUtils.c xkbEvents.c xkbAccessX.c xkbSwap.c \
xkbLEDs.c xkbInit.c xkbActions.c xkbPrKeyEv.c \
xkmread.c xkbtext.c xkbfmisc.c xkberrs.c xkbout.c maprules.c \
xkmread.c xkbfmisc.c xkberrs.c maprules.c \
XKBMisc.c XKBMAlloc.c XKBAlloc.c XKBGAlloc.c \
$(XKBXI_SRCS) $(DDX_SRCS)
OBJS = xkb.o xkbUtils.o xkbEvents.o xkbAccessX.o xkbSwap.o \
xkbLEDs.o xkbInit.o xkbActions.o xkbPrKeyEv.o \
xkmread.o xkbtext.o xkbfmisc.o xkberrs.o xkbout.o maprules.o \
xkmread.o xkbfmisc.o xkberrs.o maprules.o \
XKBMisc.o XKBMAlloc.o XKBAlloc.o XKBGAlloc.o \
$(XKBXI_OBJS) $(DDX_OBJS)
INCLUDES = -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) -I$(SERVERSRC)/Xext \
Expand All @@ -52,13 +47,6 @@ NormalLibraryTarget(xkb,$(OBJS))
LintLibraryTarget(xkb,$(SRCS))
NormalLintTarget($(SRCS))

#if (defined(XorgServer) && XorgServer)
ObjectFromSpecialSource(xf86KillSrv,ddxKillSrv,-DXF86DDXACTIONS)
ObjectFromSpecialSource(xf86VT,ddxVT,-DXF86DDXACTIONS)
ObjectFromSpecialSource(xf86Private,ddxPrivate,-DXF86DDXACTIONS)
AllTarget($(XF86_OBJS))
#endif

SpecialCObjectRule(xkbInit,$(ICONFIGFILES),$(XKB_DEFINES))

#if BuildLibraries
Expand Down
4 changes: 0 additions & 4 deletions nx-X11/programs/Xserver/xkb/XKBAlloc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.

#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#elif defined(HAVE_CONFIG_H)
#include <config.h>
#endif


#include <stdio.h>
#include <nx-X11/X.h>
#include <nx-X11/Xproto.h>
Expand All @@ -39,7 +36,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <xkbsrv.h>
#include "xkbgeom.h"


/***===================================================================***/

/*ARGSUSED*/
Expand Down
3 changes: 0 additions & 3 deletions nx-X11/programs/Xserver/xkb/XKBGAlloc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.

#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#elif defined(HAVE_CONFIG_H)
#include <config.h>
#endif


Expand All @@ -39,7 +37,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <xkbsrv.h>
#include "xkbgeom.h"


#ifdef X_NOT_POSIX
#define Size_t unsigned int
#else
Expand Down
4 changes: 1 addition & 3 deletions nx-X11/programs/Xserver/xkb/XKBMAlloc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <config.h>
#endif


#include <stdio.h>
#include <nx-X11/X.h>
#include <nx-X11/Xproto.h>
Expand All @@ -39,7 +38,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <nx-X11/keysym.h>
#include <xkbsrv.h>


/***====================================================================***/

Status
Expand Down Expand Up @@ -298,7 +296,7 @@ XkbClientMapPtr map;
}
}
}
if ((!map)||(!map->types)||(!map->num_types<XkbNumRequiredTypes)) {
if ((!map)||(!map->types)||(!(map->num_types<XkbNumRequiredTypes))) {
tmp= XkbNumRequiredTypes+1;
if (XkbAllocClientMap(xkb,XkbKeyTypesMask,tmp)!=Success)
return NULL;
Expand Down
2 changes: 0 additions & 2 deletions nx-X11/programs/Xserver/xkb/XKBMisc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <config.h>
#endif


#include <stdio.h>
#include <nx-X11/X.h>
#include <nx-X11/Xproto.h>
Expand All @@ -39,7 +38,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <nx-X11/keysym.h>
#include <xkbsrv.h>


/***====================================================================***/

#define mapSize(m) (sizeof(m)/sizeof(XkbKTMapEntryRec))
Expand Down
208 changes: 0 additions & 208 deletions nx-X11/programs/Xserver/xkb/ddxConfig.c
View file
Open in desktop

This file was deleted.

18 changes: 2 additions & 16 deletions nx-X11/programs/Xserver/xkb/ddxKillSrv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,25 +42,11 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <xkbsrv.h>
#include <nx-X11/extensions/XI.h>

#ifdef XF86DDXACTIONS
#include "xf86.h"
#endif

int
XkbDDXTerminateServer(DeviceIntPtr dev,KeyCode key,XkbAction *act)
{
#ifdef NXAGENT_SERVER

return 0;

#else

#ifdef XF86DDXACTIONS
xf86ProcessActionEvent(ACTION_TERMINATE, NULL);
#else
#ifndef NXAGENT_SERVER
GiveUp(1);
#endif
return 0;

#endif /* NXAGENT_SERVER */
return 0;
}