summaryrefslogtreecommitdiff
path: root/Userland/Services/WindowServer
diff options
context:
space:
mode:
authorLiav A <liavalb@gmail.com>2022-04-30 14:57:03 +0300
committerAndreas Kling <kling@serenityos.org>2022-05-05 20:55:57 +0200
commitaad968cc5e099bfa480c3cd67af5ef092b1b15f3 (patch)
tree0a86cf73f039f3562bdd89cc68a686efe33ef980 /Userland/Services/WindowServer
parent10adc27eda6a044fc64486d7ce19e16201aa50d7 (diff)
downloadserenity-aad968cc5e099bfa480c3cd67af5ef092b1b15f3.zip
Everywhere: Rename fb prefix function names => graphics_connector
Diffstat (limited to 'Userland/Services/WindowServer')
-rw-r--r--Userland/Services/WindowServer/HardwareScreenBackend.cpp16
-rw-r--r--Userland/Services/WindowServer/ScreenLayout.ipp2
2 files changed, 9 insertions, 9 deletions
diff --git a/Userland/Services/WindowServer/HardwareScreenBackend.cpp b/Userland/Services/WindowServer/HardwareScreenBackend.cpp
index ac2b736a34..cceae2d84e 100644
--- a/Userland/Services/WindowServer/HardwareScreenBackend.cpp
+++ b/Userland/Services/WindowServer/HardwareScreenBackend.cpp
@@ -28,7 +28,7 @@ ErrorOr<void> HardwareScreenBackend::open()
m_framebuffer_fd = TRY(Core::System::open(m_device.characters(), O_RDWR | O_CLOEXEC));
GraphicsConnectorProperties properties;
- if (fb_get_properties(m_framebuffer_fd, &properties) < 0)
+ if (graphics_connector_get_properties(m_framebuffer_fd, &properties) < 0)
return Error::from_syscall(String::formatted("failed to ioctl {}", m_device), errno);
m_can_device_flush_buffers = (properties.partial_flushing_support != 0);
@@ -66,13 +66,13 @@ ErrorOr<void> HardwareScreenBackend::set_head_resolution(FBHeadResolution resolu
mode_setting.horizontal_active = resolution.width;
mode_setting.vertical_active = resolution.height;
mode_setting.horizontal_stride = resolution.pitch;
- auto rc = fb_set_head_mode_setting(m_framebuffer_fd, &mode_setting);
+ auto rc = graphics_connector_set_head_mode_setting(m_framebuffer_fd, &mode_setting);
if (rc != 0) {
dbgln("Failed to set backend mode setting: falling back to safe resolution");
- rc = fb_set_safe_head_mode_setting(m_framebuffer_fd);
+ rc = graphics_connector_set_safe_head_mode_setting(m_framebuffer_fd);
if (rc != 0) {
dbgln("Failed to set backend safe mode setting: aborting");
- return Error::from_syscall("fb_set_safe_head_mode_setting", rc);
+ return Error::from_syscall("graphics_connector_set_safe_head_mode_setting", rc);
}
dbgln("Failed to set backend mode setting: falling back to safe resolution - success.");
}
@@ -136,9 +136,9 @@ ErrorOr<void> HardwareScreenBackend::map_framebuffer()
} else {
GraphicsHeadModeSetting mode_setting {};
memset(&mode_setting, 0, sizeof(GraphicsHeadModeSetting));
- int rc = fb_get_head_mode_setting(m_framebuffer_fd, &mode_setting);
+ int rc = graphics_connector_get_head_mode_setting(m_framebuffer_fd, &mode_setting);
if (rc != 0) {
- return Error::from_syscall("fb_get_head_mode_setting", rc);
+ return Error::from_syscall("graphics_connector_get_head_mode_setting", rc);
}
m_size_in_bytes = mode_setting.horizontal_stride * mode_setting.vertical_active * 2;
m_framebuffer = (Gfx::ARGB32*)malloc(m_size_in_bytes);
@@ -170,9 +170,9 @@ ErrorOr<FBHeadProperties> HardwareScreenBackend::get_head_properties()
} else {
GraphicsHeadModeSetting mode_setting {};
memset(&mode_setting, 0, sizeof(GraphicsHeadModeSetting));
- int rc = fb_get_head_mode_setting(m_framebuffer_fd, &mode_setting);
+ int rc = graphics_connector_get_head_mode_setting(m_framebuffer_fd, &mode_setting);
if (rc != 0) {
- return Error::from_syscall("fb_get_head_mode_setting", rc);
+ return Error::from_syscall("graphics_connector_get_head_mode_setting", rc);
}
m_pitch = mode_setting.horizontal_stride;
// Note: We translate (for now, until Framebuffer devices are removed) the GraphicsHeadModeSetting
diff --git a/Userland/Services/WindowServer/ScreenLayout.ipp b/Userland/Services/WindowServer/ScreenLayout.ipp
index 0b665d7d49..2baa465b58 100644
--- a/Userland/Services/WindowServer/ScreenLayout.ipp
+++ b/Userland/Services/WindowServer/ScreenLayout.ipp
@@ -323,7 +323,7 @@ bool ScreenLayout::try_auto_add_display_connector(String const& device_path)
GraphicsHeadModeSetting mode_setting {};
memset(&mode_setting, 0, sizeof(GraphicsHeadModeSetting));
- if (fb_get_head_mode_setting(display_connector_fd, &mode_setting) < 0) {
+ if (graphics_connector_get_head_mode_setting(display_connector_fd, &mode_setting) < 0) {
int err = errno;
dbgln("Error ({}) querying resolution from display connector device {}", err, device_path);
return false;