changeset 53501:7d99b410be1b

8210863: Remove Xrandr include files from JDK sources Reviewed-by: serb
author prr
date Wed, 31 Oct 2018 16:58:37 -0700
parents 5b5e66c298c3
children 356e75119d31
files src/java.desktop/unix/native/libawt_xawt/awt/Xrandr.h src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c src/java.desktop/unix/native/libawt_xawt/awt/randr.h
diffstat 3 files changed, 1 insertions(+), 313 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.desktop/unix/native/libawt_xawt/awt/Xrandr.h	Wed Oct 31 13:26:06 2018 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,233 +0,0 @@
-/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
- */
-/*
- * $XFree86: xc/lib/Xrandr/Xrandr.h,v 1.9 2002/09/29 23:39:44 keithp Exp $
- *
- * Copyright © 2000 Compaq Computer Corporation, Inc.
- * Copyright © 2002 Hewlett-Packard Company, Inc.
- *
- * 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 Compaq not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission.  HP makes no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * HP DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL COMPAQ
- * 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.
- *
- * Author:  Jim Gettys, HP Labs, HP.
- */
-
-#ifndef _XRANDR_H_
-#define _XRANDR_H_
-
-/*#include <X11/extensions/randr.h>*/
-#include "randr.h"
-
-#include <X11/Xfuncproto.h>
-
-_XFUNCPROTOBEGIN
-
-
-typedef struct {
-    int width, height;
-    int mwidth, mheight;
-} XRRScreenSize;
-
-/*
- *  Events.
- */
-
-typedef struct {
-    int type;                   /* event base */
-    unsigned long serial;       /* # of last request processed by server */
-    Bool send_event;            /* true if this came from a SendEvent request */
-    Display *display;           /* Display the event was read from */
-    Window window;              /* window which selected for this event */
-    Window root;                /* Root window for changed screen */
-    Time timestamp;             /* when the screen change occurred */
-    Time config_timestamp;      /* when the last configuration change */
-    SizeID size_index;
-    SubpixelOrder subpixel_order;
-    Rotation rotation;
-    int width;
-    int height;
-    int mwidth;
-    int mheight;
-} XRRScreenChangeNotifyEvent;
-
-typedef XID RROutput;
-typedef XID RRCrtc;
-typedef XID RRMode;
-
-typedef unsigned long XRRModeFlags;
-
-typedef struct {
-    RRMode              id;
-    unsigned int        width;
-    unsigned int        height;
-    unsigned long       dotClock;
-    unsigned int        hSyncStart;
-    unsigned int        hSyncEnd;
-    unsigned int        hTotal;
-    unsigned int        hSkew;
-    unsigned int        vSyncStart;
-    unsigned int        vSyncEnd;
-    unsigned int        vTotal;
-    char                *name;
-    unsigned int        nameLength;
-    XRRModeFlags        modeFlags;
-} XRRModeInfo;
-
-typedef struct {
-    Time        timestamp;
-    Time        configTimestamp;
-    int         ncrtc;
-    RRCrtc      *crtcs;
-    int         noutput;
-    RROutput    *outputs;
-    int         nmode;
-    XRRModeInfo *modes;
-} XRRScreenResources;
-
-typedef struct {
-    Time            timestamp;
-    RRCrtc          crtc;
-    char            *name;
-    int             nameLen;
-    unsigned long   mm_width;
-    unsigned long   mm_height;
-    Connection      connection;
-    SubpixelOrder   subpixel_order;
-    int             ncrtc;
-    RRCrtc          *crtcs;
-    int             nclone;
-    RROutput        *clones;
-    int             nmode;
-    int             npreferred;
-    RRMode          *modes;
-} XRROutputInfo;
-
-typedef struct {
-    Time            timestamp;
-    int             x, y;
-    unsigned int    width, height;
-    RRMode          mode;
-    Rotation        rotation;
-    int             noutput;
-    RROutput        *outputs;
-    Rotation        rotations;
-    int             npossible;
-    RROutput        *possible;
-} XRRCrtcInfo;
-
-XRRScreenResources *XRRGetScreenResources (Display *dpy, Window window);
-
-void XRRFreeScreenResources (XRRScreenResources *resources);
-
-XRROutputInfo * XRRGetOutputInfo (Display *dpy, XRRScreenResources *resources,
-                                                               RROutput output);
-void XRRFreeOutputInfo (XRROutputInfo *outputInfo);
-
-XRRCrtcInfo *XRRGetCrtcInfo (Display *dpy, XRRScreenResources *resources,
-                                                                   RRCrtc crtc);
-void XRRFreeCrtcInfo (XRRCrtcInfo *crtcInfo);
-
-
-/* internal representation is private to the library */
-typedef struct _XRRScreenConfiguration XRRScreenConfiguration;
-
-Bool XRRQueryExtension (Display *dpy, int *event_basep, int *error_basep);
-Status XRRQueryVersion (Display *dpy,
-                            int     *major_versionp,
-                            int     *minor_versionp);
-
-XRRScreenConfiguration *XRRGetScreenInfo (Display *dpy,
-                                          Drawable draw);
-
-void XRRFreeScreenConfigInfo (XRRScreenConfiguration *config);
-
-/*
- * Note that screen configuration changes are only permitted if the client can
- * prove it has up to date configuration information.  We are trying to
- * insist that it become possible for screens to change dynamically, so
- * we want to ensure the client knows what it is talking about when requesting
- * changes.
- */
-Status XRRSetScreenConfig (Display *dpy,
-                           XRRScreenConfiguration *config,
-                           Drawable draw,
-                           int size_index,
-                           Rotation rotation,
-                           Time timestamp);
-
-/* added in v1.1, sorry for the lame name */
-Status XRRSetScreenConfigAndRate (Display *dpy,
-                                  XRRScreenConfiguration *config,
-                                  Drawable draw,
-                                  int size_index,
-                                  Rotation rotation,
-                                  short rate,
-                                  Time timestamp);
-
-
-Rotation XRRConfigRotations(XRRScreenConfiguration *config, Rotation *current_rotation);
-
-Time XRRConfigTimes (XRRScreenConfiguration *config, Time *config_timestamp);
-
-XRRScreenSize *XRRConfigSizes(XRRScreenConfiguration *config, int *nsizes);
-
-short *XRRConfigRates (XRRScreenConfiguration *config, int sizeID, int *nrates);
-
-SizeID XRRConfigCurrentConfiguration (XRRScreenConfiguration *config,
-                              Rotation *rotation);
-
-short XRRConfigCurrentRate (XRRScreenConfiguration *config);
-
-int XRRRootToScreen(Display *dpy, Window root);
-
-/*
- * returns the screen configuration for the specified screen; does a lazy
- * evalution to delay getting the information, and caches the result.
- * These routines should be used in preference to XRRGetScreenInfo
- * to avoid unneeded round trips to the X server.  These are new
- * in protocol version 0.1.
- */
-
-
-XRRScreenConfiguration *XRRScreenConfig(Display *dpy, int screen);
-XRRScreenConfiguration *XRRConfig(Screen *screen);
-void XRRSelectInput(Display *dpy, Window window, int mask);
-
-/*
- * the following are always safe to call, even if RandR is not implemented
- * on a screen
- */
-
-
-Rotation XRRRotations(Display *dpy, int screen, Rotation *current_rotation);
-XRRScreenSize *XRRSizes(Display *dpy, int screen, int *nsizes);
-short *XRRRates (Display *dpy, int screen, int sizeID, int *nrates);
-Time XRRTimes (Display *dpy, int screen, Time *config_timestamp);
-
-
-/*
- * intended to take RRScreenChangeNotify,  or
- * ConfigureNotify (on the root window)
- * returns 1 if it is an event type it understands, 0 if not
- */
-int XRRUpdateConfiguration(XEvent *event);
-
-_XFUNCPROTOEND
-
-#endif /* _XRANDR_H_ */
--- a/src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c	Wed Oct 31 13:26:06 2018 -0700
+++ b/src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c	Wed Oct 31 16:58:37 2018 -0700
@@ -34,7 +34,7 @@
 #ifndef HEADLESS
 #include <X11/extensions/Xdbe.h>
 #include <X11/XKBlib.h>
