2006-09-17 08:21:37 +02:00
|
|
|
/*
|
|
|
|
* Copyright © 2006 Keith Packard
|
|
|
|
*
|
|
|
|
* Permission to use, copy, modify, distribute, and sell this software and its
|
|
|
|
* documentation for any purpose is hereby granted without fee, provided that
|
|
|
|
* the above copyright notice appear in all copies and that both that copyright
|
|
|
|
* notice and this permission notice appear in supporting documentation, and
|
|
|
|
* that the name of the copyright holders not be used in advertising or
|
|
|
|
* publicity pertaining to distribution of the software without specific,
|
|
|
|
* written prior permission. The copyright holders make no representations
|
|
|
|
* about the suitability of this software for any purpose. It is provided "as
|
|
|
|
* is" without express or implied warranty.
|
|
|
|
*
|
|
|
|
* THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
|
|
|
|
* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
|
|
|
|
* EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
|
|
|
|
* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
|
|
|
|
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
|
|
|
|
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
|
|
|
|
* OF THIS SOFTWARE.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "randrstr.h"
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
RESTYPE RRModeType;
|
2006-09-17 08:21:37 +02:00
|
|
|
|
2006-10-04 06:06:11 +02:00
|
|
|
static Bool
|
|
|
|
RRModeEqual (xRRModeInfo *a, xRRModeInfo *b)
|
|
|
|
{
|
|
|
|
if (a->width != b->width) return FALSE;
|
|
|
|
if (a->height != b->height) return FALSE;
|
|
|
|
if (a->dotClock != b->dotClock) return FALSE;
|
|
|
|
if (a->hSyncStart != b->hSyncStart) return FALSE;
|
|
|
|
if (a->hSyncEnd != b->hSyncEnd) return FALSE;
|
|
|
|
if (a->hTotal != b->hTotal) return FALSE;
|
|
|
|
if (a->hSkew != b->hSkew) return FALSE;
|
|
|
|
if (a->vSyncStart != b->vSyncStart) return FALSE;
|
|
|
|
if (a->vSyncEnd != b->vSyncEnd) return FALSE;
|
|
|
|
if (a->vTotal != b->vTotal) return FALSE;
|
|
|
|
if (a->nameLength != b->nameLength) return FALSE;
|
|
|
|
if (a->modeFlags != b->modeFlags) return FALSE;
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2006-11-09 06:36:35 +01:00
|
|
|
/*
|
|
|
|
* Keep a list so it's easy to find modes in the resource database.
|
|
|
|
*/
|
|
|
|
static int num_modes;
|
|
|
|
static RRModePtr *modes;
|
|
|
|
|
2007-02-19 08:49:38 +01:00
|
|
|
static RRModePtr
|
|
|
|
RRModeCreate (xRRModeInfo *modeInfo,
|
|
|
|
const char *name,
|
|
|
|
ScreenPtr userScreen)
|
2006-09-17 08:21:37 +02:00
|
|
|
{
|
2007-02-19 08:49:38 +01:00
|
|
|
RRModePtr mode, *newModes;
|
|
|
|
|
2006-11-27 04:31:48 +01:00
|
|
|
if (!RRInit ())
|
|
|
|
return NULL;
|
|
|
|
|
2010-05-05 20:44:06 +02:00
|
|
|
mode = malloc(sizeof (RRModeRec) + modeInfo->nameLength + 1);
|
2006-09-18 21:18:22 +02:00
|
|
|
if (!mode)
|
|
|
|
return NULL;
|
2006-09-17 08:21:37 +02:00
|
|
|
mode->refcnt = 1;
|
|
|
|
mode->mode = *modeInfo;
|
|
|
|
mode->name = (char *) (mode + 1);
|
|
|
|
memcpy (mode->name, name, modeInfo->nameLength);
|
|
|
|
mode->name[modeInfo->nameLength] = '\0';
|
2007-02-19 08:49:38 +01:00
|
|
|
mode->userScreen = userScreen;
|
2006-09-18 21:18:22 +02:00
|
|
|
|
2006-11-09 06:36:35 +01:00
|
|
|
if (num_modes)
|
2010-05-05 20:44:06 +02:00
|
|
|
newModes = realloc(modes, (num_modes + 1) * sizeof (RRModePtr));
|
2006-09-18 21:18:22 +02:00
|
|
|
else
|
2010-05-05 20:44:06 +02:00
|
|
|
newModes = malloc(sizeof (RRModePtr));
|
2006-09-18 21:18:22 +02:00
|
|
|
|
2006-11-09 06:36:35 +01:00
|
|
|
if (!newModes)
|
2006-09-18 21:18:22 +02:00
|
|
|
{
|
2010-05-05 20:44:06 +02:00
|
|
|
free(mode);
|
2006-09-18 21:18:22 +02:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2006-09-19 09:46:27 +02:00
|
|
|
mode->mode.id = FakeClientID(0);
|
|
|
|
if (!AddResource (mode->mode.id, RRModeType, (pointer) mode))
|
2006-09-17 08:21:37 +02:00
|
|
|
return NULL;
|
2006-11-09 06:36:35 +01:00
|
|
|
modes = newModes;
|
|
|
|
modes[num_modes++] = mode;
|
2008-09-08 03:16:59 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* give the caller a reference to this mode
|
|
|
|
*/
|
|
|
|
++mode->refcnt;
|
2006-09-17 08:21:37 +02:00
|
|
|
return mode;
|
|
|
|
}
|
|
|
|
|
2007-02-19 08:49:38 +01:00
|
|
|
static RRModePtr
|
|
|
|
RRModeFindByName (const char *name,
|
|
|
|
CARD16 nameLength)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
RRModePtr mode;
|
|
|
|
|
|
|
|
for (i = 0; i < num_modes; i++)
|
|
|
|
{
|
|
|
|
mode = modes[i];
|
|
|
|
if (mode->mode.nameLength == nameLength &&
|
|
|
|
!memcmp (name, mode->name, nameLength))
|
|
|
|
{
|
|
|
|
return mode;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
RRModePtr
|
2007-02-19 08:49:38 +01:00
|
|
|
RRModeGet (xRRModeInfo *modeInfo,
|
|
|
|
const char *name)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < num_modes; i++)
|
|
|
|
{
|
|
|
|
RRModePtr mode = modes[i];
|
|
|
|
if (RRModeEqual (&mode->mode, modeInfo) &&
|
|
|
|
!memcmp (name, mode->name, modeInfo->nameLength))
|
|
|
|
{
|
|
|
|
++mode->refcnt;
|
|
|
|
return mode;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return RRModeCreate (modeInfo, name, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
static RRModePtr
|
|
|
|
RRModeCreateUser (ScreenPtr pScreen,
|
|
|
|
xRRModeInfo *modeInfo,
|
|
|
|
const char *name,
|
|
|
|
int *error)
|
|
|
|
{
|
|
|
|
RRModePtr mode;
|
|
|
|
|
|
|
|
mode = RRModeFindByName (name, modeInfo->nameLength);
|
|
|
|
if (mode)
|
|
|
|
{
|
|
|
|
*error = BadName;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
mode = RRModeCreate (modeInfo, name, pScreen);
|
|
|
|
if (!mode)
|
|
|
|
{
|
|
|
|
*error = BadAlloc;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
*error = Success;
|
|
|
|
return mode;
|
|
|
|
}
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
RRModePtr *
|
2006-11-09 06:36:35 +01:00
|
|
|
RRModesForScreen (ScreenPtr pScreen, int *num_ret)
|
|
|
|
{
|
|
|
|
rrScrPriv(pScreen);
|
2007-02-19 08:49:38 +01:00
|
|
|
int o, c, m;
|
2006-11-09 06:36:35 +01:00
|
|
|
RRModePtr *screen_modes;
|
|
|
|
int num_screen_modes = 0;
|
|
|
|
|
2010-05-05 20:44:06 +02:00
|
|
|
screen_modes = malloc((num_modes ? num_modes : 1) * sizeof (RRModePtr));
|
2007-11-18 17:44:36 +01:00
|
|
|
if (!screen_modes)
|
|
|
|
return NULL;
|
2006-11-09 06:36:35 +01:00
|
|
|
|
2006-12-13 05:16:49 +01:00
|
|
|
/*
|
|
|
|
* Add modes from all outputs
|
|
|
|
*/
|
2006-11-09 06:36:35 +01:00
|
|
|
for (o = 0; o < pScrPriv->numOutputs; o++)
|
|
|
|
{
|
|
|
|
RROutputPtr output = pScrPriv->outputs[o];
|
|
|
|
int m, n;
|
|
|
|
|
2007-02-19 08:49:38 +01:00
|
|
|
for (m = 0; m < output->numModes + output->numUserModes; m++)
|
2006-11-09 06:36:35 +01:00
|
|
|
{
|
2007-02-19 08:49:38 +01:00
|
|
|
RRModePtr mode = (m < output->numModes ?
|
|
|
|
output->modes[m] :
|
|
|
|
output->userModes[m-output->numModes]);
|
2006-11-09 06:36:35 +01:00
|
|
|
for (n = 0; n < num_screen_modes; n++)
|
|
|
|
if (screen_modes[n] == mode)
|
|
|
|
break;
|
|
|
|
if (n == num_screen_modes)
|
|
|
|
screen_modes[num_screen_modes++] = mode;
|
|
|
|
}
|
|
|
|
}
|
2006-12-13 05:16:49 +01:00
|
|
|
/*
|
|
|
|
* Add modes from all crtcs. The goal is to
|
|
|
|
* make sure all available and active modes
|
|
|
|
* are visible to the client
|
|
|
|
*/
|
|
|
|
for (c = 0; c < pScrPriv->numCrtcs; c++)
|
|
|
|
{
|
|
|
|
RRCrtcPtr crtc = pScrPriv->crtcs[c];
|
|
|
|
RRModePtr mode = crtc->mode;
|
|
|
|
int n;
|
|
|
|
|
|
|
|
if (!mode) continue;
|
|
|
|
for (n = 0; n < num_screen_modes; n++)
|
|
|
|
if (screen_modes[n] == mode)
|
|
|
|
break;
|
|
|
|
if (n == num_screen_modes)
|
|
|
|
screen_modes[num_screen_modes++] = mode;
|
|
|
|
}
|
2007-02-19 08:49:38 +01:00
|
|
|
/*
|
|
|
|
* Add all user modes for this screen
|
|
|
|
*/
|
|
|
|
for (m = 0; m < num_modes; m++)
|
|
|
|
{
|
|
|
|
RRModePtr mode = modes[m];
|
|
|
|
int n;
|
|
|
|
|
|
|
|
if (mode->userScreen != pScreen)
|
|
|
|
continue;
|
|
|
|
for (n = 0; n < num_screen_modes; n++)
|
|
|
|
if (screen_modes[n] == mode)
|
|
|
|
break;
|
|
|
|
if (n == num_screen_modes)
|
|
|
|
screen_modes[num_screen_modes++] = mode;
|
|
|
|
}
|
|
|
|
|
2006-11-09 06:36:35 +01:00
|
|
|
*num_ret = num_screen_modes;
|
|
|
|
return screen_modes;
|
|
|
|
}
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
void
|
2006-09-17 08:21:37 +02:00
|
|
|
RRModeDestroy (RRModePtr mode)
|
|
|
|
{
|
2006-10-04 06:06:11 +02:00
|
|
|
int m;
|
|
|
|
|
2006-09-17 08:21:37 +02:00
|
|
|
if (--mode->refcnt > 0)
|
|
|
|
return;
|
2006-11-09 06:36:35 +01:00
|
|
|
for (m = 0; m < num_modes; m++)
|
2006-10-04 06:06:11 +02:00
|
|
|
{
|
2006-11-09 06:36:35 +01:00
|
|
|
if (modes[m] == mode)
|
2006-10-04 06:06:11 +02:00
|
|
|
{
|
2006-11-09 06:36:35 +01:00
|
|
|
memmove (modes + m, modes + m + 1,
|
|
|
|
(num_modes - m - 1) * sizeof (RRModePtr));
|
|
|
|
num_modes--;
|
|
|
|
if (!num_modes)
|
2006-10-04 06:06:11 +02:00
|
|
|
{
|
2010-05-05 20:44:06 +02:00
|
|
|
free(modes);
|
2006-11-09 06:36:35 +01:00
|
|
|
modes = NULL;
|
2006-10-04 06:06:11 +02:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-05-05 20:44:06 +02:00
|
|
|
free(mode);
|
2006-09-17 08:21:37 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
RRModeDestroyResource (pointer value, XID pid)
|
|
|
|
{
|
|
|
|
RRModeDestroy ((RRModePtr) value);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
Bool
|
2006-09-17 08:21:37 +02:00
|
|
|
RRModeInit (void)
|
|
|
|
{
|
2006-11-09 06:36:35 +01:00
|
|
|
assert (num_modes == 0);
|
|
|
|
assert (modes == NULL);
|
2009-12-03 02:43:01 +01:00
|
|
|
RRModeType = CreateNewResourceType (RRModeDestroyResource, "MODE");
|
2006-09-18 08:03:23 +02:00
|
|
|
if (!RRModeType)
|
2006-09-17 08:21:37 +02:00
|
|
|
return FALSE;
|
|
|
|
return TRUE;
|
|
|
|
}
|
2006-09-20 07:48:54 +02:00
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
int
|
2006-09-20 07:48:54 +02:00
|
|
|
ProcRRCreateMode (ClientPtr client)
|
|
|
|
{
|
|
|
|
REQUEST(xRRCreateModeReq);
|
2007-02-19 08:49:38 +01:00
|
|
|
xRRCreateModeReply rep;
|
|
|
|
WindowPtr pWin;
|
|
|
|
ScreenPtr pScreen;
|
|
|
|
rrScrPrivPtr pScrPriv;
|
|
|
|
xRRModeInfo *modeInfo;
|
|
|
|
long units_after;
|
|
|
|
char *name;
|
|
|
|
int error, rc;
|
|
|
|
RRModePtr mode;
|
|
|
|
|
|
|
|
REQUEST_AT_LEAST_SIZE (xRRCreateModeReq);
|
2009-08-16 06:06:10 +02:00
|
|
|
rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
|
2007-02-19 08:49:38 +01:00
|
|
|
if (rc != Success)
|
|
|
|
return rc;
|
|
|
|
|
|
|
|
pScreen = pWin->drawable.pScreen;
|
|
|
|
pScrPriv = rrGetScrPriv(pScreen);
|
2006-09-20 07:48:54 +02:00
|
|
|
|
2007-02-19 08:49:38 +01:00
|
|
|
modeInfo = &stuff->modeInfo;
|
|
|
|
name = (char *) (stuff + 1);
|
2009-07-06 04:24:27 +02:00
|
|
|
units_after = (stuff->length - bytes_to_int32(sizeof (xRRCreateModeReq)));
|
2007-02-19 08:49:38 +01:00
|
|
|
|
|
|
|
/* check to make sure requested name fits within the data provided */
|
2009-07-06 04:24:27 +02:00
|
|
|
if (bytes_to_int32(modeInfo->nameLength) > units_after)
|
2007-02-19 08:49:38 +01:00
|
|
|
return BadLength;
|
|
|
|
|
|
|
|
mode = RRModeCreateUser (pScreen, modeInfo, name, &error);
|
|
|
|
if (!mode)
|
|
|
|
return error;
|
|
|
|
|
|
|
|
rep.type = X_Reply;
|
|
|
|
rep.pad0 = 0;
|
|
|
|
rep.sequenceNumber = client->sequence;
|
|
|
|
rep.length = 0;
|
|
|
|
rep.mode = mode->mode.id;
|
|
|
|
if (client->swapped)
|
|
|
|
{
|
|
|
|
int n;
|
|
|
|
swaps(&rep.sequenceNumber, n);
|
|
|
|
swapl(&rep.length, n);
|
|
|
|
swapl(&rep.mode, n);
|
|
|
|
}
|
|
|
|
WriteToClient(client, sizeof(xRRCreateModeReply), (char *)&rep);
|
2008-09-10 07:11:09 +02:00
|
|
|
/* Drop out reference to this mode */
|
|
|
|
RRModeDestroy (mode);
|
2010-05-11 05:22:05 +02:00
|
|
|
return Success;
|
2006-09-20 07:48:54 +02:00
|
|
|
}
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
int
|
2006-09-20 07:48:54 +02:00
|
|
|
ProcRRDestroyMode (ClientPtr client)
|
|
|
|
{
|
|
|
|
REQUEST(xRRDestroyModeReq);
|
2007-02-19 08:49:38 +01:00
|
|
|
RRModePtr mode;
|
2006-09-20 07:48:54 +02:00
|
|
|
|
|
|
|
REQUEST_SIZE_MATCH(xRRDestroyModeReq);
|
2009-04-29 07:04:37 +02:00
|
|
|
VERIFY_RR_MODE(stuff->mode, mode, DixDestroyAccess);
|
|
|
|
|
2007-02-19 08:49:38 +01:00
|
|
|
if (!mode->userScreen)
|
|
|
|
return BadMatch;
|
|
|
|
if (mode->refcnt > 1)
|
|
|
|
return BadAccess;
|
|
|
|
FreeResource (stuff->mode, 0);
|
|
|
|
return Success;
|
2006-09-20 07:48:54 +02:00
|
|
|
}
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
int
|
2006-09-20 07:48:54 +02:00
|
|
|
ProcRRAddOutputMode (ClientPtr client)
|
|
|
|
{
|
|
|
|
REQUEST(xRRAddOutputModeReq);
|
2007-02-19 08:49:38 +01:00
|
|
|
RRModePtr mode;
|
|
|
|
RROutputPtr output;
|
2006-09-20 07:48:54 +02:00
|
|
|
|
|
|
|
REQUEST_SIZE_MATCH(xRRAddOutputModeReq);
|
2009-04-29 07:04:37 +02:00
|
|
|
VERIFY_RR_OUTPUT(stuff->output, output, DixReadAccess);
|
|
|
|
VERIFY_RR_MODE(stuff->mode, mode, DixUseAccess);
|
2007-02-19 08:49:38 +01:00
|
|
|
|
|
|
|
return RROutputAddUserMode (output, mode);
|
2006-09-20 07:48:54 +02:00
|
|
|
}
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
int
|
2006-09-20 07:48:54 +02:00
|
|
|
ProcRRDeleteOutputMode (ClientPtr client)
|
|
|
|
{
|
|
|
|
REQUEST(xRRDeleteOutputModeReq);
|
2007-02-19 08:49:38 +01:00
|
|
|
RRModePtr mode;
|
|
|
|
RROutputPtr output;
|
2006-09-20 07:48:54 +02:00
|
|
|
|
|
|
|
REQUEST_SIZE_MATCH(xRRDeleteOutputModeReq);
|
2009-04-29 07:04:37 +02:00
|
|
|
VERIFY_RR_OUTPUT(stuff->output, output, DixReadAccess);
|
|
|
|
VERIFY_RR_MODE(stuff->mode, mode, DixUseAccess);
|
2007-02-19 08:49:38 +01:00
|
|
|
|
|
|
|
return RROutputDeleteUserMode (output, mode);
|
2006-09-20 07:48:54 +02:00
|
|
|
}
|