aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/lib/X11/CrGC.c
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-10-12 08:32:04 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-10-12 08:32:04 +0200
commit051d521f6e20761ba6831cecd91883da960fa931 (patch)
treeb28abba7818115d2fed80eb360a79a0f9183948e /nx-X11/lib/X11/CrGC.c
parent6dce607bad8711dd06a5a7b69ad1930386b4123b (diff)
parentb8de7bf654929c823080b211aeac56cd213f5a32 (diff)
downloadnx-libs-051d521f6e20761ba6831cecd91883da960fa931.tar.gz
nx-libs-051d521f6e20761ba6831cecd91883da960fa931.tar.bz2
nx-libs-051d521f6e20761ba6831cecd91883da960fa931.zip
Merge branch 'uli42-pr/upgrade_libX11' into 3.6.x
Attributes GH PR #214: https://github.com/ArcticaProject/nx-libs/pull/214 Fixes ArcticaProject/nx-libs#157.
Diffstat (limited to 'nx-X11/lib/X11/CrGC.c')
-rw-r--r--nx-X11/lib/X11/CrGC.c50
1 files changed, 26 insertions, 24 deletions
diff --git a/nx-X11/lib/X11/CrGC.c b/nx-X11/lib/X11/CrGC.c
index 3c6fde33e..11de94c1f 100644
--- a/nx-X11/lib/X11/CrGC.c
+++ b/nx-X11/lib/X11/CrGC.c
@@ -61,11 +61,11 @@ static void _XGenerateGCList(
GC gc,
xReq *req);
-GC XCreateGC (dpy, d, valuemask, values)
- register Display *dpy;
- Drawable d; /* Window or Pixmap for which depth matches */
- unsigned long valuemask; /* which ones to set initially */
- XGCValues *values; /* the values themselves */
+GC XCreateGC (
+ register Display *dpy,
+ Drawable d, /* Window or Pixmap for which depth matches */
+ unsigned long valuemask, /* which ones to set initially */
+ XGCValues *values) /* the values themselves */
{
register GC gc;
register xCreateGCReq *req;
@@ -148,10 +148,10 @@ _XGenerateGCList (
req->length += (nvalues = value - values);
- /*
+ /*
* note: Data is a macro that uses its arguments multiple
* times, so "nvalues" is changed in a separate assignment
- * statement
+ * statement
*/
nvalues <<= 2;
@@ -161,11 +161,11 @@ _XGenerateGCList (
int
-_XUpdateGCCache (gc, mask, attr)
- register unsigned long mask;
- register XGCValues *attr;
- register GC gc;
- {
+_XUpdateGCCache (
+ register GC gc,
+ register unsigned long mask,
+ register XGCValues *attr)
+{
register XGCValues *gv = &gc->values;
if (mask & GCFunction)
@@ -173,7 +173,7 @@ _XUpdateGCCache (gc, mask, attr)
gv->function = attr->function;
gc->dirty |= GCFunction;
}
-
+
if (mask & GCPlaneMask)
if (gv->plane_mask != attr->plane_mask) {
gv->plane_mask = attr->plane_mask;
@@ -209,7 +209,7 @@ _XUpdateGCCache (gc, mask, attr)
gv->cap_style = attr->cap_style;
gc->dirty |= GCCapStyle;
}
-
+
if (mask & GCJoinStyle)
if (gv->join_style != attr->join_style) {
gv->join_style = attr->join_style;
@@ -308,13 +308,13 @@ _XUpdateGCCache (gc, mask, attr)
gc->dashes = 0;
}
return 0;
- }
+}
/* can only call when display is already locked. */
-void _XFlushGCCache(dpy, gc)
- Display *dpy;
- GC gc;
+void _XFlushGCCache(
+ Display *dpy,
+ GC gc)
{
register xChangeGCReq *req;
register _XExtension *ext;
@@ -331,13 +331,15 @@ void _XFlushGCCache(dpy, gc)
}
}
-void XFlushGC(dpy, gc)
- Display *dpy;
- GC gc;
+void
+XFlushGC(
+ Display *dpy,
+ GC gc)
{
FlushGC(dpy, gc);
}
-GContext XGContextFromGC(gc)
- GC gc;
- { return (gc->gid); }
+GContext XGContextFromGC(GC gc)
+{
+ return (gc->gid);
+}