libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-28 02:30:35 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Revert "(X11/dispserv) Cleanups"

Browse Source 
This reverts commit 30cde1edfb.
This commit is contained in:
twinaphex 2020-09-14 13:05:02 +02:00
parent 30cde1edfb
commit 19a380a328
1 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
gfx/display_servers/dispserv_x11.c
View File

@ -114,6 +114,7 @@ static bool x11_display_server_set_resolution(void *data,
int crt_mode_flag = 0;
bool crt_exists = false;
XRRModeInfo *swmode = NULL;
XRRModeInfo *crt_xrrmode = NULL;
x11_monitor_index = monitor_index;
@ -201,10 +202,26 @@ static bool x11_display_server_set_resolution(void *data,
/* need to run loops for DVI0 - DVI-2 and VGA0 - VGA-2 outputs to
* add and delete modes */
crt_rrmode.name = new_mode;
crt_rrmode.nameLength = strlen(crt_name);
crt_rrmode.dotClock = pixel_clock;
crt_rrmode.width = width;
crt_rrmode.hSyncStart = hfp;
crt_rrmode.hSyncEnd = hsp;
crt_rrmode.hTotal = hmax;
crt_rrmode.height = height;
crt_rrmode.vSyncStart = vfp;
crt_rrmode.vSyncEnd = vsp;
crt_rrmode.vTotal = vbp;
crt_rrmode.modeFlags = crt_mode_flag; /* 10 for -hsync -vsync. 26 for -hsync -vsync interlaced */
crt_rrmode.hSkew = 0;
crt_xrrmode = &crt_rrmode;
res = XRRGetScreenResources(dpy, window);
XSync(dpy, False);
resources = XRRGetScreenResourcesCurrent(dpy, window);
resources = XRRGetScreenResourcesCurrent(dpy, window);
for (m = 0; m < resources->nmode; m++)
{
@ -218,23 +235,7 @@ static bool x11_display_server_set_resolution(void *data,
XRRFreeScreenResources(resources);
if (!crt_exists)
{
crt_rrmode.name = new_mode;
crt_rrmode.nameLength = strlen(crt_name);
crt_rrmode.dotClock = pixel_clock;
crt_rrmode.width = width;
crt_rrmode.hSyncStart = hfp;
crt_rrmode.hSyncEnd = hsp;
crt_rrmode.hTotal = hmax;
crt_rrmode.height = height;
crt_rrmode.vSyncStart = vfp;
crt_rrmode.vSyncEnd = vsp;
crt_rrmode.vTotal = vbp;
crt_rrmode.modeFlags = crt_mode_flag; /* 10 for -hsync -vsync. 26 for -hsync -vsync interlaced */
crt_rrmode.hSkew = 0;
XRRCreateMode(dpy, window, &crt_rrmode);
}
resources = XRRGetScreenResourcesCurrent(dpy, window);
@ -506,10 +507,27 @@ static void x11_display_server_destroy(void *data)
strlcpy(dmode, "d_mo", sizeof(dmode));
crt_rrmode.name = dmode;
crt_rrmode.nameLength = strlen(crt_name);
crt_rrmode.dotClock = 13849698;
crt_rrmode.width = 700;
crt_rrmode.hSyncStart = 742;
crt_rrmode.hSyncEnd = 801;
crt_rrmode.hTotal = 867;
crt_rrmode.height = 480;
crt_rrmode.vSyncStart = 490;
crt_rrmode.vSyncEnd = 496;
crt_rrmode.vTotal = 533;
crt_rrmode.modeFlags = 26;
/* 10 for -hsync -vsync. ?? for -hsync -vsync interlaced */
crt_rrmode.hSkew = 0;
res = XRRGetScreenResources(dpy, window);
resources = XRRGetScreenResourcesCurrent(dpy, window);
XSync(dpy, False);
resources = XRRGetScreenResourcesCurrent(dpy, window);
for (m = 0; m < resources->nmode; m++)
{
if (string_is_equal(resources->modes[m].name, dmode))
@ -523,23 +541,7 @@ static void x11_display_server_destroy(void *data)
if (!crt_exists)
{
crt_rrmode.name = dmode;
crt_rrmode.nameLength = strlen(crt_name);
crt_rrmode.dotClock = 13849698;
crt_rrmode.width = 700;
crt_rrmode.hSyncStart = 742;
crt_rrmode.hSyncEnd = 801;
crt_rrmode.hTotal = 867;
crt_rrmode.height = 480;
crt_rrmode.vSyncStart = 490;
crt_rrmode.vSyncEnd = 496;
crt_rrmode.vTotal = 533;
crt_rrmode.modeFlags = 26;
/* 10 for -hsync -vsync. ?? for -hsync -vsync interlaced */
crt_rrmode.hSkew = 0;
XRRCreateMode(dpy, window, &crt_rrmode);
}
resources = XRRGetScreenResourcesCurrent(dpy, window);
@ -650,6 +652,7 @@ static void x11_display_server_destroy(void *data)
XRRFreeScreenResources(res);
XCloseDisplay(dpy);
}
#endif
if (dispserv)