mirror of
https://github.com/X11Libre/xserver.git
synced 2026-10-26 01:59:57 +00:00
Merge c78bf862b5 into a8192aa709
This commit is contained in:
commit
1517724844
5 changed files with 15 additions and 4 deletions
|
|
@ -184,6 +184,7 @@ xf86parseLayoutSection(void)
|
|||
aptr->adj_where = CONF_ADJ_OBSOLETE;
|
||||
else
|
||||
aptr->adj_where = CONF_ADJ_ABSOLUTE;
|
||||
break;
|
||||
}
|
||||
switch (aptr->adj_where) {
|
||||
case CONF_ADJ_ABSOLUTE:
|
||||
|
|
@ -257,7 +258,9 @@ xf86parseLayoutSection(void)
|
|||
Error(SCREEN_MSG);
|
||||
}
|
||||
aptr->adj_right_str = xf86_lex_val.str;
|
||||
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
ptr->lay_adjacency_lst = (XF86ConfAdjacencyPtr)
|
||||
xf86addListItem((glp) ptr->lay_adjacency_lst, (glp) aptr);
|
||||
|
|
@ -359,6 +362,8 @@ xf86printLayoutSection(FILE * cf, XF86ConfLayoutPtr ptr)
|
|||
fprintf(cf, " Relative \"%s\" %d %d\n", aptr->adj_refscreen,
|
||||
aptr->adj_x, aptr->adj_y);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
for (iptr = ptr->lay_inactive_lst; iptr; iptr = iptr->list.next)
|
||||
|
|
|
|||
|
|
@ -104,6 +104,7 @@ xf86parseModuleSubSection(XF86LoadPtr head, char *name)
|
|||
xf86parseError(UNEXPECTED_EOF_MSG);
|
||||
free(ptr);
|
||||
return NULL;
|
||||
break;
|
||||
default:
|
||||
xf86parseError(INVALID_KEYWORD_MSG, xf86tokenString());
|
||||
free(ptr);
|
||||
|
|
@ -216,11 +217,8 @@ xf86printModuleSection(FILE * cf, XF86ConfModulePtr ptr)
|
|||
else
|
||||
fputc('\n', cf);
|
||||
break;
|
||||
#if 0
|
||||
default:
|
||||
fprintf(cf, "#\tUnknown type \"%s\"\n", lptr->load_name);
|
||||
break;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -381,6 +381,7 @@ xf86parseVerboseMode(void)
|
|||
break;
|
||||
default:
|
||||
Error("Unexpected token in verbose \"Mode\" entry\n");
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!had_dotclock)
|
||||
|
|
@ -480,6 +481,7 @@ xf86parseMonitorSection(void)
|
|||
ptr->mon_hsync[ptr->mon_n_hsync].lo;
|
||||
ptr->mon_n_hsync++;
|
||||
goto HorizDone;
|
||||
break;
|
||||
}
|
||||
ptr->mon_n_hsync++;
|
||||
} while ((token = xf86getSubToken(&(ptr->mon_comment))) == NUMBER);
|
||||
|
|
@ -515,6 +517,7 @@ xf86parseMonitorSection(void)
|
|||
ptr->mon_vrefresh[ptr->mon_n_vrefresh].lo;
|
||||
ptr->mon_n_vrefresh++;
|
||||
goto VertDone;
|
||||
break;
|
||||
}
|
||||
if (ptr->mon_n_vrefresh >= CONF_MAX_VREFRESH)
|
||||
Error("Sorry. Too many vertical refresh intervals.");
|
||||
|
|
|
|||
|
|
@ -118,6 +118,8 @@ xnestPointerProc(DeviceIntPtr pDev, int onoff)
|
|||
break;
|
||||
case DEVICE_CLOSE:
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
return Success;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -113,6 +113,9 @@ xnestSaveScreen(ScreenPtr pScreen, int what)
|
|||
xcb_unmap_window(xnestUpstreamInfo.conn, screenPriv->screenSaverWindow);
|
||||
xnestSetInstalledColormapWindows(pScreen);
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
return TRUE;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue