diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2006-07-19 10:05:12 -0400 |
|---|---|---|
| committer | Daniel Stone <daniels@endtroducing.fooishbar.org> | 2006-07-21 15:19:49 -0400 |
| commit | 02a95311568e24e1055ea52c7df8cb7aa3f38ad0 (patch) | |
| tree | add5acaf2c60969aa9a9e49dee22c4682d3a3423 /os | |
| parent | 93cd53860c3aca182a0a02543c41b5d71d65926b (diff) | |
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.
Diffstat (limited to 'os')
| -rw-r--r-- | os/connection.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/os/connection.c b/os/connection.c index ce765665f..7648a52ca 100644 --- a/os/connection.c +++ b/os/connection.c @@ -1014,16 +1014,22 @@ CloseDownConnection(ClientPtr client) } _X_EXPORT void -AddEnabledDevice(int fd) +AddGeneralSocket(int fd) { - FD_SET(fd, &EnabledDevices); FD_SET(fd, &AllSockets); if (GrabInProgress) FD_SET(fd, &SavedAllSockets); } _X_EXPORT void -RemoveEnabledDevice(int fd) +AddEnabledDevice(int fd) +{ + FD_SET(fd, &EnabledDevices); + AddGeneralSocket(fd); +} + +_X_EXPORT void +RemoveGeneralSocket(int fd) { FD_CLR(fd, &EnabledDevices); FD_CLR(fd, &AllSockets); @@ -1031,6 +1037,13 @@ RemoveEnabledDevice(int fd) FD_CLR(fd, &SavedAllSockets); } +_X_EXPORT void +RemoveEnabledDevice(int fd) +{ + FD_CLR(fd, &EnabledDevices); + RemoveGeneralSocket(fd); +} + /***************** * OnlyListenToOneClient: * Only accept requests from one client. Continue to handle new |