view src/video/Xext/XmuStdCmap/LookupCmap.c @ 5082:de59e0218aa2

Fixed bug #1011 Daniel Ellis 2010-06-25 15:20:31 PDT SDL based applications sometimes display the wrong application name in the Sound Preferences dialog when using pulseaudio. I can see from the code that the SDL pulse module is initiating a new pulse audio context and passing an application name using the function get_progname(). The get_progname() function returns the name of the current process. However, the process name is often not a suitable name to use. For example, the OpenShot video editor is a python application, and so "python" is displayed in the Sound Preferences window (see Bug #596504), when it should be displaying "OpenShot". PulseAudio allows applications to specify the application name, either at the time the context is created (as SDL does currently), or by special environment variables (see http://www.pulseaudio.org/wiki/ApplicationProperties). If no name is specified, then pulseaudio will determine the name based on the process. If you specify the application name when initiating the pulseaudio context, then that will override any application name specified using an environment variable. As libsdl is a library, I believe the solution is for libsdl to not specify any application name when initiating a pulseaudio context, which will enable applications to specify the application name using environment variables. In the case that the applications do not specify anything, pulseaudio will fall back to using the process name anyway. The attached patch removes the get_progname() function and passes NULL as the application name when creating the pulseaudio context, which fixes the issue.
author Sam Lantinga <slouken@libsdl.org>
date Sun, 23 Jan 2011 21:55:04 -0800
parents 2032348afed1
children
line wrap: on
line source

/* $Xorg: LookupCmap.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */

/* 
 
Copyright 1989, 1998  The Open Group

Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear in supporting
documentation.

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Except as contained in this notice, the name of The Open Group shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.

*/
/* $XFree86: xc/lib/Xmu/LookupCmap.c,v 1.7 2001/07/25 15:04:50 dawes Exp $ */

/*
 * Author:  Donna Converse, MIT X Consortium
 */

#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <stdio.h>
#include <X11/Xlib.h>
#include <X11/Xatom.h>
#include <X11/Xutil.h>
#include "../extensions/StdCmap.h"
#include <stdlib.h>

/*
 * Prototypes
 */
static Status lookup(Display *, int, VisualID, Atom, XStandardColormap *,
                     Bool);

/*
 * To create a standard colormap if one does not currently exist, or
 * replace the currently existing standard colormap, use 
 * XmuLookupStandardColormap().
 *
 * Given a screen, a visual, and a property, XmuLookupStandardColormap()
 * will determine the best allocation for the property under the specified
 * visual, and determine the whether to create a new colormap or to use
 * the default colormap of the screen.  It will call XmuStandardColormap()
 * to create the standard colormap.
 *
 * If replace is true, any previous definition of the property will be 
 * replaced.  If retain is true, the property and the colormap will be
 * made permanent for the duration of the server session.  However,
 * pre-existing property definitions which are not replaced cannot be made
 * permanent by a call to XmuLookupStandardColormap(); a request to retain 
 * resources pertains to newly created resources.
 *
 * Returns 0 on failure, non-zero on success.  A request to create a 
 * standard colormap upon a visual which cannot support such a map is
 * considered a failure.  An example of this would be requesting any
 * standard colormap property on a monochrome visual, or, requesting an
 * RGB_BEST_MAP on a display whose colormap size is 16.
 */

Status
XmuLookupStandardColormap(Display * dpy, int screen, VisualID visualid,
                          unsigned int depth, Atom property,
                          Bool replace, Bool retain)
     /*
      * dpy             - specifies X server connection
      * screen          - specifies screen of display
      * visualid        - specifies the visual type
      * depth           - specifies  the visual type
      * property        - a standard colormap property
      * replace         - specifies whether to replace
      * retain          - specifies whether to retain
      */
{
    Display *odpy;              /* original display connection */
    XStandardColormap *colormap;
    XVisualInfo vinfo_template, *vinfo; /* visual */
    long vinfo_mask;
    unsigned long r_max, g_max, b_max;  /* allocation */
    int count;
    Colormap cmap;              /* colormap ID */
    Status status = 0;


    /* Match the requested visual */

    vinfo_template.visualid = visualid;
    vinfo_template.screen = screen;
    vinfo_template.depth = depth;
    vinfo_mask = VisualIDMask | VisualScreenMask | VisualDepthMask;
    if ((vinfo = XGetVisualInfo(dpy, vinfo_mask, &vinfo_template, &count)) ==
        NULL)
        return 0;

    /* Monochrome visuals have no standard maps */

    if (vinfo->colormap_size <= 2) {
        XFree((char *) vinfo);
        return 0;
    }

    /* If the requested property already exists on this screen, and, 
     * if the replace flag has not been set to true, return success.
     * lookup() will remove a pre-existing map if replace is true.
     */

    if (lookup(dpy, screen, visualid, property, (XStandardColormap *) NULL,
               replace) && !replace) {
        XFree((char *) vinfo);
        return 1;
    }

    /* Determine the best allocation for this property under the requested
     * visualid and depth, and determine whether or not to use the default
     * colormap of the screen.
     */

    if (!XmuGetColormapAllocation(vinfo, property, &r_max, &g_max, &b_max)) {
        XFree((char *) vinfo);
        return 0;
    }

    cmap = (property == XA_RGB_DEFAULT_MAP &&
            visualid == XVisualIDFromVisual(DefaultVisual(dpy, screen)))
        ? DefaultColormap(dpy, screen) : None;

    /* If retaining resources, open a new connection to the same server */

    if (retain) {
        odpy = dpy;
        if ((dpy = XOpenDisplay(XDisplayString(odpy))) == NULL) {
            XFree((char *) vinfo);
            return 0;
        }
    }

    /* Create the standard colormap */

    colormap = XmuStandardColormap(dpy, screen, visualid, depth, property,
                                   cmap, r_max, g_max, b_max);

    /* Set the standard colormap property */

    if (colormap) {
        XGrabServer(dpy);

        if (lookup(dpy, screen, visualid, property, colormap, replace) &&
            !replace) {
            /* Someone has defined the property since we last looked.
             * Since we will not replace it, release our own resources.
             * If this is the default map, our allocations will be freed 
             * when this connection closes.
             */
            if (colormap->killid == ReleaseByFreeingColormap)
                XFreeColormap(dpy, colormap->colormap);
        } else if (retain) {
            XSetCloseDownMode(dpy, RetainPermanent);
        }
        XUngrabServer(dpy);
        XFree((char *) colormap);
        status = 1;
    }

    if (retain)
        XCloseDisplay(dpy);
    XFree((char *) vinfo);
    return status;
}

