[PATCH] xext: Remove XCALIBRATE extension
Peter Hutterer
peter.hutterer at who-t.net
Mon Feb 28 17:07:52 PST 2011
On Mon, Feb 28, 2011 at 08:01:25PM +0100, Simon Thum wrote:
> (sorry for double-posting, that one got sent to the list incomplete)
>
> On 02/28/2011 06:32 PM, Adam Jackson wrote:
> > Nobody can have been using this, it's never called from extension init.
> > XI2 device properties should now be a functional replacement.
> While at it, there's also the AbsoluteClassRec, complete with device
> controls and all, sitting around doing nothing but confusing people.
>
> If clients exists (gimp?), we should at least tell them the truth
> instead of pretending to be doing something.
>
> If a removal patch would be acceptable I'd probably give it a shot.
> Thoughts?
feel free to remove it, it doesn't seem to be hooked up to anything anyway
and none of the input drivers initialises it.
Cheers,
Peter
> >
> > Signed-off-by: Adam Jackson <ajax at redhat.com>
> > ---
> > Xext/Makefile.am | 7 -
> > Xext/xcalibrate.c | 297 -------------------------------------------
> > configure.ac | 10 --
> > include/protocol-versions.h | 4 -
> > 4 files changed, 0 insertions(+), 318 deletions(-)
> > delete mode 100644 Xext/xcalibrate.c
> >
> > diff --git a/Xext/Makefile.am b/Xext/Makefile.am
> > index b6c95cb..cb432e0 100644
> > --- a/Xext/Makefile.am
> > +++ b/Xext/Makefile.am
> > @@ -94,12 +94,6 @@ if XCSECURITY
> > BUILTIN_SRCS += $(XCSECURITY_SRCS)
> > endif
> >
> > -XCALIBRATE_SRCS = xcalibrate.c
> > -if XCALIBRATE
> > -BUILTIN_SRCS += $(XCALIBRATE_SRCS)
> > -# XCalibrate needs tslib
> > -endif
> > -
> > # XF86 Big Font extension
> > BIGFONT_SRCS = xf86bigfont.c xf86bigfontsrv.h
> > if XF86BIGFONT
> > @@ -132,7 +126,6 @@ EXTRA_DIST = \
> > $(XACE_SRCS) \
> > $(XCSECURITY_SRCS) \
> > $(XSELINUX_SRCS) \
> > - $(XCALIBRATE_SRCS) \
> > $(XINERAMA_SRCS) \
> > $(BIGFONT_SRCS) \
> > $(DPMS_SRCS) \
> > diff --git a/Xext/xcalibrate.c b/Xext/xcalibrate.c
> > deleted file mode 100644
> > index bff1c31..0000000
> > --- a/Xext/xcalibrate.c
> > +++ /dev/null
> > @@ -1,297 +0,0 @@
> > -/*
> > - * Copyright © 2003 Philip Blundell
> > - *
> > - * 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, and that the name of Philip Blundell not be used in
> > - * advertising or publicity pertaining to distribution of the software without
> > - * specific, written prior permission. Philip Blundell makes no
> > - * representations about the suitability of this software for any purpose. It
> > - * is provided "as is" without express or implied warranty.
> > - *
> > - * PHILIP BLUNDELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
> > - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
> > - * EVENT SHALL PHILIP BLUNDELL 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_KDRIVE_CONFIG_H
> > -#include <kdrive-config.h>
> > -#endif
> > -
> > -
> > -#include <X11/X.h>
> > -#include <X11/Xproto.h>
> > -#include "misc.h"
> > -#include "os.h"
> > -#include "dixstruct.h"
> > -#include "extnsionst.h"
> > -#include "swaprep.h"
> > -#include "protocol-versions.h"
> > -
> > -#include <X11/extensions/xcalibrateproto.h>
> > -#include <X11/extensions/xcalibratewire.h>
> > -
> > -extern void (*tslib_raw_event_hook)(int x, int y, int pressure, void *closure);
> > -extern void *tslib_raw_event_closure;
> > -
> > -static CARD8 XCalibrateReqCode;
> > -int XCalibrateEventBase;
> > -int XCalibrateReqBase;
> > -int XCalibrateErrorBase;
> > -
> > -static ClientPtr xcalibrate_client;
> > -
> > -static void
> > -xcalibrate_event_hook (int x, int y, int pressure, void *closure)
> > -{
> > - ClientPtr pClient = (ClientPtr) closure;
> > - xXCalibrateRawTouchscreenEvent ev;
> > -
> > - ev.type = XCalibrateEventBase + X_XCalibrateRawTouchscreen;
> > - ev.x = x;
> > - ev.y = y;
> > - ev.pressure = pressure;
> > -
> > - WriteEventsToClient (pClient, 1, (xEvent *) &ev);
> > -}
> > -
> > -static int
> > -ProcXCalibrateQueryVersion (ClientPtr client)
> > -{
> > - REQUEST(xXCalibrateQueryVersionReq);
> > - xXCalibrateQueryVersionReply rep;
> > - CARD16 client_major, client_minor; /* not used */
> > -
> > - REQUEST_SIZE_MATCH (xXCalibrateQueryVersionReq);
> > -
> > - client_major = stuff->majorVersion;
> > - client_minor = stuff->minorVersion;
> > -
> > - fprintf(stderr, "%s(): called\n", __func__);
> > -
> > - rep.type = X_Reply;
> > - rep.length = 0;
> > - rep.sequenceNumber = client->sequence;
> > - rep.majorVersion = SERVER_XCALIBRATE_MAJOR_VERSION;
> > - rep.minorVersion = SERVER_XCALIBRATE_MINOR_VERSION;
> > - if (client->swapped) {
> > - int n;
> > - swaps(&rep.sequenceNumber, n);
> > - swapl(&rep.length, n);
> > - swaps(&rep.majorVersion, n);
> > - swaps(&rep.minorVersion, n);
> > - }
> > - WriteToClient(client, sizeof (xXCalibrateQueryVersionReply), (char *)&rep);
> > - return Success;
> > -}
> > -
> > -static int
> > -SProcXCalibrateQueryVersion (ClientPtr client)
> > -{
> > - REQUEST(xXCalibrateQueryVersionReq);
> > - int n;
> > -
> > - REQUEST_SIZE_MATCH (xXCalibrateQueryVersionReq);
> > - swaps(&stuff->majorVersion,n);
> > - swaps(&stuff->minorVersion,n);
> > - return ProcXCalibrateQueryVersion(client);
> > -}
> > -
> > -static int
> > -ProcXCalibrateSetRawMode (ClientPtr client)
> > -{
> > - REQUEST(xXCalibrateRawModeReq);
> > - xXCalibrateRawModeReply rep;
> > -
> > - REQUEST_SIZE_MATCH (xXCalibrateRawModeReq);
> > -
> > - memset (&rep, 0, sizeof (rep));
> > - rep.type = X_Reply;
> > - rep.sequenceNumber = client->sequence;
> > -
> > - if (stuff->on)
> > - {
> > - if (xcalibrate_client == NULL)
> > - {
> > - /* Start calibrating. */
> > - xcalibrate_client = client;
> > - tslib_raw_event_hook = xcalibrate_event_hook;
> > - tslib_raw_event_closure = client;
> > - rep.status = GrabSuccess;
> > - }
> > - else
> > - {
> > - rep.status = AlreadyGrabbed;
> > - }
> > - }
> > - else
> > - {
> > - if (xcalibrate_client == client)
> > - {
> > - /* Stop calibrating. */
> > - xcalibrate_client = NULL;
> > - tslib_raw_event_hook = NULL;
> > - tslib_raw_event_closure = NULL;
> > - rep.status = GrabSuccess;
> > -
> > - /* Cycle input off and on to reload configuration. */
> > - KdDisableInput ();
> > - KdEnableInput ();
> > - }
> > - else
> > - {
> > - rep.status = AlreadyGrabbed;
> > - }
> > - }
> > -
> > - if (client->swapped)
> > - {
> > - int n;
> > -
> > - swaps (&rep.sequenceNumber, n);
> > - swaps (&rep.status, n);
> > - }
> > - WriteToClient(client, sizeof (rep), (char *) &rep);
> > - return Success;
> > -}
> > -
> > -static int
> > -SProcXCalibrateSetRawMode (ClientPtr client)
> > -{
> > - REQUEST(xXCalibrateRawModeReq);
> > - int n;
> > -
> > - REQUEST_SIZE_MATCH (xXCalibrateRawModeReq);
> > -
> > - swaps(&stuff->on, n);
> > -
> > - return ProcXCalibrateSetRawMode(client);
> > -}
> > -
> > -static int
> > -ProcXCalibrateScreenToCoord (ClientPtr client)
> > -{
> > - REQUEST(xXCalibrateScreenToCoordReq);
> > - xXCalibrateScreenToCoordReply rep;
> > -
> > - REQUEST_SIZE_MATCH (xXCalibrateScreenToCoordReq);
> > -
> > - memset (&rep, 0, sizeof (rep));
> > - rep.type = X_Reply;
> > - rep.sequenceNumber = client->sequence;
> > - rep.x = stuff->x;
> > - rep.y = stuff->y;
> > -
> > - KdScreenToPointerCoords(&rep.x, &rep.y);
> > -
> > - if (client->swapped)
> > - {
> > - int n;
> > -
> > - swaps (&rep.x, n);
> > - swaps (&rep.y, n);
> > - }
> > - WriteToClient(client, sizeof (rep), (char *) &rep);
> > - return Success;
> > -}
> > -
> > -static int
> > -SProcXCalibrateScreenToCoord (ClientPtr client)
> > -{
> > - REQUEST(xXCalibrateScreenToCoordReq);
> > - int n;
> > -
> > - REQUEST_SIZE_MATCH (xXCalibrateScreenToCoordReq);
> > -
> > - swaps(&stuff->x, n);
> > - swaps(&stuff->y, n);
> > -
> > - return ProcXCalibrateScreenToCoord(client);
> > -}
> > -
> > -static int
> > -ProcXCalibrateDispatch (ClientPtr client)
> > -{
> > - REQUEST(xReq);
> > - switch (stuff->data) {
> > - case X_XCalibrateQueryVersion:
> > - return ProcXCalibrateQueryVersion(client);
> > - case X_XCalibrateRawMode:
> > - return ProcXCalibrateSetRawMode(client);
> > - case X_XCalibrateScreenToCoord:
> > - return ProcXCalibrateScreenToCoord(client);
> > -
> > - default: break;
> > - }
> > -
> > - return BadRequest;
> > -}
> > -
> > -static int
> > -SProcXCalibrateDispatch (ClientPtr client)
> > -{
> > - REQUEST(xReq);
> > - int n;
> > -
> > - swaps(&stuff->length,n);
> > -
> > - switch (stuff->data) {
> > - case X_XCalibrateQueryVersion:
> > - return SProcXCalibrateQueryVersion(client);
> > - case X_XCalibrateRawMode:
> > - return SProcXCalibrateSetRawMode(client);
> > - case X_XCalibrateScreenToCoord:
> > - return SProcXCalibrateScreenToCoord(client);
> > -
> > - default: break;
> > - }
> > -
> > - return BadRequest;
> > -}
> > -
> > -static void
> > -XCalibrateClientCallback (CallbackListPtr *list,
> > - pointer closure,
> > - pointer data)
> > -{
> > - NewClientInfoRec *clientinfo = (NewClientInfoRec *) data;
> > - ClientPtr pClient = clientinfo->client;
> > -
> > - if (clientinfo->setup == NULL
> > - && xcalibrate_client != NULL
> > - && xcalibrate_client == pClient)
> > - {
> > - /* Stop calibrating. */
> > - xcalibrate_client = NULL;
> > - tslib_raw_event_hook = NULL;
> > - tslib_raw_event_closure = NULL;
> > - }
> > -}
> > -
> > -void
> > -XCalibrateExtensionInit(void)
> > -{
> > - ExtensionEntry *extEntry;
> > -
> > - if (!AddCallback (&ClientStateCallback, XCalibrateClientCallback, 0))
> > - return;
> > -
> > - extEntry = AddExtension(XCALIBRATE_NAME, XCalibrateNumberEvents, XCalibrateNumberErrors,
> > - ProcXCalibrateDispatch, SProcXCalibrateDispatch,
> > - NULL, StandardMinorOpcode);
> > -
> > - if (!extEntry)
> > - return;
> > -
> > - XCalibrateReqCode = (unsigned char)extEntry->base;
> > - XCalibrateEventBase = extEntry->eventBase;
> > - XCalibrateErrorBase = extEntry->errorBase;
> > -
> > - xcalibrate_client = 0;
> > -}
> > diff --git a/configure.ac b/configure.ac
> > index 85d5c98..edd32fd 100644
> > --- a/configure.ac
> > +++ b/configure.ac
> > @@ -626,7 +626,6 @@ AC_ARG_ENABLE(xf86vidmode, AS_HELP_STRING([--disable-xf86vidmode], [Build XF8
> > AC_ARG_ENABLE(xace, AS_HELP_STRING([--disable-xace], [Build X-ACE extension (default: enabled)]), [XACE=$enableval], [XACE=yes])
> > AC_ARG_ENABLE(xselinux, AS_HELP_STRING([--enable-xselinux], [Build SELinux extension (default: disabled)]), [XSELINUX=$enableval], [XSELINUX=no])
> > AC_ARG_ENABLE(xcsecurity, AS_HELP_STRING([--enable-xcsecurity], [Build Security extension (default: disabled)]), [XCSECURITY=$enableval], [XCSECURITY=no])
> > -AC_ARG_ENABLE(xcalibrate, AS_HELP_STRING([--enable-xcalibrate], [Build XCalibrate extension (default: disabled)]), [XCALIBRATE=$enableval], [XCALIBRATE=no])
> > AC_ARG_ENABLE(tslib, AS_HELP_STRING([--enable-tslib], [Build kdrive tslib touchscreen support (default: disabled)]), [TSLIB=$enableval], [TSLIB=no])
> > AC_ARG_ENABLE(dbe, AS_HELP_STRING([--disable-dbe], [Build DBE extension (default: enabled)]), [DBE=$enableval], [DBE=yes])
> > AC_ARG_ENABLE(xf86bigfont, AS_HELP_STRING([--enable-xf86bigfont], [Build XF86 Big Font extension (default: disabled)]), [XF86BIGFONT=$enableval], [XF86BIGFONT=no])
> > @@ -779,7 +778,6 @@ DRIPROTO="xf86driproto >= 2.1.0"
> > DRI2PROTO="dri2proto >= 2.3"
> > XINERAMAPROTO="xineramaproto"
> > BIGFONTPROTO="xf86bigfontproto >= 1.2.0"
> > -XCALIBRATEPROTO="xcalibrateproto"
> > DGAPROTO="xf86dgaproto >= 2.0.99.1"
> > GLPROTO="glproto >= 1.4.10"
> > DMXPROTO="dmxproto >= 2.2.99.1"
> > @@ -1120,14 +1118,6 @@ if test "x$DPMSExtension" = xyes; then
> > AC_DEFINE(DPMSExtension, 1, [Support DPMS extension])
> > fi
> >
> > -if test "x$XCALIBRATE" = xyes && test "$KDRIVE" = yes; then
> > - AC_DEFINE(XCALIBRATE, 1, [Build XCalibrate extension])
> > - REQUIRED_MODULES="$REQUIRED_MODULES $XCALIBRATEPROTO"
> > -else
> > - XCALIBRATE=no
> > -fi
> > -AM_CONDITIONAL(XCALIBRATE, [test "x$XCALIBRATE" = xyes])
> > -
> > AC_DEFINE(RENDER, 1, [Support RENDER extension])
> > RENDER_LIB='$(top_builddir)/render/librender.la'
> > RENDER_INC='-I$(top_srcdir)/render'
> > diff --git a/include/protocol-versions.h b/include/protocol-versions.h
> > index 1d33bdd..8692ded 100644
> > --- a/include/protocol-versions.h
> > +++ b/include/protocol-versions.h
> > @@ -104,10 +104,6 @@
> > #define SERVER_WINDOWSWM_MINOR_VERSION 0
> > #define SERVER_WINDOWSWM_PATCH_VERSION 0
> >
> > -/* Xcalibrate */
> > -#define SERVER_XCALIBRATE_MAJOR_VERSION 0
> > -#define SERVER_XCALIBRATE_MINOR_VERSION 1
> > -
> > /* DGA */
> > #define SERVER_XDGA_MAJOR_VERSION 2
> > #define SERVER_XDGA_MINOR_VERSION 0
>
More information about the xorg-devel
mailing list