add basic D-BUS configuration mechanism
Also move LookupDeviceIntRec into the DIX, and add InputOption type, and NewInputDeviceRequest prototype (DIX requests DDX to add a device). Does not link without an implemented NIDR.
This commit is contained in:
committed by
Daniel Stone
parent
93cd53860c
commit
02a9531156
@@ -101,6 +101,7 @@ Equipment Corporation.
|
||||
#include <X11/fonts/font.h>
|
||||
#include "opaque.h"
|
||||
#include "servermd.h"
|
||||
#include "config.h"
|
||||
#include "site.h"
|
||||
#include "dixfont.h"
|
||||
#include "extnsionst.h"
|
||||
@@ -311,6 +312,7 @@ main(int argc, char *argv[], char *envp[])
|
||||
DPMSPowerLevel = 0;
|
||||
#endif
|
||||
InitBlockAndWakeupHandlers();
|
||||
configInitialise();
|
||||
/* Perform any operating system dependent initializations you'd like */
|
||||
OsInit();
|
||||
if(serverGeneration == 1)
|
||||
@@ -463,6 +465,7 @@ main(int argc, char *argv[], char *envp[])
|
||||
FreeAllResources();
|
||||
#endif
|
||||
|
||||
configFini();
|
||||
CloseDownDevices();
|
||||
for (i = screenInfo.numScreens - 1; i >= 0; i--)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user