randr: Rename pan() to set_origin(), and xf86CrtcPan() to xf86CrtcSetOrigin()
This commit is contained in:
parent
825b2c2f4a
commit
18a8bac1a1
|
@ -328,10 +328,10 @@ xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotati
|
|||
crtc->x, crtc->y);
|
||||
}
|
||||
|
||||
if (crtc->funcs->pan &&
|
||||
if (crtc->funcs->set_origin &&
|
||||
memcmp (mode, &saved_mode, sizeof(saved_mode)) == 0 &&
|
||||
saved_rotation == rotation) {
|
||||
crtc->funcs->pan (crtc, crtc->x, crtc->y);
|
||||
crtc->funcs->set_origin (crtc, crtc->x, crtc->y);
|
||||
ret = TRUE;
|
||||
goto done;
|
||||
}
|
||||
|
@ -428,12 +428,12 @@ xf86CrtcSetMode (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation,
|
|||
* Pans the screen, does not change the mode
|
||||
*/
|
||||
_X_EXPORT void
|
||||
xf86CrtcPan (xf86CrtcPtr crtc, int x, int y)
|
||||
xf86CrtcSetOrigin (xf86CrtcPtr crtc, int x, int y)
|
||||
{
|
||||
crtc->x = x;
|
||||
crtc->y = y;
|
||||
if (crtc->funcs->pan)
|
||||
crtc->funcs->pan (crtc, x, y);
|
||||
if (crtc->funcs->set_origin)
|
||||
crtc->funcs->set_origin (crtc, x, y);
|
||||
else
|
||||
xf86CrtcSetMode (crtc, &crtc->mode, crtc->rotation, x, y);
|
||||
}
|
||||
|
|
|
@ -218,7 +218,7 @@ typedef struct _xf86CrtcFuncs {
|
|||
* Callback for panning. Doesn't change the mode.
|
||||
*/
|
||||
void
|
||||
(*pan)(xf86CrtcPtr crtc, int x, int y);
|
||||
(*set_origin)(xf86CrtcPtr crtc, int x, int y);
|
||||
|
||||
} xf86CrtcFuncsRec, *xf86CrtcFuncsPtr;
|
||||
|
||||
|
@ -695,7 +695,7 @@ xf86CrtcSetMode (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation,
|
|||
int x, int y);
|
||||
|
||||
void
|
||||
xf86CrtcPan (xf86CrtcPtr crtc, int x, int y);
|
||||
xf86CrtcSetOrigin (xf86CrtcPtr crtc, int x, int y);
|
||||
|
||||
/*
|
||||
* Assign crtc rotation during mode set
|
||||
|
|
|
@ -164,7 +164,7 @@ xf86RandR13Pan (xf86CrtcPtr crtc, int x, int y)
|
|||
if (newY < crtc->panningTotalArea.y1)
|
||||
newY = crtc->panningTotalArea.y1;
|
||||
if (newX != crtc->x || newY != crtc->y)
|
||||
xf86CrtcPan (crtc, newX, newY);
|
||||
xf86CrtcSetOrigin (crtc, newX, newY);
|
||||
}
|
||||
|
||||
static Bool
|
||||
|
|
Loading…
Reference in New Issue
Block a user