XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-24 03:44:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

dix: replace "screen" by "pScreen" in AttachDevice()

Browse Source 
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2026-02-06 20:21:49 +01:00
committed by Enrico Weigelt
parent a21c9ef420
commit d28d18ff00
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dix/devices.c
View File

@@ -2598,8 +2598,6 @@ ReleaseButtonsAndKeys(DeviceIntPtr dev)
int int
AttachDevice(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr master) AttachDevice(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr master)
{ {
ScreenPtr screen;
if (!dev || InputDevIsMaster(dev)) if (!dev || InputDevIsMaster(dev))
return BadDevice; return BadDevice;
@@ -2614,8 +2612,8 @@ AttachDevice(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr master)
/* free the existing sprite. */ /* free the existing sprite. */
if (InputDevIsFloating(dev) && dev->spriteInfo->paired == dev) { if (InputDevIsFloating(dev) && dev->spriteInfo->paired == dev) {
screen = miPointerGetScreen(dev); ScreenPtr pScreen = miPointerGetScreen(dev);
screen->DeviceCursorCleanup(dev, screen); pScreen->DeviceCursorCleanup(dev, pScreen);
free(dev->spriteInfo->sprite); free(dev->spriteInfo->sprite);
dev->spriteInfo->sprite = NULL; dev->spriteInfo->sprite = NULL;
} }
@@ -2637,8 +2635,8 @@ AttachDevice(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr master)
currentRoot = dixGetMasterScreen()->root; currentRoot = dixGetMasterScreen()->root;
/* we need to init a fake sprite */ /* we need to init a fake sprite */
screen = currentRoot->drawable.pScreen; ScreenPtr pScreen = currentRoot->drawable.pScreen;
screen->DeviceCursorInitialize(dev, screen); pScreen->DeviceCursorInitialize(dev, pScreen);
dev->spriteInfo->sprite = NULL; dev->spriteInfo->sprite = NULL;
InitializeSprite(dev, currentRoot); InitializeSprite(dev, currentRoot);
dev->spriteInfo->spriteOwner = FALSE; dev->spriteInfo->spriteOwner = FALSE;