mirror of
https://github.com/X11Libre/xserver.git
synced 2026-10-04 22:36:10 +00:00
xc/programs/Xserver/dix/atom.c
xc/programs/Xserver/dix/colormap.c xc/programs/Xserver/dix/cursor.c xc/programs/Xserver/dix/devices.c xc/programs/Xserver/dix/dispatch.c xc/programs/Xserver/dix/dixfonts.c xc/programs/Xserver/dix/dixutils.c xc/programs/Xserver/dix/events.c xc/programs/Xserver/dix/extension.c xc/programs/Xserver/dix/gc.c xc/programs/Xserver/dix/glyphcurs.c xc/programs/Xserver/dix/grabs.c xc/programs/Xserver/dix/main.c xc/programs/Xserver/dix/pixmap.c xc/programs/Xserver/dix/privates.c xc/programs/Xserver/dix/property.c xc/programs/Xserver/dix/resource.c xc/programs/Xserver/dix/swaprep.c xc/programs/Xserver/dix/swapreq.c //bugs.freedesktop.org/show_bug.cgi?id=2560) attachment #2037 (https://bugs.freedesktop.org/attachment.cgi?id=2037) ANSI-fy Xserver/dix code. The conversion preserves the comments which annotate variables. These have been moved into doxygen(esque?) "stubs" above each function. Patch by Mike Owens <etc@filespanker.com>.
This commit is contained in:
Roland Mainz
parent
cb0aa2b4d8
commit
8d0e520721
20 changed files with 761 additions and 1701 deletions
172
dix/devices.c
172
dix/devices.c
|
|
@ -78,9 +78,7 @@ SOFTWARE.
|
|||
#include "dixevents.h"
|
||||
|
||||
DeviceIntPtr
|
||||
_AddInputDevice(deviceProc, autoStart)
|
||||
DeviceProc deviceProc;
|
||||
Bool autoStart;
|
||||
_AddInputDevice(DeviceProc deviceProc, Bool autoStart)
|
||||
{
|
||||
register DeviceIntPtr dev;
|
||||
|
||||
|
|
@ -127,8 +125,7 @@ _AddInputDevice(deviceProc, autoStart)
|
|||
}
|
||||
|
||||
Bool
|
||||
EnableDevice(dev)
|
||||
register DeviceIntPtr dev;
|
||||
EnableDevice(register DeviceIntPtr dev)
|
||||
{
|
||||
register DeviceIntPtr *prev;
|
||||
|
||||
|
|
@ -146,8 +143,7 @@ EnableDevice(dev)
|
|||
}
|
||||
|
||||
Bool
|
||||
DisableDevice(dev)
|
||||
register DeviceIntPtr dev;
|
||||
DisableDevice(register DeviceIntPtr dev)
|
||||
{
|
||||
register DeviceIntPtr *prev;
|
||||
|
||||
|
|
@ -302,8 +298,7 @@ CloseDownDevices()
|
|||
}
|
||||
|
||||
void
|
||||
RemoveDevice(dev)
|
||||
register DeviceIntPtr dev;
|
||||
RemoveDevice(register DeviceIntPtr dev)
|
||||
{
|
||||
register DeviceIntPtr prev,tmp,next;
|
||||
|
||||
|
|
@ -353,8 +348,7 @@ NumMotionEvents()
|
|||
}
|
||||
|
||||
void
|
||||
_RegisterPointerDevice(device)
|
||||
DeviceIntPtr device;
|
||||
_RegisterPointerDevice(DeviceIntPtr device)
|
||||
{
|
||||
inputInfo.pointer = device;
|
||||
#ifdef XKB
|
||||
|
|
@ -380,8 +374,7 @@ _RegisterPointerDevice(device)
|
|||
}
|
||||
|
||||
void
|
||||
_RegisterKeyboardDevice(device)
|
||||
DeviceIntPtr device;
|
||||
_RegisterKeyboardDevice(DeviceIntPtr device)
|
||||
{
|
||||
inputInfo.keyboard = device;
|
||||
#ifdef XKB
|
||||
|
|
@ -419,8 +412,7 @@ LookupPointerDevice()
|
|||
}
|
||||
|
||||
DevicePtr
|
||||
LookupDevice(id)
|
||||
int id;
|
||||
LookupDevice(int id)
|
||||
{
|
||||
DeviceIntPtr dev;
|
||||
|
||||
|
|
@ -436,8 +428,7 @@ LookupDevice(id)
|
|||
}
|
||||
|
||||
void
|
||||
QueryMinMaxKeyCodes(minCode, maxCode)
|
||||
KeyCode *minCode, *maxCode;
|
||||
QueryMinMaxKeyCodes(KeyCode *minCode, KeyCode *maxCode)
|
||||
{
|
||||
if (inputInfo.keyboard) {
|
||||
*minCode = inputInfo.keyboard->key->curKeySyms.minKeyCode;
|
||||
|
|
@ -446,8 +437,7 @@ QueryMinMaxKeyCodes(minCode, maxCode)
|
|||
}
|
||||
|
||||
Bool
|
||||
SetKeySymsMap(dst, src)
|
||||
register KeySymsPtr dst, src;
|
||||
SetKeySymsMap(register KeySymsPtr dst, register KeySymsPtr src)
|
||||
{
|
||||
int i, j;
|
||||
int rowDif = src->minKeyCode - dst->minKeyCode;
|
||||
|
|
@ -538,10 +528,7 @@ InitModMap(register KeyClassPtr keyc)
|
|||
}
|
||||
|
||||
Bool
|
||||
InitKeyClassDeviceStruct(dev, pKeySyms, pModifiers)
|
||||
DeviceIntPtr dev;
|
||||
KeySymsPtr pKeySyms;
|
||||
CARD8 pModifiers[];
|
||||
InitKeyClassDeviceStruct(DeviceIntPtr dev, KeySymsPtr pKeySyms, CARD8 pModifiers[])
|
||||
{
|
||||
int i;
|
||||
register KeyClassPtr keyc;
|
||||
|
|
@ -579,10 +566,8 @@ InitKeyClassDeviceStruct(dev, pKeySyms, pModifiers)
|
|||
}
|
||||
|
||||
Bool
|
||||
InitButtonClassDeviceStruct(dev, numButtons, map)
|
||||
register DeviceIntPtr dev;
|
||||
int numButtons;
|
||||
CARD8 *map;
|
||||
InitButtonClassDeviceStruct(register DeviceIntPtr dev, int numButtons,
|
||||
CARD8 *map)
|
||||
{
|
||||
register ButtonClassPtr butc;
|
||||
int i;
|
||||
|
|
@ -605,12 +590,9 @@ InitButtonClassDeviceStruct(dev, numButtons, map)
|
|||
}
|
||||
|
||||
Bool
|
||||
InitValuatorClassDeviceStruct(dev, numAxes, motionProc, numMotionEvents, mode)
|
||||
DeviceIntPtr dev;
|
||||
ValuatorMotionProcPtr motionProc;
|
||||
int numAxes;
|
||||
int numMotionEvents;
|
||||
int mode;
|
||||
InitValuatorClassDeviceStruct(DeviceIntPtr dev, int numAxes,
|
||||
ValuatorMotionProcPtr motionProc,
|
||||
int numMotionEvents, int mode)
|
||||
{
|
||||
int i;
|
||||
register ValuatorClassPtr valc;
|
||||
|
|
@ -634,8 +616,7 @@ InitValuatorClassDeviceStruct(dev, numAxes, motionProc, numMotionEvents, mode)
|
|||
}
|
||||
|
||||
Bool
|
||||
InitFocusClassDeviceStruct(dev)
|
||||
DeviceIntPtr dev;
|
||||
InitFocusClassDeviceStruct(DeviceIntPtr dev)
|
||||
{
|
||||
register FocusClassPtr focc;
|
||||
|
||||
|
|
@ -653,10 +634,8 @@ InitFocusClassDeviceStruct(dev)
|
|||
}
|
||||
|
||||
Bool
|
||||
InitKbdFeedbackClassDeviceStruct(dev, bellProc, controlProc)
|
||||
DeviceIntPtr dev;
|
||||
BellProcPtr bellProc;
|
||||
KbdCtrlProcPtr controlProc;
|
||||
InitKbdFeedbackClassDeviceStruct(DeviceIntPtr dev, BellProcPtr bellProc,
|
||||
KbdCtrlProcPtr controlProc)
|
||||
{
|
||||
register KbdFeedbackPtr feedc;
|
||||
|
||||
|
|
@ -683,9 +662,7 @@ InitKbdFeedbackClassDeviceStruct(dev, bellProc, controlProc)
|
|||
}
|
||||
|
||||
Bool
|
||||
InitPtrFeedbackClassDeviceStruct(dev, controlProc)
|
||||
DeviceIntPtr dev;
|
||||
PtrCtrlProcPtr controlProc;
|
||||
InitPtrFeedbackClassDeviceStruct(DeviceIntPtr dev, PtrCtrlProcPtr controlProc)
|
||||
{
|
||||
register PtrFeedbackPtr feedc;
|
||||
|
||||
|
|
@ -726,13 +703,9 @@ IntegerCtrl defaultIntegerControl = {
|
|||
0};
|
||||
|
||||
Bool
|
||||
InitStringFeedbackClassDeviceStruct (dev, controlProc, max_symbols,
|
||||
num_symbols_supported, symbols)
|
||||
DeviceIntPtr dev;
|
||||
StringCtrlProcPtr controlProc;
|
||||
int max_symbols;
|
||||
int num_symbols_supported;
|
||||
KeySym *symbols;
|
||||
InitStringFeedbackClassDeviceStruct (
|
||||
DeviceIntPtr dev, StringCtrlProcPtr controlProc,
|
||||
int max_symbols, int num_symbols_supported, KeySym *symbols)
|
||||
{
|
||||
int i;
|
||||
register StringFeedbackPtr feedc;
|
||||
|
|
@ -770,10 +743,8 @@ InitStringFeedbackClassDeviceStruct (dev, controlProc, max_symbols,
|
|||
}
|
||||
|
||||
Bool
|
||||
InitBellFeedbackClassDeviceStruct (dev, bellProc, controlProc)
|
||||
DeviceIntPtr dev;
|
||||
BellProcPtr bellProc;
|
||||
BellCtrlProcPtr controlProc;
|
||||
InitBellFeedbackClassDeviceStruct (DeviceIntPtr dev, BellProcPtr bellProc,
|
||||
BellCtrlProcPtr controlProc)
|
||||
{
|
||||
register BellFeedbackPtr feedc;
|
||||
|
||||
|
|
@ -792,9 +763,7 @@ InitBellFeedbackClassDeviceStruct (dev, bellProc, controlProc)
|
|||
}
|
||||
|
||||
Bool
|
||||
InitLedFeedbackClassDeviceStruct (dev, controlProc)
|
||||
DeviceIntPtr dev;
|
||||
LedCtrlProcPtr controlProc;
|
||||
InitLedFeedbackClassDeviceStruct (DeviceIntPtr dev, LedCtrlProcPtr controlProc)
|
||||
{
|
||||
register LedFeedbackPtr feedc;
|
||||
|
||||
|
|
@ -815,9 +784,7 @@ InitLedFeedbackClassDeviceStruct (dev, controlProc)
|
|||
}
|
||||
|
||||
Bool
|
||||
InitIntegerFeedbackClassDeviceStruct (dev, controlProc)
|
||||
DeviceIntPtr dev;
|
||||
IntegerCtrlProcPtr controlProc;
|
||||
InitIntegerFeedbackClassDeviceStruct (DeviceIntPtr dev, IntegerCtrlProcPtr controlProc)
|
||||
{
|
||||
register IntegerFeedbackPtr feedc;
|
||||
|
||||
|
|
@ -835,14 +802,9 @@ InitIntegerFeedbackClassDeviceStruct (dev, controlProc)
|
|||
}
|
||||
|
||||
Bool
|
||||
InitPointerDeviceStruct(device, map, numButtons, motionProc, controlProc,
|
||||
numMotionEvents)
|
||||
DevicePtr device;
|
||||
CARD8 *map;
|
||||
int numButtons;
|
||||
PtrCtrlProcPtr controlProc;
|
||||
ValuatorMotionProcPtr motionProc;
|
||||
int numMotionEvents;
|
||||
InitPointerDeviceStruct(DevicePtr device, CARD8 *map, int numButtons,
|
||||
ValuatorMotionProcPtr motionProc,
|
||||
PtrCtrlProcPtr controlProc, int numMotionEvents)
|
||||
{
|
||||
DeviceIntPtr dev = (DeviceIntPtr)device;
|
||||
|
||||
|
|
@ -853,12 +815,9 @@ InitPointerDeviceStruct(device, map, numButtons, motionProc, controlProc,
|
|||
}
|
||||
|
||||
Bool
|
||||
InitKeyboardDeviceStruct(device, pKeySyms, pModifiers, bellProc, controlProc)
|
||||
DevicePtr device;
|
||||
KeySymsPtr pKeySyms;
|
||||
CARD8 pModifiers[];
|
||||
BellProcPtr bellProc;
|
||||
KbdCtrlProcPtr controlProc;
|
||||
InitKeyboardDeviceStruct(DevicePtr device, KeySymsPtr pKeySyms,
|
||||
CARD8 pModifiers[], BellProcPtr bellProc,
|
||||
KbdCtrlProcPtr controlProc)
|
||||
{
|
||||
DeviceIntPtr dev = (DeviceIntPtr)device;
|
||||
|
||||
|
|
@ -868,10 +827,8 @@ InitKeyboardDeviceStruct(device, pKeySyms, pModifiers, bellProc, controlProc)
|
|||
}
|
||||
|
||||
void
|
||||
SendMappingNotify(request, firstKeyCode, count, client)
|
||||
unsigned int request, count;
|
||||
unsigned int firstKeyCode;
|
||||
ClientPtr client;
|
||||
SendMappingNotify(unsigned request, unsigned firstKeyCode, unsigned count,
|
||||
ClientPtr client)
|
||||
{
|
||||
int i;
|
||||
xEvent event;
|
||||
|
|
@ -914,11 +871,7 @@ SendMappingNotify(request, firstKeyCode, count, client)
|
|||
* sort it to do the checking. How often is it called? Just being lazy?
|
||||
*/
|
||||
Bool
|
||||
BadDeviceMap(buff, length, low, high, errval)
|
||||
register BYTE *buff;
|
||||
int length;
|
||||
unsigned low, high;
|
||||
XID *errval;
|
||||
BadDeviceMap(register BYTE *buff, int length, unsigned low, unsigned high, XID *errval)
|
||||
{
|
||||
register int i, j;
|
||||
|
||||
|
|
@ -966,8 +919,7 @@ AllModifierKeysAreUp(dev, map1, per1, map2, per2)
|
|||
}
|
||||
|
||||
int
|
||||
ProcSetModifierMapping(client)
|
||||
ClientPtr client;
|
||||
ProcSetModifierMapping(ClientPtr client)
|
||||
{
|
||||
xSetModifierMappingReply rep;
|
||||
REQUEST(xSetModifierMappingReq);
|
||||
|
|
@ -1078,8 +1030,7 @@ ProcSetModifierMapping(client)
|
|||
}
|
||||
|
||||
int
|
||||
ProcGetModifierMapping(client)
|
||||
ClientPtr client;
|
||||
ProcGetModifierMapping(ClientPtr client)
|
||||
{
|
||||
xGetModifierMappingReply rep;
|
||||
register KeyClassPtr keyc = inputInfo.keyboard->key;
|
||||
|
|
@ -1100,8 +1051,7 @@ ProcGetModifierMapping(client)
|
|||
}
|
||||
|
||||
int
|
||||
ProcChangeKeyboardMapping(client)
|
||||
ClientPtr client;
|
||||
ProcChangeKeyboardMapping(ClientPtr client)
|
||||
{
|
||||
REQUEST(xChangeKeyboardMappingReq);
|
||||
unsigned len;
|
||||
|
|
@ -1146,8 +1096,7 @@ ProcChangeKeyboardMapping(client)
|
|||
}
|
||||
|
||||
int
|
||||
ProcSetPointerMapping(client)
|
||||
ClientPtr client;
|
||||
ProcSetPointerMapping(ClientPtr client)
|
||||
{
|
||||
REQUEST(xSetPointerMappingReq);
|
||||
BYTE *map;
|
||||
|
|
@ -1186,8 +1135,7 @@ ProcSetPointerMapping(client)
|
|||
}
|
||||
|
||||
int
|
||||
ProcGetKeyboardMapping(client)
|
||||
ClientPtr client;
|
||||
ProcGetKeyboardMapping(ClientPtr client)
|
||||
{
|
||||
xGetKeyboardMappingReply rep;
|
||||
REQUEST(xGetKeyboardMappingReq);
|
||||
|
|
@ -1225,8 +1173,7 @@ ProcGetKeyboardMapping(client)
|
|||
}
|
||||
|
||||
int
|
||||
ProcGetPointerMapping(client)
|
||||
ClientPtr client;
|
||||
ProcGetPointerMapping(ClientPtr client)
|
||||
{
|
||||
xGetPointerMappingReply rep;
|
||||
ButtonClassPtr butc = inputInfo.pointer->button;
|
||||
|
|
@ -1242,10 +1189,7 @@ ProcGetPointerMapping(client)
|
|||
}
|
||||
|
||||
void
|
||||
NoteLedState(keybd, led, on)
|
||||
DeviceIntPtr keybd;
|
||||
int led;
|
||||
Bool on;
|
||||
NoteLedState(DeviceIntPtr keybd, int led, Bool on)
|
||||
{
|
||||
KeybdCtrl *ctrl = &keybd->kbdfeed->ctrl;
|
||||
if (on)
|
||||
|
|
@ -1255,8 +1199,7 @@ NoteLedState(keybd, led, on)
|
|||
}
|
||||
|
||||
int
|
||||
Ones(mask) /* HACKMEM 169 */
|
||||
unsigned long mask;
|
||||
Ones(unsigned long mask) /* HACKMEM 169 */
|
||||
{
|
||||
register unsigned long y;
|
||||
|
||||
|
|
@ -1266,8 +1209,7 @@ Ones(mask) /* HACKMEM 169 */
|
|||
}
|
||||
|
||||
int
|
||||
ProcChangeKeyboardControl (client)
|
||||
ClientPtr client;
|
||||
ProcChangeKeyboardControl (ClientPtr client)
|
||||
{
|
||||
#define DO_ALL (-1)
|
||||
KeybdCtrl ctrl;
|
||||
|
|
@ -1457,8 +1399,7 @@ ProcChangeKeyboardControl (client)
|
|||
}
|
||||
|
||||
int
|
||||
ProcGetKeyboardControl (client)
|
||||
ClientPtr client;
|
||||
ProcGetKeyboardControl (ClientPtr client)
|
||||
{
|
||||
int i;
|
||||
register KeybdCtrl *ctrl = &inputInfo.keyboard->kbdfeed->ctrl;
|
||||
|
|
@ -1481,8 +1422,7 @@ ProcGetKeyboardControl (client)
|
|||
}
|
||||
|
||||
int
|
||||
ProcBell(client)
|
||||
ClientPtr client;
|
||||
ProcBell(ClientPtr client)
|
||||
{
|
||||
register DeviceIntPtr keybd = inputInfo.keyboard;
|
||||
int base = keybd->kbdfeed->ctrl.bell;
|
||||
|
|
@ -1511,8 +1451,7 @@ ProcBell(client)
|
|||
}
|
||||
|
||||
int
|
||||
ProcChangePointerControl(client)
|
||||
ClientPtr client;
|
||||
ProcChangePointerControl(ClientPtr client)
|
||||
{
|
||||
DeviceIntPtr mouse = inputInfo.pointer;
|
||||
PtrCtrl ctrl; /* might get BadValue part way through */
|
||||
|
|
@ -1566,8 +1505,7 @@ ProcChangePointerControl(client)
|
|||
}
|
||||
|
||||
int
|
||||
ProcGetPointerControl(client)
|
||||
ClientPtr client;
|
||||
ProcGetPointerControl(ClientPtr client)
|
||||
{
|
||||
register PtrCtrl *ctrl = &inputInfo.pointer->ptrfeed->ctrl;
|
||||
xGetPointerControlReply rep;
|
||||
|
|
@ -1584,9 +1522,7 @@ ProcGetPointerControl(client)
|
|||
}
|
||||
|
||||
void
|
||||
MaybeStopHint(dev, client)
|
||||
register DeviceIntPtr dev;
|
||||
ClientPtr client;
|
||||
MaybeStopHint(register DeviceIntPtr dev, ClientPtr client)
|
||||
{
|
||||
GrabPtr grab = dev->grab;
|
||||
|
||||
|
|
@ -1602,8 +1538,7 @@ MaybeStopHint(dev, client)
|
|||
}
|
||||
|
||||
int
|
||||
ProcGetMotionEvents(client)
|
||||
ClientPtr client;
|
||||
ProcGetMotionEvents(ClientPtr client)
|
||||
{
|
||||
WindowPtr pWin;
|
||||
xTimecoord * coords = (xTimecoord *) NULL;
|
||||
|
|
@ -1670,8 +1605,7 @@ ProcGetMotionEvents(client)
|
|||
}
|
||||
|
||||
int
|
||||
ProcQueryKeymap(client)
|
||||
ClientPtr client;
|
||||
ProcQueryKeymap(ClientPtr client)
|
||||
{
|
||||
xQueryKeymapReply rep;
|
||||
int i;
|
||||
|
|
@ -1703,9 +1637,7 @@ ProcQueryKeymap(client)
|
|||
#undef AddInputDevice
|
||||
|
||||
DevicePtr
|
||||
AddInputDevice(
|
||||
DeviceProc deviceProc,
|
||||
Bool autoStart)
|
||||
AddInputDevice(DeviceProc deviceProc, Bool autoStart)
|
||||
{
|
||||
return (DevicePtr)_AddInputDevice(deviceProc, autoStart);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue