CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-16 23:37:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Set override-redirect on true fullscreen, but after window is mapped.

Browse Source
This commit is contained in:
Brandon Wright 2018-04-01 14:52:29 -05:00
parent 015facee70
commit 64686d8106
3 changed files with 5 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
gfx/common/x11_common.c
View File

@ -107,47 +107,6 @@ void x11_show_mouse(Display *dpy, Window win, bool state)
x11_hide_mouse(dpy, win);
}
static bool x11_check_atom_supported(Display *dpy, Atom atom)
{
Atom XA_NET_SUPPORTED = XInternAtom(dpy, "_NET_SUPPORTED", True);
Atom type;
int format;
unsigned long nitems;
unsigned long bytes_after;
Atom *prop;
int i;
if (XA_NET_SUPPORTED == None)
return false;
XGetWindowProperty(dpy, DefaultRootWindow(dpy), XA_NET_SUPPORTED, 0, UINT_MAX, False, XA_ATOM, &type, &format,&nitems, &bytes_after, (unsigned char **) &prop);
if (!prop || type != XA_ATOM)
{
return false;
}
for (i = 0; i < nitems; i++)
{
if (prop[i] == atom)
{
XFree(prop);
return true;
}
}
XFree(prop);
return false;
}
bool x11_has_net_wm_fullscreen(Display *dpy)
{
XA_NET_WM_STATE_FULLSCREEN = XInternAtom(dpy, "_NET_WM_STATE_FULLSCREEN", False);
return x11_check_atom_supported(dpy, XA_NET_WM_STATE_FULLSCREEN);
}
void x11_set_net_wm_fullscreen(Display *dpy, Window win)
{
XEvent xev = {0};

1
gfx/common/x11_common.h
View File

@ -29,7 +29,6 @@ extern Colormap g_x11_cmap;
extern unsigned g_x11_screen;
void x11_show_mouse(Display *dpy, Window win, bool state);
bool x11_has_net_wm_fullscreen(Display *dpy);
void x11_set_net_wm_fullscreen(Display *dpy, Window win);
void x11_suspend_screensaver(Window win, bool enable);
bool x11_enter_fullscreen(video_frame_info_t *video_info,

10
gfx/drivers_context/x_ctx.c
View File

@ -691,7 +691,7 @@ static bool gfx_ctx_x_set_video_mode(void *data,
RARCH_ERR("[GLX]: Entering true fullscreen failed. Will attempt windowed mode.\n");
}
swa.override_redirect = (!x11_has_net_wm_fullscreen(g_x11_dpy) && true_full) ? True : False;
swa.override_redirect = (true_full) ? True : False;
if (video_info->monitor_index)
g_x11_screen = video_info->monitor_index - 1;
@ -722,8 +722,8 @@ static bool gfx_ctx_x_set_video_mode(void *data,
g_x11_win = XCreateWindow(g_x11_dpy, RootWindow(g_x11_dpy, vi->screen),
x_off, y_off, width, height, 0,
vi->depth, InputOutput, vi->visual,
CWBorderPixel | CWColormap | CWEventMask |
CWOverrideRedirect, &swa);
CWBorderPixel | CWColormap | CWEventMask,
&swa);
XSetWindowBackground(g_x11_dpy, g_x11_win, 0);
XChangeProperty(g_x11_dpy, g_x11_win, net_wm_icon, cardinal, 32, PropModeReplace, (const unsigned char*)retroarch_icon_data, sizeof(retroarch_icon_data) / sizeof(*retroarch_icon_data));
@ -780,8 +780,8 @@ static bool gfx_ctx_x_set_video_mode(void *data,
{
RARCH_LOG("[GLX]: Using true fullscreen.\n");
XMapRaised(g_x11_dpy, g_x11_win);
if (swa.override_redirect == False)
x11_set_net_wm_fullscreen(g_x11_dpy, g_x11_win);
x11_set_net_wm_fullscreen(g_x11_dpy, g_x11_win);
XChangeWindowAttributes(g_x11_dpy, g_x11_win, CWOverrideRedirect, &swa);
}
else if (fullscreen)
{