diff --git a/gfx/display_servers/dispserv_x11.c b/gfx/display_servers/dispserv_x11.c
index bab8db50d1..82d4d5b6bf 100644
--- a/gfx/display_servers/dispserv_x11.c
+++ b/gfx/display_servers/dispserv_x11.c
@@ -1,358 +1,306 @@
-/* RetroArch - A frontend for libretro.
- * Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- * Copyright (C) 2011-2017 - Daniel De Matteis
- * Copyright (C) 2016-2017 - Brad Parker
- *
- * RetroArch is free software: you can redistribute it and/or modify it under the terms
- * of the GNU General Public License as published by the Free Software Found-
- * ation, either version 3 of the License, or (at your option) any later version.
- *
- * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with RetroArch.
- * If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "../video_display_server.h"
-#include "../common/x11_common.h"
-#include "../../configuration.h"
-#include "../video_driver.h" /* needed to set refresh rate in set resolution */
-#include "../video_crt_switch.h" /* needed to set aspect for low res in linux */
-
-#include <sys/types.h>
-#include <unistd.h>
-#include <X11/Xlib.h>
-
-static unsigned orig_width = 0;
-static unsigned orig_height = 0;
-static char orig_res[50];
-static char old_mode[150];
-static char new_mode[150];
-static char output[450];
-static bool crt_en = false;
-static FILE *res;
-
-typedef struct
-{
- unsigned opacity;
- bool decorations;
-} dispserv_x11_t;
-
-static void* x11_display_server_init(void)
-{
- dispserv_x11_t *dispserv = (dispserv_x11_t*)calloc(1, sizeof(*dispserv));
-
- if (!dispserv)
- return NULL;
-
- return dispserv;
-}
-
-static void x11_display_server_destroy(void *data)
-{
- dispserv_x11_t *dispserv = (dispserv_x11_t*)data;
- int i = 0;
-
- if (crt_en == true)
- {
- sprintf(orig_res, "xrandr -s %dx%d", orig_width, orig_height);
- system(orig_res);
-
- res= fopen ("res.sh", "w");
- for (i =0; i < 3; i++)
- {
- fprintf(res, "if (xrandr | grep \"VGA-%d connected\" )"
- "\nthen"
- "\n xrandr --delmode VGA-%d %s"
- "\n exit"
- "\n fi \n\n"
- "if (xrandr | grep \"VGA%d connected\" )"
- "\nthen"
- "\n xrandr --delmode VGA%d %s"
- "\n exit"
- "\n fi \n\n"
- "if (xrandr | grep \"DVI-%d connected\" )"
- "\nthen"
- "\n xrandr --delmode VGA-%d %s"
- "\n exit"
- "\n fi \n\n"
- "if (xrandr | grep \"DVI%d connected\" )"
- "\nthen"
- "\n xrandr --delmode DVI%d %s"
- "\n exit"
- "\n fi \n\n"
- "\nexit"
-
- ,i, i ,old_mode
- ,i, i ,old_mode
- ,i, i ,old_mode
- ,i, i ,old_mode);
- }
- fclose(res);
- system("bash res.sh");
- sprintf(output,"xrandr --rmmode %s", old_mode);
- system(output);
-
- }
-
- if (dispserv)
- free(dispserv);
-}
-
-static bool x11_set_window_opacity(void *data, unsigned opacity)
-{
- dispserv_x11_t *serv = (dispserv_x11_t*)data;
- Atom net_wm_opacity = XInternAtom(g_x11_dpy, "_NET_WM_WINDOW_OPACITY", False);
- Atom cardinal = XInternAtom(g_x11_dpy, "CARDINAL", False);
-
- serv->opacity = opacity;
-
- opacity = opacity * ((unsigned)-1 / 100.0);
-
- if (opacity == (unsigned)-1)
- XDeleteProperty(g_x11_dpy, g_x11_win, net_wm_opacity);
- else
- XChangeProperty(g_x11_dpy, g_x11_win, net_wm_opacity, cardinal, 32, PropModeReplace, (const unsigned char*)&opacity, 1);
-
- return true;
-}
-
-static bool x11_set_window_decorations(void *data, bool on)
-{
- dispserv_x11_t *serv = (dispserv_x11_t*)data;
-
- serv->decorations = on;
-
- /* menu_setting performs a reinit instead to properly apply decoration changes */
-
- return true;
-}
-
-static bool x11_set_resolution(void *data,
- unsigned width, unsigned height, int int_hz, float hz)
-{
- int i = 0;
- int hfp = 0;
- int hsp = 0;
- int hbp = 0;
- int vfp = 0;
- int vsp = 0;
- int vbp = 0;
- int hmax = 0;
- int vmax = 0;
- float pixel_clock = 0;
- char xrandr[250];
- char fbset[150];
-
- Display* disp = XOpenDisplay(NULL);
- Screen* scrn = DefaultScreenOfDisplay(disp);
-
- crt_en = true;
-
- if (orig_width == 0)
- orig_width = scrn->width;
-
- if (orig_height == 0)
- orig_height = scrn->height;
-
- hsp = width*1.12;
-
- /* set core refresh from hz */
- video_monitor_set_refresh_rate(hz);
-
- /* following code is the mode line genorator */
-
- hfp = width+12;
- hbp = width*1.22;
- hmax = hbp;
-
- if (height < 241)
- {
- vmax = 261;
- }
- if (height < 241 && hz > 56 && hz < 58)
- {
- vmax = 280;
- }
- if (height < 241 && hz < 55)
- {
- vmax = 313;
- }
- if (height > 250 && height < 260 && hz > 54)
- {
- vmax = 296;
- }
- if (height > 250 && height < 260 && hz > 52 && hz < 54)
- {
- vmax = 285;
- }
- if (height > 240 && height < 260 && hz < 52)
- {
- vmax = 265;
- }
- if (height > 250 && height < 260 && hz < 52)
- {
- vmax = 313;
- }sprintf(output,"xrandr --rmmode %s", old_mode);
- system(output);
- if (height > 260 && height < 300)
- {
- vmax = 313;
- }
-
- if (height > 400 && hz > 56)
- {
- vmax = 523;
- }
- if (height > 520 && hz < 57)
- {
- vmax = 580;
- }
-
- if (height > 300 && hz < 56)
- {
- vmax = 627;
- }
-
- if (hz < 53)
- {
- vfp = height+((vmax-height)*0.38);
- }
- if (hz > 56)
- {
- vfp = height+((vmax-height)*0.28);
- }
- if (hz > 53 && hz < 56)
- {
- vfp = height+((vmax-height)*0.35);
- }
-
-
- if ( vfp < 1 )
- {
- vfp = height+2;
-
- }
-
- if (height < 300)
- {
- vsp = vfp+3; /* needs to me 3 for progressive */
- } if (height > 300)
- {
- vsp = vfp+6; /* needs to me 6 for interlaced */
- }
-
- vbp = vmax;
-
- if (height < 300)
- {
- pixel_clock = (hmax*vmax*hz)/1000000;
- }
-
- if (height > 300)
- {
- pixel_clock = ((hmax*vmax*hz)/1000000)/2;
- }
- /* above code is the modeline genorator */
-
- /* create progressive newmode from modline variables */
- if (height < 300)
- {
- sprintf(xrandr,"xrandr --newmode \"%dx%d_%0.2f\" %lf %d %d %d %d %d %d %d %d -hsync -vsync", width, height, hz, pixel_clock, width, hfp, hsp, hbp, height, vfp, vsp, vbp);
- system(xrandr);
-
- }
- /* create interlaced newmode from modline variables */
- if (height > 300)
- {
- sprintf(xrandr,"xrandr --newmode \"%dx%d_%0.2f\" %lf %d %d %d %d %d %d %d %d interlace -hsync -vsync", width, height, hz, pixel_clock, width, hfp, hsp, hbp, height, vfp, vsp, vbp);
- system(xrandr);
-
- }
- /* variable for new mode */
- sprintf(new_mode,"%dx%d_%0.2f", width, height, hz);
-
- res= fopen ("res.sh", "w");
- for (i =0; i < 3; i++)
- {
- fprintf(res, "if (xrandr | grep \"VGA-%d connected\" )"
- "\nthen"
- "\n xrandr --addmode VGA-%d %s"
- "\n xrandr --output VGA-%d --mode %s"
- "\n xrandr --delmode VGA-%d %s"
- "\n exit"
- "\n fi \n \n"
- "if (xrandr | grep \"VGA%d connected\" )"
- "\nthen"
- "\n xrandr --addmode VGA%d %s"
- "\n xrandr --output VGA%d --mode %s"
- "\n xrandr --delmode VGA%d %s"
- "\n exit"
- "\n fi \n \n"
- "if (xrandr | grep \"DVI-%d connected\" )"
- "\nthen"
- "\n xrandr --addmode DVI-%d %s"
- "\n xrandr --output DVI-%d --mode %s"
- "\n xrandr --delmode DVI-%d %s"
- "\n exit"
- "\n fi \n \n"
- "if (xrandr | grep \"DVI%d connected\" )"
- "\nthen"
- "\n xrandr --addmode DVI%d %s"
- "\n xrandr --output DVI%d --mode %s"
- "\n xrandr --delmode DVI%d %s"
- "\n exit"
- "\n fi \n \n"
- "if (xrandr | grep \"HDMI-%d connected\" )"
- "\nthen"
- "\n xrandr --addmode HDMI-%d %s"
- "\n xrandr --output HDMI-%d --mode %s"
- "\n xrandr --delmode HDMI-%d %s"
- "\n exit"
- "\n fi \n \n"
- "if (xrandr | grep \"HDMI%d connected\" )"
- "\nthen"
- "\n xrandr --addmode HDMI%d %s"
- "\n xrandr --output HDMI%d --mode %s"
- "\n xrandr --delmode HMDI%d %s"
- "\n exit"
- "\n fi \n \n"
- "\nexit"
- ,i ,i ,new_mode,i , new_mode, i ,old_mode
- ,i ,i ,new_mode,i , new_mode, i ,old_mode
- ,i ,i ,new_mode,i , new_mode, i ,old_mode
- ,i ,i ,new_mode,i , new_mode, i ,old_mode
- ,i ,i ,new_mode,i , new_mode, i ,old_mode
- ,i ,i ,new_mode,i , new_mode, i ,old_mode);
- }
- fclose(res);
-
-
- /* need to run loops for DVI0 - DVI-2 and VGA0 - VGA-2 outputs to add and delete modes */
-
- system("bash res.sh");
-
- /* remove old mode */
- sprintf(output,"xrandr --rmmode %s", old_mode);
- system(output);
- system("xdotool windowactivate $(xdotool search --class RetroArch)"); /* needs xdotool installed. needed to recaputure window. */
- /* variable for old mode */
- sprintf(old_mode,"%s", new_mode);
- system("xdotool windowactivate $(xdotool search --class RetroArch)"); /* needs xdotool installed. needed to recaputure window. */
- /* Second run needed as some times it runs to fast to capture first time */
-
- return true;
-}
-
-const video_display_server_t dispserv_x11 = {
- x11_display_server_init,
- x11_display_server_destroy,
- x11_set_window_opacity,
- NULL,
- x11_set_window_decorations,
- x11_set_resolution, /* set_resolution */
- "x11"
-};
-
+/* RetroArch - A frontend for libretro.
+ * Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ * Copyright (C) 2011-2017 - Daniel De Matteis
+ * Copyright (C) 2016-2017 - Brad Parker
+ *
+ * RetroArch is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Found-
+ * ation, either version 3 of the License, or (at your option) any later version.
+ *
+ * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with RetroArch.
+ * If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "../video_display_server.h"
+#include "../common/x11_common.h"
+#include "../../configuration.h"
+#include "../video_driver.h" /* needed to set refresh rate in set resolution */
+#include "../video_crt_switch.h" /* needed to set aspect for low res in linux */
+
+#include <sys/types.h>
+#include <unistd.h>
+#include <X11/Xlib.h>
+
+static unsigned orig_width = 0;
+static unsigned orig_height = 0;
+static char old_mode[150];
+static char new_mode[150];
+static char xrandr[250];
+static char fbset[150];
+static char output[150];
+static bool crt_en = false;
+
+typedef struct
+{
+ unsigned opacity;
+ bool decorations;
+} dispserv_x11_t;
+
+static void* x11_display_server_init(void)
+{
+ dispserv_x11_t *dispserv = (dispserv_x11_t*)calloc(1, sizeof(*dispserv));
+
+ if (!dispserv)
+ return NULL;
+
+ return dispserv;
+}
+
+static void x11_display_server_destroy(void *data)
+{
+ dispserv_x11_t *dispserv = (dispserv_x11_t*)data;
+ int i = 0;
+ if (crt_en == true)
+ {
+ sprintf(output,"xrandr -s %dx%d", orig_width, orig_height);
+ system(output);
+ }
+ for (i =0; i < 3; i++)
+ {
+ sprintf(output,"xrandr --delmode %s%d %s", "VGA",i ,old_mode);
+ system(output);
+ sprintf(output,"xrandr --delmode %s-%d %s", "VGA",i ,old_mode);
+ system(output);
+
+ sprintf(output,"xrandr --delmode %s%d %s", "DVI",i ,old_mode);
+ system(output);
+ sprintf(output,"xrandr --delmode %s-%d %s", "DVI",i ,old_mode);
+ system(output);
+
+ }
+ sprintf(output,"xrandr --rmmode %s", old_mode);
+ system(output);
+
+ if (dispserv)
+ free(dispserv);
+}
+
+static bool x11_set_window_opacity(void *data, unsigned opacity)
+{
+ dispserv_x11_t *serv = (dispserv_x11_t*)data;
+ Atom net_wm_opacity = XInternAtom(g_x11_dpy, "_NET_WM_WINDOW_OPACITY", False);
+ Atom cardinal = XInternAtom(g_x11_dpy, "CARDINAL", False);
+
+ serv->opacity = opacity;
+
+ opacity = opacity * ((unsigned)-1 / 100.0);
+
+ if (opacity == (unsigned)-1)
+ XDeleteProperty(g_x11_dpy, g_x11_win, net_wm_opacity);
+ else
+ XChangeProperty(g_x11_dpy, g_x11_win, net_wm_opacity, cardinal, 32, PropModeReplace, (const unsigned char*)&opacity, 1);
+
+ return true;
+}
+
+static bool x11_set_window_decorations(void *data, bool on)
+{
+ dispserv_x11_t *serv = (dispserv_x11_t*)data;
+
+ serv->decorations = on;
+
+ /* menu_setting performs a reinit instead to properly apply decoration changes */
+
+ return true;
+}
+
+static bool x11_set_resolution(void *data,
+ unsigned width, unsigned height, int int_hz, float hz)
+{
+ int i = 0;
+ int hfp = 0;
+ int hsp = 0;
+ int hbp = 0;
+ int vfp = 0;
+ int vsp = 0;
+ int vbp = 0;
+ int hmax = 0;
+ int vmax = 0;
+ float pixel_clock = 0;
+
+ Display* disp = XOpenDisplay(NULL);
+ Screen* scrn = DefaultScreenOfDisplay(disp);
+
+ if (orig_height == 0 && orig_width == 0)
+ {
+ orig_width = scrn->width;
+ orig_height = scrn->height;
+ }
+
+ crt_en = true;
+
+ hsp = width*1.10;
+
+ /* set core refresh from hz */
+ video_monitor_set_refresh_rate(hz);
+
+ /* following code is the mode line genorator */
+
+ hfp = width+8;
+ hbp = width*1.23;
+ hmax = hbp;
+
+ if (height < 241)
+ {
+ vmax = 261;
+ }
+ if (height < 241 && hz > 56 && hz < 58)
+ {
+ vmax = 280;
+ }
+ if (height < 241 && hz < 55)
+ {
+ vmax = 313;
+ }
+ if (height > 250 && height < 260 && hz > 54)
+ {
+ vmax = 296;
+ }
+ if (height > 250 && height < 260 && hz > 52 && hz < 54)
+ {
+ vmax = 285;
+ }
+ if (height > 240 && height < 260 && hz < 52)
+ {
+ vmax = 265;
+ }
+ if (height > 250 && height < 260 && hz < 52)
+ {
+ vmax = 313;
+ }
+ if (height > 260 && height < 300)
+ {
+ vmax = 313;
+ }
+
+ if (height > 400 && hz > 56)
+ {
+ vmax = 523;
+ }
+ if (height > 520 && hz < 57)
+ {
+ vmax = 580;
+ }
+
+ if (height > 300 && hz < 56)
+ {
+ vmax = 627;
+ }
+
+ if (hz < 53)
+ {
+ vfp = height+((vmax-height)*0.20);
+ }
+ if (hz > 56)
+ {
+ vfp = height+((vmax-height)*0.26);
+ }
+ if (hz > 53 && hz < 56)
+ {
+ vfp = height+((vmax-height)*0.25);
+ }
+
+
+ if ( vfp < 1 )
+ {
+ vfp = height+2;
+
+ }
+
+ if (height < 300)
+ {
+ vsp = vfp+3; /* needs to me 3 for progressive */
+ } if (height > 300)
+ {
+ vsp = vfp+6; /* needs to me 6 for interlaced */
+ }
+
+ vbp = vmax;
+
+ if (height < 300)
+ {
+ pixel_clock = (hmax*vmax*hz)/1000000;
+ }
+
+ if (height > 300)
+ {
+ pixel_clock = ((hmax*vmax*hz)/1000000)/2;
+ }
+ /* above code is the modeline genorator */
+
+ /* create progressive newmode from modline variables */
+ if (height < 300)
+ {
+ sprintf(xrandr,"xrandr --newmode \"%dx%d_%0.2f\" %lf %d %d %d %d %d %d %d %d -hsync -vsync", width, height, hz, pixel_clock, width, hfp, hsp, hbp, height, vfp, vsp, vbp);
+ system(xrandr);
+
+ }
+ /* create interlaced newmode from modline variables */
+ if (height > 300)
+ {
+ sprintf(xrandr,"xrandr --newmode \"%dx%d_%0.2f\" %lf %d %d %d %d %d %d %d %d interlace -hsync -vsync", width, height, hz, pixel_clock, width, hfp, hsp, hbp, height, vfp, vsp, vbp);
+ system(xrandr);
+
+ }
+ /* variable for new mode */
+ sprintf(new_mode,"%dx%d_%0.2f", width, height, hz);
+
+ /* need to run loops for DVI0 - DVI-2 and VGA0 - VGA-2 outputs to add and delete modes */
+ for (i =0; i < 3; i++)
+ {
+ sprintf(output,"xrandr --addmode %s%d %s", "DVI",i ,new_mode);
+ system(output);
+ sprintf(output,"xrandr --output %s%d --mode %s", "DVI", i, new_mode);
+ system(output);
+ sprintf(output,"xrandr --delmode %s%d %s", "DVI",i ,old_mode);
+ system(output);
+
+ sprintf(output,"xrandr --addmode %s-%d %s", "DVI",i ,new_mode);
+ system(output);
+ sprintf(output,"xrandr --output %s-%d --mode %s", "DVI", i, new_mode);
+ system(output);
+ sprintf(output,"xrandr --delmode %s-%d %s", "DVI",i ,old_mode);
+ system(output);
+
+ sprintf(output,"xrandr --addmode %s%d %s", "VGA",i ,new_mode);
+ system(output);
+ sprintf(output,"xrandr --output %s%d --mode %s", "VGA", i, new_mode);
+ system(output);
+ sprintf(output,"xrandr --delmode %s%d %s", "VGA",i ,old_mode);
+ system(output);
+
+ sprintf(output,"xrandr --addmode %s-%d %s", "VGA",i ,new_mode);
+ system(output);
+ sprintf(output,"xrandr --output %s-%d --mode %s", "VGA", i, new_mode);
+ system(output);
+ sprintf(output,"xrandr --delmode %s-%d %s", "VGA",i ,old_mode);
+ system(output);
+ }
+
+
+ /* remove old mode */
+ sprintf(output,"xrandr --rmmode %s", old_mode);
+ system(output);
+ system("xdotool windowactivate $(xdotool search --class RetroArch)"); /* needs xdotool installed. needed to recaputure window. */
+ /* variable for old mode */
+ sprintf(old_mode,"%s", new_mode);
+ system("xdotool windowactivate $(xdotool search --class RetroArch)"); /* needs xdotool installed. needed to recaputure window. */
+ /* Second run needed as some times it runs to fast to capture first time */
+
+ return true;
+}
+
+const video_display_server_t dispserv_x11 = {
+ x11_display_server_init,
+ x11_display_server_destroy,
+ x11_set_window_opacity,
+ NULL,
+ x11_set_window_decorations,
+ x11_set_resolution, /* set_resolution */
+ "x11"
+};
+