[pulseaudio-commits] r1610 - in /branches/lennart/src: Makefile.am daemon/default.pa.in modules/module-x11-xsmp.c
svnmailer-noreply at 0pointer.de
svnmailer-noreply at 0pointer.de
Thu Aug 9 16:47:07 PDT 2007
Author: lennart
Date: Fri Aug 10 01:47:06 2007
New Revision: 1610
URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=3D1610&root=3Dpulseaudio&vi=
ew=3Drev
Log:
Add X11 XSMP module for hooking into the X11 session manager, for being not=
ified about X11 disconnects before they actually happen, so that we are not=
killed by the bloody xlibs
Added:
branches/lennart/src/modules/module-x11-xsmp.c (with props)
Modified:
branches/lennart/src/Makefile.am
branches/lennart/src/daemon/default.pa.in
Modified: branches/lennart/src/Makefile.am
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/Makefile.a=
m?rev=3D1610&root=3Dpulseaudio&r1=3D1609&r2=3D1610&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/lennart/src/Makefile.am (original)
+++ branches/lennart/src/Makefile.am Fri Aug 10 01:47:06 2007
@@ -924,7 +924,8 @@
if HAVE_X11
modlibexec_LTLIBRARIES +=3D \
module-x11-bell.la \
- module-x11-publish.la
+ module-x11-publish.la \
+ module-x11-xsmp.la
endif
=
if HAVE_OSS
@@ -1016,6 +1017,7 @@
modules/module-http-protocol-unix-symdef.h \
modules/module-x11-bell-symdef.h \
modules/module-x11-publish-symdef.h \
+ modules/module-x11-xsmp-symdef.h \
modules/module-oss-symdef.h \
modules/module-alsa-sink-symdef.h \
modules/module-alsa-source-symdef.h \
@@ -1173,6 +1175,11 @@
module_x11_publish_la_LDFLAGS =3D -module -avoid-version
module_x11_publish_la_LIBADD =3D $(AM_LIBADD) $(X_PRE_LIBS) -lX11 $(X_LIBS=
) $(X_EXTRA_LIBS) libx11wrap.la libauthkey.la libauthkey-prop.la libx11prop=
.la libstrlist.la libpulsecore.la
=
+module_x11_xsmp_la_SOURCES =3D modules/module-x11-xsmp.c
+module_x11_xsmp_la_CFLAGS =3D $(AM_CFLAGS) $(X_CFLAGS)
+module_x11_xsmp_la_LDFLAGS =3D -module -avoid-version
+module_x11_xsmp_la_LIBADD =3D $(AM_LIBADD) $(X_PRE_LIBS) -lX11 $(X_LIBS) $=
(X_EXTRA_LIBS) libpulsecore.la
+
# OSS
=
liboss_util_la_SOURCES =3D modules/oss-util.c modules/oss-util.h
Modified: branches/lennart/src/daemon/default.pa.in
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/daemon/def=
ault.pa.in?rev=3D1610&root=3Dpulseaudio&r1=3D1609&r2=3D1610&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/lennart/src/daemon/default.pa.in (original)
+++ branches/lennart/src/daemon/default.pa.in Fri Aug 10 01:47:06 2007
@@ -76,6 +76,9 @@
### Publish connection data in the X11 root window
load-module module-x11-publish
=
+### Register ourselves in the X11 session manager
+load-module module-x11-xsmp
+
### Load additional modules from GConf settings. This can be configured wi=
th the paprefs tool.
### Please keep in mind that the modules configured by paprefs might confl=
ict with manually
### loaded modules.
Added: branches/lennart/src/modules/module-x11-xsmp.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/modules/mo=
dule-x11-xsmp.c?rev=3D1610&root=3Dpulseaudio&view=3Dauto
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/lennart/src/modules/module-x11-xsmp.c (added)
+++ branches/lennart/src/modules/module-x11-xsmp.c Fri Aug 10 01:47:06 2007
@@ -1,0 +1,201 @@
+/* $Id$ */
+
+/***
+ This file is part of PulseAudio.
+
+ Copyright 2004-2006 Lennart Poettering
+
+ PulseAudio is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2 of the License,
+ or (at your option) any later version.
+
+ PulseAudio 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
+ General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with PulseAudio; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ USA.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <X11/Xlib.h>
+#include <X11/SM/SMlib.h>
+
+#include <pulse/xmalloc.h>
+#include <pulse/util.h>
+
+#include <pulsecore/iochannel.h>
+#include <pulsecore/sink.h>
+#include <pulsecore/core-scache.h>
+#include <pulsecore/modargs.h>
+#include <pulsecore/namereg.h>
+#include <pulsecore/log.h>
+#include <pulsecore/core-util.h>
+
+#include "module-x11-xsmp-symdef.h"
+
+PA_MODULE_AUTHOR("Lennart Poettering")
+PA_MODULE_DESCRIPTION("X11 session management")
+PA_MODULE_VERSION(PACKAGE_VERSION)
+
+struct userdata {
+ pa_core *core;
+ SmcConn sm_conn;
+};
+
+static const char* const valid_modargs[] =3D {
+ NULL
+};
+
+static void die_cb(SmcConn connection, SmPointer client_data){
+ pa_core *c =3D client_data;
+
+ pa_log_debug("Got die message from XSM. Exiting...");
+ =
+ pa_core_assert_ref(c);
+ c->mainloop->quit(c->mainloop, 0);
+}
+
+static void save_complete_cb(SmcConn connection, SmPointer client_data) {
+}
+
+static void shutdown_cancelled_cb(SmcConn connection, SmPointer client_dat=
a) {
+ SmcSaveYourselfDone(connection, True);
+}
+
+static void save_yourself_cb(SmcConn connection, SmPointer client_data, in=
t save_type, Bool _shutdown, int interact_style, Bool fast) {
+ SmcSaveYourselfDone(connection, True);
+}
+
+static void ice_io_cb(pa_mainloop_api*a, pa_io_event *e, int fd, pa_io_eve=
nt_flags_t flags, void *userdata) {
+ IceConn connection =3D userdata;
+
+ if (IceProcessMessages(connection, NULL, NULL) =3D=3D IceProcessMessag=
esIOError) {
+ IceSetShutdownNegotiation(connection, False);
+ IceCloseConnection(connection);
+ }
+}
+
+static void new_ice_connection(IceConn connection, IcePointer client_data,=
Bool opening, IcePointer *watch_data) {
+ pa_core *c =3D client_data;
+
+ pa_assert(c);
+ =
+ if (opening)
+ *watch_data =3D c->mainloop->io_new(c->mainloop, IceConnectionNumb=
er(connection), PA_IO_EVENT_INPUT, ice_io_cb, connection);
+ else
+ c->mainloop->io_free(*watch_data);
+}
+
+int pa__init(pa_core *c, pa_module*m) {
+ struct userdata *u =3D NULL;
+ pa_modargs *ma =3D NULL;
+ char t[256], *vendor, *client_id;
+ SmcCallbacks callbacks;
+ SmProp prop_program, prop_user;
+ SmProp *prop_list[2];
+ SmPropValue val_program, val_user;
+ =
+ pa_assert(c);
+ pa_assert(m);
+
+ if (!(ma =3D pa_modargs_new(m->argument, valid_modargs))) {
+ pa_log("Failed to parse module arguments");
+ goto fail;
+ }
+
+ if (!getenv("SESSION_MANAGER")) {
+ pa_log("X11 session manager not running.");
+ goto fail;
+ }
+
+ m->userdata =3D u =3D pa_xnew(struct userdata, 1);
+ u->core =3D c;
+ u->sm_conn =3D NULL;
+
+ IceAddConnectionWatch(new_ice_connection, c);
+ =
+ memset(&callbacks, 0, sizeof(callbacks));
+ callbacks.die.callback =3D die_cb;
+ callbacks.die.client_data =3D c;
+
+ callbacks.save_yourself.callback =3D save_yourself_cb;
+ callbacks.save_complete.callback =3D save_complete_cb;
+ callbacks.shutdown_cancelled.callback =3D shutdown_cancelled_cb;
+ =
+ if (!(u->sm_conn =3D SmcOpenConnection(
+ NULL, u,
+ SmProtoMajor, SmProtoMinor,
+ SmcSaveYourselfProcMask | SmcDieProcMask | SmcSaveComple=
teProcMask | SmcShutdownCancelledProcMask,
+ &callbacks, NULL, &client_id,
+ sizeof(t), t))) {
+ =
+ pa_log("Failed to open connection to session manager: %s", t);
+ goto fail;
+ }
+
+ prop_program.name =3D (char*) SmProgram;
+ prop_program.type =3D (char*) SmARRAY8;
+ val_program.value =3D (char*) PACKAGE_NAME;
+ val_program.length =3D strlen(val_program.value);
+ prop_program.num_vals =3D 1;
+ prop_program.vals =3D &val_program;
+ prop_list[0] =3D &prop_program;
+
+ prop_user.name =3D (char*) SmUserID;
+ prop_user.type =3D (char*) SmARRAY8;
+ pa_get_user_name(t, sizeof(t));
+ val_user.value =3D t;
+ val_user.length =3D strlen(val_user.value);
+ prop_user.num_vals =3D 1;
+ prop_user.vals =3D &val_user;
+ prop_list[1] =3D &prop_user;
+
+ SmcSetProperties(u->sm_conn, PA_ELEMENTSOF(prop_list), prop_list);
+
+ pa_log_info("Connected to session manager '%s' as '%s'.", vendor =3D S=
mcVendor(u->sm_conn), client_id);
+ free(vendor);
+ free(client_id);
+ =
+ pa_modargs_free(ma);
+
+ return 0;
+
+fail:
+ if (ma)
+ pa_modargs_free(ma);
+ =
+ pa__done(c, m);
+ =
+ return -1;
+}
+
+void pa__done(pa_core *c, pa_module*m) {
+ struct userdata *u;
+ =
+ assert(c);
+ assert(m);
+
+ if (!m->userdata)
+ return;
+
+ u =3D m->userdata;
+
+ if (u->sm_conn)
+ SmcCloseConnection(u->sm_conn, 0, NULL);
+
+ IceRemoveConnectionWatch(new_ice_connection, c);
+ =
+ pa_xfree(u);
+}
Propchange: branches/lennart/src/modules/module-x11-xsmp.c
---------------------------------------------------------------------------=
---
svn:keywords =3D Id
More information about the pulseaudio-commits
mailing list