Merge lp:~aurelien-riv/livewallpaper/openmp into lp:livewallpaper

[Aurélien RIVIERE]

Unmerged revisions

326. By Aurélien RIVIERE on 2016-11-24

remove dead code
limit lw:range with string conditions in addition to double, num_processors is the only possible value for now

325. By Aurélien RIVIERE on 2016-10-06

Option to limit the number of threads used to update the stars

324. By Aurélien RIVIERE on 2016-10-06

Use OpenMP to parallelize the stars' position faster

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-01-21 12:32:29 +0000
+++ CMakeLists.txt	2016-11-24 09:49:00 +0000
@@ -11,7 +11,7 @@
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
 include(LiveWallpaperCommon)
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c89 -pedantic -W -Wall -Wextra -Wno-missing-field-initializers")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c89 -pedantic -W -Wall -Wextra -Wno-missing-field-initializers -Wno-variadic-macros")
 
 # enable debugging
 option(ENABLE_DEBUG "Enable debugging" OFF)

=== modified file 'data/livewallpaper.xml'
--- data/livewallpaper.xml	2014-06-13 09:40:37 +0000
+++ data/livewallpaper.xml	2016-11-24 09:49:00 +0000
@@ -1,60 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schemalist>
-	<enum id="net.launchpad.livewallpaper.multioutput-mode">
-		<value nick="One big wallpaper"    value="0" />
-		<value nick="Multiple wallpapers"  value="1" />
-	</enum>
-
-	<enum id="net.launchpad.livewallpaper.bg-mode">
-		<value nick="Default background"         value="0" />
-		<value nick="Custom image"               value="1" />
-		<value nick="Single color"               value="2" />
-		<value nick="Horizontal color gradient"  value="3" />
-		<value nick="Vertical color gradient"    value="4" />
-	</enum>
-
-	<enum id="net.launchpad.livewallpaper.bg-render-type">
-		<value nick="Zoom"      value="0" />
-		<value nick="Center"    value="1" />
-		<value nick="Scale"     value="2" />
-		<value nick="Fill"      value="3" />
-		<value nick="Tile"      value="4" />
-	</enum>
-
-	<enum id="net.launchpad.livewallpaper.pm-mode">
-        <value nick="Never"  		 value="0" />
-		<value nick="On low battery" value="1" />
-		<value nick="On battery"     value="2" />
-	</enum>
-
-	<schema id="net.launchpad.livewallpaper" path="/net/launchpad/livewallpaper/">
-		<key type="b" name="active">
-			<default>true</default>
-			<summary>Show or hide the live wallpaper</summary>
-			<description>Set whether the live wallpaper is visible or not</description>
-		</key>
-		<key type="s" name="active-plugin">
-			<default>"galaxy"</default>
-			<summary>Active plugin</summary>
-			<description>The name of the active wallpaper plugin</description>
-		</key>
-
-		<lw:tab name="General">
-			<key type="b" name="autostart">
-				<default>true</default>
-				<summary>Autostart</summary>
-				<description>Define whether LiveWallpaper should autostart at startup</description>
-			</key>
-			<key type="b" name="desktop-icons">
-				<default>false</default>
-				<summary>Show desktop icons (Nautilus only)</summary>
-				<description>Set this to true, if you want to see the desktop icons with Nautilus when a live wallpaper is running.</description>
-			</key>
-			<key name="multioutput-mode" enum="net.launchpad.livewallpaper.multioutput-mode">
-				<default>"One big wallpaper"</default>
-				<summary>Multioutput Mode</summary>
-				<description>Selects how the live wallpaper is displayed if multiple output devices are used</description>
-			</key>
+    <enum id="net.launchpad.livewallpaper.multioutput-mode">
+        <value nick="One big wallpaper"    value="0" />
+        <value nick="Multiple wallpapers"  value="1" />
+    </enum>
+
+    <enum id="net.launchpad.livewallpaper.bg-mode">
+        <value nick="Default background"         value="0" />
+        <value nick="Custom image"               value="1" />
+        <value nick="Single color"               value="2" />
+        <value nick="Horizontal color gradient"  value="3" />
+        <value nick="Vertical color gradient"    value="4" />
+    </enum>
+
+    <enum id="net.launchpad.livewallpaper.bg-render-type">
+        <value nick="Zoom"      value="0" />
+        <value nick="Center"    value="1" />
+        <value nick="Scale"     value="2" />
+        <value nick="Fill"      value="3" />
+        <value nick="Tile"      value="4" />
+    </enum>
+
+    <enum id="net.launchpad.livewallpaper.pm-mode">
+        <value nick="Never"           value="0" />
+        <value nick="On low battery" value="1" />
+        <value nick="On battery"     value="2" />
+    </enum>
+
+    <schema id="net.launchpad.livewallpaper" path="/net/launchpad/livewallpaper/">
+        <key type="b" name="active">
+            <default>true</default>
+            <summary>Show or hide the live wallpaper</summary>
+            <description>Set whether the live wallpaper is visible or not</description>
+        </key>
+        <key type="s" name="active-plugin">
+            <default>"galaxy"</default>
+            <summary>Active plugin</summary>
+            <description>The name of the active wallpaper plugin</description>
+        </key>
+
+        <lw:tab name="General">
+            <key type="b" name="autostart">
+                <default>true</default>
+                <summary>Autostart</summary>
+                <description>Define whether LiveWallpaper should autostart at startup</description>
+            </key>
+            <key type="b" name="desktop-icons">
+                <default>false</default>
+                <summary>Show desktop icons (Nautilus only)</summary>
+                <description>Set this to true, if you want to see the desktop icons with Nautilus when a live wallpaper is running.</description>
+            </key>
+            <key name="multioutput-mode" enum="net.launchpad.livewallpaper.multioutput-mode">
+                <default>"One big wallpaper"</default>
+                <summary>Multioutput Mode</summary>
+                <description>Selects how the live wallpaper is displayed if multiple output devices are used</description>
+            </key>
             <lw:frame name="Power Management">
                 <lw:DisplayIf computer="Laptop" />
                 <key name="pm-mode" enum="net.launchpad.livewallpaper.pm-mode">
