summaryrefslogtreecommitdiffstats
path: root/xlib
diff options
context:
space:
mode:
Diffstat (limited to 'xlib')
-rw-r--r--xlib/X11/X.h4
-rw-r--r--xlib/X11/Xlib.h15
-rw-r--r--xlib/X11/Xutil.h4
-rw-r--r--xlib/X11/keysym.h4
-rw-r--r--xlib/xbytes.h17
-rw-r--r--xlib/xdraw.c50
-rw-r--r--xlib/xgc.c494
-rw-r--r--xlib/ximage.c35
-rw-r--r--xlib/xutil.c54
9 files changed, 351 insertions, 326 deletions
diff --git a/xlib/X11/X.h b/xlib/X11/X.h
index 7755cac..bdc4f13 100644
--- a/xlib/X11/X.h
+++ b/xlib/X11/X.h
@@ -33,7 +33,7 @@ SOFTWARE.
#define X_PROTOCOL 11 /* current protocol version */
#define X_PROTOCOL_REVISION 0 /* current minor version */
-#if defined(MAC_TCL) || defined(MAC_OSX_TK)
+#if defined(MAC_OSX_TK)
# define Cursor XCursor
# define Region XRegion
#endif
@@ -669,7 +669,7 @@ are reserved in the protocol for errors and replies. */
#define LSBFirst 0
#define MSBFirst 1
-#if defined(MAC_TCL) || defined(MAC_OSX_TK)
+#if defined(MAC_OSX_TK)
# undef Cursor
# undef Region
#endif
diff --git a/xlib/X11/Xlib.h b/xlib/X11/Xlib.h
index 252b11d..3af3682 100644
--- a/xlib/X11/Xlib.h
+++ b/xlib/X11/Xlib.h
@@ -27,14 +27,9 @@
#define XlibSpecificationRelease 5
-#if !defined(MAC_TCL) && !defined(MAC_OSX_TK)
+#if !defined(MAC_OSX_TK)
# include <X11/X.h>
#endif
-#ifdef MAC_TCL
-# include <X.h>
-# define Cursor XCursor
-# define Region XRegion
-#endif
#ifdef MAC_OSX_TK
# include <X11/X.h>
# define Cursor XCursor
@@ -42,11 +37,7 @@
#endif
/* applications should not depend on these two headers being included! */
-#ifdef MAC_TCL
-#include <Xfuncproto.h>
-#else
#include <X11/Xfuncproto.h>
-#endif
#ifndef X_WCHAR
#ifdef X_NOT_STDC_ENV
@@ -64,7 +55,7 @@ typedef unsigned long wchar_t;
typedef char *XPointer;
#define Bool int
-#if defined(MAC_TCL) || defined(MAC_OSX_TK)
+#if defined(MAC_OSX_TK)
/* Use define rather than typedef, since may need to undefine this later */
#define Status int
#else
@@ -1206,7 +1197,7 @@ _XFUNCPROTOBEGIN
_XFUNCPROTOEND
-#if defined(MAC_TCL) || defined(MAC_OSX_TK)
+#if defined(MAC_OSX_TK)
# undef Cursor
# undef Region
#endif
diff --git a/xlib/X11/Xutil.h b/xlib/X11/Xutil.h
index 8534768..7348e90 100644
--- a/xlib/X11/Xutil.h
+++ b/xlib/X11/Xutil.h
@@ -29,7 +29,7 @@ SOFTWARE.
/* You must include <X11/Xlib.h> before including this file */
-#if defined(MAC_TCL) || defined(MAC_OSX_TK)
+#if defined(MAC_OSX_TK)
# define Region XRegion
#endif
@@ -848,7 +848,7 @@ extern void XXorRegion(
_XFUNCPROTOEND
-#if defined(MAC_TCL) || defined(MAC_OSX_TK)
+#if defined(MAC_OSX_TK)
# undef Region
#endif
diff --git a/xlib/X11/keysym.h b/xlib/X11/keysym.h
index 027afe0..a8f1408 100644
--- a/xlib/X11/keysym.h
+++ b/xlib/X11/keysym.h
@@ -32,8 +32,4 @@ SOFTWARE.
#define XK_LATIN4
#define XK_GREEK
-#ifdef MAC_TCL
-#include <keysymdef.h>
-#else
#include <X11/keysymdef.h>
-#endif
diff --git a/xlib/xbytes.h b/xlib/xbytes.h
index 611e246..13e2faa 100644
--- a/xlib/xbytes.h
+++ b/xlib/xbytes.h
@@ -5,17 +5,16 @@
*
* Copyright (c) 1995 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.
*/
#ifndef _XBYTES
#define _XBYTES
/*
- * The bits in a byte can be reversed so the least significant becomes
- * the most significant by indexing xBitReverseTable with the byte
- * to be reversed.
+ * The bits in a byte can be reversed so the least significant becomes the
+ * most significant by indexing xBitReverseTable with the byte to be reversed.
*/
static unsigned char xBitReverseTable[256] = {
@@ -54,3 +53,11 @@ static unsigned char xBitReverseTable[256] = {
};
#endif /* _XBYTES */
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
diff --git a/xlib/xdraw.c b/xlib/xdraw.c
index 281a7e8..f8f035c 100644
--- a/xlib/xdraw.c
+++ b/xlib/xdraw.c
@@ -1,13 +1,12 @@
-/*
+/*
* xdraw.c --
*
- * This file contains generic procedures related to X drawing
- * primitives.
+ * This file contains generic procedures related to X drawing primitives.
*
* Copyright (c) 1995 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.
*/
#include "tk.h"
@@ -17,7 +16,7 @@
*
* XDrawLine --
*
- * Draw a single line between two points in a given drawable.
+ * Draw a single line between two points in a given drawable.
*
* Results:
* None.
@@ -29,11 +28,12 @@
*/
void
-XDrawLine(display, d, gc, x1, y1, x2, y2)
- Display* display;
- Drawable d;
- GC gc;
- int x1, y1, x2, y2; /* Coordinates of line segment. */
+XDrawLine(
+ Display *display,
+ Drawable d,
+ GC gc,
+ int x1, int y1,
+ int x2, int y2) /* Coordinates of line segment. */
{
XPoint points[2];
@@ -49,8 +49,8 @@ XDrawLine(display, d, gc, x1, y1, x2, y2)
*
* XFillRectangle --
*
- * Fills a rectangular area in the given drawable. This procedure
- * is implemented as a call to XFillRectangles.
+ * Fills a rectangular area in the given drawable. This procedure is
+ * implemented as a call to XFillRectangles.
*
* Results:
* None
@@ -62,14 +62,14 @@ XDrawLine(display, d, gc, x1, y1, x2, y2)
*/
void
-XFillRectangle(display, d, gc, x, y, width, height)
- Display* display;
- Drawable d;
- GC gc;
- int x;
- int y;
- unsigned int width;
- unsigned int height;
+XFillRectangle(
+ Display *display,
+ Drawable d,
+ GC gc,
+ int x,
+ int y,
+ unsigned int width,
+ unsigned int height)
{
XRectangle rectangle;
rectangle.x = x;
@@ -78,3 +78,11 @@ XFillRectangle(display, d, gc, x, y, width, height)
rectangle.height = height;
XFillRectangles(display, d, gc, &rectangle, 1);
}
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
diff --git a/xlib/xgc.c b/xlib/xgc.c
index 76828b1..9fa8c4a 100644
--- a/xlib/xgc.c
+++ b/xlib/xgc.c
@@ -1,33 +1,27 @@
-/*
+/*
* xgc.c --
*
* This file contains generic routines for manipulating X graphics
- * contexts.
+ * contexts.
*
* Copyright (c) 1995-1996 Sun Microsystems, Inc.
* Copyright (c) 2002-2007 Daniel A. Steffen <das@users.sourceforge.net>
*
- * 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.
*/
#include <tkInt.h>
-#if !defined(MAC_TCL) && !defined(MAC_OSX_TK)
-# include <X11/Xlib.h>
-#endif
-#ifdef MAC_TCL
-# include <Xlib.h>
-# include <X.h>
-# define Cursor XCursor
-# define Region XRegion
+#if !defined(MAC_OSX_TK)
+# include <X11/Xlib.h>
#endif
#ifdef MAC_OSX_TK
-# include <tkMacOSXInt.h>
-# include <X11/Xlib.h>
-# include <X11/X.h>
-# define Cursor XCursor
-# define Region XRegion
+# include <tkMacOSXInt.h>
+# include <X11/Xlib.h>
+# include <X11/X.h>
+# define Cursor XCursor
+# define Region XRegion
#endif
@@ -97,7 +91,7 @@ static void FreeClipMask(GC gc) {
* Allocate a new GC, and initialize the specified fields.
*
* Results:
- * Returns a newly allocated GC.
+ * Returns a newly allocated GC.
*
* Side effects:
* None.
@@ -106,52 +100,56 @@ static void FreeClipMask(GC gc) {
*/
GC
-XCreateGC(display, d, mask, values)
- Display* display;
- Drawable d;
- unsigned long mask;
- XGCValues* values;
+XCreateGC(
+ Display *display,
+ Drawable d,
+ unsigned long mask,
+ XGCValues *values)
{
GC gp;
-/*
- * In order to have room for a dash list, MAX_DASH_LIST_SIZE extra chars are
- * defined, which is invisible from the outside. The list is assumed to end
- * with a 0-char, so this must be set explicitely during initialization.
- */
+ /*
+ * In order to have room for a dash list, MAX_DASH_LIST_SIZE extra chars
+ * are defined, which is invisible from the outside. The list is assumed
+ * to end with a 0-char, so this must be set explicitely during
+ * initialization.
+ */
#define MAX_DASH_LIST_SIZE 10
- gp = (XGCValues *)ckalloc(sizeof(XGCValues) + MAX_DASH_LIST_SIZE);
+ gp = (XGCValues *) ckalloc(sizeof(XGCValues) + MAX_DASH_LIST_SIZE);
if (!gp) {
return None;
}
- gp->function = (mask & GCFunction) ?values->function :GXcopy;
- gp->plane_mask = (mask & GCPlaneMask) ?values->plane_mask :~0;
- gp->foreground = (mask & GCForeground) ?values->foreground :
- BlackPixelOfScreen(DefaultScreenOfDisplay(display));
- gp->background = (mask & GCBackground) ?values->background :
- WhitePixelOfScreen(DefaultScreenOfDisplay(display));
- gp->line_width = (mask & GCLineWidth) ?values->line_width :1;
- gp->line_style = (mask & GCLineStyle) ?values->line_style :LineSolid;
- gp->cap_style = (mask & GCCapStyle) ?values->cap_style :0;
- gp->join_style = (mask & GCJoinStyle) ?values->join_style :0;
- gp->fill_style = (mask & GCFillStyle) ?values->fill_style :FillSolid;
- gp->fill_rule = (mask & GCFillRule) ?values->fill_rule :WindingRule;
- gp->arc_mode = (mask & GCArcMode) ?values->arc_mode :ArcPieSlice;
- gp->tile = (mask & GCTile) ?values->tile :None;
- gp->stipple = (mask & GCStipple) ?values->stipple :None;
- gp->ts_x_origin = (mask & GCTileStipXOrigin) ?values->ts_x_origin:0;
- gp->ts_y_origin = (mask & GCTileStipYOrigin) ?values->ts_y_origin:0;
- gp->font = (mask & GCFont) ?values->font :None;
- gp->subwindow_mode = (mask & GCSubwindowMode)?values->subwindow_mode:ClipByChildren;
- gp->graphics_exposures = (mask & GCGraphicsExposures)?values->graphics_exposures:True;
- gp->clip_x_origin = (mask & GCClipXOrigin) ?values->clip_x_origin :0;
- gp->clip_y_origin = (mask & GCClipYOrigin) ?values->clip_y_origin :0;
- gp->dash_offset = (mask & GCDashOffset) ?values->dash_offset :0;
- gp->dashes = (mask & GCDashList) ?values->dashes :4;
- (&(gp->dashes))[1] = 0;
+#define InitField(name,maskbit,default) \
+ (gp->name = (mask & (maskbit)) ? values->name : (default))
+
+ InitField(function, GCFunction, GXcopy);
+ InitField(plane_mask, GCPlaneMask, (unsigned long)(~0));
+ InitField(foreground, GCForeground,
+ BlackPixelOfScreen(DefaultScreenOfDisplay(display)));
+ InitField(background, GCBackground,
+ WhitePixelOfScreen(DefaultScreenOfDisplay(display)));
+ InitField(line_width, GCLineWidth, 1);
+ InitField(line_style, GCLineStyle, LineSolid);
+ InitField(cap_style, GCCapStyle, 0);
+ InitField(join_style, GCJoinStyle, 0);
+ InitField(fill_style, GCFillStyle, FillSolid);
+ InitField(fill_rule, GCFillRule, WindingRule);
+ InitField(arc_mode, GCArcMode, ArcPieSlice);
+ InitField(tile, GCTile, None);
+ InitField(stipple, GCStipple, None);
+ InitField(ts_x_origin, GCTileStipXOrigin, 0);
+ InitField(ts_y_origin, GCTileStipYOrigin, 0);
+ InitField(font, GCFont, None);
+ InitField(subwindow_mode, GCSubwindowMode, ClipByChildren);
+ InitField(graphics_exposures, GCGraphicsExposures, True);
+ InitField(clip_x_origin, GCClipXOrigin, 0);
+ InitField(clip_y_origin, GCClipYOrigin, 0);
+ InitField(dash_offset, GCDashOffset, 0);
+ InitField(dashes, GCDashList, 4);
+ (&(gp->dashes))[1] = 0;
gp->clip_mask = None;
if (mask & GCClipMask) {
@@ -169,8 +167,7 @@ XCreateGC(display, d, mask, values)
*
* XChangeGC --
*
- * Changes the GC components specified by valuemask for the
- * specified GC.
+ * Changes the GC components specified by valuemask for the specified GC.
*
* Results:
* None.
@@ -182,35 +179,43 @@ XCreateGC(display, d, mask, values)
*/
void
-XChangeGC(d, gc, mask, values)
- Display * d;
- GC gc;
- unsigned long mask;
- XGCValues *values;
-{
- if (mask & GCFunction) { gc->function = values->function; }
- if (mask & GCPlaneMask) { gc->plane_mask = values->plane_mask; }
- if (mask & GCForeground) { gc->foreground = values->foreground; }
- if (mask & GCBackground) { gc->background = values->background; }
- if (mask & GCLineWidth) { gc->line_width = values->line_width; }
- if (mask & GCLineStyle) { gc->line_style = values->line_style; }
- if (mask & GCCapStyle) { gc->cap_style = values->cap_style; }
- if (mask & GCJoinStyle) { gc->join_style = values->join_style; }
- if (mask & GCFillStyle) { gc->fill_style = values->fill_style; }
- if (mask & GCFillRule) { gc->fill_rule = values->fill_rule; }
- if (mask & GCArcMode) { gc->arc_mode = values->arc_mode; }
- if (mask & GCTile) { gc->tile = values->tile; }
- if (mask & GCStipple) { gc->stipple = values->stipple; }
- if (mask & GCTileStipXOrigin) { gc->ts_x_origin = values->ts_x_origin; }
- if (mask & GCTileStipYOrigin) { gc->ts_y_origin = values->ts_y_origin; }
- if (mask & GCFont) { gc->font = values->font; }
- if (mask & GCSubwindowMode) { gc->subwindow_mode = values->subwindow_mode; }
- if (mask & GCGraphicsExposures) { gc->graphics_exposures = values->graphics_exposures; }
- if (mask & GCClipXOrigin) { gc->clip_x_origin = values->clip_x_origin; }
- if (mask & GCClipYOrigin) { gc->clip_y_origin = values->clip_y_origin; }
- if (mask & GCClipMask) { XSetClipMask(d, gc, values->clip_mask); }
- if (mask & GCDashOffset) { gc->dash_offset = values->dash_offset; }
- if (mask & GCDashList) { gc->dashes = values->dashes; (&(gc->dashes))[1] = 0;}
+XChangeGC(
+ Display *d,
+ GC gc,
+ unsigned long mask,
+ XGCValues *values)
+{
+#define ModifyField(name,maskbit) \
+ if (mask & (maskbit)) { gc->name = values->name; }
+
+ ModifyField(function, GCFunction);
+ ModifyField(plane_mask, GCPlaneMask);
+ ModifyField(foreground, GCForeground);
+ ModifyField(background, GCBackground);
+ ModifyField(line_width, GCLineWidth);
+ ModifyField(line_style, GCLineStyle);
+ ModifyField(cap_style, GCCapStyle);
+ ModifyField(join_style, GCJoinStyle);
+ ModifyField(fill_style, GCFillStyle);
+ ModifyField(fill_rule, GCFillRule);
+ ModifyField(arc_mode, GCArcMode);
+ ModifyField(tile, GCTile);
+ ModifyField(stipple, GCStipple);
+ ModifyField(ts_x_origin, GCTileStipXOrigin);
+ ModifyField(ts_y_origin, GCTileStipYOrigin);
+ ModifyField(font, GCFont);
+ ModifyField(subwindow_mode, GCSubwindowMode);
+ ModifyField(graphics_exposures, GCGraphicsExposures);
+ ModifyField(clip_x_origin, GCClipXOrigin);
+ ModifyField(clip_y_origin, GCClipYOrigin);
+ ModifyField(dash_offset, GCDashOffset);
+ if (mask & GCClipMask) {
+ XSetClipMask(d, gc, values->clip_mask);
+ }
+ if (mask & GCDashList) {
+ gc->dashes = values->dashes;
+ (&(gc->dashes))[1] = 0;
+ }
}
/*
@@ -229,9 +234,9 @@ XChangeGC(d, gc, mask, values)
*----------------------------------------------------------------------
*/
-void XFreeGC(d, gc)
- Display * d;
- GC gc;
+void XFreeGC(
+ Display *d,
+ GC gc)
{
if (gc != None) {
FreeClipMask(gc);
@@ -244,8 +249,8 @@ void XFreeGC(d, gc)
*
* XSetForeground, etc. --
*
- * The following functions are simply accessor functions for
- * the GC slots.
+ * The following functions are simply accessor functions for the GC
+ * slots.
*
* Results:
* None.
@@ -256,31 +261,31 @@ void XFreeGC(d, gc)
*----------------------------------------------------------------------
*/
-void
-XSetForeground(display, gc, foreground)
- Display *display;
- GC gc;
- unsigned long foreground;
+void
+XSetForeground(
+ Display *display,
+ GC gc,
+ unsigned long foreground)
{
gc->foreground = foreground;
}
-void
-XSetBackground(display, gc, background)
- Display *display;
- GC gc;
- unsigned long background;
+void
+XSetBackground(
+ Display *display,
+ GC gc,
+ unsigned long background)
{
gc->background = background;
}
void
-XSetDashes(display, gc, dash_offset, dash_list, n)
- Display* display;
- GC gc;
- int dash_offset;
- _Xconst char* dash_list;
- int n;
+XSetDashes(
+ Display *display,
+ GC gc,
+ int dash_offset,
+ _Xconst char *dash_list,
+ int n)
{
char *p = &(gc->dashes);
@@ -299,78 +304,77 @@ XSetDashes(display, gc, dash_offset, dash_list, n)
}
void
-XSetFunction(display, gc, function)
- Display *display;
- GC gc;
- int function;
+XSetFunction(
+ Display *display,
+ GC gc,
+ int function)
{
gc->function = function;
}
void
-XSetFillRule(display, gc, fill_rule)
- Display *display;
- GC gc;
- int fill_rule;
+XSetFillRule(
+ Display *display,
+ GC gc,
+ int fill_rule)
{
gc->fill_rule = fill_rule;
}
void
-XSetFillStyle(display, gc, fill_style)
- Display *display;
- GC gc;
- int fill_style;
+XSetFillStyle(
+ Display *display,
+ GC gc,
+ int fill_style)
{
gc->fill_style = fill_style;
}
void
-XSetTSOrigin(display, gc, x, y)
- Display *display;
- GC gc;
- int x, y;
+XSetTSOrigin(
+ Display *display,
+ GC gc,
+ int x, int y)
{
gc->ts_x_origin = x;
gc->ts_y_origin = y;
}
void
-XSetFont(display, gc, font)
- Display *display;
- GC gc;
- Font font;
+XSetFont(
+ Display *display,
+ GC gc,
+ Font font)
{
gc->font = font;
}
void
-XSetArcMode(display, gc, arc_mode)
- Display *display;
- GC gc;
- int arc_mode;
+XSetArcMode(
+ Display *display,
+ GC gc,
+ int arc_mode)
{
gc->arc_mode = arc_mode;
}
void
-XSetStipple(display, gc, stipple)
- Display *display;
- GC gc;
- Pixmap stipple;
+XSetStipple(
+ Display *display,
+ GC gc,
+ Pixmap stipple)
{
gc->stipple = stipple;
}
void
-XSetLineAttributes(display, gc, line_width, line_style, cap_style,
- join_style)
- Display *display;
- GC gc;
- unsigned int line_width;
- int line_style;
- int cap_style;
- int join_style;
+XSetLineAttributes(
+ Display *display,
+ GC gc,
+ unsigned int line_width,
+ int line_style,
+ int cap_style,
+ int join_style)
{
gc->line_width = line_width;
gc->line_style = line_style;
@@ -379,11 +383,11 @@ XSetLineAttributes(display, gc, line_width, line_style, cap_style,
}
void
-XSetClipOrigin(display, gc, clip_x_origin, clip_y_origin)
- Display* display;
- GC gc;
- int clip_x_origin;
- int clip_y_origin;
+XSetClipOrigin(
+ Display *display,
+ GC gc,
+ int clip_x_origin,
+ int clip_y_origin)
{
gc->clip_x_origin = clip_x_origin;
gc->clip_y_origin = clip_y_origin;
@@ -411,10 +415,10 @@ XSetClipOrigin(display, gc, clip_x_origin, clip_y_origin)
*/
void
-TkSetRegion(display, gc, r)
- Display* display;
- GC gc;
- TkRegion r;
+TkSetRegion(
+ Display *display,
+ GC gc,
+ TkRegion r)
{
if (r == None) {
FreeClipMask(gc);
@@ -430,10 +434,10 @@ TkSetRegion(display, gc, r)
}
void
-XSetClipMask(display, gc, pixmap)
- Display* display;
- GC gc;
- Pixmap pixmap;
+XSetClipMask(
+ Display *display,
+ GC gc,
+ Pixmap pixmap)
{
if (pixmap == None) {
FreeClipMask(gc);
@@ -451,157 +455,167 @@ XSetClipMask(display, gc, pixmap)
#if 0
Cursor
-XCreateFontCursor(display, shape)
- Display* display;
- unsigned int shape;
+XCreateFontCursor(
+ Display *display,
+ unsigned int shape)
{
return (Cursor) 0;
}
void
-XDrawImageString(display, d, gc, x, y, string, length)
- Display* display;
- Drawable d;
- GC gc;
- int x;
- int y;
- _Xconst char* string;
- int length;
+XDrawImageString(
+ Display *display,
+ Drawable d,
+ GC gc,
+ int x,
+ int y,
+ _Xconst char *string,
+ int length)
{
}
#endif
void
-XDrawPoint(display, d, gc, x, y)
- Display* display;
- Drawable d;
- GC gc;
- int x;
- int y;
+XDrawPoint(
+ Display *display,
+ Drawable d,
+ GC gc,
+ int x,
+ int y)
{
XDrawLine(display, d, gc, x, y, x, y);
}
void
-XDrawPoints(display, d, gc, points, npoints, mode)
- Display* display;
- Drawable d;
- GC gc;
- XPoint* points;
- int npoints;
- int mode;
+XDrawPoints(
+ Display *display,
+ Drawable d,
+ GC gc,
+ XPoint *points,
+ int npoints,
+ int mode)
{
int i;
for (i=0; i<npoints; i++) {
- XDrawPoint(display, d, gc, points[i].x, points[i].y);
+ XDrawLine(display, d, gc,
+ points[i].x, points[i].y, points[i].x, points[i].y);
}
}
-#if !defined(MAC_TCL) && !defined(MAC_OSX_TK)
+#if !defined(MAC_OSX_TK)
void
-XDrawSegments(display, d, gc, segments, nsegments)
- Display* display;
- Drawable d;
- GC gc;
- XSegment* segments;
- int nsegments;
+XDrawSegments(
+ Display *display,
+ Drawable d,
+ GC gc,
+ XSegment *segments,
+ int nsegments)
{
}
#endif
#if 0
char *
-XFetchBuffer(display, nbytes_return, buffer)
- Display* display;
- int* nbytes_return;
- int buffer;
+XFetchBuffer(
+ Display *display,
+ int *nbytes_return,
+ int buffer)
{
return (char *) 0;
}
-Status XFetchName(display, w, window_name_return)
- Display* display;
- Window w;
- char** window_name_return;
+Status
+XFetchName(
+ Display *display,
+ Window w,
+ char **window_name_return)
{
return (Status) 0;
}
-Atom *XListProperties(display, w, num_prop_return)
- Display* display;
- Window w;
- int* num_prop_return;
+Atom *
+XListProperties(
+ Display* display,
+ Window w,
+ int *num_prop_return)
{
return (Atom *) 0;
}
void
-XMapRaised(display, w)
- Display* display;
- Window w;
+XMapRaised(
+ Display *display,
+ Window w)
{
}
void
-XPutImage(display, d, gc, image, src_x, src_y, dest_x, dest_y, width, height)
- Display* display;
- Drawable d;
- GC gc;
- XImage* image;
- int src_x;
- int src_y;
- int dest_x;
- int dest_y;
- unsigned int width;
- unsigned int height;
+XPutImage(
+ Display *display,
+ Drawable d,
+ GC gc,
+ XImage *image,
+ int src_x,
+ int src_y,
+ int dest_x,
+ int dest_y,
+ unsigned int width,
+ unsigned int height)
{
}
void
-XQueryTextExtents(display, font_ID, string, nchars, direction_return,
- font_ascent_return, font_descent_return, overall_return)
- Display* display;
- XID font_ID;
- _Xconst char* string;
- int nchars;
- int* direction_return;
- int* font_ascent_return;
- int* font_descent_return;
- XCharStruct* overall_return;
+XQueryTextExtents(
+ Display *display,
+ XID font_ID,
+ _Xconst char *string,
+ int nchars,
+ int *direction_return,
+ int *font_ascent_return,
+ int *font_descent_return,
+ XCharStruct *overall_return)
{
}
void
-XReparentWindow(display, w, parent, x, y)
- Display* display;
- Window w;
- Window parent;
- int x;
- int y;
+XReparentWindow(
+ Display *display,
+ Window w,
+ Window parent,
+ int x,
+ int y)
{
}
void
-XRotateBuffers(display, rotate)
- Display* display;
- int rotate;
+XRotateBuffers(
+ Display *display,
+ int rotate)
{
}
void
-XStoreBuffer(display, bytes, nbytes, buffer)
- Display* display;
- _Xconst char* bytes;
- int nbytes;
- int buffer;
+XStoreBuffer(
+ Display *display,
+ _Xconst char *bytes,
+ int nbytes,
+ int buffer)
{
}
void
-XUndefineCursor(display, w)
- Display* display;
- Window w;
+XUndefineCursor(
+ Display *display,
+ Window w)
{
}
#endif
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
diff --git a/xlib/ximage.c b/xlib/ximage.c
index de3bb1e..aaab946 100644
--- a/xlib/ximage.c
+++ b/xlib/ximage.c
@@ -1,16 +1,15 @@
-/*
+/*
* ximage.c --
*
* X bitmap and image routines.
*
* Copyright (c) 1995 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.
*/
#include "tkInt.h"
-
/*
*----------------------------------------------------------------------
@@ -19,10 +18,10 @@
*
* Construct a single plane pixmap from bitmap data.
*
- * NOTE: This procedure has the correct behavior on Windows and
- * the Macintosh, but not on UNIX. This is probably because the
- * emulation for XPutImage on those platforms compensates for whatever
- * is wrong here :-)
+ * NOTE: This procedure has the correct behavior on Windows and the
+ * Macintosh, but not on UNIX. This is probably because the emulation for
+ * XPutImage on those platforms compensates for whatever is wrong here
+ * :-)
*
* Results:
* Returns a new Pixmap.
@@ -34,12 +33,12 @@
*/
Pixmap
-XCreateBitmapFromData(display, d, data, width, height)
- Display* display;
- Drawable d;
- _Xconst char* data;
- unsigned int width;
- unsigned int height;
+XCreateBitmapFromData(
+ Display *display,
+ Drawable d,
+ _Xconst char *data,
+ unsigned int width,
+ unsigned int height)
{
XImage *ximage;
GC gc;
@@ -60,3 +59,11 @@ XCreateBitmapFromData(display, d, data, width, height)
XFreeGC(display, gc);
return pix;
}
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
diff --git a/xlib/xutil.c b/xlib/xutil.c
index db9d35e..267a624 100644
--- a/xlib/xutil.c
+++ b/xlib/xutil.c
@@ -1,34 +1,28 @@
-/*
+/*
* 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.
*/
#include <stdlib.h>
#include <tk.h>
-#ifdef MAC_TCL
-# include <Xutil.h>
-# include <Xatom.h>
-#else
-# include <X11/Xutil.h>
-# include <X11/Xatom.h>
-#endif
+#include <X11/Xutil.h>
+#include <X11/Xatom.h>
/*
*----------------------------------------------------------------------
*
* 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.
@@ -40,13 +34,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;
}
@@ -68,13 +62,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;
@@ -85,7 +79,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)
@@ -112,3 +106,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:
+ */