mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

x11: Use the default screen for X11 properties.

Browse source 
This commit restores the functionality originally included in 65e807
by Leszek Koltunski.
This commit is contained in:
Colin Guthrie 2010-09-18 11:12:56 +01:00
parent 5c0bc09180
commit 165cb87c38
5 changed files with 96 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/modules/x11/module-x11-publish.c
View file

@ -84,6 +84,8 @@ struct userdata {
static void publish_servers(struct userdata *u, pa_strlist *l) { static void publish_servers(struct userdata *u, pa_strlist *l) {
int screen = DefaultScreen(pa_x11_wrapper_get_display(u->x11_wrapper));
if (l) { if (l) {
char *s; char *s;
@ -91,20 +93,22 @@ static void publish_servers(struct userdata *u, pa_strlist *l) {
s = pa_strlist_tostring(l); s = pa_strlist_tostring(l);
pa_strlist_reverse(l); pa_strlist_reverse(l);
pa_x11_set_prop(pa_x11_wrapper_get_xcb_connection(u->x11_wrapper), "PULSE_SERVER", s); pa_x11_set_prop(pa_x11_wrapper_get_xcb_connection(u->x11_wrapper), screen, "PULSE_SERVER", s);
pa_xfree(s); pa_xfree(s);
} else } else
pa_x11_del_prop(pa_x11_wrapper_get_xcb_connection(u->x11_wrapper), "PULSE_SERVER"); pa_x11_del_prop(pa_x11_wrapper_get_xcb_connection(u->x11_wrapper), screen, "PULSE_SERVER");
} }
static pa_hook_result_t servers_changed_cb(void *hook_data, void *call_data, void *slot_data) { static pa_hook_result_t servers_changed_cb(void *hook_data, void *call_data, void *slot_data) {
pa_strlist *servers = call_data; pa_strlist *servers = call_data;
struct userdata *u = slot_data; struct userdata *u = slot_data;
char t[256]; char t[256];
int screen;
pa_assert(u); pa_assert(u);
if (!pa_x11_get_prop(pa_x11_wrapper_get_xcb_connection(u->x11_wrapper), "PULSE_ID", t, sizeof(t)) || strcmp(t, u->id)) { screen = DefaultScreen(pa_x11_wrapper_get_display(u->x11_wrapper));
if (!pa_x11_get_prop(pa_x11_wrapper_get_xcb_connection(u->x11_wrapper), screen, "PULSE_ID", t, sizeof(t)) || strcmp(t, u->id)) {
pa_log_warn("PulseAudio information vanished from X11!"); pa_log_warn("PulseAudio information vanished from X11!");
return PA_HOOK_OK; return PA_HOOK_OK;
} }
@ -138,6 +142,7 @@ int pa__init(pa_module*m) {
char *mid, *sid; char *mid, *sid;
char hx[PA_NATIVE_COOKIE_LENGTH*2+1]; char hx[PA_NATIVE_COOKIE_LENGTH*2+1];
const char *t; const char *t;
int screen;
pa_assert(m); pa_assert(m);
@ -163,26 +168,27 @@ int pa__init(pa_module*m) {
if (!(u->x11_wrapper = pa_x11_wrapper_get(m->core, pa_modargs_get_value(ma, "display", NULL)))) if (!(u->x11_wrapper = pa_x11_wrapper_get(m->core, pa_modargs_get_value(ma, "display", NULL))))
goto fail; goto fail;
screen = DefaultScreen(pa_x11_wrapper_get_display(u->x11_wrapper));
mid = pa_machine_id(); mid = pa_machine_id();
u->id = pa_sprintf_malloc("%lu@%s/%lu", (unsigned long) getuid(), mid, (unsigned long) getpid()); u->id = pa_sprintf_malloc("%lu@%s/%lu", (unsigned long) getuid(), mid, (unsigned long) getpid());
pa_xfree(mid); pa_xfree(mid);
pa_x11_set_prop(pa_x11_wrapper_get_xcb_connection(u->x11_wrapper), "PULSE_ID", u->id); pa_x11_set_prop(pa_x11_wrapper_get_xcb_connection(u->x11_wrapper), screen, "PULSE_ID", u->id);
if ((sid = pa_session_id())) { if ((sid = pa_session_id())) {
pa_x11_set_prop(pa_x11_wrapper_get_xcb_connection(u->x11_wrapper), "PULSE_SESSION_ID", sid); pa_x11_set_prop(pa_x11_wrapper_get_xcb_connection(u->x11_wrapper), screen, "PULSE_SESSION_ID", sid);
pa_xfree(sid); pa_xfree(sid);
} }
publish_servers(u, pa_native_protocol_servers(u->protocol)); publish_servers(u, pa_native_protocol_servers(u->protocol));
if ((t = pa_modargs_get_value(ma, "source", NULL))) if ((t = pa_modargs_get_value(ma, "source", NULL)))
pa_x11_set_prop(pa_x11_wrapper_get_xcb_connection(u->x11_wrapper), "PULSE_SOURCE", t); pa_x11_set_prop(pa_x11_wrapper_get_xcb_connection(u->x11_wrapper), screen, "PULSE_SOURCE", t);
if ((t = pa_modargs_get_value(ma, "sink", NULL))) if ((t = pa_modargs_get_value(ma, "sink", NULL)))
pa_x11_set_prop(pa_x11_wrapper_get_xcb_connection(u->x11_wrapper), "PULSE_SINK", t); pa_x11_set_prop(pa_x11_wrapper_get_xcb_connection(u->x11_wrapper), screen, "PULSE_SINK", t);
pa_x11_set_prop(pa_x11_wrapper_get_xcb_connection(u->x11_wrapper), "PULSE_COOKIE", pa_x11_set_prop(pa_x11_wrapper_get_xcb_connection(u->x11_wrapper), screen, "PULSE_COOKIE",
pa_hexstr(pa_auth_cookie_read(u->auth_cookie, PA_NATIVE_COOKIE_LENGTH), PA_NATIVE_COOKIE_LENGTH, hx, sizeof(hx))); pa_hexstr(pa_auth_cookie_read(u->auth_cookie, PA_NATIVE_COOKIE_LENGTH), PA_NATIVE_COOKIE_LENGTH, hx, sizeof(hx)));
u->x11_client = pa_x11_client_new(u->x11_wrapper, NULL, x11_kill_cb, u); u->x11_client = pa_x11_client_new(u->x11_wrapper, NULL, x11_kill_cb, u);
@ -213,17 +219,18 @@ void pa__done(pa_module*m) {
if (u->x11_wrapper) { if (u->x11_wrapper) {
char t[256]; char t[256];
int screen = DefaultScreen(pa_x11_wrapper_get_display(u->x11_wrapper));
/* Yes, here is a race condition */ /* Yes, here is a race condition */
if (!pa_x11_get_prop(pa_x11_wrapper_get_xcb_connection(u->x11_wrapper), "PULSE_ID", t, sizeof(t)) || strcmp(t, u->id)) if (!pa_x11_get_prop(pa_x11_wrapper_get_xcb_connection(u->x11_wrapper), screen, "PULSE_ID", t, sizeof(t)) || strcmp(t, u->id))
pa_log_warn("PulseAudio information vanished from X11!"); pa_log_warn("PulseAudio information vanished from X11!");
else { else {
pa_x11_del_prop(pa_x11_wrapper_get_xcb_connection(u->x11_wrapper), "PULSE_ID"); pa_x11_del_prop(pa_x11_wrapper_get_xcb_connection(u->x11_wrapper), screen, "PULSE_ID");
pa_x11_del_prop(pa_x11_wrapper_get_xcb_connection(u->x11_wrapper), "PULSE_SERVER"); pa_x11_del_prop(pa_x11_wrapper_get_xcb_connection(u->x11_wrapper), screen, "PULSE_SERVER");
pa_x11_del_prop(pa_x11_wrapper_get_xcb_connection(u->x11_wrapper), "PULSE_SINK"); pa_x11_del_prop(pa_x11_wrapper_get_xcb_connection(u->x11_wrapper), screen, "PULSE_SINK");
pa_x11_del_prop(pa_x11_wrapper_get_xcb_connection(u->x11_wrapper), "PULSE_SOURCE"); pa_x11_del_prop(pa_x11_wrapper_get_xcb_connection(u->x11_wrapper), screen, "PULSE_SOURCE");
pa_x11_del_prop(pa_x11_wrapper_get_xcb_connection(u->x11_wrapper), "PULSE_COOKIE"); pa_x11_del_prop(pa_x11_wrapper_get_xcb_connection(u->x11_wrapper), screen, "PULSE_COOKIE");
pa_x11_del_prop(pa_x11_wrapper_get_xcb_connection(u->x11_wrapper), "PULSE_SESSION_ID"); pa_x11_del_prop(pa_x11_wrapper_get_xcb_connection(u->x11_wrapper), screen, "PULSE_SESSION_ID");
xcb_flush(pa_x11_wrapper_get_xcb_connection(u->x11_wrapper)); xcb_flush(pa_x11_wrapper_get_xcb_connection(u->x11_wrapper));
} }

12
src/pulse/client-conf-x11.c
View file

@ -39,7 +39,7 @@
int pa_client_conf_from_x11(pa_client_conf *c, const char *dname) { int pa_client_conf_from_x11(pa_client_conf *c, const char *dname) {
xcb_connection_t *xcb = NULL; xcb_connection_t *xcb = NULL;
int ret = -1; int ret = -1, screen = 0;
char t[1024]; char t[1024];
pa_assert(c); pa_assert(c);
@ -60,13 +60,13 @@ int pa_client_conf_from_x11(pa_client_conf *c, const char *dname) {
goto finish; goto finish;
} }
if (pa_x11_get_prop(xcb, "PULSE_SERVER", t, sizeof(t))) { if (pa_x11_get_prop(xcb, screen, "PULSE_SERVER", t, sizeof(t))) {
pa_bool_t disable_autospawn = TRUE; pa_bool_t disable_autospawn = TRUE;
pa_xfree(c->default_server); pa_xfree(c->default_server);
c->default_server = pa_xstrdup(t); c->default_server = pa_xstrdup(t);
if (pa_x11_get_prop(xcb, "PULSE_SESSION_ID", t, sizeof(t))) { if (pa_x11_get_prop(xcb, screen, "PULSE_SESSION_ID", t, sizeof(t))) {
char *id; char *id;
if ((id = pa_session_id())) { if ((id = pa_session_id())) {
@ -80,17 +80,17 @@ int pa_client_conf_from_x11(pa_client_conf *c, const char *dname) {
c->autospawn = FALSE; c->autospawn = FALSE;
} }
if (pa_x11_get_prop(xcb, "PULSE_SINK", t, sizeof(t))) { if (pa_x11_get_prop(xcb, screen, "PULSE_SINK", t, sizeof(t))) {
pa_xfree(c->default_sink); pa_xfree(c->default_sink);
c->default_sink = pa_xstrdup(t); c->default_sink = pa_xstrdup(t);
} }
if (pa_x11_get_prop(xcb, "PULSE_SOURCE", t, sizeof(t))) { if (pa_x11_get_prop(xcb, screen, "PULSE_SOURCE", t, sizeof(t))) {
pa_xfree(c->default_source); pa_xfree(c->default_source);
c->default_source = pa_xstrdup(t); c->default_source = pa_xstrdup(t);
} }
if (pa_x11_get_prop(xcb, "PULSE_COOKIE", t, sizeof(t))) { if (pa_x11_get_prop(xcb, screen, "PULSE_COOKIE", t, sizeof(t))) {
uint8_t cookie[PA_NATIVE_COOKIE_LENGTH]; uint8_t cookie[PA_NATIVE_COOKIE_LENGTH];
if (pa_parsehex(t, cookie, sizeof(cookie)) != sizeof(cookie)) { if (pa_parsehex(t, cookie, sizeof(cookie)) != sizeof(cookie)) {

55
src/pulsecore/x11prop.c
View file

@ -34,55 +34,74 @@
#define PA_XCB_FORMAT 8 #define PA_XCB_FORMAT 8
void pa_x11_set_prop(xcb_connection_t *xcb, const char *name, const char *data) { static xcb_screen_t *screen_of_display(xcb_connection_t *xcb, int screen)
xcb_screen_t *screen; {
const xcb_setup_t *s; const xcb_setup_t *s;
xcb_screen_iterator_t iter;
if ((s = xcb_get_setup(xcb))) {
iter = xcb_setup_roots_iterator(s);
for (; iter.rem; --screen, xcb_screen_next(&iter))
if (0 == screen)
return iter.data;
}
return NULL;
}
void pa_x11_set_prop(xcb_connection_t *xcb, int screen, const char *name, const char *data) {
xcb_screen_t *xs;
xcb_atom_t a; xcb_atom_t a;
pa_assert(xcb); pa_assert(xcb);
pa_assert(name); pa_assert(name);
pa_assert(data); pa_assert(data);
if ((s = xcb_get_setup(xcb))) { if ((xs = screen_of_display(xcb, screen))) {
a = xcb_atom_get(xcb, name); a = xcb_atom_get(xcb, name);
screen = xcb_setup_roots_iterator(s).data; xcb_change_property(xcb, XCB_PROP_MODE_REPLACE, xs->root, a, STRING, PA_XCB_FORMAT, (int) strlen(data), (const void*) data);
xcb_change_property(xcb, XCB_PROP_MODE_REPLACE, screen->root, a, STRING, PA_XCB_FORMAT, (int) strlen(data), (const void*) data);
} }
} }
void pa_x11_del_prop(xcb_connection_t *xcb, const char *name) { void pa_x11_del_prop(xcb_connection_t *xcb, int screen, const char *name) {
xcb_screen_t *screen; xcb_screen_t *xs;
const xcb_setup_t *s;
xcb_atom_t a; xcb_atom_t a;
pa_assert(xcb); pa_assert(xcb);
pa_assert(name); pa_assert(name);
if ((s = xcb_get_setup(xcb))) { if ((xs = screen_of_display(xcb, screen))) {
a = xcb_atom_get(xcb, name); a = xcb_atom_get(xcb, name);
screen = xcb_setup_roots_iterator(s).data; xcb_delete_property(xcb, xs->root, a);
xcb_delete_property(xcb, screen->root, a);
} }
} }
char* pa_x11_get_prop(xcb_connection_t *xcb, const char *name, char *p, size_t l) { char* pa_x11_get_prop(xcb_connection_t *xcb, int screen, const char *name, char *p, size_t l) {
char *ret = NULL; char *ret = NULL;
int len; int len;
xcb_get_property_cookie_t req; xcb_get_property_cookie_t req;
xcb_get_property_reply_t* prop = NULL; xcb_get_property_reply_t* prop = NULL;
xcb_screen_t *screen; xcb_screen_t *xs;
const xcb_setup_t *s;
xcb_atom_t a; xcb_atom_t a;
pa_assert(xcb); pa_assert(xcb);
pa_assert(name); pa_assert(name);
pa_assert(p); pa_assert(p);
if ((s = xcb_get_setup(xcb))) {
a = xcb_atom_get(xcb, name);
screen = xcb_setup_roots_iterator(s).data;
req = xcb_get_property(xcb, 0, screen->root, a, STRING, 0, (uint32_t)(l-1)); xs = screen_of_display(xcb, screen);
/*
* Also try and get the settings from the first screen.
* This allows for e.g. a Media Center to run on screen 1 (e.g. HDMI) and have
* different defaults (e.g. prefer the HDMI sink) than the primary screen 0
* which uses the Internal Audio sink.
*/
if (!xs && 0 != screen)
xs = screen_of_display(xcb, 0);
if (xs) {
a = xcb_atom_get(xcb, name);
req = xcb_get_property(xcb, 0, xs->root, a, STRING, 0, (uint32_t)(l-1));
prop = xcb_get_property_reply(xcb, req, NULL); prop = xcb_get_property_reply(xcb, req, NULL);
if (!prop) if (!prop)

6
src/pulsecore/x11prop.h
View file

@ -27,8 +27,8 @@
#include <xcb/xcb.h> #include <xcb/xcb.h>
void pa_x11_set_prop(xcb_connection_t *xcb, const char *name, const char *data); void pa_x11_set_prop(xcb_connection_t *xcb, int screen, const char *name, const char *data);
void pa_x11_del_prop(xcb_connection_t *xcb, const char *name); void pa_x11_del_prop(xcb_connection_t *xcb, int screen, const char *name);
char* pa_x11_get_prop(xcb_connection_t *xcb, const char *name, char *p, size_t l); char* pa_x11_get_prop(xcb_connection_t *xcb, int screen, const char *name, char *p, size_t l);
#endif #endif

56
src/utils/pax11publish.c
View file

@ -44,7 +44,7 @@
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
const char *dname = NULL, *sink = NULL, *source = NULL, *server = NULL, *cookie_file = PA_NATIVE_COOKIE_FILE; const char *dname = NULL, *sink = NULL, *source = NULL, *server = NULL, *cookie_file = PA_NATIVE_COOKIE_FILE;
int c, ret = 1; int c, ret = 1, screen = 0;
xcb_connection_t *xcb = NULL; xcb_connection_t *xcb = NULL;
enum { DUMP, EXPORT, IMPORT, REMOVE } mode = DUMP; enum { DUMP, EXPORT, IMPORT, REMOVE } mode = DUMP;
@ -95,7 +95,7 @@ int main(int argc, char *argv[]) {
} }
} }
if (!(xcb = xcb_connect(dname, NULL))) { if (!(xcb = xcb_connect(dname, &screen))) {
pa_log(_("xcb_connect() failed")); pa_log(_("xcb_connect() failed"));
goto finish; goto finish;
} }
@ -108,13 +108,13 @@ int main(int argc, char *argv[]) {
switch (mode) { switch (mode) {
case DUMP: { case DUMP: {
char t[1024]; char t[1024];
if (pa_x11_get_prop(xcb, "PULSE_SERVER", t, sizeof(t))) if (pa_x11_get_prop(xcb, screen, "PULSE_SERVER", t, sizeof(t)))
printf(_("Server: %s\n"), t); printf(_("Server: %s\n"), t);
if (pa_x11_get_prop(xcb, "PULSE_SOURCE", t, sizeof(t))) if (pa_x11_get_prop(xcb, screen, "PULSE_SOURCE", t, sizeof(t)))
printf(_("Source: %s\n"), t); printf(_("Source: %s\n"), t);
if (pa_x11_get_prop(xcb, "PULSE_SINK", t, sizeof(t))) if (pa_x11_get_prop(xcb, screen, "PULSE_SINK", t, sizeof(t)))
printf(_("Sink: %s\n"), t); printf(_("Sink: %s\n"), t);
if (pa_x11_get_prop(xcb, "PULSE_COOKIE", t, sizeof(t))) if (pa_x11_get_prop(xcb, screen, "PULSE_COOKIE", t, sizeof(t)))
printf(_("Cookie: %s\n"), t); printf(_("Cookie: %s\n"), t);
break; break;
@ -122,14 +122,14 @@ int main(int argc, char *argv[]) {
case IMPORT: { case IMPORT: {
char t[1024]; char t[1024];
if (pa_x11_get_prop(xcb, "PULSE_SERVER", t, sizeof(t))) if (pa_x11_get_prop(xcb, screen, "PULSE_SERVER", t, sizeof(t)))
printf("PULSE_SERVER='%s'\nexport PULSE_SERVER\n", t); printf("PULSE_SERVER='%s'\nexport PULSE_SERVER\n", t);
if (pa_x11_get_prop(xcb, "PULSE_SOURCE", t, sizeof(t))) if (pa_x11_get_prop(xcb, screen, "PULSE_SOURCE", t, sizeof(t)))
printf("PULSE_SOURCE='%s'\nexport PULSE_SOURCE\n", t); printf("PULSE_SOURCE='%s'\nexport PULSE_SOURCE\n", t);
if (pa_x11_get_prop(xcb, "PULSE_SINK", t, sizeof(t))) if (pa_x11_get_prop(xcb, screen, "PULSE_SINK", t, sizeof(t)))
printf("PULSE_SINK='%s'\nexport PULSE_SINK\n", t); printf("PULSE_SINK='%s'\nexport PULSE_SINK\n", t);
if (pa_x11_get_prop(xcb, "PULSE_COOKIE", t, sizeof(t))) { if (pa_x11_get_prop(xcb, screen, "PULSE_COOKIE", t, sizeof(t))) {
uint8_t cookie[PA_NATIVE_COOKIE_LENGTH]; uint8_t cookie[PA_NATIVE_COOKIE_LENGTH];
size_t l; size_t l;
if ((l = pa_parsehex(t, cookie, sizeof(cookie))) != sizeof(cookie)) { if ((l = pa_parsehex(t, cookie, sizeof(cookie))) != sizeof(cookie)) {
@ -162,16 +162,16 @@ int main(int argc, char *argv[]) {
goto finish; goto finish;
} }
pa_x11_del_prop(xcb, "PULSE_SERVER"); pa_x11_del_prop(xcb, screen, "PULSE_SERVER");
pa_x11_del_prop(xcb, "PULSE_SINK"); pa_x11_del_prop(xcb, screen, "PULSE_SINK");
pa_x11_del_prop(xcb, "PULSE_SOURCE"); pa_x11_del_prop(xcb, screen, "PULSE_SOURCE");
pa_x11_del_prop(xcb, "PULSE_ID"); pa_x11_del_prop(xcb, screen, "PULSE_ID");
pa_x11_del_prop(xcb, "PULSE_COOKIE"); pa_x11_del_prop(xcb, screen, "PULSE_COOKIE");
if (server) if (server)
pa_x11_set_prop(xcb, "PULSE_SERVER", server); pa_x11_set_prop(xcb, screen, "PULSE_SERVER", server);
else if (conf->default_server) else if (conf->default_server)
pa_x11_set_prop(xcb, "PULSE_SERVER", conf->default_server); pa_x11_set_prop(xcb, screen, "PULSE_SERVER", conf->default_server);
else { else {
char hn[256]; char hn[256];
if (!pa_get_fqdn(hn, sizeof(hn))) { if (!pa_get_fqdn(hn, sizeof(hn))) {
@ -179,18 +179,18 @@ int main(int argc, char *argv[]) {
goto finish; goto finish;
} }
pa_x11_set_prop(xcb, "PULSE_SERVER", hn); pa_x11_set_prop(xcb, screen, "PULSE_SERVER", hn);
} }
if (sink) if (sink)
pa_x11_set_prop(xcb, "PULSE_SINK", sink); pa_x11_set_prop(xcb, screen, "PULSE_SINK", sink);
else if (conf->default_sink) else if (conf->default_sink)
pa_x11_set_prop(xcb, "PULSE_SINK", conf->default_sink); pa_x11_set_prop(xcb, screen, "PULSE_SINK", conf->default_sink);
if (source) if (source)
pa_x11_set_prop(xcb, "PULSE_SOURCE", source); pa_x11_set_prop(xcb, screen, "PULSE_SOURCE", source);
if (conf->default_source) if (conf->default_source)
pa_x11_set_prop(xcb, "PULSE_SOURCE", conf->default_source); pa_x11_set_prop(xcb, screen, "PULSE_SOURCE", conf->default_source);
pa_client_conf_free(conf); pa_client_conf_free(conf);
@ -199,16 +199,16 @@ int main(int argc, char *argv[]) {
goto finish; goto finish;
} }
pa_x11_set_prop(xcb, "PULSE_COOKIE", pa_hexstr(cookie, sizeof(cookie), hx, sizeof(hx))); pa_x11_set_prop(xcb, screen, "PULSE_COOKIE", pa_hexstr(cookie, sizeof(cookie), hx, sizeof(hx)));
break; break;
} }
case REMOVE: case REMOVE:
pa_x11_del_prop(xcb, "PULSE_SERVER"); pa_x11_del_prop(xcb, screen, "PULSE_SERVER");
pa_x11_del_prop(xcb, "PULSE_SINK"); pa_x11_del_prop(xcb, screen, "PULSE_SINK");
pa_x11_del_prop(xcb, "PULSE_SOURCE"); pa_x11_del_prop(xcb, screen, "PULSE_SOURCE");
pa_x11_del_prop(xcb, "PULSE_ID"); pa_x11_del_prop(xcb, screen, "PULSE_ID");
pa_x11_del_prop(xcb, "PULSE_COOKIE"); pa_x11_del_prop(xcb, screen, "PULSE_COOKIE");
break; break;
default: default: