summaryrefslogtreecommitdiffstats
path: root/xlib
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-06-01 22:29:19 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-06-01 22:29:19 (GMT)
commit4d934afdaa794c2cb190a8f1b5712069e12b9750 (patch)
tree5bc13e4395b89309cb5eb55ee6a0b1d763975de7 /xlib
parent406db445ef0a95a9d3b5ac77690326f9cc1a07a2 (diff)
downloadtk-4d934afdaa794c2cb190a8f1b5712069e12b9750.zip
tk-4d934afdaa794c2cb190a8f1b5712069e12b9750.tar.gz
tk-4d934afdaa794c2cb190a8f1b5712069e12b9750.tar.bz2
Change XSetDashes signature and many others to match Xorg, needed for Cygwin.
Add .PHONY targets, and various quoting issues (Makefile.in)
Diffstat (limited to 'xlib')
-rw-r--r--xlib/xdraw.c4
-rw-r--r--xlib/xgc.c21
-rw-r--r--xlib/ximage.c2
-rw-r--r--xlib/xutil.c6
4 files changed, 17 insertions, 16 deletions
diff --git a/xlib/xdraw.c b/xlib/xdraw.c
index 8ec924a..8523df7 100644
--- a/xlib/xdraw.c
+++ b/xlib/xdraw.c
@@ -1,4 +1,4 @@
-/*
+/*
* xdraw.c --
*
* This file contains generic procedures related to X drawing
@@ -17,7 +17,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.
diff --git a/xlib/xgc.c b/xlib/xgc.c
index 76828b1..a741b76 100644
--- a/xlib/xgc.c
+++ b/xlib/xgc.c
@@ -1,8 +1,8 @@
-/*
+/*
* 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>
@@ -49,7 +49,7 @@
static TkpClipMask *AllocClipMask(GC gc) {
TkpClipMask *clip_mask = (TkpClipMask*) gc->clip_mask;
-
+
if (clip_mask == None) {
clip_mask = (TkpClipMask*) ckalloc(sizeof(TkpClipMask));
gc->clip_mask = (Pixmap) clip_mask;
@@ -97,7 +97,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.
@@ -133,7 +133,7 @@ XCreateGC(display, d, mask, values)
BlackPixelOfScreen(DefaultScreenOfDisplay(display));
gp->background = (mask & GCBackground) ?values->background :
WhitePixelOfScreen(DefaultScreenOfDisplay(display));
- gp->line_width = (mask & GCLineWidth) ?values->line_width :1;
+ 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;
@@ -156,7 +156,7 @@ XCreateGC(display, d, mask, values)
gp->clip_mask = None;
if (mask & GCClipMask) {
TkpClipMask *clip_mask = AllocClipMask(gp);
-
+
clip_mask->type = TKP_CLIP_PIXMAP;
clip_mask->value.pixmap = values->clip_mask;
}
@@ -192,7 +192,7 @@ XChangeGC(d, gc, mask, values)
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 & 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; }
@@ -256,7 +256,7 @@ void XFreeGC(d, gc)
*----------------------------------------------------------------------
*/
-void
+void
XSetForeground(display, gc, foreground)
Display *display;
GC gc;
@@ -265,7 +265,7 @@ XSetForeground(display, gc, foreground)
gc->foreground = foreground;
}
-void
+void
XSetBackground(display, gc, background)
Display *display;
GC gc;
@@ -274,7 +274,7 @@ XSetBackground(display, gc, background)
gc->background = background;
}
-void
+int
XSetDashes(display, gc, dash_offset, dash_list, n)
Display* display;
GC gc;
@@ -296,6 +296,7 @@ XSetDashes(display, gc, dash_offset, dash_list, n)
*p++ = *dash_list++;
}
*p = 0;
+ return Success;
}
void
diff --git a/xlib/ximage.c b/xlib/ximage.c
index de3bb1e..e7ac86c 100644
--- a/xlib/ximage.c
+++ b/xlib/ximage.c
@@ -1,4 +1,4 @@
-/*
+/*
* ximage.c --
*
* X bitmap and image routines.
diff --git a/xlib/xutil.c b/xlib/xutil.c
index db9d35e..23b589c 100644
--- a/xlib/xutil.c
+++ b/xlib/xutil.c
@@ -1,4 +1,4 @@
-/*
+/*
* xutil.c --
*
* This function contains generic X emulation routines.
@@ -46,7 +46,7 @@ XInternAtom(display, atom_name, only_if_exists)
Bool only_if_exists;
{
static Atom atom = XA_LAST_PREDEFINED;
-
+
display->request++;
return ++atom;
}
@@ -85,7 +85,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)