aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/dix
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/dix')
-rw-r--r--xorg-server/dix/devices.c8
-rw-r--r--xorg-server/dix/dixfonts.c9
-rw-r--r--xorg-server/dix/events.c24
3 files changed, 26 insertions, 15 deletions
diff --git a/xorg-server/dix/devices.c b/xorg-server/dix/devices.c
index f30407a4e..c190b1bde 100644
--- a/xorg-server/dix/devices.c
+++ b/xorg-server/dix/devices.c
@@ -149,9 +149,11 @@ DeviceSetProperty(DeviceIntPtr dev, Atom property, XIPropertyValuePtr prop,
if (prop->format != 8 || prop->type != XA_INTEGER || prop->size != 1)
return BadValue;
- /* Don't allow disabling of VCP/VCK */
- if ((dev == inputInfo.pointer ||dev ==
- inputInfo.keyboard) &&!(*(CARD8 *) prop->data))
+ /* Don't allow disabling of VCP/VCK or XTest devices */
+ if ((dev == inputInfo.pointer ||
+ dev == inputInfo.keyboard ||
+ IsXTestDevice(dev, NULL))
+ &&!(*(CARD8 *) prop->data))
return BadAccess;
if (!checkonly) {
diff --git a/xorg-server/dix/dixfonts.c b/xorg-server/dix/dixfonts.c
index 4feca742f..22c236553 100644
--- a/xorg-server/dix/dixfonts.c
+++ b/xorg-server/dix/dixfonts.c
@@ -1860,12 +1860,14 @@ InitFonts(void)
register_fpe_functions();
}
+_X_EXPORT
int
GetDefaultPointSize(void)
{
return 120;
}
+_X_EXPORT
FontResolutionPtr
GetClientResolutions(int *num)
{
@@ -1898,6 +1900,7 @@ GetClientResolutions(int *num)
* should be called (only once!) by each type of fpe when initialized
*/
+_X_EXPORT
int
RegisterFPEFunctions(NameCheckFunc name_func,
InitFpeFunc init_func,
@@ -1969,24 +1972,28 @@ find_old_font(XID id)
return (FontPtr) pFont;
}
+_X_EXPORT
Font
GetNewFontClientID(void)
{
return FakeClientID(0);
}
+_X_EXPORT
int
StoreFontClientFont(FontPtr pfont, Font id)
{
return AddResource(id, RT_NONE, (pointer) pfont);
}
+_X_EXPORT
void
DeleteFontClientID(Font id)
{
FreeResource(id, RT_NONE);
}
+_X_EXPORT
int
client_auth_generation(ClientPtr client)
{
@@ -1996,6 +2003,7 @@ client_auth_generation(ClientPtr client)
static int fs_handlers_installed = 0;
static unsigned int last_server_gen;
+_X_EXPORT
int
init_fs_handlers(FontPathElementPtr fpe, BlockHandlerProcPtr block_handler)
{
@@ -2014,6 +2022,7 @@ init_fs_handlers(FontPathElementPtr fpe, BlockHandlerProcPtr block_handler)
return Successful;
}
+_X_EXPORT
void
remove_fs_handlers(FontPathElementPtr fpe, BlockHandlerProcPtr block_handler,
Bool all)
diff --git a/xorg-server/dix/events.c b/xorg-server/dix/events.c
index 4f9a762bb..1475fe6a2 100644
--- a/xorg-server/dix/events.c
+++ b/xorg-server/dix/events.c
@@ -2030,19 +2030,19 @@ DeliverToWindowOwner(DeviceIntPtr dev, WindowPtr win,
*/
static Bool
GetClientsForDelivery(DeviceIntPtr dev, WindowPtr win,
- xEvent *events, Mask filter, InputClients ** clients)
+ xEvent *events, Mask filter, InputClients ** iclients)
{
int rc = 0;
if (core_get_type(events) != 0)
- *clients = (InputClients *) wOtherClients(win);
+ *iclients = (InputClients *) wOtherClients(win);
else if (xi2_get_type(events) != 0) {
OtherInputMasks *inputMasks = wOtherInputMasks(win);
/* Has any client selected for the event? */
if (!WindowXI2MaskIsset(dev, win, events))
goto out;
- *clients = inputMasks->inputClients;
+ *iclients = inputMasks->inputClients;
}
else {
OtherInputMasks *inputMasks = wOtherInputMasks(win);
@@ -2051,7 +2051,7 @@ GetClientsForDelivery(DeviceIntPtr dev, WindowPtr win,
if (!inputMasks || !(inputMasks->inputEvents[dev->id] & filter))
goto out;
- *clients = inputMasks->inputClients;
+ *iclients = inputMasks->inputClients;
}
rc = 1;
@@ -2113,12 +2113,12 @@ DeliverEventToWindowMask(DeviceIntPtr dev, WindowPtr win, xEvent *events,
int count, Mask filter, GrabPtr grab,
ClientPtr *client_return, Mask *mask_return)
{
- InputClients *clients;
+ InputClients *iclients;
- if (!GetClientsForDelivery(dev, win, events, filter, &clients))
+ if (!GetClientsForDelivery(dev, win, events, filter, &iclients))
return EVENT_SKIP;
- return DeliverEventToInputClients(dev, clients, win, events, count, filter,
+ return DeliverEventToInputClients(dev, iclients, win, events, count, filter,
grab, client_return, mask_return);
}
@@ -4422,7 +4422,7 @@ int
EventSuppressForWindow(WindowPtr pWin, ClientPtr client,
Mask mask, Bool *checkOptional)
{
- int i, free;
+ int i, freed;
if (mask & ~PropagateMask) {
client->errorValue = mask;
@@ -4433,14 +4433,14 @@ EventSuppressForWindow(WindowPtr pWin, ClientPtr client,
if (!mask)
i = 0;
else {
- for (i = DNPMCOUNT, free = 0; --i > 0;) {
+ for (i = DNPMCOUNT, freed = 0; --i > 0;) {
if (!DontPropagateRefCnts[i])
- free = i;
+ freed = i;
else if (mask == DontPropagateMasks[i])
break;
}
- if (!i && free) {
- i = free;
+ if (!i && freed) {
+ i = freed;
DontPropagateMasks[i] = mask;
}
}