Remove deprecated xy from grdimage's THIS_MODULE_OPTIONS and other fixes (#8257)

* Remove deprecated xy from grdimage's THIS_MODULE_OPTIONS

That was the only plotting module that still had the old lower case xy in the MODULE OPTIONS list. We then added x for multicore, hence got 2 -x options to check and that yielded the trouble in #8256. This lead to more relevant fixes in grdfilter test scripts.

* Handle -x in usage and synopsis

* Update explain_core_full.rst_

* Restor GLIB check for windows

Author: PaulWessel

doc/rst/source/explain_core_full.rst_

@@ -8,8 +8,9 @@ The **-x** option
 
 **Description**
 
-The **-x** option limits the number of cores to be used in any OpenMP-enabled multi-threaded algorithms [default is to
-use all available cores]. Append *n* to only use *n* cores (if too large it will be truncated to the maximum cores
-available).  Finally, give a negative *n* to select (all - *n*) cores (or at least 1 if *n* equals or exceeds all).
-The **-x** option is only available to GMT modules compiled with OpenMP support, with the exception of :doc:`/movie`
-and :doc:`/batch` which handle their own parallel execution.
+The **-x** option limits the number of cores to be used in any multi-threaded algorithms [default is to
+use all available cores]. Append *n* to only use *n* cores (if too large it will be truncated to the
+maximum cores available).  Finally, give a negative *n* to select (all - *n*) cores (or at least 1 if *n*
+equals or exceeds all). **Note**: The **-x** option is only available to GMT modules compiled with OpenMP
+or Glib threads support, with the exception of :doc:`/movie` and :doc:`/batch` which handle their own
+parallel execution separately.

src/gmt_init.c

@@ -8137,10 +8137,12 @@ void gmtlib_explain_options (struct GMT_CTRL *GMT, char *options) {
 
 #ifdef GMT_MP_ENABLED
 		case 'y':	/* Number of threads (reassigned from -x in GMT_Option) */
-			cores = gmtlib_get_num_processors();
-			GMT_Usage (API, 1, "\n%s", GMT_x_OPT);
-			GMT_Usage (API, -2, "Limit the number of cores used in multi-threaded algorithms [Default uses all %d cores]. "
-				"If <n> is negative then we select (%d - <n>) cores (or at least 1).", cores, cores);
+			if (strlen (GMT_x_OPT) > 1) {	/* Only print this if it is in fact available */
+				cores = gmtlib_get_num_processors();
+				GMT_Usage (API, 1, "\n%s", GMT_x_OPT);
+				GMT_Usage (API, -2, "Limit the number of cores used in multi-threaded algorithms [Default uses all %d cores]. "
+					"If <n> is negative then we select (%d - <n>) cores (or at least 1).", cores, cores);
+			}
 			break;
 #endif
 		case 'Z':	/* Vertical scaling for 3-D plots */

src/gmt_parse.c

@@ -1118,8 +1118,8 @@ int GMT_Parse_Common (void *V_API, const char *given_options, struct GMT_OPTION
 		if (strchr (critical_opt_order, given_options[i])) continue;	/* Skip critical option */
 		list[0] = given_options[i];	/* Just look for this particular option */
 		for (opt = options; opt; opt = opt->next) {
-			n_errors += gmt_parse_common_options (API->GMT, list, opt->option, opt->arg);
 			if (opt->option != list[0]) continue;
+			n_errors += gmt_parse_common_options (API->GMT, list, opt->option, opt->arg);
 		}
 	}
 	if (GMT_Destroy_Options (API, &options)) {

src/gmt_synopsis.h

@@ -55,7 +55,8 @@
 #define GMT_qo_OPT	"-qo[~]<rows>|<limits>[,...][+c<col>][+a|t|s]"
 #define GMT_PAR_OPT	"--PAR=<value>"
 
-#ifdef GMT_MP_ENABLED
+#if defined(_OPENMP)
+/* Use these constants in modules only serviced by OpenMP; see gmt_glib.h for equivalent constants for Glib threads modules */
 #define GMT_x_OPT	" [-x[[-]<n>]] "	/* Must add spaces and brackets here and place via %s since it may be blank */
 #define GMT_ADD_x_OPT	"x"
 #else	/* No Open-MP support */

src/grdimage.c

@@ -34,7 +34,7 @@
 #define THIS_MODULE_PURPOSE		"Project and plot grids or images"
 #define THIS_MODULE_KEYS		"<G{+,CC(,IG(,>X},>IA,<ID"
 #define THIS_MODULE_NEEDS		"Jg"
-#define THIS_MODULE_OPTIONS		"->BJKOPRUVXYfnptxy" GMT_OPT("Sc") GMT_ADD_x_OPT
+#define THIS_MODULE_OPTIONS		"->BJKOPRUVXYfnpt" GMT_OPT("Sc") GMT_ADD_x_OPT
 
 /* These are images that GDAL knows how to read for us. */
 #define N_IMG_EXTENSIONS 7

test/grdfilter/spikes.sh

@@ -5,7 +5,7 @@
 ps=spikes.ps
 
 if [[ ${HAVE_GLIB_GTHREAD} =~ TRUE|ON ]]; then
-  _thread_opt=-x+a
+	_thread_opt=-x+a
 fi
 
 filter () {

test/grdfilter/threads.sh

@@ -2,7 +2,7 @@
 # Testing gmt grdfilter if gthreads is enabled.
 ps=threads.ps # Basically same as test openmp.sh but using GTHREAD
 
-if [ "X$(gmt-config --has-gthreads)" = "Xyes" ]; then
+if [[ ${HAVE_GLIB_GTHREAD} =~ TRUE|ON ]]; then
 	_thread_opt=-x+a
 fi