Attachment #116761 for bug #197858

View | Details | Raw Unified | Return to bug 197858
Collapse All | Expand All




 *     For more info on ClientsWithInput, see ReadRequestFromClient().
 *     pClientsReady is an array to store ready client->index values into.
 *****************/
volatile fd_set tmp_set;

int
WaitForSomething(int *pClientsReady)

                if (expired)
                    return 0;
	    }
	} 
	else
	 {
	    fd_set tmp_set;

	    if (*checkForInput[0] == *checkForInput[1]) {
	        if (timers)

		QueueWorkProc(EstablishNewConnections, NULL,
			      (pointer)&LastSelectMask);
#ifdef DPMSExtension
	    XFD_ANDSET(&tmp_set, &devicesReadable, &EnabledDevices);
	    if (XFD_ANYSET (&tmp_set) && (DPMSPowerLevel != DPMSModeOn))
		DPMSSet(DPMSModeOn);
#endif
	    if (XFD_ANYSET (&devicesReadable) || XFD_ANYSET (&clientsReadable))

Lines 164-169 typedef struct x_IHRec { Link Here

(-)hw/xfree86/common/xf86Events.c.orig_1 (-8 / +22 lines)
164	InputHandlerProc ihproc;	164	InputHandlerProc ihproc;
165	pointer data;	165	pointer data;
166	Bool enabled;	166	Bool enabled;
		167	Bool is_input;
167	struct x_IHRec * next;	168	struct x_IHRec * next;
168	} IHRec, *IHPtr;	169	} IHRec, *IHPtr;
169		170
Lines 1526-1533 xf86VTSwitch() Link Here
1526	for (i = 0; i < xf86NumScreens; i++)	1527	for (i = 0; i < xf86NumScreens; i++)
1527	xf86Screens[i]->LeaveVT(i, 0);	1528	xf86Screens[i]->LeaveVT(i, 0);
1528		1529
1529	for (ih = InputHandlers; ih; ih = ih->next)	1530	for (ih = InputHandlers; ih; ih = ih->next) {
1530	xf86DisableInputHandler(ih);	1531	if (ih->is_input)
		1532	xf86DisableInputHandler(ih);
		1533	else
		1534	xf86DisableGeneralHandler(ih);
		1535	}
1531	xf86AccessLeave(); /* We need this here, otherwise */	1536	xf86AccessLeave(); /* We need this here, otherwise */
1532	xf86AccessLeaveState(); /* console won't be restored */	1537	xf86AccessLeaveState(); /* console won't be restored */
1533		1538
Lines 1563-1571 xf86VTSwitch() Link Here
1563	pInfo = pInfo->next;	1568	pInfo = pInfo->next;
1564	}	1569	}
1565	#endif /* !__UNIXOS2__ */	1570	#endif /* !__UNIXOS2__ */
1566	for (ih = InputHandlers; ih; ih = ih->next)	1571	for (ih = InputHandlers; ih; ih = ih->next) {
1567	xf86EnableInputHandler(ih);	1572	if (ih->is_input)
1568		1573	xf86EnableInputHandler(ih);
		1574	else
		1575	xf86EnableGeneralHandler(ih);
		1576	}
1569	xf86UnblockSIGIO(prevSIGIO);	1577	xf86UnblockSIGIO(prevSIGIO);
1570		1578
1571	} else {	1579	} else {
Lines 1626-1633 xf86VTSwitch() Link Here
1626	}	1634	}
1627	#endif /* !__UNIXOS2__ */	1635	#endif /* !__UNIXOS2__ */
1628		1636
1629	for (ih = InputHandlers; ih; ih = ih->next)	1637	for (ih = InputHandlers; ih; ih = ih->next) {
1630	xf86EnableInputHandler(ih);	1638	if (ih->is_input)
		1639	xf86EnableInputHandler(ih);
		1640	else
		1641	xf86EnableGeneralHandler(ih);
		1642	}
1631		1643
1632	xf86UnblockSIGIO(prevSIGIO);	1644	xf86UnblockSIGIO(prevSIGIO);
1633	}	1645	}
Lines 1664-1671 xf86AddInputHandler(int fd, InputHandler Link Here
1664	{	1676	{
1665	IHPtr ih = addInputHandler(fd, proc, data);	1677	IHPtr ih = addInputHandler(fd, proc, data);
1666		1678
1667	if (ih)	1679	if (ih) {
1668	AddEnabledDevice(fd);	1680	AddEnabledDevice(fd);
		1681	ih->is_input = TRUE;
		1682	}
1669	return ih;	1683	return ih;
1670	}	1684	}
1671		1685

Return to bug 197858

Lines 144-149 static OsTimerPtr timers = NULL; Link Here

(-)os/WaitFor.c.orig (-4 / +5 lines)
144	* For more info on ClientsWithInput, see ReadRequestFromClient().	144	* For more info on ClientsWithInput, see ReadRequestFromClient().
145	* pClientsReady is an array to store ready client->index values into.	145	* pClientsReady is an array to store ready client->index values into.
146	*****************/	146	*****************/
		147	volatile fd_set tmp_set;
147		148
148	int	149	int
149	WaitForSomething(int *pClientsReady)	150	WaitForSomething(int *pClientsReady)
Lines 298-307 WaitForSomething(int *pClientsReady) Link Here
298	if (expired)	299	if (expired)
299	return 0;	300	return 0;
300	}	301	}
301	}	302	}
302	else	303	else
303	{	304	{
304	fd_set tmp_set;
305		305
306	if (checkForInput[0] == checkForInput[1]) {	306	if (checkForInput[0] == checkForInput[1]) {
307	if (timers)	307	if (timers)
Lines 338-344 WaitForSomething(int *pClientsReady) Link Here
338	QueueWorkProc(EstablishNewConnections, NULL,	338	QueueWorkProc(EstablishNewConnections, NULL,
339	(pointer)&LastSelectMask);	339	(pointer)&LastSelectMask);
340	#ifdef DPMSExtension	340	#ifdef DPMSExtension
341	if (XFD_ANYSET (&devicesReadable) && (DPMSPowerLevel != DPMSModeOn))	341	XFD_ANDSET(&tmp_set, &devicesReadable, &EnabledDevices);
		342	if (XFD_ANYSET (&tmp_set) && (DPMSPowerLevel != DPMSModeOn))
342	DPMSSet(DPMSModeOn);	343	DPMSSet(DPMSModeOn);
343	#endif	344	#endif
344	if (XFD_ANYSET (&devicesReadable) \|\| XFD_ANYSET (&clientsReadable))	345	if (XFD_ANYSET (&devicesReadable) \|\| XFD_ANYSET (&clientsReadable))