infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-15 18:33:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

8220528: [AIX] Fix basic Xinerama and Xrender functionality

Browse Source 
Reviewed-by: clanger, stuefe, serb
This commit is contained in:
Volker Simonis 2019-03-27 19:47:47 +01:00
parent 9f2ac63e67
commit 4049bcaffe
1 changed files with 43 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c
View File

@ -122,7 +122,11 @@ static char *x11GraphicsConfigClassName = "sun/awt/X11GraphicsConfig";
*/
#define MAXFRAMEBUFFERS 16
#if defined(__linux__) || defined(MACOSX)
#if defined(__solaris__)
typedef Status XineramaGetInfoFunc(Display* display, int screen_number,
XRectangle* framebuffer_rects, unsigned char* framebuffer_hints,
int* num_framebuffers);
#else /* Linux, Mac, AIX */
typedef struct {
int screen_number;
short x_org;
@ -132,11 +136,6 @@ typedef struct {
} XineramaScreenInfo;
typedef XineramaScreenInfo* XineramaQueryScreensFunc(Display*, int*);
#else /* SOLARIS */
typedef Status XineramaGetInfoFunc(Display* display, int screen_number,
XRectangle* framebuffer_rects, unsigned char* framebuffer_hints,
int* num_framebuffers);
#endif
Bool usingXinerama = False;
@ -425,6 +424,7 @@ getAllConfigs (JNIEnv *env, int screen, AwtScreenDataPtr screenDataPtr) {
if (XQueryExtension(awt_display, "RENDER",
&major_opcode, &first_event, &first_error))
{
DTRACE_PRINTLN("RENDER extension available");
xrenderLibHandle = dlopen("libXrender.so.1", RTLD_LAZY | RTLD_GLOBAL);
#ifdef MACOSX
@ -438,18 +438,30 @@ getAllConfigs (JNIEnv *env, int screen, AwtScreenDataPtr screenDataPtr) {
RTLD_LAZY | RTLD_GLOBAL);
}
#ifndef __linux__ /* SOLARIS */
#if defined(__solaris__)
if (xrenderLibHandle == NULL) {
xrenderLibHandle = dlopen("/usr/lib/libXrender.so.1",
RTLD_LAZY | RTLD_GLOBAL);
}
#elif defined(_AIX)
if (xrenderLibHandle == NULL) {
xrenderLibHandle = dlopen("libXrender.a(libXrender.so.0)",
RTLD_MEMBER | RTLD_LAZY | RTLD_GLOBAL);
}
#endif
if (xrenderLibHandle != NULL) {
DTRACE_PRINTLN("Loaded libXrender");
xrenderFindVisualFormat =
(XRenderFindVisualFormatFunc*)dlsym(xrenderLibHandle,
"XRenderFindVisualFormat");
if (xrenderFindVisualFormat == NULL) {
DTRACE_PRINTLN1("Can't find 'XRenderFindVisualFormat' in libXrender (%s)", dlerror());
}
} else {
DTRACE_PRINTLN1("Can't load libXrender (%s)", dlerror());
}
} else {
DTRACE_PRINTLN("RENDER extension NOT available");
}
for (i = 0; i < nTrue; i++) {
@ -465,18 +477,23 @@ getAllConfigs (JNIEnv *env, int screen, AwtScreenDataPtr screenDataPtr) {
graphicsConfigs [ind]->awt_depth = pVITrue [i].depth;
memcpy (&graphicsConfigs [ind]->awt_visInfo, &pVITrue [i],
sizeof (XVisualInfo));
if (xrenderFindVisualFormat != NULL) {
if (xrenderFindVisualFormat != NULL) {
XRenderPictFormat *format = xrenderFindVisualFormat (awt_display,
pVITrue [i].visual);
pVITrue [i].visual);
if (format &&
format->type == PictTypeDirect &&
format->direct.alphaMask)
{
DTRACE_PRINTLN1("GraphicsConfig[%d] supports Translucency", ind);
graphicsConfigs [ind]->isTranslucencySupported = 1;
memcpy(&graphicsConfigs [ind]->renderPictFormat, format,
sizeof(*format));
} else {
DTRACE_PRINTLN1(format ?
"GraphicsConfig[%d] has no Translucency support" :
"Error calling 'XRenderFindVisualFormat'", ind);
}
}
}
}
if (xrenderLibHandle != NULL) {
@ -582,7 +599,7 @@ getAllConfigs (JNIEnv *env, int screen, AwtScreenDataPtr screenDataPtr) {
}
#ifndef HEADLESS
#if defined(__linux__) || defined(MACOSX)
#if defined(__linux__) || defined(MACOSX) || defined(_AIX)
static void xinerama_init_linux()
{
void* libHandle = NULL;
@ -595,14 +612,18 @@ static void xinerama_init_linux()
libHandle = dlopen(VERSIONED_JNI_LIB_NAME("Xinerama", "1"),
RTLD_LAZY | RTLD_GLOBAL);
if (libHandle == NULL) {
#if defined(_AIX)
libHandle = dlopen("libXext.a(shr_64.o)", RTLD_MEMBER | RTLD_LAZY | RTLD_GLOBAL);
#else
libHandle = dlopen(JNI_LIB_NAME("Xinerama"), RTLD_LAZY | RTLD_GLOBAL);
#endif
}
if (libHandle != NULL) {
XineramaQueryScreens = (XineramaQueryScreensFunc*)
dlsym(libHandle, XineramaQueryScreensName);
if (XineramaQueryScreens != NULL) {
DTRACE_PRINTLN("calling XineramaQueryScreens func on Linux");
DTRACE_PRINTLN("calling XineramaQueryScreens func");
xinInfo = (*XineramaQueryScreens)(awt_display, &locNumScr);
if (xinInfo != NULL && locNumScr > XScreenCount(awt_display)) {
int32_t idx;
@ -622,7 +643,10 @@ static void xinerama_init_linux()
fbrects[idx].y = xinInfo[idx].y_org;
}
} else {
DTRACE_PRINTLN("calling XineramaQueryScreens didn't work");
DTRACE_PRINTLN((xinInfo == NULL) ?
"calling XineramaQueryScreens didn't work" :
"XineramaQueryScreens <= XScreenCount"
);
}
} else {
DTRACE_PRINTLN("couldn't load XineramaQueryScreens symbol");
@ -632,8 +656,7 @@ static void xinerama_init_linux()
DTRACE_PRINTLN1("\ncouldn't open shared library: %s\n", dlerror());
}
}
#endif
#if !defined(__linux__) && !defined(MACOSX) /* Solaris */
#elif defined(__solaris__)
static void xinerama_init_solaris()
{
void* libHandle = NULL;
@ -689,11 +712,11 @@ static void xineramaInit(void) {
}
DTRACE_PRINTLN("Xinerama extension is available");
#if defined(__linux__) || defined(MACOSX)
xinerama_init_linux();
#else /* Solaris */
#if defined(__solaris__)
xinerama_init_solaris();
#endif /* __linux__ || MACOSX */
#else /* Linux, Mac, AIX */
xinerama_init_linux();
#endif
}
#endif /* HEADLESS */