Commit 72c69cfc60d6b762415828930a63e485aa00185f

Peter Hutterer <peter.hutterer @wh…t.net> (Committer)
Thu Dec 24 00:01:05 CET 2009
Ping Cheng <pingc @wa…m.com> (Author)
Wed Dec 23 02:48:09 CET 2009

Tree SHA1: 5580206
Parent SHA1: fe2d108 (Add routine wcmRotateCoordinates)
raw diff | raw patch

Add local maxX, maxY, resolX, and resolY

Instead of switching maximum and resolution back and forth between
touch and penabled devices globally, we define them into WacomDevice.
The values are initialized in xf86WcmInitialToolSize once and used
through out the life of the device.

Signed-off-by: Ping Cheng <pinglinux@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

Diff rendering mode:
inline
side by side


1880	1880
1881	1881	DBG(10, priv, "\n");
1882	1882
1883		if (!IsTouch(priv))
1884		{
1885		oldMaxX = common->wcmMaxX;
1886		oldMaxY = common->wcmMaxY;
1887		}
1888		else
1889		{
1890		oldMaxX = common->wcmMaxTouchX;
1891		oldMaxY = common->wcmMaxTouchY;
1892		}
	1883	oldMaxX = priv->maxX;
	1884	oldMaxY = priv->maxY;
