MrMonopoly/raylib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor "GetMonitor" properties for DRM Platform

Browse Source 
Refactored GetMonitorHeight, GetMonitorWidth, GetMonitorPhysicalHeight,
GetMonitorPhysicalWidth and GetMonitorName to accept only argument "0"
as more than one screen is not supported in DRM platform.
This commit is contained in:
gabriel.dasilvam 2024-05-07 09:58:13 +02:00
parent c228819e30
commit af7d2d2199
1 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/platforms/rcore_drm.c
View File

@ -389,16 +389,14 @@ Vector2 GetMonitorPosition(int monitor)
int GetMonitorWidth(int monitor) int GetMonitorWidth(int monitor)
{ {
int width = 0; int width = 0;
if (monitor > 0)
if (monitor != 0)
{ {
TRACELOG(LOG_WARNING, "GetMonitorWidth() implemented for first monitor only"); TRACELOG(LOG_WARNING, "GetMonitorWidth() implemented for first monitor only");
} }
else else if ((platform.connector) && (platform.modeIndex >= 0))
{ {
if ((platform.connector) && (platform.modeIndex >= 0)) width = platform.connector->modes[platform.modeIndex].hdisplay;
{
width = platform.connector->modes[platform.modeIndex].hdisplay;
}
} }
return width; return width;
@ -408,16 +406,14 @@ int GetMonitorWidth(int monitor)
int GetMonitorHeight(int monitor) int GetMonitorHeight(int monitor)
{ {
int height = 0; int height = 0;
if (monitor > 0)
if (monitor != 0)
{ {
TRACELOG(LOG_WARNING, "GetMonitorHeight() implemented for first monitor only"); TRACELOG(LOG_WARNING, "GetMonitorHeight() implemented for first monitor only");
} }
else else if ((platform.connector) && (platform.modeIndex >= 0))
{ {
if ((platform.connector) && (platform.modeIndex >= 0)) height = platform.connector->modes[platform.modeIndex].vdisplay;
{
height = platform.connector->modes[platform.modeIndex].vdisplay;
}
} }
return height; return height;
@ -427,16 +423,14 @@ int GetMonitorHeight(int monitor)
int GetMonitorPhysicalWidth(int monitor) int GetMonitorPhysicalWidth(int monitor)
{ {
int physicalWidth = 0; int physicalWidth = 0;
if (monitor > 0)
if (monitor != 0)
{ {
TRACELOG(LOG_WARNING, "GetMonitorPhysicalWidth() implemented for first monitor only"); TRACELOG(LOG_WARNING, "GetMonitorPhysicalWidth() implemented for first monitor only");
} }
else else if ((platform.connector) && (platform.modeIndex >= 0))
{ {
if ((platform.connector) && (platform.modeIndex >= 0)) physicalWidth = platform.connector->mmWidth;
{
physicalWidth = platform.connector->mmWidth;
}
} }
return physicalWidth; return physicalWidth;
@ -446,16 +440,14 @@ int GetMonitorPhysicalWidth(int monitor)
int GetMonitorPhysicalHeight(int monitor) int GetMonitorPhysicalHeight(int monitor)
{ {
int physicalHeight = 0; int physicalHeight = 0;
if (monitor > 0)
if (monitor != 0)
{ {
TRACELOG(LOG_WARNING, "GetMonitorPhysicalHeight() implemented for first monitor only"); TRACELOG(LOG_WARNING, "GetMonitorPhysicalHeight() implemented for first monitor only");
} }
else else if ((platform.connector) && (platform.modeIndex >= 0))
{ {
if ((platform.connector) && (platform.modeIndex >= 0)) physicalHeight = platform.connector->mmHeight;
{
physicalHeight = platform.connector->mmHeight;
}
} }
return physicalHeight; return physicalHeight;
@ -477,9 +469,13 @@ int GetMonitorRefreshRate(int monitor)
// Get the human-readable, UTF-8 encoded name of the selected monitor // Get the human-readable, UTF-8 encoded name of the selected monitor
const char *GetMonitorName(int monitor) const char *GetMonitorName(int monitor)
{ {
const char *name = NULL; const char *name = "";
if ((platform.connector) && (platform.modeIndex >= 0)) if (monitor != 0)
{
TRACELOG(LOG_WARNING, "GetMonitorName() implemented for first monitor only");
}
else if ((platform.connector) && (platform.modeIndex >= 0))
{ {
name = platform.connector->modes[platform.modeIndex].name; name = platform.connector->modes[platform.modeIndex].name;
} }