@@ -68,73 +68,73 @@
                     <description>Restart the live wallpaper if the laptop is not on battery anymore. This only works, if LiveWallpaper stopped automatically because it is on (low) battery.</description>
                 </key>
             </lw:frame>
-		</lw:tab>
-		<lw:tab name="Background">
-			<key name="bg-mode" enum="net.launchpad.livewallpaper.bg-mode">
-				<default>"Default background"</default>
-				<summary>Background</summary>
-				<description>Choose the plugin's background image</description>
-			</key>
+        </lw:tab>
+        <lw:tab name="Background">
+            <key name="bg-mode" enum="net.launchpad.livewallpaper.bg-mode">
+                <default>"Default background"</default>
+                <summary>Background</summary>
+                <description>Choose the plugin's background image</description>
+            </key>
 
-			<lw:separator/>
-			<key type="s" name="bg-image">
-				<lw:type>file</lw:type>
+            <lw:separator/>
+            <key type="s" name="bg-image">
+                <lw:type>file</lw:type>
                 <lw:filefilter name="Image" pixbuf="true"></lw:filefilter>
-				<default>""</default>
-				<summary>Background Image</summary>
-				<description>Path to use for the background image</description>
-			</key>
-			<key name="bg-render-type" enum="net.launchpad.livewallpaper.bg-render-type">
-				<default>"Zoom"</default>
-				<summary>Render Type</summary>
-				<description>Determines how the background image is rendered</description>
-			</key>
+                <default>""</default>
+                <summary>Background Image</summary>
+                <description>Path to use for the background image</description>
+            </key>
+            <key name="bg-render-type" enum="net.launchpad.livewallpaper.bg-render-type">
+                <default>"Zoom"</default>
+                <summary>Render Type</summary>
+                <description>Determines how the background image is rendered</description>
+            </key>
 
