andreacavalli
/
xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

EPHYR: Add an experiment proto proxy extension. 

* hw/kdrive/ephyr/Makefile.am: add the proxy extension to
	  ephyr. The proxy extension is an experimental extension that
	  forwards protocol packets targeted at a given extension to the
	  host X.
	* hw/kdrive/ephyr/ephyr.c: init proxy ext.
	* hw/kdrive/ephyr/ephyrhostproxy.c,h: added this new file as part of the
	  proxy extension.
	* hw/kdrive/ephyr/ephyrproxyext.c,h: ditto
	* hw/kdrive/ephyr/hostx.c: add the hostx_get_get_extension_info() entry
	  point.
This commit is contained in:
Dodji Seketeli 2007-08-24 16:30:50 +02:00 committed by Dodji Seketeli
parent c06fa924b4
commit 5af73f98c4
8 changed files with 334 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/kdrive/ephyr/Makefile.am
View File

@ -30,6 +30,11 @@ libxephyr_a_SOURCES = \
ephyrglxext.h \
ephyrhostglx.c \
ephyrhostglx.h \
ephyrhostproxy.c \
ephyrhostproxy.h \
ephyrhostproxy.c \
ephyrproxyext.c \
ephyrproxyext.h \
os.c \
hostx.h \
ephyr.h \

5
hw/kdrive/ephyr/ephyr.c
View File

@ -31,8 +31,12 @@
#include "inputstr.h"
#include "scrnintstr.h"
#include "ephyrlog.h"
#ifdef XEPHYR_DRI
#include "ephyrdri.h"
#include "ephyrglxext.h"
#include "ephyrproxyext.h"
#endif /*XEPHYR_DRI*/
extern int KdTsPhyScreen;
KdKeyboardInfo *ephyrKbd;
@ -625,6 +629,7 @@ ephyrInitScreen (ScreenPtr pScreen)
#ifdef XEPHYR_DRI
ephyrDRIExtensionInit () ;
ephyrHijackGLXExtension () ;
ephyrProxyExtensionInit ("ATIFGLRXDRI") ;
#endif
return TRUE;
}

94
hw/kdrive/ephyr/ephyrhostproxy.c Normal file
View File

@ -0,0 +1,94 @@
/*
* Xephyr - A kdrive X server thats runs in a host X window.
* Authored by Matthew Allum <mallum@openedhand.com>
*
* Copyright © 2007 OpenedHand Ltd
*
* 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 OpenedHand Ltd not be used in
* advertising or publicity pertaining to distribution of the software without
* specific, written prior permission. OpenedHand Ltd makes no
* representations about the suitability of this software for any purpose. It
* is provided "as is" without express or implied warranty.
*
* OpenedHand Ltd DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
* EVENT SHALL OpenedHand Ltd 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.
*
* Authors:
* Dodji Seketeli <dodji@openedhand.com>
*/
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
#endif
#include <X11/Xlibint.h>
#define _HAVE_XALLOC_DECLS
#include "ephyrlog.h"
#include "ephyrhostproxy.h"
#include "hostx.h"
/* byte swap a short */
#define swaps(x, n) { \
n = ((char *) (x))[0];\
((char *) (x))[0] = ((char *) (x))[1];\
((char *) (x))[1] = n; }
#define GetXReq(req) \
WORD64ALIGN ;\
if ((dpy->bufptr + SIZEOF(xReq)) > dpy->bufmax)\
_XFlush(dpy);\
req = (xReq *)(dpy->last_req = dpy->bufptr);\
dpy->bufptr += SIZEOF(xReq);\
dpy->request++
Bool
ephyrHostProxyDoForward (pointer a_request_buffer,
struct XReply *a_reply,
Bool a_do_swap)
{
Bool is_ok = FALSE ;
int n=0 ;
Display *dpy=hostx_get_display () ;
xReq *in_req = (xReq*) a_request_buffer ;
xReq *forward_req=NULL ;
struct XReply reply ;
EPHYR_RETURN_VAL_IF_FAIL (in_req && dpy, FALSE) ;
EPHYR_LOG ("enter\n") ;
if (a_do_swap) {
swaps (&in_req->length, n) ;
}
EPHYR_LOG ("Req {type:%d, data:%d, length:%d}\n",
in_req->reqType, in_req->data, in_req->length) ;
GetXReq (forward_req) ;
memmove (forward_req, in_req, 4) ;
if (!_XReply (dpy, (xReply*) &reply, 0, FALSE)) {
EPHYR_LOG_ERROR ("failed to get reply\n") ;
goto out;
}
EPHYR_LOG ("XReply{type:%d, foo:%d, seqnum:%d, length:%d}\n",
reply.type, reply.foo, reply.sequence_number, reply.length) ;
if (a_reply) {
memmove (a_reply, &reply, sizeof (reply)) ;
}
is_ok = TRUE ;
out:
EPHYR_LOG ("leave\n") ;
return is_ok ;
}

51
hw/kdrive/ephyr/ephyrhostproxy.h Normal file
View File

@ -0,0 +1,51 @@
/*
* Xephyr - A kdrive X server thats runs in a host X window.
* Authored by Matthew Allum <mallum@openedhand.com>
*
* Copyright © 2007 OpenedHand Ltd
*
* 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 OpenedHand Ltd not be used in
* advertising or publicity pertaining to distribution of the software without
* specific, written prior permission. OpenedHand Ltd makes no
* representations about the suitability of this software for any purpose. It
* is provided "as is" without express or implied warranty.
*
* OpenedHand Ltd DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
* EVENT SHALL OpenedHand Ltd 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.
*
* Authors:
* Dodji Seketeli <dodji@openedhand.com>
*/
#ifndef __EPHYRHOSTPROXY_H__
#define __EPHYRHOSTPROXY_H__
struct XReply {
int8_t type ;/*X_Reply*/
int8_t foo;
int16_t sequence_number ;
int32_t length ;
/*following is some data up to 32 bytes lenght*/
int32_t pad0 ;
int32_t pad1 ;
int32_t pad2 ;
int32_t pad3 ;
int32_t pad4 ;
int32_t pad5 ;
};
Bool
ephyrHostProxyDoForward (pointer a_request_buffer,
struct XReply *a_reply,
Bool a_do_swap) ;
#endif /*__EPHYRHOSTPROXY_H__*/

