From eaa70945cb3f1a432b8c505ecede9ebc7769f36d Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 13 Feb 2012 08:47:19 +0100 Subject: libX11 libxcb mesa xserver mkfontscale git update 13 feb 2012 --- xorg-server/hw/xfree86/common/xf86Xinput.c | 10 ++-- xorg-server/hw/xfree86/dri2/dri2.c | 20 +++---- xorg-server/hw/xfree86/os-support/xf86_OSlib.h | 2 +- xorg-server/hw/xfree86/parser/InputClass.c | 76 +++++++++++++------------- xorg-server/hw/xfree86/parser/xf86Parser.h | 20 +++---- 5 files changed, 64 insertions(+), 64 deletions(-) (limited to 'xorg-server/hw') diff --git a/xorg-server/hw/xfree86/common/xf86Xinput.c b/xorg-server/hw/xfree86/common/xf86Xinput.c index fd40f28da..f6be99910 100644 --- a/xorg-server/hw/xfree86/common/xf86Xinput.c +++ b/xorg-server/hw/xfree86/common/xf86Xinput.c @@ -516,13 +516,13 @@ match_string_implicit(const char *attr, const char *pattern) * If a pattern in each list entry is matched, return TRUE. */ static Bool -MatchAttrToken(const char *attr, struct list *patterns, +MatchAttrToken(const char *attr, struct xorg_list *patterns, int (*compare)(const char *attr, const char *pattern)) { const xf86MatchGroup *group; /* If there are no patterns, accept the match */ - if (list_is_empty(patterns)) + if (xorg_list_is_empty(patterns)) return TRUE; /* If there are patterns but no attribute, reject the match */ @@ -533,7 +533,7 @@ MatchAttrToken(const char *attr, struct list *patterns, * Otherwise, iterate the list of patterns ensuring each entry has a * match. Each list entry is a separate Match line of the same type. */ - list_for_each_entry(group, patterns, entry) { + xorg_list_for_each_entry(group, patterns, entry) { char * const *cur; Bool match = FALSE; @@ -590,7 +590,7 @@ InputClassMatches(const XF86ConfInputClassPtr iclass, const InputInfoPtr idev, * MatchTag string * See if any of the device's tags match any of the MatchTag tokens. */ - if (!list_is_empty(&iclass->match_tag)) { + if (!xorg_list_is_empty(&iclass->match_tag)) { char * const *tag; Bool match; @@ -607,7 +607,7 @@ InputClassMatches(const XF86ConfInputClassPtr iclass, const InputInfoPtr idev, } /* MatchLayout string */ - if (!list_is_empty(&iclass->match_layout)) { + if (!xorg_list_is_empty(&iclass->match_layout)) { if (!MatchAttrToken(xf86ConfigLayout.id, &iclass->match_layout, match_string_implicit)) return FALSE; diff --git a/xorg-server/hw/xfree86/dri2/dri2.c b/xorg-server/hw/xfree86/dri2/dri2.c index d6441a234..5cc9068af 100644 --- a/xorg-server/hw/xfree86/dri2/dri2.c +++ b/xorg-server/hw/xfree86/dri2/dri2.c @@ -67,7 +67,7 @@ typedef struct _DRI2Screen *DRI2ScreenPtr; typedef struct _DRI2Drawable { DRI2ScreenPtr dri2_screen; DrawablePtr drawable; - struct list reference_list; + struct xorg_list reference_list; int width; int height; DRI2BufferPtr *buffers; @@ -179,7 +179,7 @@ DRI2AllocateDrawable(DrawablePtr pDraw) pPriv->swap_limit = 1; /* default to double buffering */ pPriv->last_swap_msc = 0; pPriv->last_swap_ust = 0; - list_init(&pPriv->reference_list); + xorg_list_init(&pPriv->reference_list); pPriv->serialNumber = DRI2DrawableSerial(pDraw); pPriv->needInvalidate = FALSE; @@ -229,7 +229,7 @@ typedef struct DRI2DrawableRefRec { XID dri2_id; DRI2InvalidateProcPtr invalidate; void *priv; - struct list link; + struct xorg_list link; } DRI2DrawableRefRec, *DRI2DrawableRefPtr; static DRI2DrawableRefPtr @@ -237,7 +237,7 @@ DRI2LookupDrawableRef(DRI2DrawablePtr pPriv, XID id) { DRI2DrawableRefPtr ref; - list_for_each_entry(ref, &pPriv->reference_list, link) { + xorg_list_for_each_entry(ref, &pPriv->reference_list, link) { if (ref->id == id) return ref; } @@ -270,7 +270,7 @@ DRI2AddDrawableRef(DRI2DrawablePtr pPriv, XID id, XID dri2_id, ref->dri2_id = dri2_id; ref->invalidate = invalidate; ref->priv = priv; - list_add(&ref->link, &pPriv->reference_list); + xorg_list_add(&ref->link, &pPriv->reference_list); return Success; } @@ -307,9 +307,9 @@ static int DRI2DrawableGone(pointer p, XID id) DrawablePtr pDraw; int i; - list_for_each_entry_safe(ref, next, &pPriv->reference_list, link) { + xorg_list_for_each_entry_safe(ref, next, &pPriv->reference_list, link) { if (ref->dri2_id == id) { - list_del(&ref->link); + xorg_list_del(&ref->link); /* If this was the last ref under this X drawable XID, * unregister the X drawable resource. */ if (!DRI2LookupDrawableRef(pPriv, ref->id)) @@ -319,13 +319,13 @@ static int DRI2DrawableGone(pointer p, XID id) } if (ref->id == id) { - list_del(&ref->link); + xorg_list_del(&ref->link); FreeResourceByType(ref->dri2_id, dri2DrawableRes, TRUE); free(ref); } } - if (!list_is_empty(&pPriv->reference_list)) + if (!xorg_list_is_empty(&pPriv->reference_list)) return Success; pDraw = pPriv->drawable; @@ -586,7 +586,7 @@ DRI2InvalidateDrawable(DrawablePtr pDraw) pPriv->needInvalidate = FALSE; - list_for_each_entry(ref, &pPriv->reference_list, link) + xorg_list_for_each_entry(ref, &pPriv->reference_list, link) ref->invalidate(pDraw, ref->priv, ref->id); } diff --git a/xorg-server/hw/xfree86/os-support/xf86_OSlib.h b/xorg-server/hw/xfree86/os-support/xf86_OSlib.h index 0a5861f49..45500dbdb 100644 --- a/xorg-server/hw/xfree86/os-support/xf86_OSlib.h +++ b/xorg-server/hw/xfree86/os-support/xf86_OSlib.h @@ -98,8 +98,8 @@ # if !(defined (sun) && defined (SVR4)) # include # include +# include # endif -# include # include # include # if defined(SVR4) && !defined(sun) diff --git a/xorg-server/hw/xfree86/parser/InputClass.c b/xorg-server/hw/xfree86/parser/InputClass.c index 919ae1869..c25117c1a 100644 --- a/xorg-server/hw/xfree86/parser/InputClass.c +++ b/xorg-server/hw/xfree86/parser/InputClass.c @@ -67,14 +67,14 @@ xf86ConfigSymTabRec InputClassTab[] = #define TOKEN_SEP "|" static void -add_group_entry(struct list *head, char **values) +add_group_entry(struct xorg_list *head, char **values) { xf86MatchGroup *group; group = malloc(sizeof(*group)); if (group) { group->values = values; - list_add(&group->entry, head); + xorg_list_add(&group->entry, head); } } @@ -87,15 +87,15 @@ xf86parseInputClassSection(void) parsePrologue(XF86ConfInputClassPtr, XF86ConfInputClassRec) /* Initialize MatchGroup lists */ - list_init(&ptr->match_product); - list_init(&ptr->match_vendor); - list_init(&ptr->match_device); - list_init(&ptr->match_os); - list_init(&ptr->match_pnpid); - list_init(&ptr->match_usbid); - list_init(&ptr->match_driver); - list_init(&ptr->match_tag); - list_init(&ptr->match_layout); + xorg_list_init(&ptr->match_product); + xorg_list_init(&ptr->match_vendor); + xorg_list_init(&ptr->match_device); + xorg_list_init(&ptr->match_os); + xorg_list_init(&ptr->match_pnpid); + xorg_list_init(&ptr->match_usbid); + xorg_list_init(&ptr->match_driver); + xorg_list_init(&ptr->match_tag); + xorg_list_init(&ptr->match_layout); while ((token = xf86getToken(InputClassTab)) != ENDSECTION) { switch (token) { @@ -274,63 +274,63 @@ xf86printInputClassSection (FILE * cf, XF86ConfInputClassPtr ptr) if (ptr->driver) fprintf(cf, "\tDriver \"%s\"\n", ptr->driver); - list_for_each_entry(group, &ptr->match_product, entry) { + xorg_list_for_each_entry(group, &ptr->match_product, entry) { fprintf(cf, "\tMatchProduct \""); for (cur = group->values; *cur; cur++) fprintf(cf, "%s%s", cur == group->values ? "" : TOKEN_SEP, *cur); fprintf(cf, "\"\n"); } - list_for_each_entry(group, &ptr->match_vendor, entry) { + xorg_list_for_each_entry(group, &ptr->match_vendor, entry) { fprintf(cf, "\tMatchVendor \""); for (cur = group->values; *cur; cur++) fprintf(cf, "%s%s", cur == group->values ? "" : TOKEN_SEP, *cur); fprintf(cf, "\"\n"); } - list_for_each_entry(group, &ptr->match_device, entry) { + xorg_list_for_each_entry(group, &ptr->match_device, entry) { fprintf(cf, "\tMatchDevicePath \""); for (cur = group->values; *cur; cur++) fprintf(cf, "%s%s", cur == group->values ? "" : TOKEN_SEP, *cur); fprintf(cf, "\"\n"); } - list_for_each_entry(group, &ptr->match_os, entry) { + xorg_list_for_each_entry(group, &ptr->match_os, entry) { fprintf(cf, "\tMatchOS \""); for (cur = group->values; *cur; cur++) fprintf(cf, "%s%s", cur == group->values ? "" : TOKEN_SEP, *cur); fprintf(cf, "\"\n"); } - list_for_each_entry(group, &ptr->match_pnpid, entry) { + xorg_list_for_each_entry(group, &ptr->match_pnpid, entry) { fprintf(cf, "\tMatchPnPID \""); for (cur = group->values; *cur; cur++) fprintf(cf, "%s%s", cur == group->values ? "" : TOKEN_SEP, *cur); fprintf(cf, "\"\n"); } - list_for_each_entry(group, &ptr->match_usbid, entry) { + xorg_list_for_each_entry(group, &ptr->match_usbid, entry) { fprintf(cf, "\tMatchUSBID \""); for (cur = group->values; *cur; cur++) fprintf(cf, "%s%s", cur == group->values ? "" : TOKEN_SEP, *cur); fprintf(cf, "\"\n"); } - list_for_each_entry(group, &ptr->match_driver, entry) { + xorg_list_for_each_entry(group, &ptr->match_driver, entry) { fprintf(cf, "\tMatchDriver \""); for (cur = group->values; *cur; cur++) fprintf(cf, "%s%s", cur == group->values ? "" : TOKEN_SEP, *cur); fprintf(cf, "\"\n"); } - list_for_each_entry(group, &ptr->match_tag, entry) { + xorg_list_for_each_entry(group, &ptr->match_tag, entry) { fprintf(cf, "\tMatchTag \""); for (cur = group->values; *cur; cur++) fprintf(cf, "%s%s", cur == group->values ? "" : TOKEN_SEP, *cur); fprintf(cf, "\"\n"); } - list_for_each_entry(group, &ptr->match_layout, entry) { + xorg_list_for_each_entry(group, &ptr->match_layout, entry) { fprintf(cf, "\tMatchLayout \""); for (cur = group->values; *cur; cur++) fprintf(cf, "%s%s", cur == group->values ? "" : TOKEN_SEP, @@ -374,56 +374,56 @@ xf86freeInputClassList (XF86ConfInputClassPtr ptr) TestFree(ptr->identifier); TestFree(ptr->driver); - list_for_each_entry_safe(group, next, &ptr->match_product, entry) { - list_del(&group->entry); + xorg_list_for_each_entry_safe(group, next, &ptr->match_product, entry) { + xorg_list_del(&group->entry); for (list = group->values; *list; list++) free(*list); free(group); } - list_for_each_entry_safe(group, next, &ptr->match_vendor, entry) { - list_del(&group->entry); + xorg_list_for_each_entry_safe(group, next, &ptr->match_vendor, entry) { + xorg_list_del(&group->entry); for (list = group->values; *list; list++) free(*list); free(group); } - list_for_each_entry_safe(group, next, &ptr->match_device, entry) { - list_del(&group->entry); + xorg_list_for_each_entry_safe(group, next, &ptr->match_device, entry) { + xorg_list_del(&group->entry); for (list = group->values; *list; list++) free(*list); free(group); } - list_for_each_entry_safe(group, next, &ptr->match_os, entry) { - list_del(&group->entry); + xorg_list_for_each_entry_safe(group, next, &ptr->match_os, entry) { + xorg_list_del(&group->entry); for (list = group->values; *list; list++) free(*list); free(group); } - list_for_each_entry_safe(group, next, &ptr->match_pnpid, entry) { - list_del(&group->entry); + xorg_list_for_each_entry_safe(group, next, &ptr->match_pnpid, entry) { + xorg_list_del(&group->entry); for (list = group->values; *list; list++) free(*list); free(group); } - list_for_each_entry_safe(group, next, &ptr->match_usbid, entry) { - list_del(&group->entry); + xorg_list_for_each_entry_safe(group, next, &ptr->match_usbid, entry) { + xorg_list_del(&group->entry); for (list = group->values; *list; list++) free(*list); free(group); } - list_for_each_entry_safe(group, next, &ptr->match_driver, entry) { - list_del(&group->entry); + xorg_list_for_each_entry_safe(group, next, &ptr->match_driver, entry) { + xorg_list_del(&group->entry); for (list = group->values; *list; list++) free(*list); free(group); } - list_for_each_entry_safe(group, next, &ptr->match_tag, entry) { - list_del(&group->entry); + xorg_list_for_each_entry_safe(group, next, &ptr->match_tag, entry) { + xorg_list_del(&group->entry); for (list = group->values; *list; list++) free(*list); free(group); } - list_for_each_entry_safe(group, next, &ptr->match_layout, entry) { - list_del(&group->entry); + xorg_list_for_each_entry_safe(group, next, &ptr->match_layout, entry) { + xorg_list_del(&group->entry); for (list = group->values; *list; list++) free(*list); free(group); diff --git a/xorg-server/hw/xfree86/parser/xf86Parser.h b/xorg-server/hw/xfree86/parser/xf86Parser.h index 7d4662b98..beac35404 100644 --- a/xorg-server/hw/xfree86/parser/xf86Parser.h +++ b/xorg-server/hw/xfree86/parser/xf86Parser.h @@ -340,7 +340,7 @@ xf86TriState; typedef struct { - struct list entry; + struct xorg_list entry; char **values; } xf86MatchGroup; @@ -350,15 +350,15 @@ typedef struct GenericListRec list; char *identifier; char *driver; - struct list match_product; - struct list match_vendor; - struct list match_device; - struct list match_os; - struct list match_pnpid; - struct list match_usbid; - struct list match_driver; - struct list match_tag; - struct list match_layout; + struct xorg_list match_product; + struct xorg_list match_vendor; + struct xorg_list match_device; + struct xorg_list match_os; + struct xorg_list match_pnpid; + struct xorg_list match_usbid; + struct xorg_list match_driver; + struct xorg_list match_tag; + struct xorg_list match_layout; xf86TriState is_keyboard; xf86TriState is_pointer; xf86TriState is_joystick; -- cgit v1.2.3