frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

randr: Rename pan() to set_origin(), and xf86CrtcPan() to xf86CrtcSetOrigin()

This commit is contained in:
Matthias Hopf 2008-12-04 16:30:38 +01:00
parent 825b2c2f4a
commit 18a8bac1a1
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/xfree86/modes/xf86Crtc.c
View File

@ -328,10 +328,10 @@ xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotati
crtc->x, crtc->y); crtc->x, crtc->y);
} }
if (crtc->funcs->pan && if (crtc->funcs->set_origin &&
memcmp (mode, &saved_mode, sizeof(saved_mode)) == 0 && memcmp (mode, &saved_mode, sizeof(saved_mode)) == 0 &&
saved_rotation == rotation) { saved_rotation == rotation) {
crtc->funcs->pan (crtc, crtc->x, crtc->y); crtc->funcs->set_origin (crtc, crtc->x, crtc->y);
ret = TRUE; ret = TRUE;
goto done; goto done;
} }
@ -428,12 +428,12 @@ xf86CrtcSetMode (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation,
* Pans the screen, does not change the mode * Pans the screen, does not change the mode
*/ */
_X_EXPORT void _X_EXPORT void
xf86CrtcPan (xf86CrtcPtr crtc, int x, int y) xf86CrtcSetOrigin (xf86CrtcPtr crtc, int x, int y)
{ {
crtc->x = x; crtc->x = x;
crtc->y = y; crtc->y = y;
if (crtc->funcs->pan) if (crtc->funcs->set_origin)
crtc->funcs->pan (crtc, x, y); crtc->funcs->set_origin (crtc, x, y);
else else
xf86CrtcSetMode (crtc, &crtc->mode, crtc->rotation, x, y); xf86CrtcSetMode (crtc, &crtc->mode, crtc->rotation, x, y);
} }

4
hw/xfree86/modes/xf86Crtc.h
View File

@ -218,7 +218,7 @@ typedef struct _xf86CrtcFuncs {
* Callback for panning. Doesn't change the mode. * Callback for panning. Doesn't change the mode.
*/ */
void void
(*pan)(xf86CrtcPtr crtc, int x, int y); (*set_origin)(xf86CrtcPtr crtc, int x, int y);
} xf86CrtcFuncsRec, *xf86CrtcFuncsPtr; } xf86CrtcFuncsRec, *xf86CrtcFuncsPtr;
@ -695,7 +695,7 @@ xf86CrtcSetMode (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation,
int x, int y); int x, int y);
void void
xf86CrtcPan (xf86CrtcPtr crtc, int x, int y); xf86CrtcSetOrigin (xf86CrtcPtr crtc, int x, int y);
/* /*
* Assign crtc rotation during mode set * Assign crtc rotation during mode set

2
hw/xfree86/modes/xf86RandR12.c
View File

@ -164,7 +164,7 @@ xf86RandR13Pan (xf86CrtcPtr crtc, int x, int y)
if (newY < crtc->panningTotalArea.y1) if (newY < crtc->panningTotalArea.y1)
newY = crtc->panningTotalArea.y1; newY = crtc->panningTotalArea.y1;
if (newX != crtc->x || newY != crtc->y) if (newX != crtc->x || newY != crtc->y)
xf86CrtcPan (crtc, newX, newY); xf86CrtcSetOrigin (crtc, newX, newY);
} }
static Bool static Bool