Attachment #427004 for bug #574766

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

Lines 323-329 Link Here

(-)randr/rrmonitor.c (-3 / +3 lines)
323	/* Fill in the primary monitor data first	323	/* Fill in the primary monitor data first
324	*/	324	*/
325	if (list.client_primary >= 0) {	325	if (list.client_primary >= 0) {
326	RRMonitorSetFromClient(pScrPriv->monitors[list.client_primary], mon);	326	RRMonitorSetFromServer(list.server_crtc[list.server_primary], mon);
327	mon++;	327	mon++;
328	} else if (list.server_primary >= 0) {	328	} else if (list.server_primary >= 0) {
329	RRMonitorSetFromServer(pScrPriv->crtcs[list.server_primary], mon);	329	RRMonitorSetFromServer(pScrPriv->crtcs[list.server_primary], mon);
Lines 354-361 Link Here
354		354
355	/* And finish with the list of crtc-inspired monitors	355	/* And finish with the list of crtc-inspired monitors
356	*/	356	*/
357	for (c = 0; c < pScrPriv->numCrtcs; c++) {	357	for (c = 0; c < list.num_crtcs; c++) {
358	RRCrtcPtr crtc = pScrPriv->crtcs[c];	358	RRCrtcPtr crtc = list.server_crtc[c];
359	if (c == list.server_primary && list.client_primary < 0)	359	if (c == list.server_primary && list.client_primary < 0)
360	continue;	360	continue;
361		361




    WindowPtr pWin;
    rrScrPrivPtr pScrPriv;
    int ret;
    ScreenPtr slave;

    REQUEST_SIZE_MATCH(xRRSetOutputPrimaryReq);



    pScrPriv = rrGetScrPriv(pWin->drawable.pScreen);
    if (pScrPriv)
    {
        RRSetPrimaryOutput(pWin->drawable.pScreen, pScrPriv, output);

        xorg_list_for_each_entry(slave,
                                  &pWin->drawable.pScreen->output_slave_list,
                                  output_head) {
             rrScrPrivPtr pSlavePriv;
             pSlavePriv = rrGetScrPriv(slave);
 
             RRSetPrimaryOutput(slave, pSlavePriv, output);
         }
     }

    return Success;
}


Return to bug 574766

Lines 543-548 Link Here

(-)randr/rroutput.c (+12 lines)
543	WindowPtr pWin;	543	WindowPtr pWin;
544	rrScrPrivPtr pScrPriv;	544	rrScrPrivPtr pScrPriv;
545	int ret;	545	int ret;
		546	ScreenPtr slave;
546		547
547	REQUEST_SIZE_MATCH(xRRSetOutputPrimaryReq);	548	REQUEST_SIZE_MATCH(xRRSetOutputPrimaryReq);
548		549
Lines 565-572 Link Here
565		566
566	pScrPriv = rrGetScrPriv(pWin->drawable.pScreen);	567	pScrPriv = rrGetScrPriv(pWin->drawable.pScreen);
567	if (pScrPriv)	568	if (pScrPriv)
		569	{
568	RRSetPrimaryOutput(pWin->drawable.pScreen, pScrPriv, output);	570	RRSetPrimaryOutput(pWin->drawable.pScreen, pScrPriv, output);
569		571
		572	xorg_list_for_each_entry(slave,
		573	&pWin->drawable.pScreen->output_slave_list,
		574	output_head) {
		575	rrScrPrivPtr pSlavePriv;
		576	pSlavePriv = rrGetScrPriv(slave);
		577
		578	RRSetPrimaryOutput(slave, pSlavePriv, output);
		579	}
		580	}
		581
570	return Success;	582	return Success;
571	}	583	}
572		584