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

Account for CRTC rotation in the cursor containment code.

This commit is contained in:
Eric Anholt 2007-01-18 14:28:01 -08:00
parent df147c10ce
commit a811e92104
1 changed files with 42 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
randr/rrpointer.c
View File

@ -22,6 +22,32 @@
#include "randrstr.h" #include "randrstr.h"
/**
* Returns the width/height that the crtc scans out from the framebuffer
*/
static void
RRCrtcGetScanoutSize(RRCrtcPtr crtc, int *width, int *height)
{
if (crtc->mode == NULL) {
*width = 0;
*height = 0;
return;
}
switch (crtc->rotation & 0xf) {
case RR_Rotate_0:
case RR_Rotate_180:
*width = crtc->mode->mode.width;
*height = crtc->mode->mode.height;
break;
case RR_Rotate_90:
case RR_Rotate_270:
*width = crtc->mode->mode.height;
*height = crtc->mode->mode.width;
break;
}
}
/* /*
* When the pointer moves, check to see if the specified position is outside * When the pointer moves, check to see if the specified position is outside
* any of theavailable CRTCs and move it to a 'sensible' place if so, where * any of theavailable CRTCs and move it to a 'sensible' place if so, where
@ -34,11 +60,15 @@ static Bool
RRCrtcContainsPosition (RRCrtcPtr crtc, int x, int y) RRCrtcContainsPosition (RRCrtcPtr crtc, int x, int y)
{ {
RRModePtr mode = crtc->mode; RRModePtr mode = crtc->mode;
int scan_width, scan_height;
if (!mode) if (!mode)
return FALSE; return FALSE;
if (crtc->x <= x && x < crtc->x + mode->mode.width &&
crtc->y <= y && y < crtc->y + mode->mode.height) RRCrtcGetScanoutSize (crtc, &scan_width, &scan_height);
if (crtc->x <= x && x < crtc->x + scan_width &&
crtc->y <= y && y < crtc->y + scan_height)
return TRUE; return TRUE;
return FALSE; return FALSE;
} }
@ -54,28 +84,32 @@ RRPointerToNearestCrtc (ScreenPtr pScreen, int x, int y, RRCrtcPtr skip)
RRCrtcPtr nearest = NULL; RRCrtcPtr nearest = NULL;
int best = 0; int best = 0;
int best_dx = 0, best_dy = 0; int best_dx = 0, best_dy = 0;
for (c = 0; c < pScrPriv->numCrtcs; c++) for (c = 0; c < pScrPriv->numCrtcs; c++)
{ {
RRCrtcPtr crtc = pScrPriv->crtcs[c]; RRCrtcPtr crtc = pScrPriv->crtcs[c];
RRModePtr mode = crtc->mode; RRModePtr mode = crtc->mode;
int dx, dy; int dx, dy;
int dist; int dist;
int scan_width, scan_height;
if (!mode) if (!mode)
continue; continue;
if (crtc == skip) if (crtc == skip)
continue; continue;
RRCrtcGetScanoutSize (crtc, &scan_width, &scan_height);
if (x < crtc->x) if (x < crtc->x)
dx = crtc->x - x; dx = crtc->x - x;
else if (x > crtc->x + mode->mode.width) else if (x > crtc->x + scan_width)
dx = x - (crtc->x + mode->mode.width); dx = x - (crtc->x + scan_width);
else else
dx = 0; dx = 0;
if (y < crtc->y) if (y < crtc->y)
dy = crtc->y - x; dy = crtc->y - x;
else if (y > crtc->y + mode->mode.height) else if (y > crtc->y + scan_height)
dy = y - (crtc->y + mode->mode.height); dy = y - (crtc->y + scan_height);
else else
dy = 0; dy = 0;
dist = dx + dy; dist = dx + dy;