archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-23 04:24:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

6851515: awt_p.h incorporates a chunk of the XRender header

Browse source 
Use XRender header directly rather than copying chunks locally

Reviewed-by: anthony, ohair
This commit is contained in:
Andrew John Hughes 2009-06-17 21:13:04 +01:00
parent d184c2ebce
commit fdff41f711
2 changed files with 5 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

8
jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c
View file

@ -337,7 +337,7 @@ getAllConfigs (JNIEnv *env, int screen, AwtScreenDataPtr screenDataPtr) {
char errmsg[128]; char errmsg[128];
int xinawareScreen; int xinawareScreen;
void* xrenderLibHandle = NULL; void* xrenderLibHandle = NULL;
XRenderFindVisualFormatFunc *XRenderFindVisualFormat = NULL; XRenderFindVisualFormatFunc* xrenderFindVisualFormat = NULL;
int major_opcode, first_event, first_error; int major_opcode, first_event, first_error;
if (usingXinerama) { if (usingXinerama) {
@ -435,7 +435,7 @@ getAllConfigs (JNIEnv *env, int screen, AwtScreenDataPtr screenDataPtr) {
#endif #endif
if (xrenderLibHandle != NULL) { if (xrenderLibHandle != NULL) {
XRenderFindVisualFormat = xrenderFindVisualFormat =
(XRenderFindVisualFormatFunc*)dlsym(xrenderLibHandle, (XRenderFindVisualFormatFunc*)dlsym(xrenderLibHandle,
"XRenderFindVisualFormat"); "XRenderFindVisualFormat");
} }
@ -454,8 +454,8 @@ getAllConfigs (JNIEnv *env, int screen, AwtScreenDataPtr screenDataPtr) {
graphicsConfigs [ind]->awt_depth = pVITrue [i].depth; graphicsConfigs [ind]->awt_depth = pVITrue [i].depth;
memcpy (&graphicsConfigs [ind]->awt_visInfo, &pVITrue [i], memcpy (&graphicsConfigs [ind]->awt_visInfo, &pVITrue [i],
sizeof (XVisualInfo)); sizeof (XVisualInfo));
if (XRenderFindVisualFormat != NULL) { if (xrenderFindVisualFormat != NULL) {
XRenderPictFormat *format = XRenderFindVisualFormat (awt_display, XRenderPictFormat *format = xrenderFindVisualFormat (awt_display,
pVITrue [i].visual); pVITrue [i].visual);
if (format && if (format &&
format->type == PictTypeDirect && format->type == PictTypeDirect &&

41
jdk/src/solaris/native/sun/awt/awt_p.h
View file

@ -48,6 +48,7 @@
#include <X11/Xatom.h> #include <X11/Xatom.h>
#include <X11/keysym.h> #include <X11/keysym.h>
#include <X11/keysymdef.h> #include <X11/keysymdef.h>
#include <X11/extensions/Xrender.h>
#ifndef XAWT #ifndef XAWT
#include <Xm/CascadeB.h> #include <Xm/CascadeB.h>
#include <Xm/DrawingA.h> #include <Xm/DrawingA.h>
@ -120,48 +121,8 @@ typedef struct _DamageRect {
#ifndef HEADLESS #ifndef HEADLESS
/* Note: until we include the <X11/extensions/Xrender.h> explicitly
* we have to define a couple of things ourselves.
*/
typedef unsigned long PictFormat;
#define PictTypeIndexed 0
#define PictTypeDirect 1
typedef struct {
short red;
short redMask;
short green;
short greenMask;
short blue;
short blueMask;
short alpha;
short alphaMask;
} XRenderDirectFormat;
typedef struct {
PictFormat id;
int type;
int depth;
XRenderDirectFormat direct;
Colormap colormap;
} XRenderPictFormat;
#define PictFormatID (1 << 0)
#define PictFormatType (1 << 1)
#define PictFormatDepth (1 << 2)
#define PictFormatRed (1 << 3)
#define PictFormatRedMask (1 << 4)
#define PictFormatGreen (1 << 5)
#define PictFormatGreenMask (1 << 6)
#define PictFormatBlue (1 << 7)
#define PictFormatBlueMask (1 << 8)
#define PictFormatAlpha (1 << 9)
#define PictFormatAlphaMask (1 << 10)
#define PictFormatColormap (1 << 11)
typedef XRenderPictFormat * typedef XRenderPictFormat *
XRenderFindVisualFormatFunc (Display *dpy, _Xconst Visual *visual); XRenderFindVisualFormatFunc (Display *dpy, _Xconst Visual *visual);
/* END OF Xrender.h chunk */
typedef struct _AwtGraphicsConfigData { typedef struct _AwtGraphicsConfigData {
int awt_depth; int awt_depth;