-			<lw:separator/>
-			<key type="s" name="bg-primary-color">
-				<lw:type>color</lw:type>
-				<default>"rgba (255, 255, 0, 255)"</default>
-				<summary>Primary Color</summary>
-				<description>Left or bottom color when drawing gradients, or the solid color</description>
-			</key>
-			<key type="s" name="bg-secondary-color">
-				<lw:type>color</lw:type>
-				<default>"rgba (255, 0, 0, 255)"</default>
-				<summary>Secondary Color</summary>
-				<description>Right or top color when drawing gradients, not used for solid color</description>
-			</key>
-		</lw:tab>
+            <lw:separator/>
+            <key type="s" name="bg-primary-color">
+                <lw:type>color</lw:type>
+                <default>"rgba (255, 255, 0, 255)"</default>
+                <summary>Primary Color</summary>
+                <description>Left or bottom color when drawing gradients, or the solid color</description>
+            </key>
+            <key type="s" name="bg-secondary-color">
+                <lw:type>color</lw:type>
+                <default>"rgba (255, 0, 0, 255)"</default>
+                <summary>Secondary Color</summary>
+                <description>Right or top color when drawing gradients, not used for solid color</description>
+            </key>
+        </lw:tab>
         <lw:tab name="FPS">
             <key type="u" name="fps-limit">
-				<range min="0" max="120" />
-				<default>30</default>
-				<summary>FPS Limit</summary>
-				<description>Limit the frames per second to this value</description>
-			</key>
+                <range min="0" max="120" />
+                <default>30</default>
+                <summary>FPS Limit</summary>
+                <description>Limit the frames per second to this value</description>
+            </key>
             <lw:separator/>
-			<key type="b" name="show-fps">
-				<default>false</default>
-				<summary>Show FPS</summary>
-				<description>Show the current frames per second</description>
-			</key>
+            <key type="b" name="show-fps">
+                <default>false</default>
+                <summary>Show FPS</summary>
+                <description>Show the current frames per second</description>
+            </key>
             <key type="s" name="fps-font">
-				<lw:type>font</lw:type>
-				<default>"Sans 20"</default>
-				<summary>FPS visualizer's font</summary>
-				<description>The font used to display the current frames per second</description>
-			</key>
+                <lw:type>font</lw:type>
+                <default>"Sans 20"</default>
+                <summary>FPS visualizer's font</summary>
+                <description>The font used to display the current frames per second</description>
+            </key>
             <key type="s" name="fps-fg-color">
-				<lw:type>color</lw:type>
-				<default>"rgba (255, 255, 255, 255)"</default>
-				<summary>FPS visualizer's font color</summary>
-				<description>Color used to display the current frames per second</description>
-			</key>
+                <lw:type>color</lw:type>
+                <default>"rgba (255, 255, 255, 255)"</default>
+                <summary>FPS visualizer's font color</summary>
+                <description>Color used to display the current frames per second</description>
+            </key>
             <key type="s" name="fps-bg-color">
-				<lw:type>color</lw:type>
-				<default>"rgba (0, 0, 0, 255)"</default>
-				<summary>FPS visualizer's background color</summary>
-				<description>Color used as background for the area which shows the current frames per second</description>
-			</key>
+                <lw:type>color</lw:type>
+                <default>"rgba (0, 0, 0, 255)"</default>
+                <summary>FPS visualizer's background color</summary>
+                <description>Color used as background for the area which shows the current frames per second</description>
+            </key>
         </lw:tab>
-	</schema>
+    </schema>
 </schemalist>

