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

first implementation of putimage 

* hw/kdrive/ephyr/ephyrhostvideo.c,h:
          (EphyrHostXVPutImage): first implementation. does not
          support clipping regions yet.
        * hw/kdrive/ephyr/ephyrvideo.c:
          (DoSimpleClip): clip using a clipping box. Does not
           support regions yet.
          (EphyrPutImage): first implementation.
           Uses a simple clipping rectangle, no region yet.
        * hw/kdrive/ephyr/hostx.c:
          (hostx_get_window): added this to get the main
          window of the host x.
This commit is contained in:
Dodji Seketeli 2007-08-03 01:10:39 +02:00
parent aa478e09e2
commit 207714b60d
5 changed files with 166 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
hw/kdrive/ephyr/ephyrhostvideo.c
View File

@ -544,3 +544,56 @@ EphyrHostFree (void *a_pointer)
XFree (a_pointer) ;
}
Bool
EphyrHostXVPutImage (int a_port_id,
int a_image_id,
int a_drw_x,
int a_drw_y,
int a_drw_w,
int a_drw_h,
int a_src_x,
int a_src_y,
int a_src_w,
int a_src_h,
int a_image_width,
int a_image_height,
unsigned char *a_buf)
{
Bool is_ok=TRUE ;
XvImage *xv_image=NULL ;
GC gc=0 ;
XGCValues gc_values;
EPHYR_RETURN_VAL_IF_FAIL (a_buf, FALSE) ;
EPHYR_LOG ("enter\n") ;
gc = XCreateGC (hostx_get_display (), hostx_get_window (), 0L, &gc_values);
if (!gc) {
EPHYR_LOG_ERROR ("failed to create gc \n") ;
goto out ;
}
xv_image = (XvImage*) XvCreateImage (hostx_get_display (),
a_port_id, a_image_id,
NULL, a_image_width, a_image_height) ;
if (!xv_image) {
EPHYR_LOG_ERROR ("failed to create image\n") ;
goto out ;
}
xv_image->data = (char*)a_buf ;
XvPutImage (hostx_get_display (), a_port_id, hostx_get_window (),
gc, xv_image,
a_src_x, a_src_y, a_src_w, a_src_h,
a_drw_x, a_drw_y, a_drw_w, a_drw_h) ;
XFlush (hostx_get_display ()) ;
is_ok = TRUE ;
out:
EPHYR_LOG ("leave\n") ;
if (xv_image) {
XFree (xv_image) ;
xv_image = NULL ;
}
return is_ok ;
}

17
hw/kdrive/ephyr/ephyrhostvideo.h
View File

@ -168,6 +168,23 @@ Bool EphyrHostGetAtom (const char* a_name,
int *a_atom) ;
char* EphyrHostGetAtomName (int a_atom) ;
/*
*PutImage
* (ignore clipping for now)
*/
Bool EphyrHostXVPutImage (int a_port_id,
int a_image_id,
int a_drw_x,
int a_drw_y,
int a_drw_w,
int a_drw_h,
int a_src_x,
int a_src_y,
int a_src_w,
int a_src_h,
int a_image_width,
int a_image_height,
unsigned char *a_buf) ;
#endif /*__EPHYRHOSTVIDEO_H__*/

89
hw/kdrive/ephyr/ephyrvideo.c
View File

