#include "gdkcolor.h"
#include "gdkinternals.h"
+#include "gdkx.h"
#include "gdkprivate-x11.h"
+#include "gdkscreen-x11.h"
typedef struct _GdkColormapPrivateX11 GdkColormapPrivateX11;
private = g_new (GdkColormapPrivateX11, 1);
+ colormap->screen = NULL;
colormap->windowing_data = private;
- private->xdisplay = gdk_display;
private->hash = NULL;
private->last_sync_time = 0;
private->info = NULL;
gdk_colormap_remove (colormap);
- XFreeColormap (private->xdisplay, private->xcolormap);
+ XFreeColormap (GDK_SCREEN_XDISPLAY (colormap->screen), private->xcolormap);
if (private->hash)
g_hash_table_destroy (private->hash);
GdkColormap *colormap;
GdkColormapPrivateX11 *private;
Visual *xvisual;
+ Display *xdisplay;
+ Window xrootwin;
int size;
int i;
private = GDK_COLORMAP_PRIVATE_DATA (colormap);
colormap->visual = visual;
+ colormap->screen = visual->screen;
xvisual = ((GdkVisualPrivate*) visual)->xvisual;
+ xdisplay = GDK_SCREEN_XDISPLAY (visual->screen);
+ xrootwin = GDK_SCREEN_XROOTWIN (visual->screen);
colormap->size = visual->colormap_size;
(GEqualFunc) gdk_color_equal);
private->private_val = private_cmap;
- private->xcolormap = XCreateColormap (private->xdisplay, _gdk_root_window,
+ private->xcolormap = XCreateColormap (xdisplay, xrootwin,
xvisual, (private_cmap) ? (AllocAll) : (AllocNone));
if (private_cmap)
{
XColor *default_colors;
- default_colors = g_new (XColor, colormap->size);
+ default_colors = g_new (XColor, colormap->size);
for (i = 0; i < colormap->size; i++)
default_colors[i].pixel = i;
-
- XQueryColors (private->xdisplay,
- DefaultColormap (private->xdisplay, _gdk_screen),
+
+ XQueryColors (xdisplay,
+ DefaultColormapOfScreen (GDK_SCREEN_X11 (visual->screen)->xscreen),
default_colors, colormap->size);
for (i = 0; i < colormap->size; i++)
case GDK_VISUAL_DIRECT_COLOR:
private->private_val = TRUE;
- private->xcolormap = XCreateColormap (private->xdisplay, _gdk_root_window,
+ private->xcolormap = XCreateColormap (xdisplay, xrootwin,
xvisual, AllocAll);
colormap->colors = g_new (GdkColor, colormap->size);
case GDK_VISUAL_STATIC_GRAY:
case GDK_VISUAL_STATIC_COLOR:
private->private_val = FALSE;
- private->xcolormap = XCreateColormap (private->xdisplay, _gdk_root_window,
+ private->xcolormap = XCreateColormap (xdisplay, xrootwin,
xvisual, AllocNone);
colormap->colors = g_new (GdkColor, colormap->size);
case GDK_VISUAL_TRUE_COLOR:
private->private_val = FALSE;
- private->xcolormap = XCreateColormap (private->xdisplay, _gdk_root_window,
+ private->xcolormap = XCreateColormap (xdisplay, xrootwin,
xvisual, AllocNone);
break;
}
}
}
- XQueryColors (gdk_display, private->xcolormap, xpalette, nlookup);
+ XQueryColors (GDK_SCREEN_XDISPLAY (colormap->screen),
+ private->xcolormap, xpalette, nlookup);
for (i = 0; i < nlookup; i++)
{
g_free (xpalette);
}
-
-GdkColormap*
-gdk_colormap_get_system (void)
+/**
+ * gdk_screen_get_system_colormap:
+ * @screen: a #GdkScreen
+ *
+ * Gets the system's default colormap for @screen
+ *
+ * Returns: the default colormap for @screen.
+ */
+GdkColormap *
+gdk_screen_get_system_colormap (GdkScreen *screen)
{
- static GdkColormap *colormap = NULL;
+ GdkColormap *colormap = NULL;
GdkColormapPrivateX11 *private;
+ GdkScreenX11 *screen_x11;
- if (!colormap)
- {
- colormap = g_object_new (gdk_colormap_get_type (), NULL);
- private = GDK_COLORMAP_PRIVATE_DATA (colormap);
+ g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
+ screen_x11 = GDK_SCREEN_X11 (screen);
- private->xdisplay = gdk_display;
- private->xcolormap = DefaultColormap (gdk_display, _gdk_screen);
- colormap->visual = gdk_visual_get_system ();
- private->private_val = FALSE;
+ if (screen_x11->system_colormap)
+ return screen_x11->system_colormap;
- private->hash = NULL;
- private->last_sync_time = 0;
- private->info = NULL;
+ colormap = g_object_new (gdk_colormap_get_type (), NULL);
+ private = GDK_COLORMAP_PRIVATE_DATA (colormap);
- colormap->colors = NULL;
- colormap->size = colormap->visual->colormap_size;
+ colormap->screen = screen;
+ colormap->visual = gdk_screen_get_system_visual (screen);
+
+ private->xcolormap = DefaultColormapOfScreen (screen_x11->xscreen);
+ private->private_val = FALSE;
- switch (colormap->visual->type)
- {
- case GDK_VISUAL_GRAYSCALE:
- case GDK_VISUAL_PSEUDO_COLOR:
- private->info = g_new0 (GdkColorInfo, colormap->size);
- private->hash = g_hash_table_new ((GHashFunc) gdk_color_hash,
- (GEqualFunc) gdk_color_equal);
- /* Fall through */
- case GDK_VISUAL_STATIC_GRAY:
- case GDK_VISUAL_STATIC_COLOR:
- colormap->colors = g_new (GdkColor, colormap->size);
- gdk_colormap_sync (colormap, TRUE);
-
- case GDK_VISUAL_DIRECT_COLOR:
- case GDK_VISUAL_TRUE_COLOR:
- break;
- }
+ private->hash = NULL;
+ private->last_sync_time = 0;
+ private->info = NULL;
- gdk_colormap_add (colormap);
- }
+ colormap->colors = NULL;
+ colormap->size = colormap->visual->colormap_size;
+ switch (colormap->visual->type)
+ {
+ case GDK_VISUAL_GRAYSCALE:
+ case GDK_VISUAL_PSEUDO_COLOR:
+ private->info = g_new0 (GdkColorInfo, colormap->size);
+ private->hash = g_hash_table_new ((GHashFunc) gdk_color_hash,
+ (GEqualFunc) gdk_color_equal);
+ /* Fall through */
+ case GDK_VISUAL_STATIC_GRAY:
+ case GDK_VISUAL_STATIC_COLOR:
+ colormap->colors = g_new (GdkColor, colormap->size);
+ gdk_colormap_sync (colormap, TRUE);
+
+ case GDK_VISUAL_DIRECT_COLOR:
+ case GDK_VISUAL_TRUE_COLOR:
+ break;
+ }
+
+ gdk_colormap_add (colormap);
+ screen_x11->system_colormap = colormap;
+
return colormap;
}
+/**
+ * gdk_colormap_get_system:
+ *
+ * Gets the system's default colormap for the default screen. (See
+ * gdk_colormap_get_system_for_screen ())
+ *
+ * Return value: the default colormap.
+ **/
+GdkColormap*
+gdk_colormap_get_system (void)
+{
+ return gdk_screen_get_system_colormap (gdk_get_default_screen ());
+}
+
gint
gdk_colormap_get_system_size (void)
{
- return DisplayCells (gdk_display, _gdk_screen);
+ return DisplayCells (GDK_SCREEN_XDISPLAY (gdk_get_default_screen()),
+ GDK_SCREEN_X11 (gdk_get_default_screen())->screen_num);
}
void
GdkColormapPrivateX11 *private;
GdkVisual *visual;
XColor *palette;
+ Display *xdisplay;
gint shift;
int max_colors;
int size;
g_return_if_fail (GDK_IS_COLORMAP (colormap));
+ xdisplay = GDK_SCREEN_XDISPLAY (colormap->screen);
palette = g_new (XColor, ncolors);
private = GDK_COLORMAP_PRIVATE_DATA (colormap);
palette[i].flags = DoRed | DoGreen | DoBlue;
}
- XStoreColors (private->xdisplay, private->xcolormap, palette, ncolors);
+ XStoreColors (xdisplay, private->xcolormap, palette, ncolors);
break;
case GDK_VISUAL_DIRECT_COLOR:
palette[i].flags = DoRed;
}
- XStoreColors (private->xdisplay, private->xcolormap, palette, size);
+ XStoreColors (xdisplay, private->xcolormap, palette, size);
shift = visual->green_shift;
max_colors = 1 << visual->green_prec;
palette[i].flags = DoGreen;
}
- XStoreColors (private->xdisplay, private->xcolormap, palette, size);
+ XStoreColors (xdisplay, private->xcolormap, palette, size);
shift = visual->blue_shift;
max_colors = 1 << visual->blue_prec;
palette[i].flags = DoBlue;
}
- XStoreColors (private->xdisplay, private->xcolormap, palette, size);
+ XStoreColors (xdisplay, private->xcolormap, palette, size);
break;
default:
private = GDK_COLORMAP_PRIVATE_DATA (colormap);
- return_val = XAllocColorCells (private->xdisplay, private->xcolormap,
- contiguous, planes, nplanes, pixels, npixels);
-
+ return_val = XAllocColorCells (GDK_SCREEN_XDISPLAY (colormap->screen),
+ private->xcolormap,contiguous, planes,
+ nplanes, pixels, npixels);
if (return_val)
{
for (i=0; i<npixels; i++)
}
if (npixels)
- XFreeColors (private->xdisplay, private->xcolormap,
+ XFreeColors (GDK_SCREEN_XDISPLAY (colormap->screen), private->xcolormap,
pixels, npixels, planes);
g_free (pixels);
}
}
if (npixels)
- XFreeColors (private->xdisplay, private->xcolormap,
+ XFreeColors (GDK_SCREEN_XDISPLAY (colormap->screen), private->xcolormap,
pixels, npixels, 0);
g_free (pixels);
xcolor.pixel = color->pixel;
xcolor.flags = DoRed | DoGreen | DoBlue;
- if (XAllocColor (private->xdisplay, private->xcolormap, &xcolor))
+ if (XAllocColor (GDK_SCREEN_XDISPLAY (colormap->screen), private->xcolormap, &xcolor))
{
ret->pixel = xcolor.pixel;
ret->red = xcolor.red;
{
if (private->info[ret->pixel].ref_count) /* got a duplicate */
{
- XFreeColors (private->xdisplay, private->xcolormap,
+ XFreeColors (GDK_SCREEN_XDISPLAY (colormap->screen), private->xcolormap,
&xcolor.pixel, 1, 0);
}
else
pixels = g_new (gulong, ncolors);
/* Allocation of a writeable color cells */
- status = XAllocColorCells (private->xdisplay, private->xcolormap,
+ status = XAllocColorCells (GDK_SCREEN_XDISPLAY (colormap->screen), private->xcolormap,
FALSE, NULL, 0, pixels, ncolors);
if (status)
{
}
}
- XStoreColors (private->xdisplay, private->xcolormap, store, nstore);
+ XStoreColors (GDK_SCREEN_XDISPLAY (colormap->screen), private->xcolormap,
+ store, nstore);
g_free (store);
if (nremaining > 0 && best_match)
xcolor.pixel = colors[i].pixel;
xcolor.flags = DoRed | DoGreen | DoBlue;
- if (XAllocColor (private->xdisplay, private->xcolormap, &xcolor))
+ if (XAllocColor (GDK_SCREEN_XDISPLAY (colormap->screen), private->xcolormap, &xcolor))
{
colors[i].pixel = xcolor.pixel;
success[i] = TRUE;
break;
case GDK_VISUAL_STATIC_COLOR:
xcolor.pixel = pixel;
- XQueryColor (private->xdisplay, private->xcolormap, &xcolor);
+ XQueryColor (GDK_SCREEN_XDISPLAY (colormap->screen), private->xcolormap, &xcolor);
result->red = xcolor.red;
result->green = xcolor.green;
result->blue = xcolor.blue;
xcolor.flags = DoRed | DoGreen | DoBlue;
private = GDK_COLORMAP_PRIVATE_DATA (colormap);
- XStoreColor (private->xdisplay, private->xcolormap, &xcolor);
+ XStoreColor (GDK_SCREEN_XDISPLAY (colormap->screen), private->xcolormap, &xcolor);
return TRUE;
}
gdkx_colormap_get (Colormap xcolormap)
{
GdkColormap *colormap;
+#if 0
GdkColormapPrivateX11 *private;
colormap = gdk_colormap_lookup (xcolormap);
private->xcolormap = xcolormap;
colormap->visual = NULL;
private->private_val = TRUE;
+#endif
/* To do the following safely, we would have to have some way of finding
* out what the size or visual of the given colormap is. It seems