/hg/icedtea8-forest/jdk: 4 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Jun 23 03:18:50 UTC 2016
changeset 897a897cb013 in /hg/icedtea8-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea8-forest/jdk?cmd=changeset;node=897a897cb013
author: azvegint
date: Tue Aug 11 16:32:13 2015 +0300
8014212, PR2866: Robot captures black screen
Reviewed-by: alexsch, serb
changeset bcbe8ae204f8 in /hg/icedtea8-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea8-forest/jdk?cmd=changeset;node=bcbe8ae204f8
author: ssadetsky
date: Mon Oct 05 15:13:14 2015 +0300
8058959, PR1061: closed/java/awt/event/ComponentEvent/MovedResizedTwiceTest/MovedResizedTwiceTest.java failed automatically
Reviewed-by: alexsch, serb
changeset 57da769e0949 in /hg/icedtea8-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea8-forest/jdk?cmd=changeset;node=57da769e0949
author: serb
date: Tue Jun 21 03:37:57 2016 +0100
6778087, PR1061: getLocationOnScreen() always returns (0, 0) for mouse wheel events
Reviewed-by: alexsch, azvegint
changeset 954f8b3a950a in /hg/icedtea8-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea8-forest/jdk?cmd=changeset;node=954f8b3a950a
author: alexsch
date: Thu Jul 30 12:40:45 2015 +0400
8132123, PR1061: MultiResolutionCachedImage unnecessarily creates base image to get its size
Reviewed-by: serb
diffstat:
src/macosx/classes/sun/lwawt/LWWindowPeer.java | 25 +-
src/macosx/classes/sun/lwawt/PlatformEventNotifier.java | 12 +-
src/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java | 12 +-
src/macosx/classes/sun/lwawt/macosx/CPlatformResponder.java | 24 +-
src/macosx/classes/sun/lwawt/macosx/CPlatformView.java | 11 +-
src/macosx/classes/sun/lwawt/macosx/CWarningWindow.java | 11 +-
src/share/classes/sun/awt/image/MultiResolutionCachedImage.java | 11 +-
src/solaris/classes/sun/awt/X11/XDecoratedPeer.java | 4 +-
src/solaris/native/sun/awt/awt_Robot.c | 84 ++++---
src/solaris/native/sun/awt/gtk2_interface.c | 7 +-
src/solaris/native/sun/awt/gtk2_interface.h | 9 +
src/windows/native/sun/windows/awt_Component.cpp | 6 +-
test/java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java | 15 +-
test/java/awt/Mouse/MouseWheelAbsXY/MouseWheelAbsXY.java | 92 ++++++++
test/java/awt/Window/TranslucentJAppletTest/TranslucentJAppletTest.java | 6 +-
test/java/awt/image/multiresolution/MultiResolutionCachedImageTest.java | 113 ++++++++++
test/javax/swing/JComponent/6683775/bug6683775.java | 48 ++--
test/javax/swing/JSplitPane/8132123/bug8132123.html | 38 +++
test/javax/swing/JSplitPane/8132123/bug8132123.java | 51 ++++
19 files changed, 454 insertions(+), 125 deletions(-)
diffs (truncated from 995 to 500 lines):
diff -r 794541fbbdc3 -r 954f8b3a950a src/macosx/classes/sun/lwawt/LWWindowPeer.java
--- a/src/macosx/classes/sun/lwawt/LWWindowPeer.java Fri May 27 03:28:35 2016 +0100
+++ b/src/macosx/classes/sun/lwawt/LWWindowPeer.java Thu Jul 30 12:40:45 2015 +0400
@@ -708,7 +708,7 @@
*/
@Override
public void notifyMouseEvent(int id, long when, int button,
- int x, int y, int screenX, int screenY,
+ int x, int y, int absX, int absY,
int modifiers, int clickCount, boolean popupTrigger,
byte[] bdata)
{
@@ -725,7 +725,7 @@
this);
Component target = lastMouseEventPeer.getTarget();
postMouseExitedEvent(target, when, modifiers, lp,
- screenX, screenY, clickCount, popupTrigger, button);
+ absX, absY, clickCount, popupTrigger, button);
}
// Sometimes we may get MOUSE_EXITED after lastCommonMouseEventPeer is switched
@@ -743,7 +743,7 @@
Point lp = targetPeer.windowToLocal(x, y, this);
Component target = targetPeer.getTarget();
postMouseEnteredEvent(target, when, modifiers, lp,
- screenX, screenY, clickCount, popupTrigger, button);
+ absX, absY, clickCount, popupTrigger, button);
}
lastCommonMouseEventPeer = targetPeer;
lastMouseEventPeer = targetPeer;
@@ -761,13 +761,13 @@
// implemented in CPlatformEmbeddedFrame class
if (topmostWindowPeer == this || topmostWindowPeer == null) {
generateMouseEnterExitEventsForComponents(when, button, x, y,
- screenX, screenY, modifiers, clickCount, popupTrigger,
+ absX, absY, modifiers, clickCount, popupTrigger,
targetPeer);
} else {
LWComponentPeer<?, ?> topmostTargetPeer =
topmostWindowPeer != null ? topmostWindowPeer.findPeerAt(r.x + x, r.y + y) : null;
topmostWindowPeer.generateMouseEnterExitEventsForComponents(when, button, x, y,
- screenX, screenY, modifiers, clickCount, popupTrigger,
+ absX, absY, modifiers, clickCount, popupTrigger,
topmostTargetPeer);
}
@@ -838,7 +838,7 @@
if (targetPeer.isEnabled()) {
MouseEvent event = new MouseEvent(targetPeer.getTarget(), id,
when, modifiers, lp.x, lp.y,
- screenX, screenY, clickCount,
+ absX, absY, clickCount,
popupTrigger, button);
postEvent(event);
}
@@ -849,7 +849,7 @@
postEvent(new MouseEvent(targetPeer.getTarget(),
MouseEvent.MOUSE_CLICKED,
when, modifiers,
- lp.x, lp.y, screenX, screenY,
+ lp.x, lp.y, absX, absY,
clickCount, popupTrigger, button));
}
mouseClickButtons &= ~eventButtonMask;
@@ -912,10 +912,10 @@
}
@Override
- public void notifyMouseWheelEvent(long when, int x, int y, int modifiers,
- int scrollType, int scrollAmount,
- int wheelRotation, double preciseWheelRotation,
- byte[] bdata)
+ public void notifyMouseWheelEvent(long when, int x, int y, int absX,
+ int absY, int modifiers, int scrollType,
+ int scrollAmount, int wheelRotation,
+ double preciseWheelRotation, byte[] bdata)
{
// TODO: could we just use the last mouse event target here?
Rectangle r = getBounds();
@@ -927,12 +927,11 @@
Point lp = targetPeer.windowToLocal(x, y, this);
// TODO: fill "bdata" member of AWTEvent
- // TODO: screenX/screenY
postEvent(new MouseWheelEvent(targetPeer.getTarget(),
MouseEvent.MOUSE_WHEEL,
when, modifiers,
lp.x, lp.y,
- 0, 0, /* screenX, Y */
+ absX, absY, /* absX, absY */
0 /* clickCount */, false /* popupTrigger */,
scrollType, scrollAmount,
wheelRotation, preciseWheelRotation));
diff -r 794541fbbdc3 -r 954f8b3a950a src/macosx/classes/sun/lwawt/PlatformEventNotifier.java
--- a/src/macosx/classes/sun/lwawt/PlatformEventNotifier.java Fri May 27 03:28:35 2016 +0100
+++ b/src/macosx/classes/sun/lwawt/PlatformEventNotifier.java Thu Jul 30 12:40:45 2015 +0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -49,14 +49,14 @@
* point of the client area is (insets.top, insets.left).
*/
void notifyMouseEvent(int id, long when, int button,
- int x, int y, int screenX, int screenY,
+ int x, int y, int absX, int absY,
int modifiers, int clickCount, boolean popupTrigger,
byte[] bdata);
- void notifyMouseWheelEvent(long when, int x, int y, int modifiers,
- int scrollType, int scrollAmount,
- int wheelRotation, double preciseWheelRotation,
- byte[] bdata);
+ void notifyMouseWheelEvent(long when, int x, int y, final int absX,
+ final int absY, int modifiers, int scrollType,
+ int scrollAmount, int wheelRotation,
+ double preciseWheelRotation, byte[] bdata);
/*
* Called by the delegate when a key is pressed.
*/
diff -r 794541fbbdc3 -r 954f8b3a950a src/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java
--- a/src/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java Fri May 27 03:28:35 2016 +0100
+++ b/src/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java Thu Jul 30 12:40:45 2015 +0400
@@ -73,8 +73,8 @@
int x = (int)pluginX;
int y = (int)pluginY;
Point locationOnScreen = getLocationOnScreen();
- int screenX = locationOnScreen.x + x;
- int screenY = locationOnScreen.y + y;
+ int absX = locationOnScreen.x + x;
+ int absY = locationOnScreen.y + y;
if (eventType == CocoaConstants.NPCocoaEventMouseEntered) {
CCursorManager.nativeSetAllowsCursorSetInBackground(true);
@@ -83,15 +83,19 @@
}
responder.handleMouseEvent(eventType, modifierFlags, buttonNumber,
- clickCount, x, y, screenX, screenY);
+ clickCount, x, y, absX, absY);
}
public void handleScrollEvent(double pluginX, double pluginY, int modifierFlags,
double deltaX, double deltaY, double deltaZ) {
int x = (int)pluginX;
int y = (int)pluginY;
+ Point locationOnScreen = getLocationOnScreen();
+ int absX = locationOnScreen.x + x;
+ int absY = locationOnScreen.y + y;
- responder.handleScrollEvent(x, y, modifierFlags, deltaX, deltaY);
+ responder.handleScrollEvent(x, y, absX, absY, modifierFlags, deltaX,
+ deltaY);
}
public void handleKeyEvent(int eventType, int modifierFlags, String characters,
diff -r 794541fbbdc3 -r 954f8b3a950a src/macosx/classes/sun/lwawt/macosx/CPlatformResponder.java
--- a/src/macosx/classes/sun/lwawt/macosx/CPlatformResponder.java Fri May 27 03:28:35 2016 +0100
+++ b/src/macosx/classes/sun/lwawt/macosx/CPlatformResponder.java Thu Jul 30 12:40:45 2015 +0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -54,8 +54,7 @@
* Handles mouse events.
*/
void handleMouseEvent(int eventType, int modifierFlags, int buttonNumber,
- int clickCount, int x, int y, int absoluteX,
- int absoluteY) {
+ int clickCount, int x, int y, int absX, int absY) {
final SunToolkit tk = (SunToolkit)Toolkit.getDefaultToolkit();
if ((buttonNumber > 2 && !tk.areExtraMouseButtonsEnabled())
|| buttonNumber > tk.getNumberOfButtons() - 1) {
@@ -81,14 +80,15 @@
boolean jpopupTrigger = NSEvent.isPopupTrigger(jmodifiers);
eventNotifier.notifyMouseEvent(jeventType, System.currentTimeMillis(), jbuttonNumber,
- x, y, absoluteX, absoluteY, jmodifiers, jclickCount,
+ x, y, absX, absY, jmodifiers, jclickCount,
jpopupTrigger, null);
}
/**
* Handles scroll events.
*/
- void handleScrollEvent(final int x, final int y, final int modifierFlags,
+ void handleScrollEvent(final int x, final int y, final int absX,
+ final int absY, final int modifierFlags,
final double deltaX, final double deltaY) {
final int buttonNumber = CocoaConstants.kCGMouseButtonCenter;
int jmodifiers = NSEvent.nsToJavaMouseModifiers(buttonNumber,
@@ -97,18 +97,19 @@
// Vertical scroll.
if (!isShift && deltaY != 0.0) {
- dispatchScrollEvent(x, y, jmodifiers, deltaY);
+ dispatchScrollEvent(x, y, absX, absY, jmodifiers, deltaY);
}
// Horizontal scroll or shirt+vertical scroll.
final double delta = isShift && deltaY != 0.0 ? deltaY : deltaX;
if (delta != 0.0) {
jmodifiers |= InputEvent.SHIFT_DOWN_MASK;
- dispatchScrollEvent(x, y, jmodifiers, delta);
+ dispatchScrollEvent(x, y, absX, absY, jmodifiers, delta);
}
}
- private void dispatchScrollEvent(final int x, final int y,
- final int modifiers, final double delta) {
+ private void dispatchScrollEvent(final int x, final int y, final int absX,
+ final int absY, final int modifiers,
+ final double delta) {
final long when = System.currentTimeMillis();
final int scrollType = MouseWheelEvent.WHEEL_UNIT_SCROLL;
final int scrollAmount = 1;
@@ -118,8 +119,9 @@
wheelRotation = signum;
}
// invert the wheelRotation for the peer
- eventNotifier.notifyMouseWheelEvent(when, x, y, modifiers, scrollType,
- scrollAmount, -wheelRotation, -delta, null);
+ eventNotifier.notifyMouseWheelEvent(when, x, y, absX, absY, modifiers,
+ scrollType, scrollAmount,
+ -wheelRotation, -delta, null);
}
/**
diff -r 794541fbbdc3 -r 954f8b3a950a src/macosx/classes/sun/lwawt/macosx/CPlatformView.java
--- a/src/macosx/classes/sun/lwawt/macosx/CPlatformView.java Fri May 27 03:28:35 2016 +0100
+++ b/src/macosx/classes/sun/lwawt/macosx/CPlatformView.java Thu Jul 30 12:40:45 2015 +0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -186,16 +186,19 @@
}
- private void deliverMouseEvent(NSEvent event) {
+ private void deliverMouseEvent(final NSEvent event) {
int x = event.getX();
int y = getBounds().height - event.getY();
+ int absX = event.getAbsX();
+ int absY = event.getAbsY();
if (event.getType() == CocoaConstants.NSScrollWheel) {
- responder.handleScrollEvent(x, y, event.getModifierFlags(),
+ responder.handleScrollEvent(x, y, absX, absY, event.getModifierFlags(),
event.getScrollDeltaX(), event.getScrollDeltaY());
} else {
responder.handleMouseEvent(event.getType(), event.getModifierFlags(), event.getButtonNumber(),
- event.getClickCount(), x, y, event.getAbsX(), event.getAbsY());
+ event.getClickCount(), x, y,
+ absX, absY);
}
}
diff -r 794541fbbdc3 -r 954f8b3a950a src/macosx/classes/sun/lwawt/macosx/CWarningWindow.java
--- a/src/macosx/classes/sun/lwawt/macosx/CWarningWindow.java Fri May 27 03:28:35 2016 +0100
+++ b/src/macosx/classes/sun/lwawt/macosx/CWarningWindow.java Thu Jul 30 12:40:45 2015 +0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -188,7 +188,7 @@
@Override
public void notifyMouseEvent(int id, long when, int button, int x, int y,
- int screenX, int screenY, int modifiers,
+ int absX, int absY, int modifiers,
int clickCount, boolean popupTrigger,
byte[] bdata) {
LWWindowPeer peer = ownerPeer.get();
@@ -254,9 +254,10 @@
}
@Override
- public void notifyMouseWheelEvent(long when, int x, int y, int modifiers,
- int scrollType, int scrollAmount,
- int wheelRotation, double preciseWheelRotation,
+ public void notifyMouseWheelEvent(long when, int x, int y, int absX,
+ int absY, int modifiers, int scrollType,
+ int scrollAmount, int wheelRotation,
+ double preciseWheelRotation,
byte[] bdata) {
}
diff -r 794541fbbdc3 -r 954f8b3a950a src/share/classes/sun/awt/image/MultiResolutionCachedImage.java
--- a/src/share/classes/sun/awt/image/MultiResolutionCachedImage.java Fri May 27 03:28:35 2016 +0100
+++ b/src/share/classes/sun/awt/image/MultiResolutionCachedImage.java Thu Jul 30 12:40:45 2015 +0400
@@ -86,19 +86,24 @@
@Override
public int getWidth(ImageObserver observer) {
updateInfo(observer, ImageObserver.WIDTH);
- return super.getWidth(observer);
+ return baseImageWidth;
}
@Override
public int getHeight(ImageObserver observer) {
updateInfo(observer, ImageObserver.HEIGHT);
- return super.getHeight(observer);
+ return baseImageHeight;
}
@Override
public Object getProperty(String name, ImageObserver observer) {
updateInfo(observer, ImageObserver.PROPERTIES);
- return super.getProperty(name, observer);
+ return Image.UndefinedProperty;
+ }
+
+ @Override
+ public Image getScaledInstance(int width, int height, int hints) {
+ return getResolutionVariant(width, height);
}
@Override
diff -r 794541fbbdc3 -r 954f8b3a950a src/solaris/classes/sun/awt/X11/XDecoratedPeer.java
--- a/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java Fri May 27 03:28:35 2016 +0100
+++ b/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java Thu Jul 30 12:40:45 2015 +0400
@@ -792,8 +792,8 @@
XToolkit.awtLock();
try {
updateSizeHints(rec.x, rec.y, rec.width, rec.height);
- XlibWrapper.XResizeWindow(XToolkit.getDisplay(), getShell(), rec.width, rec.height);
- XlibWrapper.XMoveWindow(XToolkit.getDisplay(), getShell(), rec.x, rec.y);
+ XlibWrapper.XMoveResizeWindow(XToolkit.getDisplay(), getShell(),
+ rec.x, rec.y, rec.width, rec.height);
}
finally {
XToolkit.awtUnlock();
diff -r 794541fbbdc3 -r 954f8b3a950a src/solaris/native/sun/awt/awt_Robot.c
--- a/src/solaris/native/sun/awt/awt_Robot.c Fri May 27 03:28:35 2016 +0100
+++ b/src/solaris/native/sun/awt/awt_Robot.c Thu Jul 30 12:40:45 2015 +0400
@@ -231,33 +231,30 @@
Java_sun_awt_X11_XRobotPeer_getRGBPixelsImpl( JNIEnv *env,
jclass cls,
jobject xgc,
- jint x,
- jint y,
- jint width,
- jint height,
+ jint jx,
+ jint jy,
+ jint jwidth,
+ jint jheight,
jintArray pixelArray) {
-
XImage *image;
jint *ary; /* Array of jints for sending pixel values back
* to parent process.
*/
Window rootWindow;
+ XWindowAttributes attr;
AwtGraphicsConfigDataPtr adata;
- DTRACE_PRINTLN6("RobotPeer: getRGBPixelsImpl(%lx, %d, %d, %d, %d, %x)", xgc, x, y, width, height, pixelArray);
+ DTRACE_PRINTLN6("RobotPeer: getRGBPixelsImpl(%lx, %d, %d, %d, %d, %x)", xgc, jx, jy, jwidth, jheight, pixelArray);
- AWT_LOCK();
-
- /* avoid a lot of work for empty rectangles */
- if ((width * height) == 0) {
- AWT_UNLOCK();
+ if (jwidth <= 0 || jheight <= 0) {
return;
}
- DASSERT(width * height > 0); /* only allow positive size */
adata = (AwtGraphicsConfigDataPtr) JNU_GetLongFieldAsPtr(env, xgc, x11GraphicsConfigIDs.aData);
DASSERT(adata != NULL);
+ AWT_LOCK();
+
rootWindow = XRootWindow(awt_display, adata->awt_visInfo.screen);
if (isXCompositeDisplay(awt_display, adata->awt_visInfo.screen) &&
hasXCompositeOverlayExtension(awt_display))
@@ -265,35 +262,54 @@
rootWindow = XCompositeGetOverlayWindow(awt_display, rootWindow);
}
+ if (!XGetWindowAttributes(awt_display, rootWindow, &attr)
+ || jx + jwidth <= attr.x
+ || attr.x + attr.width <= jx
+ || jy + jheight <= attr.y
+ || attr.y + attr.height <= jy) {
+
+ AWT_UNLOCK();
+ return; // Does not intersect with root window
+ }
+
+ jint _x, _y;
+ jint x = MAX(jx, attr.x);
+ jint y = MAX(jy, attr.y);
+ jint width = MIN(jx + jwidth, attr.x + attr.width) - x;
+ jint height = MIN(jy + jheight, attr.y + attr.height) - y;
+
+
+ int dx = attr.x > jx ? attr.x - jx : 0;
+ int dy = attr.y > jy ? attr.y - jy : 0;
+
+ int index;
+
image = getWindowImage(awt_display, rootWindow, x, y, width, height);
- /* Array to use to crunch around the pixel values */
- if (!IS_SAFE_SIZE_MUL(width, height) ||
- !(ary = (jint *) SAFE_SIZE_ARRAY_ALLOC(malloc, width * height, sizeof (jint))))
- {
- JNU_ThrowOutOfMemoryError(env, "OutOfMemoryError");
- XDestroyImage(image);
- AWT_UNLOCK();
- return;
+ ary = (*env)->GetPrimitiveArrayCritical(env, pixelArray, NULL);
+
+ if (!ary) {
+ XDestroyImage(image);
+ AWT_UNLOCK();
+ return;
}
+
/* convert to Java ARGB pixels */
- for (y = 0; y < height; y++) {
- for (x = 0; x < width; x++) {
- jint pixel = (jint) XGetPixel(image, x, y); /* Note ignore upper
- * 32-bits on 64-bit
- * OSes.
- */
+ for (_y = 0; _y < height; _y++) {
+ for (_x = 0; _x < width; _x++) {
+ jint pixel = (jint) XGetPixel(image, _x, _y); /* Note ignore upper
+ * 32-bits on 64-bit
+ * OSes.
+ */
+ pixel |= 0xff000000; /* alpha - full opacity */
- pixel |= 0xff000000; /* alpha - full opacity */
-
- ary[(y * width) + x] = pixel;
- }
+ index = (_y + dy) * jwidth + (_x + dx);
+ ary[index] = pixel;
+ }
}
- (*env)->SetIntArrayRegion(env, pixelArray, 0, height * width, ary);
- free(ary);
-
+
XDestroyImage(image);
-
+ (*env)->ReleasePrimitiveArrayCritical(env, pixelArray, ary, 0);
AWT_UNLOCK();
}
diff -r 794541fbbdc3 -r 954f8b3a950a src/solaris/native/sun/awt/gtk2_interface.c
--- a/src/solaris/native/sun/awt/gtk2_interface.c Fri May 27 03:28:35 2016 +0100
+++ b/src/solaris/native/sun/awt/gtk2_interface.c Thu Jul 30 12:40:45 2015 +0400
@@ -203,9 +203,6 @@
gint, gint, gint, gint);
static GdkPixbuf *(*fp_gdk_pixbuf_new)(GdkColorspace colorspace,
gboolean has_alpha, int bits_per_sample, int width, int height);
-static GdkPixbuf *(*fp_gdk_pixbuf_get_from_drawable)(GdkPixbuf *dest,
- GdkDrawable *src, GdkColormap *cmap, int src_x, int src_y,
- int dest_x, int dest_y, int width, int height);
static void (*fp_gdk_drawable_get_size)(GdkDrawable *drawable,
gint* width, gint* height);
@@ -645,6 +642,8 @@
fp_g_object_set = dl_symbol("g_object_set");
/* GDK */
+ fp_gdk_get_default_root_window =
+ dl_symbol("gdk_get_default_root_window");
fp_gdk_pixmap_new = dl_symbol("gdk_pixmap_new");
fp_gdk_pixbuf_get_from_drawable =
dl_symbol("gdk_pixbuf_get_from_drawable");
@@ -669,6 +668,8 @@
dl_symbol("gdk_pixbuf_get_bits_per_sample");
fp_gdk_pixbuf_get_n_channels =
dl_symbol("gdk_pixbuf_get_n_channels");
+ fp_gdk_pixbuf_get_colorspace =
+ dl_symbol("gdk_pixbuf_get_colorspace");
/* GTK painting */
fp_gtk_init_check = dl_symbol("gtk_init_check");
diff -r 794541fbbdc3 -r 954f8b3a950a src/solaris/native/sun/awt/gtk2_interface.h
--- a/src/solaris/native/sun/awt/gtk2_interface.h Fri May 27 03:28:35 2016 +0100
More information about the distro-pkg-dev
mailing list