Skip to content

N
nx-libs
Commit b32a984f authored by Ulrich Sibiller's avatar Ulrich Sibiller
Browse files
Options

Die XTESTEXT1, die!

commit a73e0f8cdfec1c9199ffe696146ba7d677c4c10d Author: Daniel Stone <daniel@fooishbar.org> Date: Thu Jun 1 18:47:47 2006 +0000 Die XTESTEXT1, die! Citing an email from the xorg-modular mailing list: On Tuesday 21 February 2006 23:04, Enrico Weigelt wrote: > Hi folks, > > I'm wondering what's the difference between XTEST and XTESTEXT1 > (the second one can be configured w/ my current patch ...) > Are they both the same ( -> XTest extension ) ? > Can I put both symbols together ? They're not the same extension. XTest is the one you want, if you want either. The other hasn't been built by default in ages and I should probably go ahead and nuke it from the tree. - ajax
parent dece0825
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 248 deletions
nx-X11/include/extensions/Imakefile
View file @ b32a984f
......@@ -54,7 +54,7 @@ HEADERS = \
xcmiscstr.h \
bigreqstr.h \
XI.h XIproto.h \
xtestconst.h xtestext1.h xteststr.h \
xtestconst.h xteststr.h \
XKB.h XKBgeom.h XKBproto.h XKBstr.h XKBsrv.h \
Xdbeproto.h \
$(EXTRAHEADERS) \
......
nx-X11/programs/Xserver/Xext/Imakefile
View file @ b32a984f
......@@ -73,21 +73,21 @@ XF86BIGFOBJS = xf86bigfont.o
#endif
SRCS = shape.c $(SHMSRCS) xcmisc.c\
xtest.c xtest1di.c xtest1dd.c sleepuntil.c \
xtest.c sleepuntil.c \
bigreq.c sync.c $(SCRNSAVSRC) \
$(XF86BIGFSRCS) $(SECURITYSRCS) \
$(PNRXSRCS) $(DPMSSRCS) \
$(XVSRCS) $(XRESSRCS) $(DMXSRCS)
OBJS = shape.o $(SHMOBJS) xcmisc.o \
xtest.o xtest1di.o xtest1dd.o sleepuntil.o \
xtest.o sleepuntil.o \
bigreq.o sync.o $(SCRNSAVOBJ) \
$(XF86BIGFOBJS) $(SECURITYOBJS) \
$(PNRXOBJS) $(DPMSOBJS) \
$(XVOBJS) $(XRESOBJS) $(DMXOBJS)
SOBJS = $(SHMOBJS) $(SECURITYOBJS) \
shape.o xtest.o xtest1di.o xtest1dd.o sleepuntil.o $(PNRXOBJS) \
shape.o xtest.o sleepuntil.o $(PNRXOBJS) \
$(XF86BIGFOBJS)
#if defined(NXAgentServer) && NXAgentServer
......
nx-X11/programs/Xserver/Xext/xtest1dd.h deleted 100644 → 0
View file @ dece0825
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
All Rights Reserved
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 the above listed
copyright holder(s) not be used in advertising or publicity pertaining
to distribution of the software without specific, written prior
permission.
THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) 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.
********************************************************/
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#ifndef XTEST1DD_H
#define XTEST1DD_H 1
extern short xtest_mousex;
extern short xtest_mousey;
extern int playback_on;
extern ClientPtr current_xtest_client;
extern ClientPtr playback_client;
extern KeyCode xtest_command_key;
extern void stop_stealing_input(
void
);
extern void
steal_input(
ClientPtr /* client */,
CARD32 /* mode */
);
extern void
flush_input_actions(
void
);
extern void
XTestStealJumpData(
int /* jx */,
int /* jy */,
int /* dev_type */
);
extern void
XTestStealMotionData(
int /* dx */,
int /* dy */,
int /* dev_type */,
int /* mx */,
int /* my */
);
extern Bool
XTestStealKeyData(
unsigned /* keycode */,
int /* keystate */,
int /* dev_type */,
int /* locx */,
int /* locy */
);
extern void
parse_fake_input(
ClientPtr /* client */,
char * /* req */
);
extern void
XTestComputeWaitTime(
struct timeval * /* waittime */
);
extern int
XTestProcessInputAction(
int /* readable */,
struct timeval * /* waittime */
);
extern void
abort_play_back(
void
);
extern void
return_input_array_size(
ClientPtr /* client */
);
extern void XTestGenerateEvent(
int /* dev_type */,
int /* keycode */,
int /* keystate */,
int /* mousex */,
int /* mousey */
);
extern void XTestGetPointerPos(
short * /* fmousex */,
short * /* fmousey */
);
extern void XTestJumpPointer(
int /* jx */,
int /* jy */,
int /* dev_type */
);
#endif /* XTEST1DD_H */
nx-X11/programs/Xserver/hw/nxagent/Imakefile
View file @ b32a984f
......@@ -42,7 +42,6 @@ SRCS = \
Keystroke.c \
Pointer.c \
Screen.c \
TestExt.c \
Visual.c \
Drawable.c \
Window.c \
......@@ -104,7 +103,6 @@ OBJS = \
Keystroke.o \
Pointer.o \
Screen.o \
TestExt.o \
Visual.o \
Drawable.o \
Window.o \
......
nx-X11/programs/Xserver/hw/nxagent/TestExt.c deleted 100644 → 0
View file @ dece0825
/**************************************************************************/
/* */
/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com) */
/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> */
/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de> */
/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de> */
/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com) */
/* */
/* NXAGENT, NX protocol compression and NX extensions to this software */
/* are copyright of the aforementioned persons and companies. */
/* */
/* Redistribution and use of the present software is allowed according */
/* to terms specified in the file LICENSE which comes in the source */
/* distribution. */
/* */
/* All rights reserved. */
/* */
/* NOTE: This software has received contributions from various other */
/* contributors, only the core maintainers and supporters are listed as */
/* copyright holders. Please contact us, if you feel you should be listed */
/* as copyright holder, as well. */
/* */
/**************************************************************************/
/*
Copyright 1993 by Davor Matic
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. Davor Matic makes no representations about
the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
#include <nx-X11/X.h>
#include <nx-X11/Xproto.h>
#include <nx-X11/Xlib.h>
#undef Bool
#include "screenint.h"
#include "input.h"
#include "misc.h"
#include "scrnintstr.h"
#include "servermd.h"
#include "mipointer.h"
#define XTestSERVER_SIDE
#include "xtestext1.h"
extern CARD32 nxagentLastEventTime;
void XTestGetPointerPos(short *fmousex, short *fmousey);
void XTestJumpPointer(int jx, int jy, int dev_type);
void XTestGenerateEvent(int dev_type, int keycode, int keystate,
int mousex, int mousey);
void XTestGetPointerPos(short *fmousex, short *fmousey)
{
int x,y;
miPointerPosition(&x, &y);
*fmousex = x;
*fmousey = y;
}
void XTestJumpPointer(int jx, int jy, int dev_type)
{
miPointerAbsoluteCursor(jx, jy, GetTimeInMillis());
}
void XTestGenerateEvent(int dev_type, int keycode, int keystate,
int mousex, int mousey)
{
/*
xEvent tevent;
tevent.u.u.type = (dev_type == XE_POINTER) ?
(keystate == XTestKEY_UP) ? ButtonRelease : ButtonPress :
(keystate == XTestKEY_UP) ? KeyRelease : KeyPress;
tevent.u.u.detail = keycode;
tevent.u.keyButtonPointer.rootX = mousex;
tevent.u.keyButtonPointer.rootY = mousey;
tevent.u.keyButtonPointer.time = nxagentLastEventTime = GetTimeInMillis();
mieqEnqueue(&tevent);
*/
}
nx-X11/programs/Xserver/mi/miinitext.c
View file @ b32a984f
......@@ -171,9 +171,6 @@ typedef void (*InitExtension)(void);
#endif
/* FIXME: this whole block of externs should be from the appropriate headers */
#ifdef XTESTEXT1
extern void XTestExtension1Init(void);
#endif
#ifdef SHAPE
extern void ShapeExtensionInit(void);
#endif
......@@ -382,9 +379,6 @@ InitExtensions(argc, argv)
if (!noPanoramiXExtension) PanoramiXExtensionInit();
# endif
#endif
#ifdef XTESTEXT1
if (!noTestExtensions) XTestExtension1Init();
#endif
#ifdef SHAPE
if (!noShapeExtension) ShapeExtensionInit();
#endif
......
nx-X11/programs/Xserver/os/WaitFor.c
View file @ b32a984f
......@@ -143,13 +143,6 @@ mffs(fd_mask mask)
#include <nx-X11/extensions/dpms.h>
#endif
#ifdef XTESTEXT1
/*
* defined in xtestext1dd.c
*/
extern int playback_on;
#endif /* XTESTEXT1 */
struct _OsTimerRec {
OsTimerPtr next;
CARD32 expires;
......@@ -244,13 +237,6 @@ WaitForSomething(int *pClientsReady)
BlockHandler((void *)&wt, (void *)&LastSelectMask);
if (NewOutputPending)
FlushAllOutput();
#ifdef XTESTEXT1
/* XXX how does this interact with new write block handling? */
if (playback_on) {
wt = &waittime;
XTestComputeWaitTime (&waittime);
}
#endif /* XTESTEXT1 */
#if defined(NX_TRANS_SOCKET) && defined(NX_TRANS_WAKEUP)
......@@ -375,11 +361,7 @@ WaitForSomething(int *pClientsReady)
#endif
selecterr = GetErrno();
WakeupHandler(i, (void *)&LastSelectMask);
#ifdef XTESTEXT1
if (playback_on) {
i = XTestProcessInputAction (i, &waittime);
}
#endif /* XTESTEXT1 */
SmartScheduleStartTimer ();
if (i <= 0) /* An error or timeout occurred */
......
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