From 5fbc2e4839bcf2a04cb46d34e4cab639855f7bea Mon Sep 17 00:00:00 2001 From: Luke Clifton Date: Fri, 16 Jun 2023 20:03:43 +0800 Subject: [PATCH] Also search for dylibs in case we are on Darwin --- src/dpms.rs | 2 +- src/glx.rs | 2 +- src/sync.rs | 2 +- src/xcursor.rs | 2 +- src/xf86vmode.rs | 2 +- src/xfixes.rs | 2 +- src/xft.rs | 2 +- src/xinerama.rs | 2 +- src/xinput.rs | 2 +- src/xinput2.rs | 2 +- src/xlib.rs | 2 +- src/xlib_xcb.rs | 3 +-- src/xmu.rs | 2 +- src/xpresent.rs | 2 +- src/xrandr.rs | 2 +- src/xrecord.rs | 2 +- src/xrender.rs | 2 +- src/xshm.rs | 2 +- src/xss.rs | 2 +- src/xt.rs | 2 +- src/xtest.rs | 2 +- x11-dl/src/old_xrandr.rs | 2 +- 22 files changed, 22 insertions(+), 23 deletions(-) diff --git a/src/dpms.rs b/src/dpms.rs index 02109bc..edf3992 100644 --- a/src/dpms.rs +++ b/src/dpms.rs @@ -11,7 +11,7 @@ use super::xmd::{BOOL, CARD16}; // functions // -x11_link! { Xext, xext, ["libXext.so.6", "libXext.so"], 9, +x11_link! { Xext, xext, ["libXext.so.6", "libXext.so", "libXext.6.dylib", "libXext.dylib"], 9, pub fn DPMSQueryExtension (_1: *mut Display, _2: *mut c_int, _3: *mut c_int) -> Bool, pub fn DPMSGetVersion (_1: *mut Display, _2: *mut c_int, _3: *mut c_int) -> Status, pub fn DPMSCapable (_1: *mut Display) -> Bool, diff --git a/src/glx.rs b/src/glx.rs index 6c422d6..e4e0d8b 100644 --- a/src/glx.rs +++ b/src/glx.rs @@ -10,7 +10,7 @@ use super::xlib::{Display, XVisualInfo, XID}; // functions // -x11_link! { Glx, gl, ["libGL.so.1", "libGL.so"], 40, +x11_link! { Glx, gl, ["libGL.so.1", "libGL.so", "libGL.1.dylib", "libGL.dylib"], 40, pub fn glXChooseFBConfig (_4: *mut Display, _3: c_int, _2: *const c_int, _1: *mut c_int) -> *mut GLXFBConfig, pub fn glXChooseVisual (_3: *mut Display, _2: c_int, _1: *mut c_int) -> *mut XVisualInfo, pub fn glXCopyContext (_4: *mut Display, _3: GLXContext, _2: GLXContext, _1: c_ulong) -> (), diff --git a/src/sync.rs b/src/sync.rs index 9c4f1ba..69ced71 100644 --- a/src/sync.rs +++ b/src/sync.rs @@ -10,7 +10,7 @@ use crate::xlib::{Bool, Display, Drawable, Status, Time, XID}; // functions // -x11_link! { Xext, xext, ["libXext.so.6", "libXext.so"], 38, +x11_link! { Xext, xext, ["libXext.so.6", "libXext.so", "libXext.6.dylib", "libXext.dylib"], 38, pub fn XSyncQueryExtension(dpy: *mut Display, event_base: *mut c_int, error_base: *mut c_int) -> Status, pub fn XSyncInitialize(dpy: *mut Display, major_version: *mut c_int, minor_version: *mut c_int) -> Status, pub fn XSyncListSystemCounters(dpy: *mut Display, n_counters: *mut c_int) -> *mut XSyncSystemCounter, diff --git a/src/xcursor.rs b/src/xcursor.rs index 5aff39a..49e2463 100644 --- a/src/xcursor.rs +++ b/src/xcursor.rs @@ -11,7 +11,7 @@ use crate::xlib::{Cursor, Display, XColor, XImage}; // functions // -x11_link! { Xcursor, xcursor, ["libXcursor.so.1", "libXcursor.so"], 59, +x11_link! { Xcursor, xcursor, ["libXcursor.so.1", "libXcursor.so", "libXcursor.dylib.1", "libXcursor.dylib", "libXcursor.1.dylib", "libXcursor.dylib"], 59, pub fn XcursorAnimateCreate (_1: *mut XcursorCursors) -> *mut XcursorAnimate, pub fn XcursorAnimateDestroy (_1: *mut XcursorAnimate) -> (), pub fn XcursorAnimateNext (_1: *mut XcursorAnimate) -> c_ulong, diff --git a/src/xf86vmode.rs b/src/xf86vmode.rs index 1346076..0b08ef6 100644 --- a/src/xf86vmode.rs +++ b/src/xf86vmode.rs @@ -10,7 +10,7 @@ use super::xlib::{Bool, Display, Time, Window, XEvent}; // functions // -x11_link! { Xf86vmode, xxf86vm, ["libXxf86vm.so.1", "libXxf86vm.so"], 22, +x11_link! { Xf86vmode, xxf86vm, ["libXxf86vm.so.1", "libXxf86vm.so", "libXxf86vm.1.dylib", "libXxf86vm.dylib"], 22, pub fn XF86VidModeAddModeLine (_4: *mut Display, _3: c_int, _2: *mut XF86VidModeModeInfo, _1: *mut XF86VidModeModeInfo) -> c_int, pub fn XF86VidModeDeleteModeLine (_3: *mut Display, _2: c_int, _1: *mut XF86VidModeModeInfo) -> c_int, pub fn XF86VidModeGetAllModeLines (_4: *mut Display, _3: c_int, _2: *mut c_int, _1: *mut *mut *mut XF86VidModeModeInfo) -> c_int, diff --git a/src/xfixes.rs b/src/xfixes.rs index 629b6dc..2179f3b 100644 --- a/src/xfixes.rs +++ b/src/xfixes.rs @@ -9,7 +9,7 @@ use libc::{c_char, c_int, c_short, c_uint, c_ulong, c_ushort}; // functions // -x11_link! { Xlib, x11, ["libXfixes.so.3", "libXfixes.so"], 35, +x11_link! { Xlib, x11, ["libXfixes.so.3", "libXfixes.so", "libXfixes.3.dylib", "libXfixes.dylib"], 35, pub fn XFixesQueryExtension(dpy: *mut Display, event_base: *mut c_int, error_base: *mut c_int) -> Bool, pub fn XFixesQueryVersion(dpy: *mut Display, major_version: *mut c_int, minor_version: *const c_int) -> Status, pub fn XFixesVersion() -> c_int, diff --git a/src/xft.rs b/src/xft.rs index 0d733df..1bf07e4 100644 --- a/src/xft.rs +++ b/src/xft.rs @@ -39,7 +39,7 @@ pub enum FcResult { // functions // -x11_link! { Xft, xft, ["libXft.so.2", "libXft.so"], 77, +x11_link! { Xft, xft, ["libXft.so.2", "libXft.so", "libXft.2.dylib", "libXft.dylib"], 77, pub fn XftCharExists (_2: *mut Display, _1: *mut XftFont, _0: c_uint) -> c_int, pub fn XftCharFontSpecRender (_7: *mut Display, _6: c_int, _5: c_ulong, _4: c_ulong, _3: c_int, _2: c_int, _1: *const XftCharFontSpec, _0: c_int) -> (), pub fn XftCharIndex (_2: *mut Display, _1: *mut XftFont, _0: c_uint) -> c_uint, diff --git a/src/xinerama.rs b/src/xinerama.rs index 59b9bb5..cf39371 100644 --- a/src/xinerama.rs +++ b/src/xinerama.rs @@ -10,7 +10,7 @@ use super::xlib::{Bool, Display, Drawable, Status, Window, XID}; // functions // -x11_link! { Xlib, xinerama, ["libXinerama.so.1", "libXinerama.so"], 10, +x11_link! { Xlib, xinerama, ["libXinerama.so.1", "libXinerama.so", "libXinerama.1.dylib", "libXinerama.dylib"], 10, pub fn XineramaIsActive (dpy: *mut Display) -> Bool, pub fn XineramaQueryExtension (dpy: *mut Display, event_base: *mut c_int, error_base: *mut c_int) -> Bool, pub fn XineramaQueryScreens (dpy: *mut Display, number: *mut c_int) -> *mut XineramaScreenInfo, diff --git a/src/xinput.rs b/src/xinput.rs index 3402d65..3239750 100644 --- a/src/xinput.rs +++ b/src/xinput.rs @@ -10,7 +10,7 @@ use super::xlib::{Atom, Display, Time, XEvent, XModifierKeymap, XID}; // functions // -x11_link! { XInput, xi, ["libXi.so.6", "libXi.so"], 44, +x11_link! { XInput, xi, ["libXi.so.6", "libXi.so", "libXi.6.dylib", "libXi.dylib"], 44, pub fn XAllowDeviceEvents (_4: *mut Display, _3: *mut XDevice, _2: c_int, _1: c_ulong) -> c_int, pub fn XChangeDeviceControl (_4: *mut Display, _3: *mut XDevice, _2: c_int, _1: *mut XDeviceControl) -> c_int, pub fn XChangeDeviceDontPropagateList (_5: *mut Display, _4: c_ulong, _3: c_int, _2: *mut c_ulong, _1: c_int) -> c_int, diff --git a/src/xinput2.rs b/src/xinput2.rs index 9f3e7cb..e11cc3c 100644 --- a/src/xinput2.rs +++ b/src/xinput2.rs @@ -24,7 +24,7 @@ pub fn XIMaskIsSet(mask: &[::std::os::raw::c_uchar], event: i32) -> bool { // // functions // -x11_link! { XInput2, xi, ["libXi.so.6", "libXi.so"], 34, +x11_link! { XInput2, xi, ["libXi.so.6", "libXi.so", "libXi.6.dylib", "libXi.dylib"], 34, pub fn XIAllowEvents (_4: *mut Display, _3: c_int, _2: c_int, _1: c_ulong) -> c_int, pub fn XIAllowTouchEvents (_5: *mut Display, _4: c_int, _3: c_uint, _2: c_ulong, _1: c_int) -> c_int, pub fn XIBarrierReleasePointer (_4: *mut Display, _3: c_int, _2: c_ulong, _1: c_uint) -> (), diff --git a/src/xlib.rs b/src/xlib.rs index 05fa737..d8d41ec 100644 --- a/src/xlib.rs +++ b/src/xlib.rs @@ -22,7 +22,7 @@ pub mod xkb {} // functions // -x11_link! { Xlib, x11, ["libX11.so.6", "libX11.so"], 767, +x11_link! { Xlib, x11, ["libX11.so.6", "libX11.so", "libX11.6.dylib", "libX11.dylib", "libX11.6.dylib", "libX11.dylib"], 767, pub fn XActivateScreenSaver (_1: *mut Display) -> c_int, pub fn XAddConnectionWatch (_3: *mut Display, _2: Option, _1: *mut c_char) -> c_int, pub fn XAddExtension (_1: *mut Display) -> *mut XExtCodes, diff --git a/src/xlib_xcb.rs b/src/xlib_xcb.rs index 1cb3f59..a329e88 100644 --- a/src/xlib_xcb.rs +++ b/src/xlib_xcb.rs @@ -1,7 +1,6 @@ use super::xlib::Display; use std::os::raw::c_void; - -x11_link! { Xlib_xcb, xlib_xcb, ["libX11-xcb.so.1", "libX11-xcb.so"], 2, +x11_link! { Xlib_xcb, xlib_xcb, ["libX11-xcb.so.1", "libX11-xcb.so", "libX11-xcb.1.dylib", "libX11-xcb.dylib", "libX11-xcb.1.dylib", "libX11-xcb.dylib"], 2, pub fn XGetXCBConnection(_1: *mut Display) -> *mut xcb_connection_t, pub fn XSetEventQueueOwner(_1: *mut Display, _2: XEventQueueOwner) -> (), variadic: diff --git a/src/xmu.rs b/src/xmu.rs index f6c5289..31bac9d 100644 --- a/src/xmu.rs +++ b/src/xmu.rs @@ -15,7 +15,7 @@ use super::xt::{Widget, XtAppContext}; // functions // -x11_link! { Xmu, xmu, ["libXmu.so.6", "libXmu.so"], 132, +x11_link! { Xmu, xmu, ["libXmu.so.6", "libXmu.so", "libXmu.6.dylib", "libXmu.dylib"], 132, pub fn XmuAddCloseDisplayHook (_3: *mut Display, _2: Option c_int>, _1: *mut c_char) -> *mut c_char, pub fn XmuAddInitializer (_2: Option, _1: *mut c_char) -> (), pub fn XmuAllStandardColormaps (_1: *mut Display) -> c_int, diff --git a/src/xpresent.rs b/src/xpresent.rs index 293d707..433116b 100644 --- a/src/xpresent.rs +++ b/src/xpresent.rs @@ -13,7 +13,7 @@ use crate::xrandr::RRCrtc; // functions // -x11_link! { Xpresent, xpresent, ["libXpresent.so.1.0.0", "libXpresent.so"], 8, +x11_link! { Xpresent, xpresent, ["libXpresent.so.1.0.0", "libXpresent.so", "libXpresent.1.0.0.dylib", "libXpresent.dylib"], 8, pub fn XPresentQueryExtension( dpy: *mut Display, major_opcode_return: *mut c_int, event_base_return: *mut c_int, error_base_return: *mut c_int) -> Bool, pub fn XPresentQueryVersion( dpy: *mut Display, major_version_return: *mut c_int, minor_version_return: *mut c_int ) -> Status, pub fn XPresentVersion() -> c_int, diff --git a/src/xrandr.rs b/src/xrandr.rs index d13806c..93fcfeb 100644 --- a/src/xrandr.rs +++ b/src/xrandr.rs @@ -11,7 +11,7 @@ use super::xrender::{XFixed, XTransform}; // functions // -x11_link! { Xrandr, xrandr, ["libXrandr.so.2", "libXrandr.so"], 70, +x11_link! { Xrandr, xrandr, ["libXrandr.so.2", "libXrandr.so", "libXrandr.2.dylib", "libXrandr.dylib", "libXrandr.2.dylib", "libXrandr.dylib"], 70, pub fn XRRAddOutputMode (dpy: *mut Display, output: RROutput, mode: RRMode) -> (), pub fn XRRAllocGamma (size: c_int) -> *mut XRRCrtcGamma, pub fn XRRAllocModeInfo (name: *const c_char, nameLength: c_int) -> *mut XRRModeInfo, diff --git a/src/xrecord.rs b/src/xrecord.rs index 6d166b8..2cc0a9d 100644 --- a/src/xrecord.rs +++ b/src/xrecord.rs @@ -10,7 +10,7 @@ use super::xlib::{Bool, Display, Time, XID}; // functions // -x11_link! { Xf86vmode, xtst, ["libXtst.so.6", "libXtst.so"], 14, +x11_link! { Xf86vmode, xtst, ["libXtst.so.6", "libXtst.so", "libXtst.6.dylib", "libXtst.dylib"], 14, pub fn XRecordAllocRange () -> *mut XRecordRange, pub fn XRecordCreateContext (_6: *mut Display, _5: c_int, _4: *mut c_ulong, _3: c_int, _2: *mut *mut XRecordRange, _1: c_int) -> c_ulong, pub fn XRecordDisableContext (_2: *mut Display, _1: c_ulong) -> c_int, diff --git a/src/xrender.rs b/src/xrender.rs index 8f45e5b..6abde8e 100644 --- a/src/xrender.rs +++ b/src/xrender.rs @@ -10,7 +10,7 @@ use super::xlib::{Atom, Bool, Colormap, Cursor, Display, Pixmap, Region, Visual, // functions // -x11_link! { Xrender, xrender, ["libXrender.so.1", "libXrender.so"], 44, +x11_link! { Xrender, xrender, ["libXrender.so.1", "libXrender.so", "libXrender.1.dylib", "libXrender.dylib"], 44, pub fn XRenderAddGlyphs (_7: *mut Display, _6: c_ulong, _5: *const c_ulong, _4: *const XGlyphInfo, _3: c_int, _2: *const c_char, _1: c_int) -> (), pub fn XRenderAddTraps (_6: *mut Display, _5: c_ulong, _4: c_int, _3: c_int, _2: *const XTrap, _1: c_int) -> (), pub fn XRenderChangePicture (_4: *mut Display, _3: c_ulong, _2: c_ulong, _1: *const XRenderPictureAttributes) -> (), diff --git a/src/xshm.rs b/src/xshm.rs index f88a09e..9c66493 100644 --- a/src/xshm.rs +++ b/src/xshm.rs @@ -1,7 +1,7 @@ use super::xlib::{Bool, Display, Drawable, Pixmap, Visual, XImage, GC}; use std::os::raw::{c_char, c_int, c_uint, c_ulong}; -x11_link! { Xext, xext, ["libXext.so.6", "libXext.so"], 10, +x11_link! { Xext, xext, ["libXext.so.6", "libXext.so", "libXext.6.dylib", "libXext.dylib"], 10, pub fn XShmQueryExtension(_1: *mut Display) -> Bool, pub fn XShmGetEventBase(_1: *mut Display) -> c_int, pub fn XShmQueryVersion(_4: *mut Display, _3: *mut c_int, _2: *mut c_int, _1: *mut Bool) -> Bool, diff --git a/src/xss.rs b/src/xss.rs index e68ebe2..5d223a4 100644 --- a/src/xss.rs +++ b/src/xss.rs @@ -11,7 +11,7 @@ use std::os::raw::{c_int, c_uint, c_ulong}; // functions // -x11_link! { Xss, xscrnsaver, ["libXss.so.2", "libXss.so"], 11, +x11_link! { Xss, xscrnsaver, ["libXss.so.2", "libXss.so", "libXss.2.dylib", "libXss.dylib"], 11, pub fn XScreenSaverQueryExtension (_1: *mut Display, _2: *mut c_int, _3: *mut c_int) -> Bool, pub fn XScreenSaverQueryVersion (_1: *mut Display, _2: *mut c_int, _3: *mut c_int) -> Status, pub fn XScreenSaverAllocInfo () -> *mut XScreenSaverInfo, diff --git a/src/xt.rs b/src/xt.rs index ff73802..76f63c9 100644 --- a/src/xt.rs +++ b/src/xt.rs @@ -13,7 +13,7 @@ use super::xlib::{ // functions // -x11_link! { Xt, xt, ["libXt.so.6", "libXt.so"], 300, +x11_link! { Xt, xt, ["libXt.so.6", "libXt.so", "libXt.6.dylib", "libXt.dylib"], 300, pub fn XtAddActions (_2: *mut XtActionsRec, _1: c_uint) -> (), pub fn XtAddCallback (_4: Widget, _3: *const c_char, _2: Option, _1: *mut c_void) -> (), pub fn XtAddCallbacks (_3: Widget, _2: *const c_char, _1: XtCallbackList) -> (), diff --git a/src/xtest.rs b/src/xtest.rs index 36413a8..0f9b783 100644 --- a/src/xtest.rs +++ b/src/xtest.rs @@ -11,7 +11,7 @@ use super::xlib::{Display, Visual, GC}; // functions // -x11_link! { Xf86vmode, xtst, ["libXtst.so.6", "libXtst.so"], 15, +x11_link! { Xf86vmode, xtst, ["libXtst.so.6", "libXtst.so", "libXtst.6.dylib", "libXtst.dylib"], 15, pub fn XTestCompareCurrentCursorWithWindow (_2: *mut Display, _1: c_ulong) -> c_int, pub fn XTestCompareCursorWithWindow (_3: *mut Display, _2: c_ulong, _1: c_ulong) -> c_int, pub fn XTestDiscard (_1: *mut Display) -> c_int, diff --git a/x11-dl/src/old_xrandr.rs b/x11-dl/src/old_xrandr.rs index 07f19dc..29e7fb1 100644 --- a/x11-dl/src/old_xrandr.rs +++ b/x11-dl/src/old_xrandr.rs @@ -2,7 +2,7 @@ // The X11 libraries are available under the MIT license. // These bindings are public domain. -x11_link! { Xrandr_2_2_0, xrandr, ["libXrandr.so.2.2.0", "libXrandr.so.2", "libXrandr.so"], 65, +x11_link! { Xrandr_2_2_0, xrandr, ["libXrandr.so.2.2.0", "libXrandr.so.2", "libXrandr.so", "libXrandr.2.2.0.dylib", "libXrandr.2.dylib", "libXrandr.dylib"], 65, pub fn XRRAddOutputMode (dpy: *mut Display, output: RROutput, mode: RRMode) -> (), pub fn XRRAllocGamma (size: c_int) -> *mut XRRCrtcGamma, pub fn XRRAllocModeInfo (name: *const c_char, nameLength: c_int) -> *mut XRRModeInfo,