Revision: 75432
http://sourceforge.net/p/brlcad/code/75432
Author: starseeker
Date: 2020-04-17 13:12:00 +0000 (Fri, 17 Apr 2020)
Log Message:
-----------
color.c appears to be specific to the X backend
Modified Paths:
--------------
brlcad/branches/dm-fb-merge/src/libdm/CMakeLists.txt
Added Paths:
-----------
brlcad/branches/dm-fb-merge/src/libdm/X/color.c
Removed Paths:
-------------
brlcad/branches/dm-fb-merge/src/libdm/color.c
Modified: brlcad/branches/dm-fb-merge/src/libdm/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/CMakeLists.txt 2020-04-17
13:07:50 UTC (rev 75431)
+++ brlcad/branches/dm-fb-merge/src/libdm/CMakeLists.txt 2020-04-17
13:12:00 UTC (rev 75432)
@@ -41,7 +41,7 @@
if(BRLCAD_ENABLE_X11 AND BRLCAD_ENABLE_TK)
list(APPEND libdm_DEFINES DM_X IF_X)
- set(dmx11_srcs X/dm-X.c X/if_X24.c)
+ set(dmx11_srcs X/dm-X.c X/if_X24.c X/color.c)
set(DM_EXTRA_LIBS ${DM_EXTRA_LIBS} ${X11_LIBRARIES})
set_property(SOURCE X/dm-X.c APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
set_property(SOURCE X/if_X24.c APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
@@ -114,7 +114,6 @@
asize.c
axes.c
clip.c
- color.c
dm-generic.c
dm_obj.c
dm_util.c
Copied: brlcad/branches/dm-fb-merge/src/libdm/X/color.c (from rev 75431,
brlcad/branches/dm-fb-merge/src/libdm/color.c)
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/X/color.c
(rev 0)
+++ brlcad/branches/dm-fb-merge/src/libdm/X/color.c 2020-04-17 13:12:00 UTC
(rev 75432)
@@ -0,0 +1,160 @@
+/* C O L O R . C
+ * BRL-CAD
+ *
+ * Copyright (c) 2004-2020 United States Government as represented by
+ * the U.S. Army Research Laboratory.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this file; see the file named COPYING for more
+ * information.
+ */
+/** @file libdm/color.c
+ *
+ */
+
+#include "common.h"
+
+#ifdef DM_X
+
+#include <stdio.h>
+#include <string.h>
+
+#ifdef HAVE_X11_XLIB_H
+# include <X11/Xlib.h>
+#endif
+#include "vmath.h"
+
+#include "bu/malloc.h"
+#include "../include/dm_xvars.h"
+
+/* Return the allocated pixel value that most closely represents
+ the color requested. */
+unsigned long
+X_get_pixel(unsigned char r, unsigned char g, unsigned char b, long unsigned
int *pixels, int cd)
+ /* values assumed to be [0, 255] */
+
+ /* cube dimension */
+{
+ fastf_t f;
+ int rf, gf, bf;
+ int idx;
+
+ if (r == 0 && g == 0 && b == 0)
+ return pixels[0];
+
+ f = cd >> 8;
+ rf = r * f;
+ gf = g * f;
+ bf = b * f;
+
+ idx = rf * cd * cd + gf * cd + bf;
+
+ if (idx == 0) {
+ if (r != 0)
+ idx = cd * cd;
+
+ if (g != 0)
+ idx += cd;
+
+ if (b != 0)
+ idx += 1;
+ }
+
+ return pixels[idx];
+}
+
+/*
+ * Alloc/Store (hi - low) colors from src colormap into dest.
+ */
+HIDDEN void
+_X_copy_cmap(Display *dpy, Colormap dest, Colormap src, int low, int hi, int
store)
+{
+ int i;
+ int ncolors;
+ XColor *colors;
+
+ ncolors = hi - low;
+ colors = (XColor *)bu_calloc(ncolors, sizeof(XColor), "dm_load_cmap:
colors");
+
+ for (i = low; i < hi; ++i)
+ colors[i].pixel = i;
+ XQueryColors(dpy, src, colors, ncolors);
+
+ if (store) {
+ XStoreColors(dpy, dest, colors, ncolors);
+ } else {
+ for (i = 0; i < ncolors; ++i) {
+ XAllocColor(dpy, dest, &colors[i]);
+ }
+ }
+
+ bu_free((void *)colors, "dm_load_cmap: colors");
+}
+
+void
+X_allocate_color_cube(Display *dpy, Colormap cmap, long unsigned int *pixels,
int cd, int cmap_base, int store)
+
+
+ /* cube dimension */
+
+
+{
+ XColor color;
+ Colormap default_cmap;
+ int i;
+ int r, g, b;
+ int incr; /* increment */
+
+ INIT_XCOLOR(&color);
+
+ /*
+ * Copy default colors below cmap_base to private colormap to help
+ * reduce flashing. Assuming cmap is private and empty, we can be
+ * fairly certain to get the colors we want in the right order even
+ * though cmap may be shared.
+ */
+ default_cmap = DefaultColormap(dpy, DefaultScreen(dpy));
+ _X_copy_cmap(dpy, cmap, default_cmap, 0, cmap_base, store);
+
+ incr = 65535 / (cd - 1);
+
+ /* store color cube at cmap_base and above */
+ for (i = r = 0; r < 65536; r = r + incr)
+ for (g = 0; g < 65536; g = g + incr)
+ for (b = 0; b < 65536; b = b + incr, ++i) {
+ color.red = (unsigned short)r;
+ color.green = (unsigned short)g;
+ color.blue = (unsigned short)b;
+
+ if (store) {
+ color.flags = DoRed|DoGreen|DoBlue;
+ pixels[i] = color.pixel = i + cmap_base;
+ XStoreColor(dpy, cmap, &color);
+ } else {
+ XAllocColor(dpy, cmap, &color);
+ pixels[i] = color.pixel;
+ }
+ }
+}
+
+
+#endif /* DM_X */
+
+/*
+ * Local Variables:
+ * mode: C
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * c-file-style: "stroustrup"
+ * End:
+ * ex: shiftwidth=4 tabstop=8
+ */
Deleted: brlcad/branches/dm-fb-merge/src/libdm/color.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/color.c 2020-04-17 13:07:50 UTC
(rev 75431)
+++ brlcad/branches/dm-fb-merge/src/libdm/color.c 2020-04-17 13:12:00 UTC
(rev 75432)
@@ -1,161 +0,0 @@
-/* C O L O R . C
- * BRL-CAD
- *
- * Copyright (c) 2004-2020 United States Government as represented by
- * the U.S. Army Research Laboratory.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this file; see the file named COPYING for more
- * information.
- */
-/** @file libdm/color.c
- *
- */
-
-#include "common.h"
-
-#ifdef DM_X
-
-#include <stdio.h>
-#include <string.h>
-
-#ifdef HAVE_X11_XLIB_H
-# include <X11/Xlib.h>
-#endif
-#include "vmath.h"
-
-#include "bu/malloc.h"
-#include "./include/dm_xvars.h"
-
-
-/* Return the allocated pixel value that most closely represents
- the color requested. */
-unsigned long
-X_get_pixel(unsigned char r, unsigned char g, unsigned char b, long unsigned
int *pixels, int cd)
- /* values assumed to be [0, 255] */
-
- /* cube dimension */
-{
- fastf_t f;
- int rf, gf, bf;
- int idx;
-
- if (r == 0 && g == 0 && b == 0)
- return pixels[0];
-
- f = cd >> 8;
- rf = r * f;
- gf = g * f;
- bf = b * f;
-
- idx = rf * cd * cd + gf * cd + bf;
-
- if (idx == 0) {
- if (r != 0)
- idx = cd * cd;
-
- if (g != 0)
- idx += cd;
-
- if (b != 0)
- idx += 1;
- }
-
- return pixels[idx];
-}
-
-/*
- * Alloc/Store (hi - low) colors from src colormap into dest.
- */
-HIDDEN void
-_X_copy_cmap(Display *dpy, Colormap dest, Colormap src, int low, int hi, int
store)
-{
- int i;
- int ncolors;
- XColor *colors;
-
- ncolors = hi - low;
- colors = (XColor *)bu_calloc(ncolors, sizeof(XColor), "dm_load_cmap:
colors");
-
- for (i = low; i < hi; ++i)
- colors[i].pixel = i;
- XQueryColors(dpy, src, colors, ncolors);
-
- if (store) {
- XStoreColors(dpy, dest, colors, ncolors);
- } else {
- for (i = 0; i < ncolors; ++i) {
- XAllocColor(dpy, dest, &colors[i]);
- }
- }
-
- bu_free((void *)colors, "dm_load_cmap: colors");
-}
-
-void
-X_allocate_color_cube(Display *dpy, Colormap cmap, long unsigned int *pixels,
int cd, int cmap_base, int store)
-
-
- /* cube dimension */
-
-
-{
- XColor color;
- Colormap default_cmap;
- int i;
- int r, g, b;
- int incr; /* increment */
-
- INIT_XCOLOR(&color);
-
- /*
- * Copy default colors below cmap_base to private colormap to help
- * reduce flashing. Assuming cmap is private and empty, we can be
- * fairly certain to get the colors we want in the right order even
- * though cmap may be shared.
- */
- default_cmap = DefaultColormap(dpy, DefaultScreen(dpy));
- _X_copy_cmap(dpy, cmap, default_cmap, 0, cmap_base, store);
-
- incr = 65535 / (cd - 1);
-
- /* store color cube at cmap_base and above */
- for (i = r = 0; r < 65536; r = r + incr)
- for (g = 0; g < 65536; g = g + incr)
- for (b = 0; b < 65536; b = b + incr, ++i) {
- color.red = (unsigned short)r;
- color.green = (unsigned short)g;
- color.blue = (unsigned short)b;
-
- if (store) {
- color.flags = DoRed|DoGreen|DoBlue;
- pixels[i] = color.pixel = i + cmap_base;
- XStoreColor(dpy, cmap, &color);
- } else {
- XAllocColor(dpy, cmap, &color);
- pixels[i] = color.pixel;
- }
- }
-}
-
-
-#endif /* DM_X */
-
-/*
- * Local Variables:
- * mode: C
- * tab-width: 8
- * indent-tabs-mode: t
- * c-file-style: "stroustrup"
- * End:
- * ex: shiftwidth=4 tabstop=8
- */
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
