mirror of
https://github.com/Ryujinx/Opentk.git
synced 2024-12-23 11:35:39 +00:00
Removed obsolete SetWindowAttributes structure.
This commit is contained in:
Jarl Gullberg
parent
65d0cf4c58
commit
74e22142cb
|
|
@ -70,7 +70,7 @@ namespace OpenTK.Platform.X11
|
|||
static int DefaultScreen { get { return defaultScreen; } }
|
||||
//internal static Window RootWindow { get { return rootWindow; } }
|
||||
internal static int ScreenCount { get { return screenCount; } }
|
||||
|
||||
|
||||
internal static object Lock = new object();
|
||||
|
||||
#endregion
|
||||
|
|
@ -79,9 +79,9 @@ namespace OpenTK.Platform.X11
|
|||
{
|
||||
int has_threaded_x = Functions.XInitThreads();
|
||||
Debug.Print("Initializing threaded X11: {0}.", has_threaded_x.ToString());
|
||||
|
||||
|
||||
defaultDisplay = Functions.XOpenDisplay(IntPtr.Zero);
|
||||
|
||||
|
||||
if (defaultDisplay == IntPtr.Zero)
|
||||
throw new PlatformException("Could not establish connection to the X-Server.");
|
||||
|
||||
|
|
@ -202,7 +202,7 @@ namespace OpenTK.Platform.X11
|
|||
/// If a window is not interested in a device event,
|
||||
/// it usually propagates to the closest ancestor that is interested,
|
||||
/// unless the do_not_propagate mask prohibits it.
|
||||
/// Setting the event-mask attribute of a window overrides any previous call for the same window but not for other clients. Multiple clients can select for the same events on the same window with the following restrictions:
|
||||
/// Setting the event-mask attribute of a window overrides any previous call for the same window but not for other clients. Multiple clients can select for the same events on the same window with the following restrictions:
|
||||
/// <para>Multiple clients can select events on the same window because their event masks are disjoint. When the X server generates an event, it reports it to all interested clients. </para>
|
||||
/// <para>Only one client at a time can select CirculateRequest, ConfigureRequest, or MapRequest events, which are associated with the event mask SubstructureRedirectMask. </para>
|
||||
/// <para>Only one client at a time can select a ResizeRequest event, which is associated with the event mask ResizeRedirectMask. </para>
|
||||
|
|
@ -343,7 +343,7 @@ namespace OpenTK.Platform.X11
|
|||
public short htotal;
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
///
|
||||
/// </summary>
|
||||
public short hskew;
|
||||
|
||||
|
|
@ -368,7 +368,7 @@ namespace OpenTK.Platform.X11
|
|||
public short vtotal;
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
///
|
||||
/// </summary>
|
||||
public short vskew;
|
||||
|
||||
|
|
@ -580,26 +580,26 @@ XF86VidModeGetGammaRampSize(
|
|||
public XcursorUInt delay;
|
||||
public XcursorPixel* pixels;
|
||||
}
|
||||
|
||||
|
||||
[StructLayout(LayoutKind.Sequential)]
|
||||
unsafe struct XcursorImages
|
||||
unsafe struct XcursorImages
|
||||
{
|
||||
public int nimage;
|
||||
public XcursorImage **images;
|
||||
public char *name;
|
||||
}
|
||||
|
||||
|
||||
[StructLayout(LayoutKind.Sequential)]
|
||||
unsafe struct XcursorCursors
|
||||
unsafe struct XcursorCursors
|
||||
{
|
||||
public Display dpy;
|
||||
public int refcount;
|
||||
public int ncursor;
|
||||
public Cursor *cursors;
|
||||
}
|
||||
|
||||
|
||||
[StructLayout(LayoutKind.Sequential)]
|
||||
unsafe struct XcursorAnimate
|
||||
unsafe struct XcursorAnimate
|
||||
{
|
||||
public XcursorCursors *cursors;
|
||||
public int sequence;
|
||||
|
|
@ -632,75 +632,6 @@ XF86VidModeGetGammaRampSize(
|
|||
|
||||
#endregion
|
||||
|
||||
#region internal class SetWindowAttributes
|
||||
|
||||
[StructLayout(LayoutKind.Sequential), Obsolete("Use XSetWindowAttributes instead")]
|
||||
internal class SetWindowAttributes
|
||||
{
|
||||
/// <summary>
|
||||
/// background, None, or ParentRelative
|
||||
/// </summary>
|
||||
public Pixmap background_pixmap;
|
||||
/// <summary>
|
||||
/// background pixel
|
||||
/// </summary>
|
||||
public long background_pixel;
|
||||
/// <summary>
|
||||
/// border of the window or CopyFromParent
|
||||
/// </summary>
|
||||
public Pixmap border_pixmap;
|
||||
/// <summary>
|
||||
/// border pixel value
|
||||
/// </summary>
|
||||
public long border_pixel;
|
||||
/// <summary>
|
||||
/// one of bit gravity values
|
||||
/// </summary>
|
||||
public int bit_gravity;
|
||||
/// <summary>
|
||||
/// one of the window gravity values
|
||||
/// </summary>
|
||||
public int win_gravity;
|
||||
/// <summary>
|
||||
/// NotUseful, WhenMapped, Always
|
||||
/// </summary>
|
||||
public int backing_store;
|
||||
/// <summary>
|
||||
/// planes to be preserved if possible
|
||||
/// </summary>
|
||||
public long backing_planes;
|
||||
/// <summary>
|
||||
/// value to use in restoring planes
|
||||
/// </summary>
|
||||
public long backing_pixel;
|
||||
/// <summary>
|
||||
/// should bits under be saved? (popups)
|
||||
/// </summary>
|
||||
public bool save_under;
|
||||
/// <summary>
|
||||
/// set of events that should be saved
|
||||
/// </summary>
|
||||
public EventMask event_mask;
|
||||
/// <summary>
|
||||
/// set of events that should not propagate
|
||||
/// </summary>
|
||||
public long do_not_propagate_mask;
|
||||
/// <summary>
|
||||
/// boolean value for override_redirect
|
||||
/// </summary>
|
||||
public bool override_redirect;
|
||||
/// <summary>
|
||||
/// color map to be associated with window
|
||||
/// </summary>
|
||||
public Colormap colormap;
|
||||
/// <summary>
|
||||
/// cursor to be displayed (or None)
|
||||
/// </summary>
|
||||
public Cursor cursor;
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region internal struct SizeHints
|
||||
|
||||
[StructLayout(LayoutKind.Sequential)]
|
||||
|
|
@ -755,7 +686,7 @@ XF86VidModeGetGammaRampSize(
|
|||
UIntPtr black_pixel; /* White and Black pixel values */ // unsigned long
|
||||
int max_maps, min_maps; /* max and min color maps */
|
||||
int backing_store; /* Never, WhenMapped, Always */
|
||||
Bool save_unders;
|
||||
Bool save_unders;
|
||||
long root_input_mask; /* initial root input mask */
|
||||
}
|
||||
|
||||
|
|
@ -773,9 +704,9 @@ XF86VidModeGetGammaRampSize(
|
|||
};
|
||||
|
||||
#endregion
|
||||
|
||||
|
||||
#region Motif
|
||||
|
||||
|
||||
[StructLayout(LayoutKind.Sequential)]
|
||||
internal struct MotifWmHints
|
||||
{
|
||||
|
|
@ -790,7 +721,7 @@ XF86VidModeGetGammaRampSize(
|
|||
return string.Format("MotifWmHints <flags={0}, functions={1}, decorations={2}, input_mode={3}, status={4}", (MotifFlags) flags.ToInt32 (), (MotifFunctions) functions.ToInt32 (), (MotifDecorations) decorations.ToInt32 (), (MotifInputMode) input_mode.ToInt32 (), status.ToInt32 ());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
[Flags]
|
||||
internal enum MotifFlags
|
||||
{
|
||||
|
|
@ -821,7 +752,7 @@ XF86VidModeGetGammaRampSize(
|
|||
Menu = 0x10,
|
||||
Minimize = 0x20,
|
||||
Maximize = 0x40,
|
||||
|
||||
|
||||
}
|
||||
|
||||
[Flags]
|
||||
|
|
@ -832,7 +763,7 @@ XF86VidModeGetGammaRampSize(
|
|||
SystemModal = 2,
|
||||
FullApplicationModal = 3
|
||||
}
|
||||
|
||||
|
||||
#endregion
|
||||
|
||||
#endregion
|
||||
|
|
@ -985,7 +916,7 @@ XF86VidModeGetGammaRampSize(
|
|||
SingleCandidate = 0xff3c,
|
||||
MultipleCandidate = 0xff3d,
|
||||
PreviousCandidate = 0xff3e,
|
||||
|
||||
|
||||
/* Japanese keyboard support */
|
||||
|
||||
Kanji = 0xff21, /* Kanji, Kanji convert */
|
||||
|
|
@ -1437,7 +1368,7 @@ XF86VidModeGetGammaRampSize(
|
|||
/// <param name="attributes">Specifies the structure from which the values (as specified by the value mask) are to be taken. The value mask should have the appropriate bits set to indicate which attributes have been set in the structure.</param>
|
||||
/// <returns>The window ID of the created window.</returns>
|
||||
/// <remarks>
|
||||
/// The coordinate system has the X axis horizontal and the Y axis vertical with the origin [0, 0] at the upper-left corner. Coordinates are integral, in terms of pixels, and coincide with pixel centers. Each window and pixmap has its own coordinate system. For a window, the origin is inside the border at the inside, upper-left corner.
|
||||
/// The coordinate system has the X axis horizontal and the Y axis vertical with the origin [0, 0] at the upper-left corner. Coordinates are integral, in terms of pixels, and coincide with pixel centers. Each window and pixmap has its own coordinate system. For a window, the origin is inside the border at the inside, upper-left corner.
|
||||
/// <para>The border_width for an InputOnly window must be zero, or a BadMatch error results. For class InputOutput, the visual type and depth must be a combination supported for the screen, or a BadMatch error results. The depth need not be the same as the parent, but the parent must not be a window of class InputOnly, or a BadMatch error results. For an InputOnly window, the depth must be zero, and the visual must be one supported by the screen. If either condition is not met, a BadMatch error results. The parent window, however, may have any depth and class. If you specify any invalid window attribute for a window, a BadMatch error results. </para>
|
||||
/// <para>The created window is not yet displayed (mapped) on the user's display. To display the window, call XMapWindow(). The new window initially uses the same cursor as its parent. A new cursor can be defined for the new window by calling XDefineCursor(). The window will not be visible on the screen unless it and all of its ancestors are mapped and it is not obscured by any of its ancestors. </para>
|
||||
/// <para>XCreateWindow can generate BadAlloc BadColor, BadCursor, BadMatch, BadPixmap, BadValue, and BadWindow errors. </para>
|
||||
|
|
@ -1488,7 +1419,7 @@ XF86VidModeGetGammaRampSize(
|
|||
internal static unsafe extern void XcursorImageDestroy(XcursorImage* image);
|
||||
|
||||
[DllImport(XcursorLibrary)]
|
||||
internal static unsafe extern Cursor XcursorImageLoadCursor(Display dpy, XcursorImage* image);
|
||||
internal static unsafe extern Cursor XcursorImageLoadCursor(Display dpy, XcursorImage* image);
|
||||
|
||||
#endregion
|
||||
|
||||
|
|
@ -1538,7 +1469,7 @@ XF86VidModeGetGammaRampSize(
|
|||
/// <param name="event">Specifies the event.</param>
|
||||
[DllImport(X11Library, EntryPoint = "XPutBackEvent")]
|
||||
public static extern void XPutBackEvent(IntPtr display, ref XEvent @event);
|
||||
|
||||
|
||||
#endregion
|
||||
|
||||
#region Xrandr
|
||||
|
|
|
|||
Loading…
Reference in a new issue