From d6d3999ccb2cb72d55820770260172eccbbb68d7 Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 16 Apr 2012 09:17:34 +0200 Subject: libX11 xserver pixman mesa git update 16 Apr 2012 --- xorg-server/hw/xfree86/dixmods/extmod/xvmod.c | 1 - xorg-server/hw/xfree86/dixmods/extmod/xvmodproc.h | 8 ++++---- xorg-server/hw/xfree86/dixmods/recordmod.c | 23 +++++++++++------------ xorg-server/hw/xfree86/dixmods/xkbKillSrv.c | 2 +- xorg-server/hw/xfree86/dixmods/xkbPrivate.c | 19 ++++++++++--------- xorg-server/hw/xfree86/dixmods/xkbVT.c | 8 ++++---- 6 files changed, 30 insertions(+), 31 deletions(-) (limited to 'xorg-server/hw/xfree86/dixmods') diff --git a/xorg-server/hw/xfree86/dixmods/extmod/xvmod.c b/xorg-server/hw/xfree86/dixmods/extmod/xvmod.c index 955104679..97616c705 100644 --- a/xorg-server/hw/xfree86/dixmods/extmod/xvmod.c +++ b/xorg-server/hw/xfree86/dixmods/extmod/xvmod.c @@ -20,4 +20,3 @@ XvRegister(void) XvGetRTPortProc = XvGetRTPort; XvMCScreenInitProc = XvMCScreenInit; } - diff --git a/xorg-server/hw/xfree86/dixmods/extmod/xvmodproc.h b/xorg-server/hw/xfree86/dixmods/extmod/xvmodproc.h index b39c915b4..be51e559d 100644 --- a/xorg-server/hw/xfree86/dixmods/extmod/xvmodproc.h +++ b/xorg-server/hw/xfree86/dixmods/extmod/xvmodproc.h @@ -5,9 +5,9 @@ #include "xvmcext.h" -extern DevPrivateKey (*XvGetScreenKeyProc)(void); -extern unsigned long (*XvGetRTPortProc)(void); -extern int (*XvScreenInitProc)(ScreenPtr); -extern int (*XvMCScreenInitProc)(ScreenPtr, int, XvMCAdaptorPtr); +extern DevPrivateKey (*XvGetScreenKeyProc) (void); +extern unsigned long (*XvGetRTPortProc) (void); +extern int (*XvScreenInitProc) (ScreenPtr); +extern int (*XvMCScreenInitProc) (ScreenPtr, int, XvMCAdaptorPtr); extern void XvRegister(void); diff --git a/xorg-server/hw/xfree86/dixmods/recordmod.c b/xorg-server/hw/xfree86/dixmods/recordmod.c index 63d340e75..b75cc3fdb 100644 --- a/xorg-server/hw/xfree86/dixmods/recordmod.c +++ b/xorg-server/hw/xfree86/dixmods/recordmod.c @@ -19,16 +19,16 @@ static ExtensionModule recordExt = { }; static XF86ModuleVersionInfo VersRec = { - "record", - MODULEVENDORSTRING, - MODINFOSTRING1, - MODINFOSTRING2, - XORG_VERSION_CURRENT, - 1, 13, 0, - ABI_CLASS_EXTENSION, - ABI_EXTENSION_VERSION, - MOD_CLASS_EXTENSION, - {0,0,0,0} + "record", + MODULEVENDORSTRING, + MODINFOSTRING1, + MODINFOSTRING2, + XORG_VERSION_CURRENT, + 1, 13, 0, + ABI_CLASS_EXTENSION, + ABI_EXTENSION_VERSION, + MOD_CLASS_EXTENSION, + {0, 0, 0, 0} }; _X_EXPORT XF86ModuleData recordModuleData = { &VersRec, recordSetup, NULL }; @@ -39,6 +39,5 @@ recordSetup(pointer module, pointer opts, int *errmaj, int *errmin) LoadExtension(&recordExt, FALSE); /* Need a non-NULL return value to indicate success */ - return (pointer)1; + return (pointer) 1; } - diff --git a/xorg-server/hw/xfree86/dixmods/xkbKillSrv.c b/xorg-server/hw/xfree86/dixmods/xkbKillSrv.c index 0f4e25c0c..6dd21dd51 100644 --- a/xorg-server/hw/xfree86/dixmods/xkbKillSrv.c +++ b/xorg-server/hw/xfree86/dixmods/xkbKillSrv.c @@ -45,7 +45,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "xf86.h" int -XkbDDXTerminateServer(DeviceIntPtr dev,KeyCode key,XkbAction *act) +XkbDDXTerminateServer(DeviceIntPtr dev, KeyCode key, XkbAction *act) { if (dev != inputInfo.keyboard) xf86ProcessActionEvent(ACTION_TERMINATE, NULL); diff --git a/xorg-server/hw/xfree86/dixmods/xkbPrivate.c b/xorg-server/hw/xfree86/dixmods/xkbPrivate.c index 06d1c2b3d..574590f28 100644 --- a/xorg-server/hw/xfree86/dixmods/xkbPrivate.c +++ b/xorg-server/hw/xfree86/dixmods/xkbPrivate.c @@ -18,31 +18,32 @@ #include "xf86.h" int -XkbDDXPrivate(DeviceIntPtr dev,KeyCode key,XkbAction *act) +XkbDDXPrivate(DeviceIntPtr dev, KeyCode key, XkbAction *act) { XkbAnyAction *xf86act = &(act->any); - char msgbuf[XkbAnyActionDataSize+1]; + char msgbuf[XkbAnyActionDataSize + 1]; if (xf86act->type == XkbSA_XFree86Private) { memcpy(msgbuf, xf86act->data, XkbAnyActionDataSize); - msgbuf[XkbAnyActionDataSize]= '\0'; - if (strcasecmp(msgbuf, "-vmode")==0) + msgbuf[XkbAnyActionDataSize] = '\0'; + if (strcasecmp(msgbuf, "-vmode") == 0) xf86ProcessActionEvent(ACTION_PREV_MODE, NULL); - else if (strcasecmp(msgbuf, "+vmode")==0) + else if (strcasecmp(msgbuf, "+vmode") == 0) xf86ProcessActionEvent(ACTION_NEXT_MODE, NULL); - else if (strcasecmp(msgbuf, "prgrbs")==0) { + else if (strcasecmp(msgbuf, "prgrbs") == 0) { DeviceIntPtr tmp; + xf86Msg(X_INFO, "Printing all currently active device grabs:\n"); for (tmp = inputInfo.devices; tmp; tmp = tmp->next) if (tmp->deviceGrab.grab) PrintDeviceGrabInfo(tmp); xf86Msg(X_INFO, "End list of active device grabs\n"); } - else if (strcasecmp(msgbuf, "ungrab")==0) + else if (strcasecmp(msgbuf, "ungrab") == 0) UngrabAllDevices(FALSE); - else if (strcasecmp(msgbuf, "clsgrb")==0) + else if (strcasecmp(msgbuf, "clsgrb") == 0) UngrabAllDevices(TRUE); - else if (strcasecmp(msgbuf, "prwins")==0) + else if (strcasecmp(msgbuf, "prwins") == 0) PrintWindowTree(); } diff --git a/xorg-server/hw/xfree86/dixmods/xkbVT.c b/xorg-server/hw/xfree86/dixmods/xkbVT.c index 13bd6f41e..4ca4451d0 100644 --- a/xorg-server/hw/xfree86/dixmods/xkbVT.c +++ b/xorg-server/hw/xfree86/dixmods/xkbVT.c @@ -45,18 +45,18 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "xf86.h" int -XkbDDXSwitchScreen(DeviceIntPtr dev,KeyCode key,XkbAction *act) +XkbDDXSwitchScreen(DeviceIntPtr dev, KeyCode key, XkbAction *act) { int scrnnum = XkbSAScreen(&act->screen); if (act->screen.flags & XkbSA_SwitchApplication) { if (act->screen.flags & XkbSA_SwitchAbsolute) - xf86ProcessActionEvent(ACTION_SWITCHSCREEN,(void *) &scrnnum); + xf86ProcessActionEvent(ACTION_SWITCHSCREEN, (void *) &scrnnum); else { if (scrnnum < 0) - xf86ProcessActionEvent(ACTION_SWITCHSCREEN_PREV,NULL); + xf86ProcessActionEvent(ACTION_SWITCHSCREEN_PREV, NULL); else - xf86ProcessActionEvent(ACTION_SWITCHSCREEN_NEXT,NULL); + xf86ProcessActionEvent(ACTION_SWITCHSCREEN_NEXT, NULL); } } -- cgit v1.2.3