=== modified file 'plugins/galaxy/CMakeLists.txt'
--- plugins/galaxy/CMakeLists.txt	2014-03-28 22:55:56 +0000
+++ plugins/galaxy/CMakeLists.txt	2016-11-24 09:49:00 +0000
@@ -1,12 +1,18 @@
 file(GLOB GALAXY_XCF images/*.xcf)
 file(GLOB GALAXY_SOURCES src/*)
 
+find_package(OpenMP)
+if (OPENMP_FOUND)
+    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
+endif()
+
 livewallpaper_plugin_c(
-	galaxy
-	SOURCES ${GALAXY_SOURCES}
-	SETTINGS galaxy.xml
+    galaxy
+    SOURCES ${GALAXY_SOURCES}
+    SETTINGS galaxy.xml
     RESOURCE galaxy.gresource.xml
-	ICON galaxy.svg
+    ICON galaxy.svg
+    LIBRARIES -fopenmp
 )
 
 livewallpaper_plugin_build_xcf(galaxy FILES ${GALAXY_XCF})

=== modified file 'plugins/galaxy/galaxy.xml'
--- plugins/galaxy/galaxy.xml	2015-01-01 12:58:43 +0000
+++ plugins/galaxy/galaxy.xml	2016-11-24 09:49:00 +0000
@@ -29,6 +29,15 @@
                 <summary>Draw star streaks</summary>
                 <description>Draw a star with streaks</description>
             </key>
+            <lw:separator/>
+            <key type="i" name="thread-count">
+                <range min="1" max="16" />
+                <lw:range max="num_processors"/>
+                <lw:scale />
+                <default>1</default>
+                <summary>Number of threads</summary>
+                <description>Number of threads to be used to update the position of the stars</description>
+            </key>
         </lw:tab>
         <lw:tab name="Colors">
             <key type="s" name="star-color">

=== modified file 'plugins/galaxy/src/galaxy.c'
--- plugins/galaxy/src/galaxy.c	2016-02-21 09:46:31 +0000
+++ plugins/galaxy/src/galaxy.c	2016-11-24 09:49:00 +0000
@@ -355,6 +355,7 @@
     LW_BIND(self->priv->ps, "star-size");
     LW_BIND(self->priv->ps, "speed-ratio");
     LW_BIND(self->priv->ps, "draw-streaks");
+    LW_BIND(self->priv->ps, "thread-count");
 	LW_BIND_COLOR(self->priv->ps, "star-color");
 
     /* Light Program */

=== modified file 'plugins/galaxy/src/particle.c'
--- plugins/galaxy/src/particle.c	2016-02-21 09:46:31 +0000
+++ plugins/galaxy/src/particle.c	2016-11-24 09:49:00 +0000
@@ -21,7 +21,6 @@
  */
 
 #include <math.h>
-#include <stdlib.h>
 #include <glib-object.h>
 #include <livewallpaper/core.h>
 #include "particle.h"
@@ -37,16 +36,22 @@
 	 * ellipse. Phi is the angle between the x-axis and the major
 	 * axis of the ellipse.
 	 */
-	gfloat cos_phi, sin_phi;
+    double sin_phi;
+    /*
+* Those values needed for the general parametic form of an
+* ellipse. Phi is the angle between the x-axis and the major
+* axis of the ellipse.
+*/
+    double cos_phi;
 
-	/* The current angle/position of this star. */
+    /* The current angle/position of this star. */
 	gfloat angle;
 
 	/* The distance from the center of the galaxy to this star. */
-	gfloat distance;
+    double distance;
 
 	/* the angular velocity of the star in 1/ms. */
-	gfloat speed;
+    double speed;
 };
 
 /* 0 (line) -> 1.0f (circle) */
@@ -54,14 +59,16 @@
 
 struct _GalaxyParticleSystemPrivate
 {
-	guint star_count;
-	guint star_size;
-	gfloat speed_ratio;
+	guint    star_count;
+	guint    star_size;
+	gdouble  speed_ratio;
 	gboolean draw_streaks;
-	GdkRGBA star_color;
+	GdkRGBA  star_color;
+
+    guint    thread_count;
 
 	GArray *stars;
-	gfloat *vertices;
+	double *vertices;
 
 	LwTexture *starTexture;
 };
@@ -76,6 +83,8 @@
     PROP_DRAW_STREAKS,
     PROP_STAR_COLOR,
 
