mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed Atom identifiers, reserved names were used

Browse Source
This commit is contained in:
toreonify 2024-05-03 12:15:03 +03:00 committed by akallabeth
parent 6ea047558e
commit 9118551334
3 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
client/X11/xf_client.c
View File

@ -1930,18 +1930,18 @@ BOOL xf_setup_x11(xfContext* xfc)
xfc->WM_STATE = XInternAtom(xfc->display, "WM_STATE", False); xfc->WM_STATE = XInternAtom(xfc->display, "WM_STATE", False);
xfc->x11event = CreateFileDescriptorEvent(NULL, FALSE, FALSE, xfc->xfds, WINPR_FD_READ); xfc->x11event = CreateFileDescriptorEvent(NULL, FALSE, FALSE, xfc->xfds, WINPR_FD_READ);
xfc->_NET_WM_ALLOWED_ACTIONS = XInternAtom(xfc->display, "_NET_WM_ALLOWED_ACTIONS", False); xfc->NET_WM_ALLOWED_ACTIONS = XInternAtom(xfc->display, "_NET_WM_ALLOWED_ACTIONS", False);
xfc->_NET_WM_ACTION_CLOSE = XInternAtom(xfc->display, "_NET_WM_ACTION_CLOSE", False); xfc->NET_WM_ACTION_CLOSE = XInternAtom(xfc->display, "_NET_WM_ACTION_CLOSE", False);
xfc->_NET_WM_ACTION_MINIMIZE = XInternAtom(xfc->display, "_NET_WM_ACTION_MINIMIZE", False); xfc->NET_WM_ACTION_MINIMIZE = XInternAtom(xfc->display, "_NET_WM_ACTION_MINIMIZE", False);
xfc->_NET_WM_ACTION_MOVE = XInternAtom(xfc->display, "_NET_WM_ACTION_MOVE", False); xfc->NET_WM_ACTION_MOVE = XInternAtom(xfc->display, "_NET_WM_ACTION_MOVE", False);
xfc->_NET_WM_ACTION_RESIZE = XInternAtom(xfc->display, "_NET_WM_ACTION_RESIZE", False); xfc->NET_WM_ACTION_RESIZE = XInternAtom(xfc->display, "_NET_WM_ACTION_RESIZE", False);
xfc->_NET_WM_ACTION_MAXIMIZE_HORZ = xfc->NET_WM_ACTION_MAXIMIZE_HORZ =
XInternAtom(xfc->display, "_NET_WM_ACTION_MAXIMIZE_HORZ", False); XInternAtom(xfc->display, "_NET_WM_ACTION_MAXIMIZE_HORZ", False);
xfc->_NET_WM_ACTION_MAXIMIZE_VERT = xfc->NET_WM_ACTION_MAXIMIZE_VERT =
XInternAtom(xfc->display, "_NET_WM_ACTION_MAXIMIZE_VERT", False); XInternAtom(xfc->display, "_NET_WM_ACTION_MAXIMIZE_VERT", False);
xfc->_NET_WM_ACTION_FULLSCREEN = XInternAtom(xfc->display, "_NET_WM_ACTION_FULLSCREEN", False); xfc->NET_WM_ACTION_FULLSCREEN = XInternAtom(xfc->display, "_NET_WM_ACTION_FULLSCREEN", False);
xfc->_NET_WM_ACTION_CHANGE_DESKTOP = xfc->NET_WM_ACTION_CHANGE_DESKTOP =
XInternAtom(xfc->display, "_NET_WM_ACTION_CHANGE_DESKTOP", False); XInternAtom(xfc->display, "_NET_WM_ACTION_CHANGE_DESKTOP", False);
if (!xfc->x11event) if (!xfc->x11event)

10
client/X11/xf_window.c
View File

@ -759,10 +759,10 @@ void xf_SetWindowStyle(xfContext* xfc, xfAppWindow* appWindow, UINT32 style, UIN
void xf_SetWindowActions(xfContext* xfc, xfAppWindow* appWindow) void xf_SetWindowActions(xfContext* xfc, xfAppWindow* appWindow)
{ {
Atom allowed_actions[] = { Atom allowed_actions[] = {
xfc->_NET_WM_ACTION_CLOSE, xfc->_NET_WM_ACTION_MINIMIZE, xfc->NET_WM_ACTION_CLOSE, xfc->NET_WM_ACTION_MINIMIZE,
xfc->_NET_WM_ACTION_MOVE, xfc->_NET_WM_ACTION_RESIZE, xfc->NET_WM_ACTION_MOVE, xfc->NET_WM_ACTION_RESIZE,
xfc->_NET_WM_ACTION_MAXIMIZE_HORZ, xfc->_NET_WM_ACTION_MAXIMIZE_VERT, xfc->NET_WM_ACTION_MAXIMIZE_HORZ, xfc->NET_WM_ACTION_MAXIMIZE_VERT,
xfc->_NET_WM_ACTION_FULLSCREEN, xfc->_NET_WM_ACTION_CHANGE_DESKTOP xfc->NET_WM_ACTION_FULLSCREEN, xfc->NET_WM_ACTION_CHANGE_DESKTOP
}; };
if (!(appWindow->dwStyle & WS_SYSMENU)) if (!(appWindow->dwStyle & WS_SYSMENU))
@ -781,7 +781,7 @@ void xf_SetWindowActions(xfContext* xfc, xfAppWindow* appWindow)
allowed_actions[6] = 0; allowed_actions[6] = 0;
} }
XChangeProperty(xfc->display, appWindow->handle, xfc->_NET_WM_ALLOWED_ACTIONS, XA_ATOM, 32, XChangeProperty(xfc->display, appWindow->handle, xfc->NET_WM_ALLOWED_ACTIONS, XA_ATOM, 32,
PropModeReplace, (unsigned char*)&allowed_actions, 8); PropModeReplace, (unsigned char*)&allowed_actions, 8);
} }

18
client/X11/xfreerdp.h
View File

@ -257,16 +257,16 @@ struct xf_context
Atom WM_DELETE_WINDOW; Atom WM_DELETE_WINDOW;
/* Allow actions */ /* Allow actions */
Atom _NET_WM_ALLOWED_ACTIONS; Atom NET_WM_ALLOWED_ACTIONS;
Atom _NET_WM_ACTION_CLOSE; Atom NET_WM_ACTION_CLOSE;
Atom _NET_WM_ACTION_MINIMIZE; Atom NET_WM_ACTION_MINIMIZE;
Atom _NET_WM_ACTION_MOVE; Atom NET_WM_ACTION_MOVE;
Atom _NET_WM_ACTION_RESIZE; Atom NET_WM_ACTION_RESIZE;
Atom _NET_WM_ACTION_MAXIMIZE_HORZ; Atom NET_WM_ACTION_MAXIMIZE_HORZ;
Atom _NET_WM_ACTION_MAXIMIZE_VERT; Atom NET_WM_ACTION_MAXIMIZE_VERT;
Atom _NET_WM_ACTION_FULLSCREEN; Atom NET_WM_ACTION_FULLSCREEN;
Atom _NET_WM_ACTION_CHANGE_DESKTOP; Atom NET_WM_ACTION_CHANGE_DESKTOP;
/* Channels */ /* Channels */
#if defined(CHANNEL_TSMF_CLIENT) #if defined(CHANNEL_TSMF_CLIENT)