pull wayland-demos: cleanups, shared config lib, signal mask fix

[Kristian Høgsberg]

On Thu, Dec 8, 2011 at 4:40 AM, Pekka Paalanen <ppaalanen at gmail.com> wrote:
> Hi Kristian,
>
> I gathered a set of miscellaneous commits that I have produced while
> working on the idle animation.
>
> Please, could you pull
>
>        git://git.collabora.co.uk/git/user/pq/wayland.git for-krh-1
>
> http://cgit.collabora.com/git/user/pq/wayland-demos.git/log/?h=for-krh-1

Yup, pulled.  Thanks for splitting out the general fixes.  It's a lot
easier to review and pull those on their own, and it'll be easier to
pull the idle animation branch later.

It all looks good, though we probably want to share more code between
clients and compositor (image loading code at least), and at that
point libconfigparser is not a great name but we can worry about that
later.  For now I just renamed it to config-parser, since we use
dashes to separate words in filenames.

thanks,
Kristian

> to get the following commits.
>
> Thanks,
> pq
>
>
> commit 9b32ed34de162c26ef9b52cc8cbf1a06ed05d2de
> Author: Pekka Paalanen <ppaalanen at gmail.com>
> Date:   Fri Dec 2 10:23:55 2011 +0200
>
>    Update .gitignores
>
>    Signed-off-by: Pekka Paalanen <ppaalanen at gmail.com>
>
>  clients/.gitignore    |   12 +++++++-----
>  compositor/.gitignore |    4 ++--
>  2 files changed, 9 insertions(+), 7 deletions(-)
>
> commit c47ddfd852125550e69f39fc6c110821bcb6b8e7
> Author: Pekka Paalanen <ppaalanen at gmail.com>
> Date:   Thu Dec 8 10:44:56 2011 +0200
>
>    compositor: reset signal mask for children
>
>    The signal mask is inherited over fork() and exec(), we need to
>    explicitly reset it.
>
>    This allows the children to receive the signals the compositor itself
>    has blocked, for example SIGINT and SIGTERM.
>
>    Signed-off-by: Pekka Paalanen <ppaalanen at gmail.com>
>
>  compositor/compositor.c |    5 +++++
>  1 files changed, 5 insertions(+), 0 deletions(-)
>
> commit 409ef0a5c85209bc09bdae8cada9b19e09a673d2
> Author: Pekka Paalanen <ppaalanen at gmail.com>
> Date:   Fri Dec 2 15:30:21 2011 +0200
>
>    compositor: refactor client forking code
>
>    shell.c and tablet-shell.c had almost the same code for forking their
>    special shell client. Generalise this code and put it into
>    wlsc_client_launch() in compositor.c.
>
>    Improve error cleanup and reporting in wlsc_client_launch().
>
>    Signed-off-by: Pekka Paalanen <ppaalanen at gmail.com>
>
>  compositor/compositor.c   |   71 +++++++++++++++++++++++++++++++++++++++++++++
>  compositor/compositor.h   |   12 +++++++-
>  compositor/shell.c        |   43 +++------------------------
>  compositor/tablet-shell.c |   42 ++------------------------
>  4 files changed, 90 insertions(+), 78 deletions(-)
>
> commit fd83b6d70f6266daeac760ee65407876faf52dbe
> Author: Pekka Paalanen <ppaalanen at gmail.com>
> Date:   Thu Dec 8 10:06:53 2011 +0200
>
>    desktop-shell: add option to not use locking
>
>    Add an option to the desktop-shell ini file that defines whether screen
>    locking is used or not.
>
>    Useful for testing screensaver interactions without a lock surface.
>
>    Signed-off-by: Pekka Paalanen <ppaalanen at gmail.com>
>
>  clients/desktop-shell.c   |    7 +++++++
>  wayland-desktop-shell.ini |    1 +
>  2 files changed, 8 insertions(+), 0 deletions(-)
>
> commit 28a20707a291854be335b800c741bdaf2c19a74b
> Author: Pekka Paalanen <ppaalanen at gmail.com>
> Date:   Thu Dec 8 09:24:24 2011 +0200
>
>    configparser: rename BOOL, document types
>
>    Rename CONFIG_KEY_BOOL to CONFIG_KEY_BOOLEAN, just like
>    CONFIG_KEY_INTEGER is not CONFIG_KEY_INT, for consistency.
>
>    Document the types expected for the void* and name the enum in the
>    header, so it is clear what config_key::type means.
>
>    Signed-off-by: Pekka Paalanen <ppaalanen at gmail.com>
>
>  shared/configparser.c |    2 +-
>  shared/configparser.h |   10 +++++-----
>  2 files changed, 6 insertions(+), 6 deletions(-)
>
> commit c1765c67b394ec82c5d576140e0e297088deaabb
> Author: Pekka Paalanen <ppaalanen at gmail.com>
> Date:   Mon Dec 5 15:58:11 2011 +0200
>
>    move config parser to a convenience library
>
>    Create a new directory for convenience librariers that can be shared
>    between compositor components and clients.
>
>    Signed-off-by: Pekka Paalanen <ppaalanen at gmail.com>
>
>  Makefile.am             |    2 +-
>  clients/Makefile.am     |    9 ++-
>  clients/config.c        |  172 -----------------------------------------------
>  clients/desktop-shell.c |    1 +
>  clients/tablet-shell.c  |    1 +
>  clients/window.h        |   27 -------
>  configure.ac            |    1 +
>  shared/Makefile.am      |    3 +
>  shared/configparser.c   |  172 +++++++++++++++++++++++++++++++++++++++++++++++
>  shared/configparser.h   |   54 +++++++++++++++
>  10 files changed, 238 insertions(+), 204 deletions(-)
>
> commit 02dfb7514547e48045e20ed57f361cfc7826ada3
> Author: Pekka Paalanen <ppaalanen at gmail.com>
> Date:   Wed Dec 7 08:47:49 2011 +0200
>
>    desktop-shell: no need to unset WAYLAND_SOCKET
>
>    As of commit "client: unset WAYLAND_SOCKET env variable",
>    58bb064afa3bfc706e3b30dd170804235aa272ea, in the Wayland core, the
>    Wayland library will unset the environment variable automatically.
>
>    No need to explicitly unset it again here.
>
>    Signed-off-by: Pekka Paalanen <ppaalanen at gmail.com>
>
>  clients/desktop-shell.c |    3 ---
>  1 files changed, 0 insertions(+), 3 deletions(-)