+    PROP_THREAD_COUNT,
+
     N_PROPERTIES
 };
 
@@ -128,6 +137,10 @@
 			self->priv->star_color = *((GdkRGBA*)g_value_get_boxed(value));
             break;
 
+        case PROP_THREAD_COUNT:
+            self->priv->thread_count = g_value_get_uint(value);
+            break;
+
 		default:
 			G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
 			break;
@@ -164,6 +177,10 @@
             g_value_set_boxed(value, &self->priv->star_color);
 			break;
 
+        case PROP_THREAD_COUNT:
+            g_value_set_uint(value, self->priv->thread_count);
+            break;
+
 		default:
 			G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
 			break;
@@ -174,17 +191,17 @@
  * Gaussian random generator
  * Using the polar form of the Box-Muller transformation
  */
-static gfloat
+static double
 randng(void)
 {
-	static gfloat y;
+	static double y;
 	static gboolean have_next = FALSE;
 
 	if (! have_next)
 	{
-		gfloat x1, x2, w;
+		double w, x1, x2;
 
-		do
+        do
 		{
 			x1 = 2.0 * randf() - 1.0;
 			x2 = 2.0 * randf() - 1.0;
@@ -201,7 +218,7 @@
 	return y;
 }
 
-static inline gfloat
+static inline double
 galaxy_particle_system_init_star(Star *star)
 {
 	star->angle = rand1f(-LW_2PI);
@@ -228,7 +245,7 @@
 {
     guint i;
 	g_array_set_size(self->priv->stars, count);
-    self->priv->vertices = g_realloc(self->priv->vertices, 3 * count * sizeof(gfloat));
+    self->priv->vertices = g_realloc(self->priv->vertices, 3 * count * sizeof(gdouble));
 
     /* Append stars if necessary */
     for(i = self->priv->star_count; i < count; i++)
@@ -259,34 +276,38 @@
 void
 galaxy_particle_system_update(GalaxyParticleSystem *self, gint ms_since_last_paint)
 {
-    const Star   * const limit = &g_array_index (self->priv->stars, Star, self->priv->star_count);
-          Star   *       star  = &g_array_index (self->priv->stars, Star, 0);
-    const gfloat         k     =  ms_since_last_paint * self->priv->speed_ratio;
-          gfloat *       v     =  self->priv->vertices;
+    const int      limit = self->priv->star_count;
+          GArray  *stars = self->priv->stars;
+    const gdouble  k     =  ms_since_last_paint * self->priv->speed_ratio;
+          gdouble *v     =  self->priv->vertices;
+          int      i;
 
-    for(; star != limit; ++star, v+=3)
+    #pragma omp parallel for num_threads(self->priv->thread_count) private(i)
+    for(i=0; i < limit; ++i)
     {
-		gfloat a_cos_angle, b_sin_angle;
-
-		/* Make sure that angle is between -2PI and 0! */
-		star->angle += k * star->speed;
-		while(star->angle < -LW_2PI) star->angle += LW_2PI;
-		while(star->angle > 0)     star->angle -= LW_2PI;
-
-		/*
-		 * a is the semi-major axis, here the distance and b is the
-		 * semi-minor axis defined by the distance and the ellipse ratio.
-		 */
-		a_cos_angle = star->distance * lw_cos(star->angle);
-		b_sin_angle = star->distance * lw_sin(star->angle) * ELLIPSE_RATIO;
-
-		/*
-		 * To calculate the current position we use the general
-		 * parametic form of an ellipse.
-		 * See http://en.wikipedia.org/wiki/Ellipse#General_parametric_form
-		 */
-		v[0] = a_cos_angle * star->cos_phi - b_sin_angle * star->sin_phi;
-		v[1] = a_cos_angle * star->sin_phi + b_sin_angle * star->cos_phi;
+        Star *star = &g_array_index(stars, Star, i);
+
+        double a_cos_angle, b_sin_angle;
+
+        /* Make sure that angle is between -2PI and 0! */
+        star->angle += k * star->speed;
+        while(star->angle < -LW_2PI) star->angle += LW_2PI;
+        while(star->angle > 0)       star->angle -= LW_2PI;
+
+        /*
+         * a is the semi-major axis, here the distance and b is the
+         * semi-minor axis defined by the distance and the ellipse ratio.
+         */
+        a_cos_angle = star->distance * lw_cos(star->angle);
+        b_sin_angle = star->distance * lw_sin(star->angle) * ELLIPSE_RATIO;
+
+        /*
+         * To calculate the current position we use the general
+         * parametic form of an ellipse.
+         * See http://en.wikipedia.org/wiki/Ellipse#General_parametric_form
+         */
+        v[i*3+0] = a_cos_angle * star->cos_phi - b_sin_angle * star->sin_phi;
+        v[i*3+1] = a_cos_angle * star->sin_phi + b_sin_angle * star->cos_phi;
     }
 }
 
@@ -316,10 +337,10 @@
     /* Set star color */
     {
         GdkRGBA *c = &self->priv->star_color;
-        glColor4f(c->red, c->green, c->blue, c->alpha);
+        glColor4d(c->red, c->green, c->blue, c->alpha);
     }
 
-	glVertexPointer(3, GL_FLOAT, 3 * sizeof(gfloat), self->priv->vertices);
+	glVertexPointer(3, GL_DOUBLE, 3 * sizeof(gdouble), self->priv->vertices);
 	glDrawArrays(GL_POINTS, 0, self->priv->star_count);
 
 	glDisable(GL_POINT_SPRITE);
@@ -337,10 +358,11 @@
     self->priv = G_TYPE_INSTANCE_GET_PRIVATE(self, GALAXY_TYPE_PARTICLE_SYSTEM,
                                              GalaxyParticleSystemPrivate);
 
-    self->priv->star_count = 0;
-    self->priv->star_size = 8;
-    self->priv->speed_ratio = 1;
+    self->priv->star_count   = 0;
+    self->priv->star_size    = 8;
+    self->priv->speed_ratio  = 1;
     self->priv->draw_streaks = TRUE;
+    self->priv->thread_count = 1;
 
     self->priv->stars = g_array_new(FALSE, FALSE, sizeof(Star));
     self->priv->vertices = NULL;
@@ -386,6 +408,7 @@
     obj_properties[PROP_SPEED_RATIO]  = g_param_spec_double ("speed-ratio",  "Speed ratio",       "Speed ratio",                -5,      5, 1, G_PARAM_READWRITE);
     obj_properties[PROP_DRAW_STREAKS] = g_param_spec_boolean("draw-streaks", "Draw star streaks", "Draw a star with streaks", TRUE,            G_PARAM_READWRITE);
     obj_properties[PROP_STAR_COLOR]   = g_param_spec_boxed  ("star-color",   "Star color",        "Color of the stars",         GDK_TYPE_RGBA, G_PARAM_READWRITE);
+    obj_properties[PROP_THREAD_COUNT] = g_param_spec_uint   ("thread-count", "Number of threads", "Number of threads",           1,     16, 1, G_PARAM_READWRITE);
 
 	g_object_class_install_properties(gobject_class, N_PROPERTIES, obj_properties);
 }

=== modified file 'ui/config/CMakeLists.txt'
--- ui/config/CMakeLists.txt	2015-03-28 09:50:38 +0000
+++ ui/config/CMakeLists.txt	2016-11-24 09:49:00 +0000
@@ -22,7 +22,7 @@
 )
 
 # append additional c sources
-list(APPEND LWC_SOURCES "${CMAKE_CURRENT_BINARY_DIR}/resources.c" "${CMAKE_CURRENT_SOURCE_DIR}/search-workaround.c")
+list(APPEND LWC_SOURCES "${CMAKE_CURRENT_BINARY_DIR}/resources.c")
 
 add_executable(livewallpaper-config ${LWC_SOURCES})
 target_link_libraries(livewallpaper-config m)

=== modified file 'ui/config/key.vala'
--- ui/config/key.vala	2016-02-21 09:46:31 +0000
+++ ui/config/key.vala	2016-11-24 09:49:00 +0000
@@ -37,10 +37,9 @@
             });
         pack_end (ctl, false, false);
 