119
hw/kdrive/ephyr/ephyrproxyext.c Normal file
View File

@ -0,0 +1,119 @@
/*
* Xephyr - A kdrive X server thats runs in a host X window.
* Authored by Matthew Allum <mallum@openedhand.com>
*
* Copyright © 2007 OpenedHand Ltd
*
* 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 OpenedHand Ltd not be used in
* advertising or publicity pertaining to distribution of the software without
* specific, written prior permission. OpenedHand Ltd makes no
* representations about the suitability of this software for any purpose. It
* is provided "as is" without express or implied warranty.
*
* OpenedHand Ltd DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
* EVENT SHALL OpenedHand Ltd 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.
*
* Authors:
* Dodji Seketeli <dodji@openedhand.com>
*/
/*
* \file
* This file defines a proxy extension that forwards requests.
* When a request to extension FOO is sent to Xephyr, that request is forwared
* to the host X, without even trying to know what the request means.
*/
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
#endif
#include "misc.h"
#include "dixstruct.h"
#include "extnsionst.h"
#include "ephyrproxyext.h"
#define _HAVE_XALLOC_DECLS
#include "ephyrlog.h"
#include "ephyrhostproxy.h"
#include "hostx.h"
static Bool ephyrProxyGetHostExtensionInfo (const char *a_ext_name,
int *a_major_opcode,
int *a_first_event,
int *a_first_error) ;
static int ephyrProxyProcDispatch (ClientPtr client) ;
static Bool
ephyrProxyGetHostExtensionInfo (const char *a_ext_name,
int *a_major_opcode,
int *a_first_event,
int *a_first_error)
{
return hostx_get_extension_info (a_ext_name, a_major_opcode,
a_first_event, a_first_error) ;
}
static int
ephyrProxyProcDispatch (ClientPtr a_client)
{
int res=BadImplementation ;
struct XReply reply ;
if (!ephyrHostProxyDoForward (a_client->requestBuffer, &reply, FALSE)) {
EPHYR_LOG_ERROR ("forwarding failed\n") ;
goto out ;
}
reply.sequence_number = a_client->sequence;
res = Success ;
WriteToClient(a_client, 32, (char *)&reply);
out:
return res ;
}
static void
ephyrProxyProcReset (ExtensionEntry *a_entry)
{
}
Bool
ephyrProxyExtensionInit (const char *a_extension_name)
{
Bool is_ok = FALSE ;
int major_opcode=0, first_event=0, first_error=0;
ExtensionEntry *ext=NULL ;
if (!ephyrProxyGetHostExtensionInfo (a_extension_name,
&major_opcode,
&first_event,
&first_error)) {
EPHYR_LOG ("failed to query extension %s from host\n", a_extension_name) ;
goto out;
}
ext = AddExtension ((char*)a_extension_name, 0, 0,
ephyrProxyProcDispatch,
ephyrProxyProcDispatch,
ephyrProxyProcReset,
StandardMinorOpcode) ;
if (!ext) {
EPHYR_LOG_ERROR ("failed to add the extension\n") ;
goto out ;
}
is_ok = TRUE ;
out:
EPHYR_LOG ("leave\n") ;
return is_ok ;
}

34
hw/kdrive/ephyr/ephyrproxyext.h Normal file
View File

@ -0,0 +1,34 @@
/*
* Xephyr - A kdrive X server thats runs in a host X window.
* Authored by Matthew Allum <mallum@openedhand.com>
*
* Copyright © 2007 OpenedHand Ltd
*
* 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 OpenedHand Ltd not be used in
* advertising or publicity pertaining to distribution of the software without
* specific, written prior permission. OpenedHand Ltd makes no
* representations about the suitability of this software for any purpose. It
* is provided "as is" without express or implied warranty.
*
* OpenedHand Ltd DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
* EVENT SHALL OpenedHand Ltd 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.
*
* Authors:
* Dodji Seketeli <dodji@openedhand.com>
*/
#ifndef __EPHYRPROXYEXT_H__
#define __EPHYRPROXYEXT_H__
Bool ephyrProxyExtensionInit (const char *a_extension_name) ;
#endif /*__EPHYRPROXYEXT_H__*/

20
hw/kdrive/ephyr/hostx.c
View File

@ -967,3 +967,23 @@ hostx_get_window(void)
{
return HostX.win ;
}
int
hostx_get_extension_info (const char *a_ext_name,
int *a_major_opcode,
int *a_first_event,
int *a_first_error)
{
if (!a_ext_name || !a_major_opcode || !a_first_event || !a_first_error)
return 0 ;
if (!XQueryExtension (HostX.dpy,
a_ext_name,
a_major_opcode,
a_first_event,
a_first_error))
{
return 0 ;
}
return 1 ;
}

6
hw/kdrive/ephyr/hostx.h
View File

@ -178,4 +178,10 @@ hostx_get_display(void) ;
int
hostx_get_window(void) ;
int
hostx_get_extension_info (const char *a_ext_name,
int *a_major_opcode,
int *a_first_even,
int *a_first_error) ;
#endif