1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
--- ui/base/x/x11_cursor_loader.cc.orig 2022-08-31 12:19:35 UTC
+++ ui/base/x/x11_cursor_loader.cc
@@ -33,7 +33,7 @@
#include "ui/gfx/x/xproto.h"
#include "ui/gfx/x/xproto_util.h"
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "ui/linux/linux_ui.h"
#endif
@@ -139,7 +139,11 @@ std::string CursorPathFromLibXcursor() {
void operator()(void* ptr) const { dlclose(ptr); }
};
+#if defined(OS_BSD)
+ std::unique_ptr<void, DlCloser> lib(dlopen("libXcursor.so", RTLD_LAZY));
+#else
std::unique_ptr<void, DlCloser> lib(dlopen("libXcursor.so.1", RTLD_LAZY));
+#endif
if (!lib)
return "";
@@ -250,7 +254,7 @@ scoped_refptr<base::RefCountedMemory> ReadCursorFile(
const std::string& rm_xcursor_theme) {
constexpr const char kDefaultTheme[] = "default";
std::string themes[] = {
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// The toolkit theme has the highest priority.
LinuxUi::instance() ? LinuxUi::instance()->GetCursorThemeName()
: std::string(),
@@ -444,7 +448,7 @@ uint32_t XCursorLoader::GetPreferredCursorSize() const
if (base::StringToInt(GetEnv(kXcursorSizeEnv), &size) && size > 0)
return size;
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// Let the toolkit have the next say.
auto* linux_ui = LinuxUi::instance();
size = linux_ui ? linux_ui->GetCursorThemeSize() : 0;
|
