diff options
| author | Matthias Hopf <mhopf@suse.de> | 2008-12-04 16:30:38 +0100 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2008-12-09 20:56:47 -0800 |
| commit | 6189f0832ecd6930608f5b253e534bb104174694 (patch) | |
| tree | 971745ded56649712f118feb81f011e564c7380e | |
| parent | 68858b202a0c32e8cc3fb22ca4714c1baa05b44c (diff) | |
randr: Rename pan() to set_origin(), and xf86CrtcPan() to xf86CrtcSetOrigin()
(cherry picked from commit 18a8bac1a1567b6215928f96870554ea63f39aab)
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | hw/xfree86/modes/xf86Crtc.c | 10 | ||||
| -rw-r--r-- | hw/xfree86/modes/xf86Crtc.h | 4 | ||||
| -rw-r--r-- | hw/xfree86/modes/xf86RandR12.c | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c index 051916d78..97176200e 100644 --- a/hw/xfree86/modes/xf86Crtc.c +++ b/hw/xfree86/modes/xf86Crtc.c @@ -324,10 +324,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; } @@ -424,12 +424,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); } diff --git a/hw/xfree86/modes/xf86Crtc.h b/hw/xfree86/modes/xf86Crtc.h index f085bf74e..5e47e6f2b 100644 --- a/hw/xfree86/modes/xf86Crtc.h +++ b/hw/xfree86/modes/xf86Crtc.h @@ -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 diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c index caf642916..0e7a5ec03 100644 --- a/hw/xfree86/modes/xf86RandR12.c +++ b/hw/xfree86/modes/xf86RandR12.c @@ -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 |