andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

privates: Allow device privates to be allocated after server start

Browse Source 
This will permit midispcur to allocate its privates for hotplug outputs

Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Keith Packard 2012-07-05 11:31:55 -07:00
parent 493ad83323
commit 9e4b8b74b0
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dix/privates.c
View File

@ -62,6 +62,7 @@ from The Open Group.
#include "inputstr.h"
#include "scrnintstr.h"
#include "extnsionst.h"
#include "inputstr.h"
static DevPrivateSetRec global_keys[PRIVATE_LAST];
@ -91,9 +92,9 @@ static const char *key_names[PRIVATE_LAST] = {
[PRIVATE_SCREEN] = "SCREEN",
[PRIVATE_EXTENSION] = "EXTENSION",
[PRIVATE_COLORMAP] = "COLORMAP",
[PRIVATE_DEVICE] = "DEVICE",
/* These cannot have any objects before all relevant keys are registered */
[PRIVATE_DEVICE] = "DEVICE",
[PRIVATE_CLIENT] = "CLIENT",
[PRIVATE_PROPERTY] = "PROPERTY",
[PRIVATE_SELECTION] = "SELECTION",
@ -265,11 +266,30 @@ fixupDefaultColormaps(FixupFunc fixup, unsigned bytes)
return TRUE;
}
static Bool
fixupDeviceList(DeviceIntPtr device, FixupFunc fixup, unsigned bytes)
{
while (device) {
if (!fixup(&device->devPrivates, global_keys[PRIVATE_DEVICE].offset, bytes))
return FALSE;
device = device->next;
}
return TRUE;
}
static Bool
fixupDevices(FixupFunc fixup, unsigned bytes)
{
return (fixupDeviceList(inputInfo.devices, fixup, bytes) &&
fixupDeviceList(inputInfo.off_devices, fixup, bytes));
}
static Bool (*const allocated_early[PRIVATE_LAST]) (FixupFunc, unsigned) = {
[PRIVATE_SCREEN] = fixupScreens,
[PRIVATE_CLIENT] = fixupServerClient,
[PRIVATE_EXTENSION] = fixupExtensions,
[PRIVATE_COLORMAP] = fixupDefaultColormaps,
[PRIVATE_DEVICE] = fixupDevices,
};
static void

2
include/privates.h
View File

@ -33,9 +33,9 @@ typedef enum {
PRIVATE_SCREEN,
PRIVATE_EXTENSION,
PRIVATE_COLORMAP,
PRIVATE_DEVICE,
/* These cannot have any objects before all relevant keys are registered */
PRIVATE_DEVICE,
PRIVATE_CLIENT,
PRIVATE_PROPERTY,
PRIVATE_SELECTION,