diff options
Diffstat (limited to 'lbx/lbxtags.c')
| -rw-r--r-- | lbx/lbxtags.c | 59 |
1 files changed, 27 insertions, 32 deletions
diff --git a/lbx/lbxtags.c b/lbx/lbxtags.c index b2bc40ade..5b1d65a4a 100644 --- a/lbx/lbxtags.c +++ b/lbx/lbxtags.c @@ -46,30 +46,31 @@ in this Software without prior written authorization from The Open Group. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ +/* $XFree86: xc/programs/Xserver/lbx/lbxtags.c,v 1.4 2001/12/14 20:00:01 dawes Exp $ */ #include "X.h" #include "misc.h" #include "lbxdata.h" #include "resource.h" +#include "colormapst.h" +#include "propertyst.h" #include "lbxtags.h" #define _XLBX_SERVER_ #include "lbxstr.h" #include "propertyst.h" -static int tag_free(); - static RESTYPE TagResType; +extern int _lbx_fi_junklen; + /* ARGSUSED */ static int -tag_free(data, id) - pointer data; - XID id; +tag_free(pointer data, + XID id) { TagData td = (TagData) data; FontTagInfoPtr ftip; char *t; - extern int _lbx_fi_junklen; if (td->global) *(td->global) = 0; @@ -88,21 +89,21 @@ tag_free(data, id) return 0; } -TagInit() +void +TagInit(void) { TagResType = CreateNewResourceType(tag_free); } XID -TagNewTag() +TagNewTag(void) { return FakeClientID(0); } void -TagClearProxy(tid, pid) - XID tid; - int pid; +TagClearProxy(XID tid, + int pid) { TagData td; @@ -112,9 +113,8 @@ TagClearProxy(tid, pid) } void -TagMarkProxy(tid, pid) - XID tid; - int pid; +TagMarkProxy(XID tid, + int pid) { TagData td; @@ -123,9 +123,8 @@ TagMarkProxy(tid, pid) } Bool -TagProxyMarked(tid, pid) - XID tid; - int pid; +TagProxyMarked(XID tid, + int pid) { TagData td; @@ -134,11 +133,10 @@ TagProxyMarked(tid, pid) } XID -TagSaveTag(dtype, size, data, global) - int dtype; - int size; - pointer data; - XID *global; +TagSaveTag(int dtype, + int size, + pointer data, + XID *global) { TagData td; @@ -162,8 +160,7 @@ TagSaveTag(dtype, size, data, global) } void -TagDeleteTag(tid) - XID tid; +TagDeleteTag(XID tid) { int pid; TagData td; @@ -192,8 +189,7 @@ TagDeleteTag(tid) } TagData -TagGetTag(tid) - XID tid; +TagGetTag(XID tid) { TagData td; @@ -202,10 +198,9 @@ TagGetTag(tid) } static void -LbxFlushTag(value, tid, cdata) - pointer value; - XID tid; - pointer cdata; +LbxFlushTag(pointer value, + XID tid, + pointer cdata) { TagData td = (TagData)value; LbxProxyPtr proxy = (LbxProxyPtr)cdata; @@ -231,8 +226,8 @@ LbxFlushTag(value, tid, cdata) /* * clear out markers for proxies */ -LbxFlushTags(proxy) - LbxProxyPtr proxy; +void +LbxFlushTags(LbxProxyPtr proxy) { FindClientResourcesByType(NULL, TagResType, LbxFlushTag, (pointer)proxy); } |