diff --git a/client/X11/xf_client.c b/client/X11/xf_client.c index 6f0e521b1..105152f06 100644 --- a/client/X11/xf_client.c +++ b/client/X11/xf_client.c @@ -1934,11 +1934,11 @@ BOOL xf_setup_x11(xfContext* xfc) xfc->big_endian = (ImageByteOrder(xfc->display) == MSBFirst); xfc->invert = TRUE; xfc->complex_regions = TRUE; - xfc->_NET_SUPPORTED = Logging_XInternAtom(xfc->log, xfc->display, "_NET_SUPPORTED", True); - xfc->_NET_SUPPORTING_WM_CHECK = + xfc->NET_SUPPORTED = Logging_XInternAtom(xfc->log, xfc->display, "_NET_SUPPORTED", True); + xfc->NET_SUPPORTING_WM_CHECK = Logging_XInternAtom(xfc->log, xfc->display, "_NET_SUPPORTING_WM_CHECK", True); - if ((xfc->_NET_SUPPORTED != None) && (xfc->_NET_SUPPORTING_WM_CHECK != None)) + if ((xfc->NET_SUPPORTED != None) && (xfc->NET_SUPPORTING_WM_CHECK != None)) { Atom actual_type = 0; int actual_format = 0; @@ -1946,7 +1946,7 @@ BOOL xf_setup_x11(xfContext* xfc) unsigned long after = 0; unsigned char* data = NULL; int status = LogTagAndXGetWindowProperty( - TAG, xfc->display, RootWindowOfScreen(xfc->screen), xfc->_NET_SUPPORTED, 0, 1024, False, + TAG, xfc->display, RootWindowOfScreen(xfc->screen), xfc->NET_SUPPORTED, 0, 1024, False, XA_ATOM, &actual_type, &actual_format, &nitems, &after, &data); if ((status == Success) && (actual_type == XA_ATOM) && (actual_format == 32)) @@ -1961,55 +1961,55 @@ BOOL xf_setup_x11(xfContext* xfc) XFree(data); } - xfc->_XWAYLAND_MAY_GRAB_KEYBOARD = + xfc->XWAYLAND_MAY_GRAB_KEYBOARD = Logging_XInternAtom(xfc->log, xfc->display, "_XWAYLAND_MAY_GRAB_KEYBOARD", False); - xfc->_NET_WM_ICON = Logging_XInternAtom(xfc->log, xfc->display, "_NET_WM_ICON", False); - xfc->_MOTIF_WM_HINTS = Logging_XInternAtom(xfc->log, xfc->display, "_MOTIF_WM_HINTS", False); - xfc->_NET_NUMBER_OF_DESKTOPS = + xfc->NET_WM_ICON = Logging_XInternAtom(xfc->log, xfc->display, "_NET_WM_ICON", False); + xfc->MOTIF_WM_HINTS = Logging_XInternAtom(xfc->log, xfc->display, "_MOTIF_WM_HINTS", False); + xfc->NET_NUMBER_OF_DESKTOPS = Logging_XInternAtom(xfc->log, xfc->display, "_NET_NUMBER_OF_DESKTOPS", False); - xfc->_NET_CURRENT_DESKTOP = + xfc->NET_CURRENT_DESKTOP = Logging_XInternAtom(xfc->log, xfc->display, "_NET_CURRENT_DESKTOP", False); - xfc->_NET_WORKAREA = Logging_XInternAtom(xfc->log, xfc->display, "_NET_WORKAREA", False); - xfc->_NET_WM_STATE = get_supported_atom(xfc, "_NET_WM_STATE"); - xfc->_NET_WM_STATE_MODAL = get_supported_atom(xfc, "_NET_WM_STATE_MODAL"); - xfc->_NET_WM_STATE_STICKY = get_supported_atom(xfc, "_NET_WM_STATE_STICKY"); - xfc->_NET_WM_STATE_MAXIMIZED_HORZ = + xfc->NET_WORKAREA = Logging_XInternAtom(xfc->log, xfc->display, "_NET_WORKAREA", False); + xfc->NET_WM_STATE = get_supported_atom(xfc, "_NET_WM_STATE"); + xfc->NET_WM_STATE_MODAL = get_supported_atom(xfc, "_NET_WM_STATE_MODAL"); + xfc->NET_WM_STATE_STICKY = get_supported_atom(xfc, "_NET_WM_STATE_STICKY"); + xfc->NET_WM_STATE_MAXIMIZED_HORZ = Logging_XInternAtom(xfc->log, xfc->display, "_NET_WM_STATE_MAXIMIZED_HORZ", False); - xfc->_NET_WM_STATE_MAXIMIZED_VERT = + xfc->NET_WM_STATE_MAXIMIZED_VERT = Logging_XInternAtom(xfc->log, xfc->display, "_NET_WM_STATE_MAXIMIZED_VERT", False); - xfc->_NET_WM_STATE_SHADED = get_supported_atom(xfc, "_NET_WM_STATE_SHADED"); - xfc->_NET_WM_STATE_SKIP_TASKBAR = get_supported_atom(xfc, "_NET_WM_STATE_SKIP_TASKBAR"); - xfc->_NET_WM_STATE_SKIP_PAGER = get_supported_atom(xfc, "_NET_WM_STATE_SKIP_PAGER"); - xfc->_NET_WM_STATE_HIDDEN = get_supported_atom(xfc, "_NET_WM_STATE_HIDDEN"); - xfc->_NET_WM_STATE_FULLSCREEN = get_supported_atom(xfc, "_NET_WM_STATE_FULLSCREEN"); - xfc->_NET_WM_STATE_ABOVE = get_supported_atom(xfc, "_NET_WM_STATE_ABOVE"); - xfc->_NET_WM_STATE_BELOW = get_supported_atom(xfc, "_NET_WM_STATE_BELOW"); - xfc->_NET_WM_STATE_DEMANDS_ATTENTION = + xfc->NET_WM_STATE_SHADED = get_supported_atom(xfc, "_NET_WM_STATE_SHADED"); + xfc->NET_WM_STATE_SKIP_TASKBAR = get_supported_atom(xfc, "_NET_WM_STATE_SKIP_TASKBAR"); + xfc->NET_WM_STATE_SKIP_PAGER = get_supported_atom(xfc, "_NET_WM_STATE_SKIP_PAGER"); + xfc->NET_WM_STATE_HIDDEN = get_supported_atom(xfc, "_NET_WM_STATE_HIDDEN"); + xfc->NET_WM_STATE_FULLSCREEN = get_supported_atom(xfc, "_NET_WM_STATE_FULLSCREEN"); + xfc->NET_WM_STATE_ABOVE = get_supported_atom(xfc, "_NET_WM_STATE_ABOVE"); + xfc->NET_WM_STATE_BELOW = get_supported_atom(xfc, "_NET_WM_STATE_BELOW"); + xfc->NET_WM_STATE_DEMANDS_ATTENTION = get_supported_atom(xfc, "_NET_WM_STATE_DEMANDS_ATTENTION"); - xfc->_NET_WM_FULLSCREEN_MONITORS = get_supported_atom(xfc, "_NET_WM_FULLSCREEN_MONITORS"); - xfc->_NET_WM_NAME = Logging_XInternAtom(xfc->log, xfc->display, "_NET_WM_NAME", False); - xfc->_NET_WM_PID = Logging_XInternAtom(xfc->log, xfc->display, "_NET_WM_PID", False); - xfc->_NET_WM_WINDOW_TYPE = + xfc->NET_WM_FULLSCREEN_MONITORS = get_supported_atom(xfc, "_NET_WM_FULLSCREEN_MONITORS"); + xfc->NET_WM_NAME = Logging_XInternAtom(xfc->log, xfc->display, "_NET_WM_NAME", False); + xfc->NET_WM_PID = Logging_XInternAtom(xfc->log, xfc->display, "_NET_WM_PID", False); + xfc->NET_WM_WINDOW_TYPE = Logging_XInternAtom(xfc->log, xfc->display, "_NET_WM_WINDOW_TYPE", False); - xfc->_NET_WM_WINDOW_TYPE_NORMAL = + xfc->NET_WM_WINDOW_TYPE_NORMAL = Logging_XInternAtom(xfc->log, xfc->display, "_NET_WM_WINDOW_TYPE_NORMAL", False); - xfc->_NET_WM_WINDOW_TYPE_DIALOG = + xfc->NET_WM_WINDOW_TYPE_DIALOG = Logging_XInternAtom(xfc->log, xfc->display, "_NET_WM_WINDOW_TYPE_DIALOG", False); - xfc->_NET_WM_WINDOW_TYPE_POPUP = + xfc->NET_WM_WINDOW_TYPE_POPUP = Logging_XInternAtom(xfc->log, xfc->display, "_NET_WM_WINDOW_TYPE_POPUP", False); - xfc->_NET_WM_WINDOW_TYPE_POPUP_MENU = + xfc->NET_WM_WINDOW_TYPE_POPUP_MENU = Logging_XInternAtom(xfc->log, xfc->display, "_NET_WM_WINDOW_TYPE_POPUP_MENU", False); - xfc->_NET_WM_WINDOW_TYPE_UTILITY = + xfc->NET_WM_WINDOW_TYPE_UTILITY = Logging_XInternAtom(xfc->log, xfc->display, "_NET_WM_WINDOW_TYPE_UTILITY", False); - xfc->_NET_WM_WINDOW_TYPE_DROPDOWN_MENU = + xfc->NET_WM_WINDOW_TYPE_DROPDOWN_MENU = Logging_XInternAtom(xfc->log, xfc->display, "_NET_WM_WINDOW_TYPE_DROPDOWN_MENU", False); - xfc->_NET_WM_STATE_SKIP_TASKBAR = + xfc->NET_WM_STATE_SKIP_TASKBAR = Logging_XInternAtom(xfc->log, xfc->display, "_NET_WM_STATE_SKIP_TASKBAR", False); - xfc->_NET_WM_STATE_SKIP_PAGER = + xfc->NET_WM_STATE_SKIP_PAGER = Logging_XInternAtom(xfc->log, xfc->display, "_NET_WM_STATE_SKIP_PAGER", False); - xfc->_NET_WM_MOVERESIZE = + xfc->NET_WM_MOVERESIZE = Logging_XInternAtom(xfc->log, xfc->display, "_NET_WM_MOVERESIZE", False); - xfc->_NET_MOVERESIZE_WINDOW = + xfc->NET_MOVERESIZE_WINDOW = Logging_XInternAtom(xfc->log, xfc->display, "_NET_MOVERESIZE_WINDOW", False); xfc->UTF8_STRING = Logging_XInternAtom(xfc->log, xfc->display, "UTF8_STRING", FALSE); xfc->WM_PROTOCOLS = Logging_XInternAtom(xfc->log, xfc->display, "WM_PROTOCOLS", False); diff --git a/client/X11/xf_cliprdr.c b/client/X11/xf_cliprdr.c index c585c2328..14532c0f7 100644 --- a/client/X11/xf_cliprdr.c +++ b/client/X11/xf_cliprdr.c @@ -111,7 +111,7 @@ struct xf_clipboard size_t numTargets; Atom targets[20]; - int requestedFormatId; + UINT32 requestedFormatId; wHashTable* cachedData; wHashTable* cachedRawData; @@ -456,7 +456,7 @@ static UINT xf_cliprdr_send_data_response(xfClipboard* clipboard, const xfCliprd WINPR_ASSERT(clipboard); /* No request currently pending, do not send a response. */ - if (clipboard->requestedFormatId < 0) + if (clipboard->requestedFormatId == UINT32_MAX) return CHANNEL_RC_OK; if (size == 0) @@ -478,7 +478,7 @@ static UINT xf_cliprdr_send_data_response(xfClipboard* clipboard, const xfCliprd format->localFormat, format->formatName); } /* Request handled, reset to invalid */ - clipboard->requestedFormatId = -1; + clipboard->requestedFormatId = UINT32_MAX; response.common.msgFlags = (data) ? CB_RESPONSE_OK : CB_RESPONSE_FAIL; @@ -932,8 +932,7 @@ static void xf_cliprdr_process_requested_data(xfClipboard* clipboard, BOOL hasDa * this ensures on next event that the buffer is not reused. */ clipboard->incr_data_length = 0; - format = xf_cliprdr_get_client_format_by_id( - clipboard, WINPR_ASSERTING_INT_CAST(uint32_t, clipboard->requestedFormatId)); + format = xf_cliprdr_get_client_format_by_id(clipboard, clipboard->requestedFormatId); if (!hasData || !data || !format) { @@ -1067,8 +1066,8 @@ static BOOL xf_cliprdr_get_requested_data(xfClipboard* clipboard, Atom target) xfContext* xfc = clipboard->xfc; WINPR_ASSERT(xfc); - const xfCliprdrFormat* format = xf_cliprdr_get_client_format_by_id( - clipboard, WINPR_ASSERTING_INT_CAST(uint32_t, clipboard->requestedFormatId)); + const xfCliprdrFormat* format = + xf_cliprdr_get_client_format_by_id(clipboard, clipboard->requestedFormatId); if (!format || (format->atom != target)) { @@ -1668,8 +1667,7 @@ static BOOL xf_cliprdr_process_property_notify(xfClipboard* clipboard, const XPr else if ((xevent->window == xfc->drawable) && (xevent->state == PropertyNewValue) && clipboard->incr_starts) { - format = xf_cliprdr_get_client_format_by_id( - clipboard, WINPR_ASSERTING_INT_CAST(uint32_t, clipboard->requestedFormatId)); + format = xf_cliprdr_get_client_format_by_id(clipboard, clipboard->requestedFormatId); if (format) xf_cliprdr_get_requested_data(clipboard, format->atom); @@ -2101,7 +2099,7 @@ xf_cliprdr_server_format_data_request(CliprdrClientContext* context, else format = xf_cliprdr_get_client_format_by_id(clipboard, formatId); - clipboard->requestedFormatId = rawTransfer ? CF_RAW : WINPR_ASSERTING_INT_CAST(int, formatId); + clipboard->requestedFormatId = rawTransfer ? CF_RAW : formatId; if (!format) return xf_cliprdr_send_data_response(clipboard, format, NULL, 0); @@ -2389,7 +2387,7 @@ xfClipboard* xf_clipboard_new(xfContext* xfc, BOOL relieveFilenameRestriction) channels = xfc->common.context.channels; clipboard->channels = channels; clipboard->system = ClipboardCreate(); - clipboard->requestedFormatId = -1; + clipboard->requestedFormatId = UINT32_MAX; clipboard->root_window = DefaultRootWindow(xfc->display); selectionAtom = diff --git a/client/X11/xf_event.c b/client/X11/xf_event.c index 8b17b4f3a..c71a1ec82 100644 --- a/client/X11/xf_event.c +++ b/client/X11/xf_event.c @@ -964,7 +964,7 @@ static BOOL xf_event_PropertyNotify(xfContext* xfc, const XPropertyEvent* event, * when the window has been minimized, maximized, restored locally * ie. not using the buttons on the rail window itself */ - if (((event->atom == xfc->_NET_WM_STATE) && (event->state != PropertyDelete)) || + if (((event->atom == xfc->NET_WM_STATE) && (event->state != PropertyDelete)) || ((event->atom == xfc->WM_STATE) && (event->state != PropertyDelete))) { BOOL status = FALSE; @@ -983,9 +983,9 @@ static BOOL xf_event_PropertyNotify(xfContext* xfc, const XPropertyEvent* event, return TRUE; } - if (event->atom == xfc->_NET_WM_STATE) + if (event->atom == xfc->NET_WM_STATE) { - status = xf_GetWindowProperty(xfc, event->window, xfc->_NET_WM_STATE, 12, &nitems, + status = xf_GetWindowProperty(xfc, event->window, xfc->NET_WM_STATE, 12, &nitems, &bytes, &prop); if (status) diff --git a/client/X11/xf_graphics.h b/client/X11/xf_graphics.h index a194f43b2..a91e32596 100644 --- a/client/X11/xf_graphics.h +++ b/client/X11/xf_graphics.h @@ -25,7 +25,7 @@ BOOL xf_register_pointer(rdpGraphics* graphics); -BOOL xf_decode_color(xfContext* xfc, const UINT32 srcColor, XColor* color); +BOOL xf_decode_color(xfContext* xfc, UINT32 srcColor, XColor* color); UINT32 xf_get_local_color_format(xfContext* xfc, BOOL aligned); BOOL xf_pointer_update_scale(xfContext* xfc); diff --git a/client/X11/xf_rail.c b/client/X11/xf_rail.c index 89c4a1d27..448d41702 100644 --- a/client/X11/xf_rail.c +++ b/client/X11/xf_rail.c @@ -181,8 +181,8 @@ void xf_rail_end_local_move(xfContext* xfc, xfAppWindow* appWindow) WINPR_ASSERT(xfc); WINPR_ASSERT(appWindow); - if ((appWindow->local_move.direction == _NET_WM_MOVERESIZE_MOVE_KEYBOARD) || - (appWindow->local_move.direction == _NET_WM_MOVERESIZE_SIZE_KEYBOARD)) + if ((appWindow->local_move.direction == NET_WM_MOVERESIZE_MOVE_KEYBOARD) || + (appWindow->local_move.direction == NET_WM_MOVERESIZE_SIZE_KEYBOARD)) { RAIL_WINDOW_MOVE_ORDER windowMove = { 0 }; @@ -217,8 +217,8 @@ void xf_rail_end_local_move(xfContext* xfc, xfAppWindow* appWindow) &child_y, &mask); /* only send the mouse coordinates if not a keyboard move or size */ - if ((appWindow->local_move.direction != _NET_WM_MOVERESIZE_MOVE_KEYBOARD) && - (appWindow->local_move.direction != _NET_WM_MOVERESIZE_SIZE_KEYBOARD)) + if ((appWindow->local_move.direction != NET_WM_MOVERESIZE_MOVE_KEYBOARD) && + (appWindow->local_move.direction != NET_WM_MOVERESIZE_SIZE_KEYBOARD)) { freerdp_client_send_button_event(&xfc->common, FALSE, PTR_FLAGS_BUTTON1, x, y); } @@ -607,8 +607,8 @@ static BOOL xf_rail_window_common(rdpContext* context, const WINDOW_ORDER_INFO* if (appWindow->rail_state == WINDOW_SHOW_MAXIMIZED) { - xf_SendClientEvent(xfc, appWindow->handle, xfc->_NET_WM_STATE, 4, _NET_WM_STATE_ADD, - xfc->_NET_WM_STATE_MAXIMIZED_VERT, xfc->_NET_WM_STATE_MAXIMIZED_HORZ, + xf_SendClientEvent(xfc, appWindow->handle, xfc->NET_WM_STATE, 4, NET_WM_STATE_ADD, + xfc->NET_WM_STATE_MAXIMIZED_VERT, xfc->NET_WM_STATE_MAXIMIZED_HORZ, 0, 0); } } @@ -756,7 +756,7 @@ static void xf_rail_set_window_icon(xfContext* xfc, xfAppWindow* railWindow, xfR { WINPR_ASSERT(xfc); - LogTagAndXChangeProperty(TAG, xfc->display, railWindow->handle, xfc->_NET_WM_ICON, XA_CARDINAL, + LogTagAndXChangeProperty(TAG, xfc->display, railWindow->handle, xfc->NET_WM_ICON, XA_CARDINAL, 32, replace ? PropModeReplace : PropModeAppend, (unsigned char*)icon->data, icon->length); XFlush(xfc->display); @@ -1004,68 +1004,68 @@ static UINT xf_rail_server_local_move_size(RailClientContext* context, switch (localMoveSize->moveSizeType) { case RAIL_WMSZ_LEFT: - direction = _NET_WM_MOVERESIZE_SIZE_LEFT; + direction = NET_WM_MOVERESIZE_SIZE_LEFT; x = localMoveSize->posX; y = localMoveSize->posY; break; case RAIL_WMSZ_RIGHT: - direction = _NET_WM_MOVERESIZE_SIZE_RIGHT; + direction = NET_WM_MOVERESIZE_SIZE_RIGHT; x = localMoveSize->posX; y = localMoveSize->posY; break; case RAIL_WMSZ_TOP: - direction = _NET_WM_MOVERESIZE_SIZE_TOP; + direction = NET_WM_MOVERESIZE_SIZE_TOP; x = localMoveSize->posX; y = localMoveSize->posY; break; case RAIL_WMSZ_TOPLEFT: - direction = _NET_WM_MOVERESIZE_SIZE_TOPLEFT; + direction = NET_WM_MOVERESIZE_SIZE_TOPLEFT; x = localMoveSize->posX; y = localMoveSize->posY; break; case RAIL_WMSZ_TOPRIGHT: - direction = _NET_WM_MOVERESIZE_SIZE_TOPRIGHT; + direction = NET_WM_MOVERESIZE_SIZE_TOPRIGHT; x = localMoveSize->posX; y = localMoveSize->posY; break; case RAIL_WMSZ_BOTTOM: - direction = _NET_WM_MOVERESIZE_SIZE_BOTTOM; + direction = NET_WM_MOVERESIZE_SIZE_BOTTOM; x = localMoveSize->posX; y = localMoveSize->posY; break; case RAIL_WMSZ_BOTTOMLEFT: - direction = _NET_WM_MOVERESIZE_SIZE_BOTTOMLEFT; + direction = NET_WM_MOVERESIZE_SIZE_BOTTOMLEFT; x = localMoveSize->posX; y = localMoveSize->posY; break; case RAIL_WMSZ_BOTTOMRIGHT: - direction = _NET_WM_MOVERESIZE_SIZE_BOTTOMRIGHT; + direction = NET_WM_MOVERESIZE_SIZE_BOTTOMRIGHT; x = localMoveSize->posX; y = localMoveSize->posY; break; case RAIL_WMSZ_MOVE: - direction = _NET_WM_MOVERESIZE_MOVE; + direction = NET_WM_MOVERESIZE_MOVE; XTranslateCoordinates(xfc->display, appWindow->handle, RootWindowOfScreen(xfc->screen), localMoveSize->posX, localMoveSize->posY, &x, &y, &child_window); break; case RAIL_WMSZ_KEYMOVE: - direction = _NET_WM_MOVERESIZE_MOVE_KEYBOARD; + direction = NET_WM_MOVERESIZE_MOVE_KEYBOARD; x = localMoveSize->posX; y = localMoveSize->posY; /* FIXME: local keyboard moves not working */ return CHANNEL_RC_OK; case RAIL_WMSZ_KEYSIZE: - direction = _NET_WM_MOVERESIZE_SIZE_KEYBOARD; + direction = NET_WM_MOVERESIZE_SIZE_KEYBOARD; x = localMoveSize->posX; y = localMoveSize->posY; /* FIXME: local keyboard moves not working */ diff --git a/client/X11/xf_window.c b/client/X11/xf_window.c index a73ff8822..9fe9d5900 100644 --- a/client/X11/xf_window.c +++ b/client/X11/xf_window.c @@ -220,7 +220,7 @@ static void xf_SetWindowTitleText(xfContext* xfc, Window window, const char* nam const size_t i = strnlen(name, MAX_PATH); XStoreName(xfc->display, window, name); - Atom wm_Name = xfc->_NET_WM_NAME; + Atom wm_Name = xfc->NET_WM_NAME; Atom utf8Str = xfc->UTF8_STRING; LogTagAndXChangeProperty(TAG, xfc->display, window, wm_Name, utf8Str, 8, PropModeReplace, (const unsigned char*)name, (int)i); @@ -336,7 +336,7 @@ void xf_SetWindowFullscreen(xfContext* xfc, xfWindow* window, BOOL fullscreen) - The window manager supports multiple monitor full screen - The user requested to use a single monitor to render the remote desktop */ - if (xfc->_NET_WM_FULLSCREEN_MONITORS != None || + if (xfc->NET_WM_FULLSCREEN_MONITORS != None || freerdp_settings_get_uint32(settings, FreeRDP_MonitorCount) == 1) { xf_ResizeDesktopWindow(xfc, window, WINPR_ASSERTING_INT_CAST(int, width), @@ -349,9 +349,9 @@ void xf_SetWindowFullscreen(xfContext* xfc, xfWindow* window, BOOL fullscreen) } /* Set the fullscreen state */ - xf_SendClientEvent(xfc, window->handle, xfc->_NET_WM_STATE, 4, - fullscreen ? _NET_WM_STATE_ADD : _NET_WM_STATE_REMOVE, - xfc->_NET_WM_STATE_FULLSCREEN, 0, 0); + xf_SendClientEvent(xfc, window->handle, xfc->NET_WM_STATE, 4, + fullscreen ? NET_WM_STATE_ADD : NET_WM_STATE_REMOVE, + xfc->NET_WM_STATE_FULLSCREEN, 0, 0); if (!fullscreen) { @@ -367,7 +367,7 @@ void xf_SetWindowFullscreen(xfContext* xfc, xfWindow* window, BOOL fullscreen) /* Set monitor bounds */ if (freerdp_settings_get_uint32(settings, FreeRDP_MonitorCount) > 1) { - xf_SendClientEvent(xfc, window->handle, xfc->_NET_WM_FULLSCREEN_MONITORS, 5, + xf_SendClientEvent(xfc, window->handle, xfc->NET_WM_FULLSCREEN_MONITORS, 5, xfc->fullscreenMonitors.top, xfc->fullscreenMonitors.bottom, xfc->fullscreenMonitors.left, xfc->fullscreenMonitors.right, 1); } @@ -380,7 +380,7 @@ void xf_SetWindowFullscreen(xfContext* xfc, xfWindow* window, BOOL fullscreen) if (xfc->fullscreenMonitors.top) { - xf_SendClientEvent(xfc, window->handle, xfc->_NET_WM_STATE, 4, _NET_WM_STATE_ADD, + xf_SendClientEvent(xfc, window->handle, xfc->NET_WM_STATE, 4, NET_WM_STATE_ADD, xfc->fullscreenMonitors.top, 0, 0); } else @@ -394,14 +394,14 @@ void xf_SetWindowFullscreen(xfContext* xfc, xfWindow* window, BOOL fullscreen) } /* if window is in maximized state, save and remove */ - if (xfc->_NET_WM_STATE_MAXIMIZED_VERT != None) + if (xfc->NET_WM_STATE_MAXIMIZED_VERT != None) { BYTE state = 0; unsigned long nitems = 0; unsigned long bytes = 0; BYTE* prop = NULL; - if (xf_GetWindowProperty(xfc, window->handle, xfc->_NET_WM_STATE, 255, &nitems, + if (xf_GetWindowProperty(xfc, window->handle, xfc->NET_WM_STATE, 255, &nitems, &bytes, &prop)) { const Atom* aprop = (const Atom*)prop; @@ -409,21 +409,21 @@ void xf_SetWindowFullscreen(xfContext* xfc, xfWindow* window, BOOL fullscreen) for (size_t x = 0; x < nitems; x++) { - if (aprop[x] == xfc->_NET_WM_STATE_MAXIMIZED_VERT) + if (aprop[x] == xfc->NET_WM_STATE_MAXIMIZED_VERT) state |= 0x01; - if (aprop[x] == xfc->_NET_WM_STATE_MAXIMIZED_HORZ) + if (aprop[x] == xfc->NET_WM_STATE_MAXIMIZED_HORZ) state |= 0x02; } if (state) { - xf_SendClientEvent(xfc, window->handle, xfc->_NET_WM_STATE, 4, - _NET_WM_STATE_REMOVE, xfc->_NET_WM_STATE_MAXIMIZED_VERT, - 0, 0); - xf_SendClientEvent(xfc, window->handle, xfc->_NET_WM_STATE, 4, - _NET_WM_STATE_REMOVE, xfc->_NET_WM_STATE_MAXIMIZED_HORZ, - 0, 0); + xf_SendClientEvent(xfc, window->handle, xfc->NET_WM_STATE, 4, + NET_WM_STATE_REMOVE, xfc->NET_WM_STATE_MAXIMIZED_VERT, 0, + 0); + xf_SendClientEvent(xfc, window->handle, xfc->NET_WM_STATE, 4, + NET_WM_STATE_REMOVE, xfc->NET_WM_STATE_MAXIMIZED_HORZ, 0, + 0); xfc->savedMaximizedState = state; } @@ -447,21 +447,21 @@ void xf_SetWindowFullscreen(xfContext* xfc, xfWindow* window, BOOL fullscreen) if (xfc->fullscreenMonitors.top) { - xf_SendClientEvent(xfc, window->handle, xfc->_NET_WM_STATE, 4, _NET_WM_STATE_REMOVE, + xf_SendClientEvent(xfc, window->handle, xfc->NET_WM_STATE, 4, NET_WM_STATE_REMOVE, xfc->fullscreenMonitors.top, 0, 0); } /* restore maximized state, if the window was maximized before setting fullscreen */ if (xfc->savedMaximizedState & 0x01) { - xf_SendClientEvent(xfc, window->handle, xfc->_NET_WM_STATE, 4, _NET_WM_STATE_ADD, - xfc->_NET_WM_STATE_MAXIMIZED_VERT, 0, 0); + xf_SendClientEvent(xfc, window->handle, xfc->NET_WM_STATE, 4, NET_WM_STATE_ADD, + xfc->NET_WM_STATE_MAXIMIZED_VERT, 0, 0); } if (xfc->savedMaximizedState & 0x02) { - xf_SendClientEvent(xfc, window->handle, xfc->_NET_WM_STATE, 4, _NET_WM_STATE_ADD, - xfc->_NET_WM_STATE_MAXIMIZED_HORZ, 0, 0); + xf_SendClientEvent(xfc, window->handle, xfc->NET_WM_STATE, 4, NET_WM_STATE_ADD, + xfc->NET_WM_STATE_MAXIMIZED_HORZ, 0, 0); } xfc->savedMaximizedState = 0; @@ -507,7 +507,7 @@ static BOOL xf_GetNumberOfDesktops(xfContext* xfc, Window root, unsigned* pval) WINPR_ASSERT(pval); const BOOL rc = - xf_GetWindowProperty(xfc, root, xfc->_NET_NUMBER_OF_DESKTOPS, 1, &nitems, &bytes, &bprop); + xf_GetWindowProperty(xfc, root, xfc->NET_NUMBER_OF_DESKTOPS, 1, &nitems, &bytes, &bprop); long* prop = (long*)bprop; *pval = 0; @@ -537,7 +537,7 @@ static BOOL xf_GetCurrentDesktop(xfContext* xfc, Window root) return FALSE; const BOOL rc = - xf_GetWindowProperty(xfc, root, xfc->_NET_CURRENT_DESKTOP, 1, &nitems, &bytes, &bprop); + xf_GetWindowProperty(xfc, root, xfc->NET_CURRENT_DESKTOP, 1, &nitems, &bytes, &bprop); long* prop = (long*)bprop; xfc->current_desktop = 0; @@ -557,7 +557,7 @@ static BOOL xf_GetWorkArea_NET_WORKAREA(xfContext* xfc, Window root) BYTE* bprop = NULL; const BOOL status = - xf_GetWindowProperty(xfc, root, xfc->_NET_WORKAREA, INT_MAX, &nitems, &bytes, &bprop); + xf_GetWindowProperty(xfc, root, xfc->NET_WORKAREA, INT_MAX, &nitems, &bytes, &bprop); long* prop = (long*)bprop; if (!status) @@ -594,15 +594,15 @@ void xf_SetWindowDecorations(xfContext* xfc, Window window, BOOL show) .inputMode = 0, .status = 0 }; WINPR_ASSERT(xfc); - LogTagAndXChangeProperty(TAG, xfc->display, window, xfc->_MOTIF_WM_HINTS, xfc->_MOTIF_WM_HINTS, + LogTagAndXChangeProperty(TAG, xfc->display, window, xfc->MOTIF_WM_HINTS, xfc->MOTIF_WM_HINTS, 32, PropModeReplace, (BYTE*)&hints, PROP_MOTIF_WM_HINTS_ELEMENTS); } void xf_SetWindowUnlisted(xfContext* xfc, Window window) { WINPR_ASSERT(xfc); - Atom window_state[] = { xfc->_NET_WM_STATE_SKIP_PAGER, xfc->_NET_WM_STATE_SKIP_TASKBAR }; - LogTagAndXChangeProperty(TAG, xfc->display, window, xfc->_NET_WM_STATE, XA_ATOM, 32, + Atom window_state[] = { xfc->NET_WM_STATE_SKIP_PAGER, xfc->NET_WM_STATE_SKIP_TASKBAR }; + LogTagAndXChangeProperty(TAG, xfc->display, window, xfc->NET_WM_STATE, XA_ATOM, 32, PropModeReplace, (BYTE*)window_state, 2); } @@ -614,7 +614,7 @@ static void xf_SetWindowPID(xfContext* xfc, Window window, pid_t pid) if (!pid) pid = getpid(); - am_wm_pid = xfc->_NET_WM_PID; + am_wm_pid = xfc->NET_WM_PID; LogTagAndXChangeProperty(TAG, xfc->display, window, am_wm_pid, XA_CARDINAL, 32, PropModeReplace, (BYTE*)&pid, 1); } @@ -734,7 +734,7 @@ xfWindow* xf_CreateDesktopWindow(xfContext* xfc, char* name, int width, int heig if (xfc->grab_keyboard) input_mask |= EnterWindowMask | LeaveWindowMask; - LogTagAndXChangeProperty(TAG, xfc->display, window->handle, xfc->_NET_WM_ICON, XA_CARDINAL, 32, + LogTagAndXChangeProperty(TAG, xfc->display, window->handle, xfc->NET_WM_ICON, XA_CARDINAL, 32, PropModeReplace, (BYTE*)xf_icon_prop, ARRAYSIZE(xf_icon_prop)); if (parentWindow) @@ -777,8 +777,8 @@ xfWindow* xf_CreateDesktopWindow(xfContext* xfc, char* name, int width, int heig window->floatbar = xf_floatbar_new(xfc, window->handle, name, freerdp_settings_get_uint32(settings, FreeRDP_Floatbar)); - if (xfc->_XWAYLAND_MAY_GRAB_KEYBOARD) - xf_SendClientEvent(xfc, window->handle, xfc->_XWAYLAND_MAY_GRAB_KEYBOARD, 1, 1); + if (xfc->XWAYLAND_MAY_GRAB_KEYBOARD) + xf_SendClientEvent(xfc, window->handle, xfc->XWAYLAND_MAY_GRAB_KEYBOARD, 1, 1); return window; } @@ -858,14 +858,14 @@ void xf_SetWindowStyle(xfContext* xfc, xfAppWindow* appWindow, UINT32 style, UIN Atom window_type = 0; BOOL redirect = FALSE; - window_type = xfc->_NET_WM_WINDOW_TYPE_NORMAL; + window_type = xfc->NET_WM_WINDOW_TYPE_NORMAL; if ((ex_style & WS_EX_NOACTIVATE) || (ex_style & WS_EX_TOOLWINDOW)) { redirect = TRUE; appWindow->is_transient = TRUE; xf_SetWindowUnlisted(xfc, appWindow->handle); - window_type = xfc->_NET_WM_WINDOW_TYPE_DROPDOWN_MENU; + window_type = xfc->NET_WM_WINDOW_TYPE_DROPDOWN_MENU; } /* * TOPMOST window that is not a tool window is treated like a regular window (i.e. task @@ -873,12 +873,12 @@ void xf_SetWindowStyle(xfContext* xfc, xfAppWindow* appWindow, UINT32 style, UIN */ else if (ex_style & WS_EX_TOPMOST) { - window_type = xfc->_NET_WM_WINDOW_TYPE_NORMAL; + window_type = xfc->NET_WM_WINDOW_TYPE_NORMAL; } if (style & WS_POPUP) { - window_type = xfc->_NET_WM_WINDOW_TYPE_DIALOG; + window_type = xfc->NET_WM_WINDOW_TYPE_DIALOG; /* this includes dialogs, popups, etc, that need to be full-fledged windows */ if (!((ex_style & WS_EX_DLGMODALFRAME) || (ex_style & WS_EX_LAYERED) || @@ -911,8 +911,8 @@ void xf_SetWindowStyle(xfContext* xfc, xfAppWindow* appWindow, UINT32 style, UIN XChangeWindowAttributes(xfc->display, appWindow->handle, CWOverrideRedirect, &attrs); } - LogTagAndXChangeProperty(TAG, xfc->display, appWindow->handle, xfc->_NET_WM_WINDOW_TYPE, - XA_ATOM, 32, PropModeReplace, (BYTE*)&window_type, 1); + LogTagAndXChangeProperty(TAG, xfc->display, appWindow->handle, xfc->NET_WM_WINDOW_TYPE, XA_ATOM, + 32, PropModeReplace, (BYTE*)&window_type, 1); const BOOL above = (ex_style & WS_EX_TOPMOST) != 0; const BOOL transient = (style & WS_CHILD) == 0; @@ -921,9 +921,9 @@ void xf_SetWindowStyle(xfContext* xfc, xfAppWindow* appWindow, UINT32 style, UIN xf_XSetTransientForHint( xfc, appWindow); // xf_XSetTransientForHint only sets the hint if there is a parent - xf_SendClientEvent(xfc, appWindow->handle, xfc->_NET_WM_STATE, 4, - above ? _NET_WM_STATE_ADD : _NET_WM_STATE_REMOVE, xfc->_NET_WM_STATE_ABOVE, - 0, 0); + xf_SendClientEvent(xfc, appWindow->handle, xfc->NET_WM_STATE, 4, + above ? NET_WM_STATE_ADD : NET_WM_STATE_REMOVE, xfc->NET_WM_STATE_ABOVE, 0, + 0); } void xf_SetWindowActions(xfContext* xfc, xfAppWindow* appWindow) @@ -1096,8 +1096,8 @@ BOOL xf_AppWindowCreate(xfContext* xfc, xfAppWindow* appWindow) FocusChangeMask | PropertyChangeMask | ColormapChangeMask | OwnerGrabButtonMask; XSelectInput(xfc->display, appWindow->handle, input_mask); - if (xfc->_XWAYLAND_MAY_GRAB_KEYBOARD) - xf_SendClientEvent(xfc, appWindow->handle, xfc->_XWAYLAND_MAY_GRAB_KEYBOARD, 1, 1); + if (xfc->XWAYLAND_MAY_GRAB_KEYBOARD) + xf_SendClientEvent(xfc, appWindow->handle, xfc->XWAYLAND_MAY_GRAB_KEYBOARD, 1, 1); return TRUE; } @@ -1142,13 +1142,13 @@ void xf_StartLocalMoveSize(xfContext* xfc, xfAppWindow* appWindow, int direction xf_SendClientEvent( xfc, appWindow->handle, - xfc->_NET_WM_MOVERESIZE, /* request X window manager to initiate a local move */ - 5, /* 5 arguments to follow */ - x, /* x relative to root window */ - y, /* y relative to root window */ - direction, /* extended ICCM direction flag */ - 1, /* simulated mouse button 1 */ - 1); /* 1 == application request per extended ICCM */ + xfc->NET_WM_MOVERESIZE, /* request X window manager to initiate a local move */ + 5, /* 5 arguments to follow */ + x, /* x relative to root window */ + y, /* y relative to root window */ + direction, /* extended ICCM direction flag */ + 1, /* simulated mouse button 1 */ + 1); /* 1 == application request per extended ICCM */ } void xf_EndLocalMoveSize(xfContext* xfc, xfAppWindow* appWindow) @@ -1166,11 +1166,11 @@ void xf_EndLocalMoveSize(xfContext* xfc, xfAppWindow* appWindow) */ xf_SendClientEvent( xfc, appWindow->handle, - xfc->_NET_WM_MOVERESIZE, /* request X window manager to abort a local move */ + xfc->NET_WM_MOVERESIZE, /* request X window manager to abort a local move */ 5, /* 5 arguments to follow */ appWindow->local_move.root_x, /* x relative to root window */ appWindow->local_move.root_y, /* y relative to root window */ - _NET_WM_MOVERESIZE_CANCEL, /* extended ICCM direction flag */ + NET_WM_MOVERESIZE_CANCEL, /* extended ICCM direction flag */ 1, /* simulated mouse button 1 */ 1); /* 1 == application request per extended ICCM */ } @@ -1226,8 +1226,8 @@ void xf_ShowWindow(xfContext* xfc, xfAppWindow* appWindow, BYTE state) /* Set the window as maximized */ appWindow->maxHorz = TRUE; appWindow->maxVert = TRUE; - xf_SendClientEvent(xfc, appWindow->handle, xfc->_NET_WM_STATE, 4, _NET_WM_STATE_ADD, - xfc->_NET_WM_STATE_MAXIMIZED_VERT, xfc->_NET_WM_STATE_MAXIMIZED_HORZ, + xf_SendClientEvent(xfc, appWindow->handle, xfc->NET_WM_STATE, 4, NET_WM_STATE_ADD, + xfc->NET_WM_STATE_MAXIMIZED_VERT, xfc->NET_WM_STATE_MAXIMIZED_HORZ, 0); /* @@ -1249,8 +1249,8 @@ void xf_ShowWindow(xfContext* xfc, xfAppWindow* appWindow, BYTE state) case WINDOW_SHOW: /* Ensure the window is not maximized */ - xf_SendClientEvent(xfc, appWindow->handle, xfc->_NET_WM_STATE, 4, _NET_WM_STATE_REMOVE, - xfc->_NET_WM_STATE_MAXIMIZED_VERT, xfc->_NET_WM_STATE_MAXIMIZED_HORZ, + xf_SendClientEvent(xfc, appWindow->handle, xfc->NET_WM_STATE, 4, NET_WM_STATE_REMOVE, + xfc->NET_WM_STATE_MAXIMIZED_VERT, xfc->NET_WM_STATE_MAXIMIZED_HORZ, 0); /* diff --git a/client/X11/xf_window.h b/client/X11/xf_window.h index efbc67d06..8a41b4e47 100644 --- a/client/X11/xf_window.h +++ b/client/X11/xf_window.h @@ -39,22 +39,22 @@ typedef struct xf_window xfWindow; WINPR_PRAGMA_DIAG_PUSH WINPR_PRAGMA_DIAG_IGNORED_RESERVED_ID_MACRO -#define _NET_WM_MOVERESIZE_SIZE_TOPLEFT 0 -#define _NET_WM_MOVERESIZE_SIZE_TOP 1 -#define _NET_WM_MOVERESIZE_SIZE_TOPRIGHT 2 -#define _NET_WM_MOVERESIZE_SIZE_RIGHT 3 -#define _NET_WM_MOVERESIZE_SIZE_BOTTOMRIGHT 4 -#define _NET_WM_MOVERESIZE_SIZE_BOTTOM 5 -#define _NET_WM_MOVERESIZE_SIZE_BOTTOMLEFT 6 -#define _NET_WM_MOVERESIZE_SIZE_LEFT 7 -#define _NET_WM_MOVERESIZE_MOVE 8 /* movement only */ -#define _NET_WM_MOVERESIZE_SIZE_KEYBOARD 9 /* size via keyboard */ -#define _NET_WM_MOVERESIZE_MOVE_KEYBOARD 10 /* move via keyboard */ -#define _NET_WM_MOVERESIZE_CANCEL 11 /* cancel operation */ +#define NET_WM_MOVERESIZE_SIZE_TOPLEFT 0 +#define NET_WM_MOVERESIZE_SIZE_TOP 1 +#define NET_WM_MOVERESIZE_SIZE_TOPRIGHT 2 +#define NET_WM_MOVERESIZE_SIZE_RIGHT 3 +#define NET_WM_MOVERESIZE_SIZE_BOTTOMRIGHT 4 +#define NET_WM_MOVERESIZE_SIZE_BOTTOM 5 +#define NET_WM_MOVERESIZE_SIZE_BOTTOMLEFT 6 +#define NET_WM_MOVERESIZE_SIZE_LEFT 7 +#define NET_WM_MOVERESIZE_MOVE 8 /* movement only */ +#define NET_WM_MOVERESIZE_SIZE_KEYBOARD 9 /* size via keyboard */ +#define NET_WM_MOVERESIZE_MOVE_KEYBOARD 10 /* move via keyboard */ +#define NET_WM_MOVERESIZE_CANCEL 11 /* cancel operation */ -#define _NET_WM_STATE_REMOVE 0 /* remove/unset property */ -#define _NET_WM_STATE_ADD 1 /* add/set property */ -#define _NET_WM_STATE_TOGGLE 2 /* toggle property */ +#define NET_WM_STATE_REMOVE 0 /* remove/unset property */ +#define NET_WM_STATE_ADD 1 /* add/set property */ +#define NET_WM_STATE_TOGGLE 2 /* toggle property */ WINPR_PRAGMA_DIAG_POP diff --git a/client/X11/xfreerdp.h b/client/X11/xfreerdp.h index 879023bf0..aa4ca72a0 100644 --- a/client/X11/xfreerdp.h +++ b/client/X11/xfreerdp.h @@ -219,46 +219,46 @@ struct xf_context Atom UTF8_STRING; - Atom _XWAYLAND_MAY_GRAB_KEYBOARD; + Atom XWAYLAND_MAY_GRAB_KEYBOARD; - Atom _NET_WM_ICON; - Atom _MOTIF_WM_HINTS; - Atom _NET_NUMBER_OF_DESKTOPS; - Atom _NET_CURRENT_DESKTOP; - Atom _NET_WORKAREA; + Atom NET_WM_ICON; + Atom MOTIF_WM_HINTS; + Atom NET_NUMBER_OF_DESKTOPS; + Atom NET_CURRENT_DESKTOP; + Atom NET_WORKAREA; - Atom _NET_SUPPORTED; - Atom _NET_SUPPORTING_WM_CHECK; + Atom NET_SUPPORTED; + Atom NET_SUPPORTING_WM_CHECK; - Atom _NET_WM_STATE; - Atom _NET_WM_STATE_MODAL; - Atom _NET_WM_STATE_STICKY; - Atom _NET_WM_STATE_MAXIMIZED_VERT; - Atom _NET_WM_STATE_MAXIMIZED_HORZ; - Atom _NET_WM_STATE_SHADED; - Atom _NET_WM_STATE_SKIP_TASKBAR; - Atom _NET_WM_STATE_SKIP_PAGER; - Atom _NET_WM_STATE_HIDDEN; - Atom _NET_WM_STATE_FULLSCREEN; - Atom _NET_WM_STATE_ABOVE; - Atom _NET_WM_STATE_BELOW; - Atom _NET_WM_STATE_DEMANDS_ATTENTION; + Atom NET_WM_STATE; + Atom NET_WM_STATE_MODAL; + Atom NET_WM_STATE_STICKY; + Atom NET_WM_STATE_MAXIMIZED_VERT; + Atom NET_WM_STATE_MAXIMIZED_HORZ; + Atom NET_WM_STATE_SHADED; + Atom NET_WM_STATE_SKIP_TASKBAR; + Atom NET_WM_STATE_SKIP_PAGER; + Atom NET_WM_STATE_HIDDEN; + Atom NET_WM_STATE_FULLSCREEN; + Atom NET_WM_STATE_ABOVE; + Atom NET_WM_STATE_BELOW; + Atom NET_WM_STATE_DEMANDS_ATTENTION; - Atom _NET_WM_FULLSCREEN_MONITORS; + Atom NET_WM_FULLSCREEN_MONITORS; - Atom _NET_WM_NAME; - Atom _NET_WM_PID; + Atom NET_WM_NAME; + Atom NET_WM_PID; - Atom _NET_WM_WINDOW_TYPE; - Atom _NET_WM_WINDOW_TYPE_NORMAL; - Atom _NET_WM_WINDOW_TYPE_DIALOG; - Atom _NET_WM_WINDOW_TYPE_UTILITY; - Atom _NET_WM_WINDOW_TYPE_POPUP; - Atom _NET_WM_WINDOW_TYPE_POPUP_MENU; - Atom _NET_WM_WINDOW_TYPE_DROPDOWN_MENU; + Atom NET_WM_WINDOW_TYPE; + Atom NET_WM_WINDOW_TYPE_NORMAL; + Atom NET_WM_WINDOW_TYPE_DIALOG; + Atom NET_WM_WINDOW_TYPE_UTILITY; + Atom NET_WM_WINDOW_TYPE_POPUP; + Atom NET_WM_WINDOW_TYPE_POPUP_MENU; + Atom NET_WM_WINDOW_TYPE_DROPDOWN_MENU; - Atom _NET_WM_MOVERESIZE; - Atom _NET_MOVERESIZE_WINDOW; + Atom NET_WM_MOVERESIZE; + Atom NET_MOVERESIZE_WINDOW; Atom WM_STATE; Atom WM_PROTOCOLS;