[SCM] xwax/master: Imported Upstream version 1.6-beta2

[dhj-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit c272256342b067ed0bd1300ef64dafae8d466486
Author: Daniel James <daniel at 64studio.com>
Date:   Mon Aug 8 15:48:06 2016 +0100

    Imported Upstream version 1.6-beta2

diff --git a/.version b/.version
deleted file mode 100644
index c0c1d5c..0000000
--- a/.version
+++ /dev/null
@@ -1 +0,0 @@
-1.6-beta1
diff --git a/interface.c b/interface.c
index 80d9cc1..ebe3eaa 100644
--- a/interface.c
+++ b/interface.c
@@ -167,6 +167,7 @@ static unsigned short *spinner_angle, spinner_size;
 
 static int width = DEFAULT_WIDTH, height = DEFAULT_HEIGHT,
     meter_scale = DEFAULT_METER_SCALE;
+static Uint32 video_flags = SDL_RESIZABLE;
 static float scale = DEFAULT_SCALE;
 static pthread_t ph;
 static struct selector selector;
@@ -1507,7 +1508,7 @@ static SDL_Surface* set_size(int w, int h, struct rect *r)
 {
     SDL_Surface *surface;
 
-    surface = SDL_SetVideoMode(w, h, 32, SDL_RESIZABLE);
+    surface = SDL_SetVideoMode(w, h, 32, video_flags);
     if (surface == NULL) {
         fprintf(stderr, "%s\n", SDL_GetError());
         return NULL;
@@ -1789,7 +1790,7 @@ static int parse_geometry(const char *s)
  * error
  */
 
-int interface_start(struct library *lib, const char *geo)
+int interface_start(struct library *lib, const char *geo, bool decor)
 {
     size_t n;
 
@@ -1798,6 +1799,9 @@ int interface_start(struct library *lib, const char *geo)
         return -1;
     }
 
+    if (!decor)
+        video_flags |= SDL_NOFRAME;
+
     for (n = 0; n < ndeck; n++) {
         if (timecoder_monitor_init(&deck[n].timecoder, zoom(SCOPE_SIZE)) == -1)
             return -1;
diff --git a/interface.h b/interface.h
index 6b787ec..ae81b79 100644
--- a/interface.h
+++ b/interface.h
@@ -23,7 +23,7 @@
 #include "deck.h"
 #include "library.h"
 
-int interface_start(struct library *lib, const char *geo);
+int interface_start(struct library *lib, const char *geo, bool decor);
 void interface_stop();
 
 #endif
diff --git a/scan b/scan
index f00fbf8..b636cb7 100755
--- a/scan
+++ b/scan
@@ -15,8 +15,8 @@ set -eu -o pipefail  # pipefail requires bash, not sh
 PATHNAME="$1"
 
 if [ -d "$PATHNAME" ]; then
-	find -L "$PATHNAME" -type f |
-		grep -iE '\.(ogg|oga|aac|cdaudio|mp3|flac|wav|aif|aiff|m4a|wma)$'
+	find -L "$PATHNAME" -type f -regextype posix-egrep \
+		-iregex '.*\.(ogg|oga|aac|cdaudio|mp3|flac|wav|aif|aiff|m4a|wma)'
 else
 	cat "$PATHNAME"
 fi |
diff --git a/xwax.1 b/xwax.1
index 52cfcde..8a8cd4f 100644
--- a/xwax.1
+++ b/xwax.1
@@ -86,6 +86,13 @@ to SDL, which may use it to set the display mode, or size of an X window.
 See the
 .B EXAMPLES.
 .TP
+.B \-\-no\-decor
+Request to the window manager to create a 'frameless' window which
+does not have the regular controls such as title bars and buttons.
+This can be useful in conjunction with the
+.B \-g
+flag for dedicated xwax installations.
+.TP
 .B \-h
 Display the help message and default values.
 .SH "ALSA DEVICE OPTIONS"
diff --git a/xwax.c b/xwax.c
index d4bd8e9..d11a7ae 100644
--- a/xwax.c
+++ b/xwax.c
@@ -80,6 +80,7 @@ static void usage(FILE *fd)
       "  -k             Lock real-time memory into RAM\n"
       "  -q <n>         Real-time priority (0 for no priority, default %d)\n"
       "  -g <s>         Set display geometry (see man page)\n"
+      "  --no-decor     Request a window with no decorations\n"
       "  -h             Display this message to stdout and exit\n\n",
       DEFAULT_PRIORITY);
 
@@ -184,7 +185,7 @@ int main(int argc, char *argv[])
     int rc = -1, n, priority;
     const char *scanner, *geo;
     char *endptr;
-    bool use_mlock;
+    bool use_mlock, decor;
 
     struct library library;
 
@@ -212,6 +213,7 @@ int main(int argc, char *argv[])
 
     ndeck = 0;
     geo = "";
+    decor = true;
     nctl = 0;
     priority = DEFAULT_PRIORITY;
     importer = DEFAULT_IMPORTER;
@@ -501,6 +503,13 @@ int main(int argc, char *argv[])
             argv += 2;
             argc -= 2;
 
+        } else if (!strcmp(argv[0], "--no-decor")) {
+
+            decor = false;
+
+            argv++;
+            argc--;
+
         } else if (!strcmp(argv[0], "-i")) {
 
             /* Importer script for subsequent decks */
@@ -601,7 +610,7 @@ int main(int argc, char *argv[])
         goto out_rt;
     }
 
-    if (interface_start(&library, geo) == -1)
+    if (interface_start(&library, geo, decor) == -1)
         goto out_rt;
 
     if (rig_main() == -1)

-- 
xwax packaging