-#if GTK_3_14_OR_HIGHER
         if (responsive)
             w.margin_start=100;
-#endif
+
         pack_end (w, responsive, responsive, 3);
     }
 }

=== modified file 'ui/config/keyfactory.vala'
--- ui/config/keyfactory.vala	2016-02-21 09:46:31 +0000
+++ ui/config/keyfactory.vala	2016-11-24 09:49:00 +0000
@@ -176,10 +176,19 @@
     }
 
     private void prepare_numeric (bool floating, out double min, out double max, out int digits, out double inc) {
-        min = double.parse (prop["min"]);
-        max = double.parse (prop["max"]);
+		parse_min_max_string(prop["min"], out min);
+		parse_min_max_string(prop["max"], out max);
         digits = int.parse (prop["lw:digits"] ?? (floating ? "6" : "0"));
         inc    = double.max (Math.pow (10.0, - (double)digits), double.parse (prop["lw:increment"] ?? (floating ? ".000001" : "1.0")));
     }
+    
+    private static void parse_min_max_string (string arg, out double ret) {
+		if (! double.try_parse(arg, out ret)) {
+			if (arg == "num_processors")
+				ret = get_num_processors();
+			else
+				stderr.printf("Unrecognized query : %s\n", arg);
+		}
+	}
 }
 }