1893	1885
1894	1886	tmpTopX = priv->topX;
1895	1887	tmpBottomX = priv->bottomX;
…	…
1890	1890
1891	1891	if (common->wcmRotate == ROTATE_CW \|\| common->wcmRotate == ROTATE_CCW)
1892	1892	{
1893		if (!IsTouch(priv))
1894		{
1895		common->wcmMaxX = oldMaxY;
1896		common->wcmMaxY = oldMaxX;
1897		}
1898		else
1899		{
1900		common->wcmMaxTouchX = oldMaxY;
1901		common->wcmMaxTouchY = oldMaxX;
1902		}
	1893	priv->maxX = oldMaxY;
	1894	priv->maxY = oldMaxX;
1903	1895	}
1904	1896
1905	1897	switch (common->wcmRotate) {
…	…
1953	1953	/* rotate all devices at once! else they get misaligned */
1954	1954	for (tmppriv = common->wcmDevices; tmppriv; tmppriv = tmppriv->next)
1955	1955	{
1956		if (!IsTouch(priv))
1957		{
1958		oldMaxX = common->wcmMaxX;
1959		oldMaxY = common->wcmMaxY;
1960		}
1961		else
1962		{
1963		oldMaxX = common->wcmMaxTouchX;
1964		oldMaxY = common->wcmMaxTouchY;
1965		}
	1956	oldMaxX = priv->maxX;
	1957	oldMaxY = priv->maxY;
1966	1958
1967	1959	if (oldRotation == ROTATE_CW \|\| oldRotation == ROTATE_CCW)
1968	1960	{
1969		if (!IsTouch(priv))
1970		{
1971		common->wcmMaxX = oldMaxY;
1972		common->wcmMaxY = oldMaxX;
1973		}
1974		else
1975		{
1976		common->wcmMaxTouchX = oldMaxY;
1977		common->wcmMaxTouchY = oldMaxX;
1978		}
	1961	priv->maxX = oldMaxY;
	1962	priv->maxY = oldMaxX;
1979	1963	}
1980	1964
1981	1965	tmpTopX = tmppriv->topX;


345	345	{
346	346	values[0] = 0;
347	347	values[1] = 0;
348		if (!IsTouch(priv))
349		values[2] = common->wcmMaxX;
350		else
351		values[2] = common->wcmMaxTouchX;
352		if (!IsTouch(priv))
353		values[3] = common->wcmMaxY;
354		else
355		values[3] = common->wcmMaxTouchY;
	348	values[2] = priv->maxX;
	349	values[3] = priv->maxY;
356	350	}
357	351
358	352	priv->topX = area->topX = values[0];


146	146	WacomToolAreaPtr area = priv->toolarea, inlist;
147	147	WacomCommonPtr common = priv->common;
148	148	double screenRatio, tabletRatio;
149		int bottomx = common->wcmMaxX, bottomy = common->wcmMaxY;
	149	int bottomx = priv->maxX, bottomy = priv->maxY;
150	150
151	151	DBG(10, priv, "\n");
152	152
153		if (IsTouch(priv))
154		{
155		bottomx = common->wcmMaxTouchX;
156		bottomy = common->wcmMaxTouchY;
157		}
158
159	153	/* Verify Box */
160	154	if (priv->topX > bottomx)
161	155	{
…	…
342	342	WacomDevicePtr priv = (WacomDevicePtr)local->private;
343	343	WacomCommonPtr common = priv->common;
344	344	int topx = 0, topy = 0, resolution;
345		int bottomx = common->wcmMaxX, bottomy = common->wcmMaxY;
	345	int bottomx = priv->maxX, bottomy = priv->maxY;
346	346	#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
347	347	Atom label;
348	348	#endif
349		if (IsTouch(priv))
350		{
351		bottomx = common->wcmMaxTouchX;
352		bottomy = common->wcmMaxTouchY;
353		}
354	349
355	350	xf86WcmMappingFactor(local);
356	351
…	…
368	368	#endif
369	369	}
370	370
371		if (!IsTouch(priv))
372		resolution = common->wcmResolX;
373		else
374		resolution = common->wcmTouchResolX;
	371	resolution = priv->resolX;
375	372	if (common->wcmScaling)
376	373	{
377	374	/* In case xf86WcmDevConvert didn't get called */
…	…
402	402	#endif
403	403	}
404	404
405		if (!IsTouch(priv))
406		resolution = common->wcmResolY;
407		else
408		resolution = common->wcmTouchResolY;
	405	resolution = priv->resolY;
409	406	if (common->wcmScaling)
410	407	{
411	408	/* In case xf86WcmDevConvert didn't get called */
…	…
577	577	WacomCommonPtr common = priv->common;
578	578	WacomToolPtr toollist = common->wcmTool;
579	579	WacomToolAreaPtr arealist;
580		int bottomx = 0, bottomy = 0;
581	580
	581	/* assign max and resolution here since we don't get them during
	582	* the configuration stage */
582	583	if (IsTouch(priv))
583	584	{
584		bottomx = common->wcmMaxTouchX;
585		bottomy = common->wcmMaxTouchY;
	585	priv->maxX = common->wcmMaxTouchX;
	586	priv->maxY = common->wcmMaxTouchY;
	587	priv->resolX = common->wcmTouchResolX;
	588	priv->resolY = common->wcmTouchResolY;
586	589	}
587	590	else
588	591	{
589		bottomx = common->wcmMaxX;
590		bottomy = common->wcmMaxY;
	592	priv->maxX = common->wcmMaxX;
	593	priv->maxY = common->wcmMaxY;
	594	priv->resolX = common->wcmResolX;
	595	priv->resolY = common->wcmResolY;
591	596	}
592	597
593	598	for (; toollist; toollist=toollist->next)
…	…
601	601	for (; arealist; arealist=arealist->next)
602	602	{
603	603	if (!arealist->bottomX)
604		arealist->bottomX = bottomx;
	604	arealist->bottomX = priv->maxX;
605	605	if (!arealist->bottomY)
606		arealist->bottomY = bottomy;
	606	arealist->bottomY = priv->maxY;
607	607	}
608	608	}
609	609


170	170	int topY; /* Y top */
171	171	int bottomX; /* X bottom */
172	172	int bottomY; /* Y bottom */
	173	int resolX; /* X resolution */
	174	int resolY; /* Y resolution */
	175	int maxX; /* tool logical maxX */
	176	int maxY; /* tool logical maxY */
173	177	int sizeX; /* active X size */
174	178	int sizeY; /* active Y size */
175	179	double factorX; /* X factor */

Commit 72c69cfc60d6b762415828930a63e485aa00185f

Gitorious