/***************************************************************************/

/* Lookup a standard colormap property.  If the property is RGB_DEFAULT_MAP,
 * the visualid is used to determine whether the indicated standard colormap
 * exists.  If the map exists and replace is true, delete the resources used
 * by the map and remove the property.  Return true if the map exists,
 * or did exist and was deleted; return false if the map was not found.
 *
 * Note that this is not the way that a Status return is normally used.
 *
 * If new is not NULL, new points to an XStandardColormap structure which
 * describes a standard colormap of the specified property.  It will be made
 * a standard colormap of the screen if none already exists, or if replace 
 * is true.
 */

static Status
lookup(Display * dpy, int screen, VisualID visualid, Atom property,
       XStandardColormap * cnew, Bool replace)
     /*
      * dpy             - specifies display connection
      * screen          - specifies screen number
      * visualid        - specifies visualid for std map
      * property        - specifies colormap property name
      * cnew            - specifies a standard colormap
      * replace         - specifies whether to replace
      */
{
    register int i;
    int count;
    XStandardColormap *stdcmaps, *s;
    Window win = RootWindow(dpy, screen);

    /* The property does not already exist */

    if (!XGetRGBColormaps(dpy, win, &stdcmaps, &count, property)) {
        if (cnew)
            XSetRGBColormaps(dpy, win, cnew, 1, property);
        return 0;
    }

    /* The property exists and is not describing the RGB_DEFAULT_MAP */

    if (property != XA_RGB_DEFAULT_MAP) {
        if (replace) {
            XmuDeleteStandardColormap(dpy, screen, property);
            if (cnew)
                XSetRGBColormaps(dpy, win, cnew, 1, property);
        }
        XFree((char *) stdcmaps);
        return 1;
    }

    /* The property exists and is RGB_DEFAULT_MAP */

    for (i = 0, s = stdcmaps; (i < count) && (s->visualid != visualid);
         i++, s++);

    /* No RGB_DEFAULT_MAP property matches the given visualid */

    if (i == count) {
        if (cnew) {
            XStandardColormap *m, *maps;

            s = (XStandardColormap *) malloc((unsigned) ((count + 1) * sizeof
                                                         (XStandardColormap)));

            for (i = 0, m = s, maps = stdcmaps; i < count; i++, m++, maps++) {
                m->colormap = maps->colormap;
                m->red_max = maps->red_max;
                m->red_mult = maps->red_mult;
                m->green_max = maps->green_max;
                m->green_mult = maps->green_mult;
                m->blue_max = maps->blue_max;
                m->blue_mult = maps->blue_mult;
                m->base_pixel = maps->base_pixel;
                m->visualid = maps->visualid;
                m->killid = maps->killid;
            }
            m->colormap = cnew->colormap;
            m->red_max = cnew->red_max;
            m->red_mult = cnew->red_mult;
            m->green_max = cnew->green_max;
            m->green_mult = cnew->green_mult;
            m->blue_max = cnew->blue_max;
            m->blue_mult = cnew->blue_mult;
            m->base_pixel = cnew->base_pixel;
            m->visualid = cnew->visualid;
            m->killid = cnew->killid;

            XSetRGBColormaps(dpy, win, s, ++count, property);
            free((char *) s);
        }
        XFree((char *) stdcmaps);
        return 0;
    }

    /* Found an RGB_DEFAULT_MAP property with a matching visualid */

    if (replace) {
        /* Free old resources first - we may need them, particularly in 
         * the default colormap of the screen.  However, because of this,
         * it is possible that we will destroy the old resource and fail 
         * to create a new one if XmuStandardColormap() fails.
         */

        if (count == 1) {
            XmuDeleteStandardColormap(dpy, screen, property);
            if (cnew)
                XSetRGBColormaps(dpy, win, cnew, 1, property);
        } else {
            XStandardColormap *map;

            /* s still points to the matching standard colormap */

            if (s->killid == ReleaseByFreeingColormap) {
                if ((s->colormap != None) &&
                    (s->colormap != DefaultColormap(dpy, screen)))
                    XFreeColormap(dpy, s->colormap);
            } else if (s->killid != None)
                XKillClient(dpy, s->killid);

            map = (cnew) ? cnew : stdcmaps + --count;

            s->colormap = map->colormap;
            s->red_max = map->red_max;
            s->red_mult = map->red_mult;
            s->green_max = map->green_max;
            s->green_mult = map->green_mult;
            s->blue_max = map->blue_max;
            s->blue_mult = map->blue_mult;
            s->visualid = map->visualid;
            s->killid = map->killid;

            XSetRGBColormaps(dpy, win, stdcmaps, count, property);
        }
    }
    XFree((char *) stdcmaps);
    return 1;
}