Attachment #103145 for bug #156825

Lines 355-361 epsonCreateColormap (ColormapPtr pmap) Link Here

(-)a/hw/kdrive/epson/epson13806.c (-1 / +1 lines)
355	Bool	355	Bool
356	epsonInitScreen (ScreenPtr pScreen)	356	epsonInitScreen (ScreenPtr pScreen)
357	{	357	{
358	#ifdef TOUCHSCREEN	358	#ifdef TSLIB
359	KdTsPhyScreen = pScreen->myNum;	359	KdTsPhyScreen = pScreen->myNum;
360	#endif	360	#endif
361		361

Lines 54-60 void Link Here

(-)a/hw/kdrive/epson/epson13806stub.c (-1 / +1 lines)
54	InitInput (int argc, char **argv)	54	InitInput (int argc, char **argv)
55	{	55	{
56	KdInitInput (&LinuxMouseFuncs, &LinuxKeyboardFuncs);	56	KdInitInput (&LinuxMouseFuncs, &LinuxKeyboardFuncs);
57	#ifdef TOUCHSCREEN	57	#ifdef TSLIB
58	KdAddMouseDriver (&TsFuncs);	58	KdAddMouseDriver (&TsFuncs);
59	#endif	59	#endif
60	}	60	}

Lines 397-403 fakeCreateColormap (ColormapPtr pmap) Link Here

(-)a/hw/kdrive/fake/fake.c (-1 / +1 lines)
397	Bool	397	Bool
398	fakeInitScreen (ScreenPtr pScreen)	398	fakeInitScreen (ScreenPtr pScreen)
399	{	399	{
400	#ifdef TOUCHSCREEN	400	#ifdef TSLIB
401	KdTsPhyScreen = pScreen->myNum;	401	KdTsPhyScreen = pScreen->myNum;
402	#endif	402	#endif
403		403

Lines 623-629 fbdevCreateColormap (ColormapPtr pmap) Link Here

(-)a/hw/kdrive/fbdev/fbdev.c (-1 / +1 lines)
623	Bool	623	Bool
624	fbdevInitScreen (ScreenPtr pScreen)	624	fbdevInitScreen (ScreenPtr pScreen)
625	{	625	{
626	#ifdef TOUCHSCREEN	626	#ifdef TSLIB
627	KdTsPhyScreen = pScreen->myNum;	627	KdTsPhyScreen = pScreen->myNum;
628	#endif	628	#endif
629		629

Lines 46-52 void Link Here

(-)a/hw/kdrive/fbdev/fbinit.c (-1 / +1 lines)
46	InitInput (int argc, char **argv)	46	InitInput (int argc, char **argv)
47	{	47	{
48	KdInitInput (&LinuxMouseFuncs, &LinuxKeyboardFuncs);	48	KdInitInput (&LinuxMouseFuncs, &LinuxKeyboardFuncs);
49	#ifdef TOUCHSCREEN	49	#ifdef TSLIB
50	KdAddMouseDriver (&TsFuncs);	50	KdAddMouseDriver (&TsFuncs);
51	#endif	51	#endif
52	}	52	}

Lines 52-58 void Link Here

(-)a/hw/kdrive/neomagic/neomagicstub.c (-1 / +1 lines)
52	InitInput (int argc, char **argv)	52	InitInput (int argc, char **argv)
53	{	53	{
54	KdInitInput (&LinuxMouseFuncs, &LinuxKeyboardFuncs);	54	KdInitInput (&LinuxMouseFuncs, &LinuxKeyboardFuncs);
55	#ifdef TOUCHSCREEN	55	#ifdef TSLIB
56	KdAddMouseDriver (&TsFuncs);	56	KdAddMouseDriver (&TsFuncs);
57	#endif	57	#endif
58	}	58	}

Lines 773-779 extern KdMouseFuncs LinuxEvdevFuncs; Link Here

(-)a/hw/kdrive/src/kdrive.h (-1 / +1 lines)
773	extern KdMouseFuncs Ps2MouseFuncs;	773	extern KdMouseFuncs Ps2MouseFuncs;
774	extern KdMouseFuncs BusMouseFuncs;	774	extern KdMouseFuncs BusMouseFuncs;
775	extern KdMouseFuncs MsMouseFuncs;	775	extern KdMouseFuncs MsMouseFuncs;
776	#ifdef TOUCHSCREEN	776	#ifdef TSLIB
777	extern KdMouseFuncs TsFuncs;	777	extern KdMouseFuncs TsFuncs;
778	#endif	778	#endif
779	extern KdKeyboardFuncs LinuxKeyboardFuncs;	779	extern KdKeyboardFuncs LinuxKeyboardFuncs;

Lines 525-531 const KdKeySymModsRec kdKeySymMods[] = { Link Here

(-)a/hw/kdrive/src/kinput.c (-1 / +1 lines)
525	{ XK_Hyper_L, Mod3Mask },	525	{ XK_Hyper_L, Mod3Mask },
526	{ XK_Hyper_R, Mod3Mask },	526	{ XK_Hyper_R, Mod3Mask },
527	{ XK_Mode_switch, Mod4Mask },	527	{ XK_Mode_switch, Mod4Mask },
528	#ifdef TOUCHSCREEN	528	#ifdef TSLIB
529	/* PDA specific hacks */	529	/* PDA specific hacks */
530	#ifdef XF86XK_Start	530	#ifdef XF86XK_Start
531	{ XF86XK_Start, ControlMask },	531	{ XF86XK_Start, ControlMask },

Lines 524-530 const KdKeySymModsRec kdKeySymMods[] = { Link Here

(-)a/hw/xgl/egl/kinput.c (-1 / +1 lines)
524	{ XK_Hyper_L, Mod3Mask },	524	{ XK_Hyper_L, Mod3Mask },
525	{ XK_Hyper_R, Mod3Mask },	525	{ XK_Hyper_R, Mod3Mask },
526	{ XK_Mode_switch, Mod4Mask },	526	{ XK_Mode_switch, Mod4Mask },
527	#ifdef TOUCHSCREEN	527	#ifdef TSLIB
528	/* PDA specific hacks */	528	/* PDA specific hacks */
529	#ifdef XF86XK_Start	529	#ifdef XF86XK_Start
530	{ XF86XK_Start, ControlMask },	530	{ XF86XK_Start, ControlMask },

Lines 291-297 #undef SVR4 Link Here

(-)a/include/dix-config.h.in (-1 / +1 lines)
291	#undef TCPCONN	291	#undef TCPCONN
292		292
293	/* Enable touchscreen support */	293	/* Enable touchscreen support */
294	#undef TOUCHSCREEN	294	#undef TSLIB
295		295
296	/* Support tslib touchscreen abstraction library */	296	/* Support tslib touchscreen abstraction library */
297	#undef TSLIB	297	#undef TSLIB

Lines 17-23 #undef KDRIVEFBDEV Link Here

(-)a/include/kdrive-config.h.in (-1 / +1 lines)
17	#undef KDRIVEVESA	17	#undef KDRIVEVESA
18		18
19	/* Enable touchscreen support */	19	/* Enable touchscreen support */
20	#undef TOUCHSCREEN	20	#undef TSLIB
21		21
22	/* Support tslib touchscreen abstraction library */	22	/* Support tslib touchscreen abstraction library */
23	#undef TSLIB	23	#undef TSLIB

Lines 101-107 #undef SVR4 Link Here

(-)a/include/xorg-server.h.in (-1 / +1 lines)
101	#undef TCPCONN	101	#undef TCPCONN
102		102
103	/* Enable touchscreen support */	103	/* Enable touchscreen support */
104	#undef TOUCHSCREEN	104	#undef TSLIB
105		105
106	/* Support tslib touchscreen abstraction library */	106	/* Support tslib touchscreen abstraction library */
107	#undef TSLIB	107	#undef TSLIB

Return to bug 156825