@ -51,6 +51,10 @@ struct _EphyrPortPriv {
};
typedef struct _EphyrPortPriv EphyrPortPriv ;
static Bool DoSimpleClip (BoxPtr a_dst_drw,
BoxPtr a_clipper,
BoxPtr a_result) ;
static Bool EphyrLocalAtomToHost (int a_local_atom, int *a_host_atom) ;
static Bool EphyrHostAtomToLocal (int a_host_atom, int *a_local_atom) ;
@ -115,6 +119,51 @@ static int s_base_port_id ;
* <helpers>
* ************/
static Bool
DoSimpleClip (BoxPtr a_dst_box,
BoxPtr a_clipper,
BoxPtr a_result)
{
BoxRec dstClippedBox ;
EPHYR_RETURN_VAL_IF_FAIL (a_dst_box && a_clipper && a_result, FALSE) ;
/*
* setup the clipbox inside the destination.
*/
dstClippedBox.x1 = a_dst_box->x1 ;
dstClippedBox.x2 = a_dst_box->x2 ;
dstClippedBox.y1 = a_dst_box->y1 ;
dstClippedBox.y2 = a_dst_box->y2 ;
/*
* if the cliper leftmost edge is inside
* the destination area then the leftmost edge of the resulting
* clipped box is the leftmost edge of the cliper.
*/
if (a_clipper->x1 > dstClippedBox.x1)
dstClippedBox.x1 = a_clipper->x1 ;
/*
* if the cliper top edge is inside the destination area
* then the bottom horizontal edge of the resulting clipped box
* is the bottom edge of the cliper
*/
if (a_clipper->y1 > dstClippedBox.y1)
dstClippedBox.y1 = a_clipper->y1 ;
/*ditto for right edge*/
if (a_clipper->x2 < dstClippedBox.x2)
dstClippedBox.x2 = a_clipper->x2 ;
/*ditto for bottom edge*/
if (a_clipper->y2 < dstClippedBox.y2)
dstClippedBox.y2 = a_clipper->y2 ;
memcpy (a_result, &dstClippedBox, sizeof (dstClippedBox)) ;
return TRUE ;
}
static Bool
EphyrLocalAtomToHost (int a_local_atom, int *a_host_atom)
{
@ -601,6 +650,7 @@ EphyrQueryBestSize (KdScreenInfo *a_info,
EPHYR_LOG ("leave\n") ;
}
static int
EphyrPutImage (KdScreenInfo *a_info,
DrawablePtr a_drawable,
@ -620,9 +670,46 @@ EphyrPutImage (KdScreenInfo *a_info,
RegionPtr a_clipping_region,
pointer a_port_priv)
{
EphyrPortPriv *port_priv = a_port_priv ;
BoxRec clipped_area, dst_box ;
int result=BadImplementation ;
int drw_x=0, drw_y=0, drw_w=0, drw_h=0 ;
EPHYR_RETURN_VAL_IF_FAIL (a_drawable, BadValue) ;
EPHYR_LOG ("enter\n") ;
return 0 ;
dst_box.x1 = a_drw_x ;
dst_box.x2 = a_drw_x + a_drw_w;
dst_box.y1 = a_drw_y ;
dst_box.y2 = a_drw_y + a_drw_h;
if (!DoSimpleClip (&dst_box,
REGION_EXTENTS (pScreen->pScreen, a_clipping_region),
&clipped_area)) {
EPHYR_LOG_ERROR ("failed to simple clip\n") ;
goto out ;
}
drw_x = clipped_area.x1 ;
drw_y = clipped_area.y1 ;
drw_w = clipped_area.x2 - clipped_area.x1 ;
drw_h = clipped_area.y2 - clipped_area.y1 ;
if (!EphyrHostXVPutImage (port_priv->port_number,
a_id,
drw_x, drw_y, drw_w, drw_h,
a_src_x, a_src_y, a_src_w, a_src_h,
a_width, a_height, a_buf)) {
EPHYR_LOG_ERROR ("EphyrHostXVPutImage() failed\n") ;
goto out ;
}
result = Success ;
out:
EPHYR_LOG ("leave\n") ;
return result ;
}
static int

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

@ -962,3 +962,8 @@ hostx_get_display(void)
return HostX.dpy ;
}
int
hostx_get_window(void)
{
return HostX.win ;
}

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

@ -175,4 +175,7 @@ hostx_get_event(EphyrHostXEvent *ev);
void*
hostx_get_display(void) ;
int
hostx_get_window(void) ;
#endif