=== modified file 'ui/config/plugin-parser.vala'
--- ui/config/plugin-parser.vala	2016-02-21 09:46:31 +0000
+++ ui/config/plugin-parser.vala	2016-11-24 09:49:00 +0000
@@ -120,6 +120,12 @@
                                     parent.no_show_all = true;
                             }
                             break;
+                        case "range":
+                            if ("min" in ht && (! ("lw:range" in key.prop) || ! ("min" in key.prop)))
+                                key.prop["min"] = ht["min"];
+                            if ("max" in ht && (! ("lw:range" in key.prop) || ! ("max" in key.prop)))
+                                key.prop["max"] = ht["max"];
+                            break;
                         default:
                             if (key != null) {
                                 key.prop[tag] = "";

=== renamed file 'ui/config/search-workaround.c' => 'ui/config/search-workaround.c.THIS'
=== modified file 'ui/config/search.vala'
--- ui/config/search.vala	2016-02-21 09:46:31 +0000
+++ ui/config/search.vala	2016-11-24 09:49:00 +0000
@@ -53,7 +53,7 @@
             if (! visible) {
                 unowned string title;
                 w.child_get(item, "title", out title, null);
-                visible = needle in title.down ();
+                visible = needle in title.down();
             }
             if (!dry_run)
                 item.visible = visible;
@@ -64,21 +64,15 @@
         ret = stack_visible;
     }
 
-    private extern bool needle_in_ssk(string schema_id, string key, string needle);
-
     public virtual signal void lwckey       (out bool ret, Key w) {
         if (! (ret = needle in w.tooltip_text.down())) {
             unowned string key = w.get_children().nth_data(2).get_data ("key");
             ret = needle in key ||
                   needle in p.settings.get_value(key).print(false).down();
-            #if GTK_3_14_OR_HIGHER
-                var ssk = SettingsSchemaSource.get_default().lookup(p.schema_id, true).get_key (key);
-                ret |= needle in ssk.get_summary()     ||
-                       needle in ssk.get_description() ||
-                       needle in ssk.get_range().print(false).down();
-            #else
-                ret |= needle_in_ssk(p.schema_id, key, needle);
-            #endif
+            var ssk = SettingsSchemaSource.get_default().lookup(p.schema_id, true).get_key (key);
+            ret |= needle in ssk.get_summary()     ||
+                   needle in ssk.get_description() ||
+                   needle in ssk.get_range().print(false).down();
         }
     }