-#include "Xrandr.h"
+#include <X11/extensions/Xrandr.h>
 #include "GLXGraphicsConfig.h"
 #endif /* !HEADLESS */
 
--- a/src/java.desktop/unix/native/libawt_xawt/awt/randr.h	Wed Oct 31 13:26:06 2018 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
- */
-/*
- * $XFree86: xc/include/extensions/randr.h,v 1.4 2001/11/24 07:24:58 keithp Exp $
- *
- * Copyright © 2000, Compaq Computer Corporation,
- * Copyright © 2002, Hewlett Packard, Inc.
- *
- * 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 Compaq or HP not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission.  HP makes no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * HP DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL HP
- * 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.
- *
- * Author:  Jim Gettys, HP Labs, Hewlett-Packard, Inc.
- */
-
-#ifndef _RANDR_H_
-#define _RANDR_H_
-
-typedef unsigned short  Connection;
-typedef unsigned short  Rotation;
-typedef unsigned short  SizeID;
-typedef unsigned short  SubpixelOrder;
-
-#define RANDR_NAME              "RANDR"
-#define RANDR_MAJOR             1
-#define RANDR_MINOR             1
-
-#define RRNumberErrors          0
-#define RRNumberEvents          1
-
-#define X_RRQueryVersion        0
-/* we skip 1 to make old clients fail pretty immediately */
-#define X_RROldGetScreenInfo    1
-#define X_RR1_0SetScreenConfig  2
-/* V1.0 apps share the same set screen config request id */
-#define X_RRSetScreenConfig     2
-#define X_RROldScreenChangeSelectInput  3
-/* 3 used to be ScreenChangeSelectInput; deprecated */
-#define X_RRSelectInput         4
-#define X_RRGetScreenInfo       5
-
-/* used in XRRSelectInput */
-
-#define RRScreenChangeNotifyMask  (1L << 0)
-
-#define RRScreenChangeNotify    0
-
-/* used in the rotation field; rotation and reflection in 0.1 proto. */
-#define RR_Rotate_0             1
-#define RR_Rotate_90            2
-#define RR_Rotate_180           4
-#define RR_Rotate_270           8
-
-/* new in 1.0 protocol, to allow reflection of screen */
-
-#define RR_Reflect_X            16
-#define RR_Reflect_Y            32
-
-#define RRSetConfigSuccess              0
-#define RRSetConfigInvalidConfigTime    1
-#define RRSetConfigInvalidTime          2
-#define RRSetConfigFailed               3
-
-#endif  /* _RANDR_H_ */