diff options
author | dkf <donal.k.fellows@manchester.ac.uk> | 2007-01-02 23:39:40 (GMT) |
---|---|---|
committer | dkf <donal.k.fellows@manchester.ac.uk> | 2007-01-02 23:39:40 (GMT) |
commit | ba7fa40f47b2346070ac01a694ba15c111ffb9eb (patch) | |
tree | fe1ed7354a514a4e4ee8d144aaeb2c5a791f2211 /xlib/xutil.c | |
parent | aadf8edf5d05ece9302d1acfac6441d36798a9f8 (diff) | |
download | tk-ba7fa40f47b2346070ac01a694ba15c111ffb9eb.zip tk-ba7fa40f47b2346070ac01a694ba15c111ffb9eb.tar.gz tk-ba7fa40f47b2346070ac01a694ba15c111ffb9eb.tar.bz2 |
Made the generic fake-X11 glue layer abide by the formatting rules of the core.
Diffstat (limited to 'xlib/xutil.c')
-rw-r--r-- | xlib/xutil.c | 47 |
1 files changed, 27 insertions, 20 deletions
diff --git a/xlib/xutil.c b/xlib/xutil.c index d803a1d..103d995 100644 --- a/xlib/xutil.c +++ b/xlib/xutil.c @@ -1,14 +1,14 @@ -/* +/* * xutil.c -- * * This function contains generic X emulation routines. * * Copyright (c) 1995-1996 Sun Microsystems, Inc. * - * See the file "license.terms" for information on usage and redistribution - * of this file, and for a DISCLAIMER OF ALL WARRANTIES. + * See the file "license.terms" for information on usage and redistribution of + * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: xutil.c,v 1.3 2004/03/17 18:15:50 das Exp $ + * RCS: @(#) $Id: xutil.c,v 1.4 2007/01/02 23:39:40 dkf Exp $ */ #include <stdlib.h> @@ -22,10 +22,9 @@ * * XInternAtom -- * - * This procedure simulates the XInternAtom function by calling - * Tk_Uid to get a unique id for every atom. This is only a - * partial implementation, since it doesn't work across - * applications. + * This procedure simulates the XInternAtom function by calling Tk_Uid to + * get a unique id for every atom. This is only a partial implementation, + * since it doesn't work across applications. * * Results: * A new Atom. @@ -37,13 +36,13 @@ */ Atom -XInternAtom(display, atom_name, only_if_exists) - Display* display; - _Xconst char* atom_name; - Bool only_if_exists; +XInternAtom( + Display *display, + _Xconst char *atom_name, + Bool only_if_exists) { static Atom atom = XA_LAST_PREDEFINED; - + display->request++; return ++atom; } @@ -65,13 +64,13 @@ XInternAtom(display, atom_name, only_if_exists) */ XVisualInfo * -XGetVisualInfo(display, vinfo_mask, vinfo_template, nitems_return) - Display* display; - long vinfo_mask; - XVisualInfo* vinfo_template; - int* nitems_return; +XGetVisualInfo( + Display *display, + long vinfo_mask, + XVisualInfo *vinfo_template, + int *nitems_return) { - XVisualInfo *info = (XVisualInfo *)ckalloc(sizeof(XVisualInfo)); + XVisualInfo *info = (XVisualInfo *) ckalloc(sizeof(XVisualInfo)); info->visual = DefaultVisual(display, 0); info->visualid = info->visual->visualid; info->screen = 0; @@ -82,7 +81,7 @@ XGetVisualInfo(display, vinfo_mask, vinfo_template, nitems_return) info->red_mask = info->visual->red_mask; info->green_mask = info->visual->green_mask; info->blue_mask = info->visual->blue_mask; - + if (((vinfo_mask & VisualIDMask) && (vinfo_template->visualid != info->visualid)) || ((vinfo_mask & VisualScreenMask) @@ -109,3 +108,11 @@ XGetVisualInfo(display, vinfo_mask, vinfo_template, nitems_return) *nitems_return = 1; return info; } + +/* + * Local Variables: + * mode: c + * c-basic-offset: 4 + * fill-column: 78 + * End: + */ |