frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

formatting fixes

This commit is contained in:
Brian 2007-03-30 16:07:26 -06:00
parent ebdc8ce5c1
commit 73fdc16bc4
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hw/dmx/input/dmxinputinit.c
View File

@ -472,8 +472,10 @@ static int dmxDeviceOnOff(DeviceIntPtr pDevice, int what)
memset(&info, 0, sizeof(info)); memset(&info, 0, sizeof(info));
switch (what) { switch (what) {
case DEVICE_INIT: case DEVICE_INIT:
if (dmxLocal->init) dmxLocal->init(pDev); if (dmxLocal->init)
if (dmxLocal->get_info) dmxLocal->get_info(pDev, &info); dmxLocal->init(pDev);
if (dmxLocal->get_info)
dmxLocal->get_info(pDev, &info);
if (info.keyboard) { /* XKEYBOARD makes this a special case */ if (info.keyboard) { /* XKEYBOARD makes this a special case */
dmxKeyboardOn(pDevice, &info); dmxKeyboardOn(pDevice, &info);
break; break;
@ -594,7 +596,8 @@ static void dmxProcessInputEvents(DMXInputInfo *dmxInput)
#if 00 /*BP*/ #if 00 /*BP*/
miPointerUpdate(); miPointerUpdate();
#endif #endif
if (dmxInput->detached) return; if (dmxInput->detached)
return;
for (i = 0; i < dmxInput->numDevs; i += dmxInput->devs[i]->binding) for (i = 0; i < dmxInput->numDevs; i += dmxInput->devs[i]->binding)
if (dmxInput->devs[i]->process_input) { if (dmxInput->devs[i]->process_input) {
#if 11 /*BP*/ #if 11 /*BP*/
@ -633,7 +636,8 @@ static void dmxUpdateWindowInformation(DMXInputInfo *dmxInput,
} }
#endif #endif
if (dmxInput->detached) return; if (dmxInput->detached)
return;
for (i = 0; i < dmxInput->numDevs; i += dmxInput->devs[i]->binding) for (i = 0; i < dmxInput->numDevs; i += dmxInput->devs[i]->binding)
if (dmxInput->devs[i]->update_info) if (dmxInput->devs[i]->update_info)
dmxInput->devs[i]->update_info(dmxInput->devs[i]->private, dmxInput->devs[i]->update_info(dmxInput->devs[i]->private,
@ -644,7 +648,8 @@ static void dmxCollectAll(DMXInputInfo *dmxInput)
{ {
int i; int i;
if (dmxInput->detached) return; if (dmxInput->detached)
return;
for (i = 0; i < dmxInput->numDevs; i += dmxInput->devs[i]->binding) for (i = 0; i < dmxInput->numDevs; i += dmxInput->devs[i]->binding)
if (dmxInput->devs[i]->collect_events) if (dmxInput->devs[i]->collect_events)
dmxInput->devs[i]->collect_events(&dmxInput->devs[i] dmxInput->devs[i]->collect_events(&dmxInput->devs[i]
@ -741,7 +746,8 @@ static DeviceIntPtr dmxAddDevice(DMXLocalInputInfoPtr dmxLocal)
char *devname; char *devname;
DMXInputInfo *dmxInput; DMXInputInfo *dmxInput;
if (!dmxLocal) return NULL; if (!dmxLocal)
return NULL;
dmxInput = &dmxInputs[dmxLocal->inputIdx]; dmxInput = &dmxInputs[dmxLocal->inputIdx];
if (dmxLocal->sendsCore) { if (dmxLocal->sendsCore) {