Revert "WUtil: Be more strict about base directory for wmkdirhier()"

This reverts commit a0b283a60f, as it breaks saving the history in ~GNUstep/.AppInfo/WindowMaker/History by restricting modifications to either ~GNUstep/Defaults or ~GNUstep/Library. Thanks to Paul Selig for reporting this issue.
Update .gitignore
2026-07-09 20:26:37 +02:00 · 2023-08-21 22:22:32 +01:00 · 2023-08-21 21:35:30 +01:00 · 2023-08-12 21:53:52 +01:00 · 2023-08-05 08:46:23 +01:00 · 2023-04-14 23:45:00 +01:00
62 changed files with 1242 additions and 264 deletions
@@ -30,6 +30,8 @@ m4/ltversion.m4
 m4/lt~obsolete.m4

 src/wconfig.h
+WINGs/WINGs/WINGsP.h
+wrlib/wraster.h

 # These files are generated by scripts
 INSTALL-WMAKER
@@ -3,6 +3,26 @@ NEWS for veteran Window Maker users

 -- 0.96.0

+Hot Corners feature
+--------------------------
+
+Screen corners can be assigned an external command to be
+executed when the mouse pointer is entering those areas.
+In WPrefs, "Hot Corner Shortcut Preferences" can be used
+for configuration or by manually adding a "HotCorners" key
+and value to "YES" in the ~/GNUstep/Defaults/WindowMaker file.
+Hot Corners feature is disabled by default.
+Actions are specified by the "HotCornerActions" and are defined
+as a four entries list ("top left action", "top right action",
+"bottom left action", "bottom right action").
+A screen corner area is a cube shape defined by the "HotCornerEdge"
+which is a number of pixels from 2 (by default) to 10.
+To lower the risk of triggering that feature accidentally a
+"HotCornerDelay" key can be used which is the time before the action
+is triggered while the pointer is in one of the screen corner.
+Default value is 250 ms.
+
+
 Screenshot capture feature
 --------------------------

@@ -10,7 +10,7 @@ include_HEADERS = wtableview.h wtabledelegates.h

 lib_LTLIBRARIES = libExtraWINGs.la

-noinst_PROGRAMS = test
+noinst_PROGRAMS = tableview

 EXTRA_DIST =

@@ -25,6 +25,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs \

 LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
 	$(top_builddir)/WINGs/libWUtil.la \
-	@XFT_LIBS@ @INTLIBS@
+	@XFT_LIBS@ @INTLIBS@ @XLIBS@

-test_LDADD = wtableview.o wtabledelegates.o $(LDADD)
+tableview_LDADD = wtableview.o wtabledelegates.o $(LDADD)
@@ -19,13 +19,18 @@ static char *options[] = {

 int numberOfRows(WMTableViewDelegate * self, WMTableView * table)
 {
+	(void) self;
+	(void) table;
+
 	return 20;
 }

 void *valueForCell(WMTableViewDelegate * self, WMTableColumn * column, int row)
 {
+	(void) self;
 	/*WMTableView *table = (WMTableView*)WMGetTableColumnTableView(column); */
 	int i;
+
 	if (col1[0] == 0) {
 		for (i = 0; i < 20; i++) {
 			char buf[128];
@@ -44,6 +49,8 @@ void *valueForCell(WMTableViewDelegate * self, WMTableColumn * column, int row)

 void setValueForCell(WMTableViewDelegate * self, WMTableColumn * column, int row, void *data)
 {
+	(void) self;
+
 	if ((uintptr_t)WMGetTableColumnId(column) == 1)
 		col1[row] = data;
 	else
@@ -59,6 +66,7 @@ static WMTableViewDelegate delegate = {

 void clickedTable(WMWidget * w, void *self)
 {
+	(void) w;
 	int row = WMGetTableViewClickedRow((WMTableView *) self);

 	WMEditTableViewRow(self, row);
@@ -2,6 +2,8 @@
 #include <WINGs/WINGsP.h>
 #include <X11/cursorfont.h>
 #include <stdint.h>
+#include <math.h>
+#include <float.h>

 #include "wtableview.h"

@@ -274,7 +276,7 @@ static void adjustScrollers(WMTableView * table)
 			prop = 1.0;
 		} else {
 			oprop = WMGetScrollerKnobProportion(table->hscroll);
-			if (oprop == 0.0)
+			if (fabs(oprop) <= DBL_EPSILON)
 				oprop = 1.0;
 			ovalue = WMGetScrollerValue(table->hscroll);

@@ -290,7 +292,7 @@ static void adjustScrollers(WMTableView * table)
 			prop = 1.0;
 		} else {
 			oprop = WMGetScrollerKnobProportion(table->vscroll);
-			if (oprop == 0.0)
+			if (fabs(oprop) <= DBL_EPSILON)
 				oprop = 1.0;
 			ovalue = WMGetScrollerValue(table->vscroll);

@@ -332,7 +334,7 @@ static void doScroll(WMWidget * self, void *data)
 	case WSIncrementWheel:
 	case WSIncrementLine:
 		value += (float)table->rowHeight / size;
-		if (value > 1.0)
+		if (value > (float)1.0)
 			value = 1.0;
 		WMSetScrollerParameters(self, value, WMGetScrollerKnobProportion(self));
 		repaintTable(table);
@@ -344,7 +346,7 @@ static void doScroll(WMWidget * self, void *data)

 	case WSDecrementPage:
 		value -= vpsize / size;
-		if (value < 0.0)
+		if (value < (float)0.0)
 			value = 0.0;
 		WMSetScrollerParameters(self, value, WMGetScrollerKnobProportion(self));
 		repaintTable(table);
@@ -352,7 +354,7 @@ static void doScroll(WMWidget * self, void *data)

 	case WSIncrementPage:
 		value += vpsize / size;
-		if (value > 1.0)
+		if (value > (float)1.0)
 			value = 1.0;
 		WMSetScrollerParameters(self, value, WMGetScrollerKnobProportion(self));
 		repaintTable(table);
@@ -398,6 +400,7 @@ static void doScroll(WMWidget * self, void *data)

 static void splitterHandler(XEvent * event, void *data)
 {
+	(void) event;
 	WMTableColumn *column = (WMTableColumn *) data;
 	WMTableView *table = column->table;
 	int done = 0;
@@ -451,6 +454,8 @@ static void splitterHandler(XEvent * event, void *data)

 static void realizeTable(void *data, WMNotification * notif)
 {
+	(void) notif;
+
 	repaintTable(data);
 }

@@ -790,7 +795,6 @@ void WMSetTableViewRowHeight(WMTableView * table, int height)

 void WMScrollTableViewRowToVisible(WMTableView * table, int row)
 {
-	WMScroller *scroller;
 	WMRange range;
 	WMRect rect;
 	int newY, tmp;
@@ -798,7 +802,6 @@ void WMScrollTableViewRowToVisible(WMTableView * table, int row)
 	rect = getVisibleRect(table);
 	range = rowsInRect(table, rect);

-	scroller = table->vscroll;

 	if (row < range.position) {
 		newY = row * table->rowHeight - rect.size.height / 2;
@@ -1157,6 +1160,8 @@ static void handleEvents(XEvent * event, void *data)

 static void handleResize(W_ViewDelegate * self, WMView * view)
 {
+	(void) self;
+
 	reorganizeInterior(view->self);
 }

@@ -1167,7 +1172,8 @@ static void reorganizeInterior(WMTableView * table)
 	WMSize size = getTotalSize(table);
 	WMView *view = table->view;
 	int vw, vh;
-	int hsThickness, vsThickness;
+	int hsThickness = 0;
+	int vsThickness = 0;

 	if (table->vscroll)
 		vsThickness = WMWidgetWidth(table->vscroll);
@@ -1,5 +1,5 @@
 # Translation into Western Frisian for Window Maker
-# Copyright (C) 2015-2016 Window Maker Developers Team
+# Copyright (C) 2015-2019 Window Maker Developers Team
 # This file is distributed under the same license as the windowmaker package.
 # Original by Alwin <translations@ziggo.nl>, 2015.
 #
@@ -1,5 +1,5 @@
 # New translation into Dutch for Window Maker
-# Copyright (C) 2014-2015 Window Maker Developers Team
+# Copyright (C) 2014-2019 Window Maker Developers Team
 # This file is distributed under the same license as the windowmaker package.
 # Original by Alwin <translations@ziggo.nl>, 2014.
 #
@@ -1732,36 +1732,23 @@ Bool WMWritePropListToFile(WMPropList * plist, const char *path)
 * file, and the last component is stripped off. the rest is the
 * the hierarchy to be created.
 *
- * refuses to create anything outside $WMAKER_USER_ROOT/Defaults or $WMAKER_USER_ROOT/Library
+ * refuses to create anything outside $WMAKER_USER_ROOT
 *
 * returns 1 on success, 0 on failure
 */
 int wmkdirhier(const char *path)
 {
-	const char *libpath;
-	char *udefpath;
-	int cmp;
+	const char *t;
 	char *thePath = NULL, buf[1024];
 	size_t p, plen;
 	struct stat st;

-	/* Only create directories under $WMAKER_USER_ROOT/Defaults or $WMAKER_USER_ROOT/Library */
-	libpath = wuserdatapath();
-	if (strncmp(path, libpath, strlen(libpath)) == 0)
-		if (path[strlen(libpath)] == '/')
-			goto path_in_valid_tree;
+	/* Only create directories under $WMAKER_USER_ROOT */
+	if ((t = wusergnusteppath()) == NULL)
+		return 0;
+	if (strncmp(path, t, strlen(t)) != 0)
+		return 0;

-	udefpath = wdefaultspathfordomain("");
-	cmp = strncmp(path, udefpath, strlen(udefpath));
-	wfree(udefpath);
-	if (cmp == 0)
-		/* Note: by side effect, 'udefpath' already contains a final '/'  */
-		goto path_in_valid_tree;
-
-	/* If we reach this point, the path is outside the allowed tree */
-	return 0;
-
- path_in_valid_tree:
 	thePath = wstrdup(path);
 	/* Strip the trailing component if it is a file */
 	p = strlen(thePath);
@@ -1784,6 +1771,7 @@ int wmkdirhier(const char *path)
 	}

 	memset(buf, 0, sizeof(buf));
+	strncpy(buf, t, sizeof(buf) - 1);
 	p = strlen(buf);
 	plen = strlen(thePath);

@@ -1794,7 +1782,7 @@ int wmkdirhier(const char *path)
 		strncpy(buf, thePath, p);
 		if (mkdir(buf, 0777) == -1 && errno == EEXIST &&
 		    stat(buf, &st) == 0 && !S_ISDIR(st.st_mode)) {
-			werror(_("Could not create path component %s"), buf);
+			werror(_("Could not create component %s"), buf);
 			wfree(thePath);
 			return 0;
 		}
@@ -2,8 +2,9 @@
 *
 *  WPrefs - Window Maker Preferences Program
 *
- *  Copyright (c) 2014 Window Maker Team
+ *  Copyright (c) 2014-2023 Window Maker Team
 *  Copyright (c) 1998-2003 Alfredo K. Kojima
+ *  Copyright (c) 2009-2023 Window Maker Team
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -88,7 +89,7 @@ static struct expert_option {
 	  /* default: */ False, OPTION_WMAKER, "KbdModeLock" },
 #endif /* XKB_MODELOCK */

-	{ N_("Maximize (snap) a window to edge or corner by dragging."),
+	{ N_("Snap a window to edge or corner by dragging."),
 	  /* default: */ False, OPTION_WMAKER, "WindowSnapping" },

 	{ N_("Distance from edge to begin window snap."),
@@ -97,7 +98,7 @@ static struct expert_option {
 	{ N_("Distance from corner to begin window snap."),
 	  /* default: */ 10, OPTION_WMAKER_INT, "SnapCornerDetect" },

-	{ N_("Snapping a window to the top maximizes it to the full screen."),
+	{ N_("Snap a window to the top to maximize it to the full screen."),
 	  /* default: */ False, OPTION_WMAKER, "SnapToTopMaximizesFullscreen" },

 	{ N_("Allow move half-maximized windows between multiple screens."),
@@ -115,7 +116,7 @@ static struct expert_option {
 	{ N_("Wrap dock-attached icons around the screen edges."),
 	  /* default: */ True, OPTION_WMAKER, "WrapAppiconsInDock" },
 	  
-	{ N_("Double click on titlebar maximize a window to full screen."),
+	{ N_("Double click on titlebar maximizes/minimizes a window to/from full screen."),
 	  /* default: */ False, OPTION_WMAKER, "DbClickFullScreen" },

 	{ N_("Close rootmenu when mouse (left or right) is clicked outside focus."),
@@ -0,0 +1,465 @@
+/* HotCornerShortcuts.c - screen corners actions
+ *
+ *  WPrefs - Window Maker Preferences Program
+ *
+ *  Copyright (c) 2023 Window Maker Team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program 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 General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "WPrefs.h"
+
+typedef struct _Panel {
+	WMBox *box;
+
+	char *sectionName;
+
+	char *description;
+
+	CallbackRec callbacks;
+
+	WMWidget *parent;
+	WMPixmap *icon;
+	Pixmap quarter[4];
+
+	WMFrame *hcF;
+	WMButton *hcB;
+	WMFrame *hceF;
+	WMSlider *hceS;
+	WMLabel *hceL;
+	WMFrame *hcdescF;
+	WMLabel *hcdescL;
+
+	WMFrame *hcdelayF;
+	WMButton *hcdelayB[5];
+	WMTextField *hcdelayT;
+	WMLabel *hcdelayL;
+	WMLabel *icornerL;
+
+	WMFrame *hcactionsF;
+	WMTextField *hcactionsT[4];
+
+	char hotcornerDelaySelected;
+} _Panel;
+
+#define ICON_FILE	"hotcorners"
+
+#define DELAY_ICON "timer%i"
+#define DELAY_ICON_S "timer%is"
+
+static void edgeCallback(WMWidget * w, void *data)
+{
+	_Panel *panel = (_Panel *) data;
+	char buffer[64];
+	int i;
+
+	/* Parameter not used, but tell the compiler that it is ok */
+	(void) w;
+
+	i = WMGetSliderValue(panel->hceS);
+
+	if (i == 0)
+		sprintf(buffer, _("OFF"));
+	else if (i == 1)
+		sprintf(buffer, _("1 pixel"));
+	else if (i <= 4)
+		/* 2-4 */
+		sprintf(buffer, _("%i pixels"), i);
+	else
+		/* >4 */
+		sprintf(buffer, _("%i pixels "), i);	/* note space! */
+	WMSetLabelText(panel->hceL, buffer);
+}
+
+static void showData(_Panel * panel)
+{
+	int i;
+	char buffer[32];
+	WMPropList *array;
+
+	if (!GetObjectForKey("HotCornerDelay"))
+		i = 250;
+	else
+		i = GetIntegerForKey("HotCornerDelay");
+	sprintf(buffer, "%i", i);
+	WMSetTextFieldText(panel->hcdelayT, buffer);
+
+	switch (i) {
+	case 0:
+		WMPerformButtonClick(panel->hcdelayB[0]);
+		break;
+	case 250:
+		WMPerformButtonClick(panel->hcdelayB[1]);
+		break;
+	case 500:
+		WMPerformButtonClick(panel->hcdelayB[2]);
+		break;
+	case 750:
+		WMPerformButtonClick(panel->hcdelayB[3]);
+		break;
+	case 1000:
+		WMPerformButtonClick(panel->hcdelayB[4]);
+		break;
+	}
+
+	i = GetIntegerForKey("HotCornerEdge");
+	i = i < 0 ? 2 : i;
+	i = i > 10 ? 10 : i;
+	WMSetSliderValue(panel->hceS, i);
+	edgeCallback(NULL, panel);
+
+	WMSetButtonSelected(panel->hcB, GetBoolForKey("HotCorners"));
+
+        array = GetObjectForKey("HotCornerActions");
+	if (array && (!WMIsPLArray(array) || WMGetPropListItemCount(array) != sizeof(panel->hcactionsT) / sizeof(WMTextField *))) {
+		wwarning(_("invalid data in option HotCornerActions."));
+	} else {
+		if (array) {
+			for (i = 0; i < sizeof(panel->hcactionsT) / sizeof(WMTextField *); i++)
+				if (strcasecmp(WMGetFromPLString(WMGetFromPLArray(array, i)), "None") != 0)
+					WMSetTextFieldText(panel->hcactionsT[i], WMGetFromPLString(WMGetFromPLArray(array, i)));
+		}
+	}
+}
+
+static void storeData(_Panel * panel)
+{
+	WMPropList *list;
+	WMPropList *tmp;
+	char *str;
+	int i;
+
+	SetBoolForKey(WMGetButtonSelected(panel->hcB), "HotCorners");
+
+	str = WMGetTextFieldText(panel->hcdelayT);
+	if (sscanf(str, "%i", &i) != 1)
+		i = 0;
+	SetIntegerForKey(i, "HotCornerDelay");
+	free(str);
+
+	SetIntegerForKey(WMGetSliderValue(panel->hceS), "HotCornerEdge");	
+
+	list = WMCreatePLArray(NULL, NULL);
+	for (i = 0; i < sizeof(panel->hcactionsT) / sizeof(WMTextField *); i++) {
+		str = WMGetTextFieldText(panel->hcactionsT[i]);
+		if (strlen(str) == 0)
+			str = "None";
+		tmp = WMCreatePLString(str);
+		WMAddToPLArray(list, tmp);
+	}
+	SetObjectForKey(list, "HotCornerActions");
+}
+
+static void pushDelayButton(WMWidget * w, void *data)
+{
+	_Panel *panel = (_Panel *) data;
+
+	panel->hotcornerDelaySelected = 1;
+	if (w == panel->hcdelayB[0]) {
+		WMSetTextFieldText(panel->hcdelayT, "0");
+	} else if (w == panel->hcdelayB[1]) {
+		WMSetTextFieldText(panel->hcdelayT, "250");
+	} else if (w == panel->hcdelayB[2]) {
+		WMSetTextFieldText(panel->hcdelayT, "500");
+	} else if (w == panel->hcdelayB[3]) {
+		WMSetTextFieldText(panel->hcdelayT, "700");
+	} else if (w == panel->hcdelayB[4]) {
+		WMSetTextFieldText(panel->hcdelayT, "1000");
+	}
+}
+
+static void delayTextChanged(void *observerData, WMNotification * notification)
+{
+	_Panel *panel = (_Panel *) observerData;
+	int i;
+
+	/* Parameter not used, but tell the compiler that it is ok */
+	(void) notification;
+
+	if (panel->hotcornerDelaySelected) {
+		for (i = 0; i < 5; i++) {
+			WMSetButtonSelected(panel->hcdelayB[i], False);
+		}
+		panel->hotcornerDelaySelected = 0;
+	}
+}
+
+static void createPanel(Panel * p)
+{
+	_Panel *panel = (_Panel *) p;
+	int i;
+	char *buf1, *buf2;
+	WMColor *color;
+	WMFont *font;
+	char *path;
+	RImage *xis = NULL;
+	WMScreen *scr = WMWidgetScreen(panel->parent);
+	RContext *rc = WMScreenRContext(scr);
+	GC gc = XCreateGC(scr->display, WMWidgetXID(panel->parent), 0, NULL);
+
+	path = LocateImage(ICON_FILE);
+	if (path) {
+		xis = RLoadImage(rc, path, 0);
+		if (!xis) {
+			wwarning(_("could not load image file %s"), path);
+		}
+		wfree(path);
+	}
+
+	panel->box = WMCreateBox(panel->parent);
+	WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 2, 2);
+
+
+    /***************** Hot Corner lelf side frames *****************/
+	panel->hcF = WMCreateFrame(panel->box);
+	WMResizeWidget(panel->hcF, 240, 53);
+	WMMoveWidget(panel->hcF, 15, 17);
+
+	panel->hcB = WMCreateSwitchButton(panel->hcF);
+	WMResizeWidget(panel->hcB, 150, 30);
+	WMMoveWidget(panel->hcB, 15, 12);
+	WMSetButtonText(panel->hcB, _("Enable Hot Corners"));
+
+	WMMapSubwidgets(panel->hcF);
+
+	panel->hceF = WMCreateFrame(panel->box);
+	WMSetFrameTitle(panel->hceF, _("Hot Corner Edge"));
+	WMResizeWidget(panel->hceF, 240, 40);
+	WMMoveWidget(panel->hceF, 15, 77);
+
+	panel->hceS = WMCreateSlider(panel->hceF);
+	WMResizeWidget(panel->hceS, 80, 15);
+	WMMoveWidget(panel->hceS, 15, 18);
+	WMSetSliderMinValue(panel->hceS, 2);
+	WMSetSliderMaxValue(panel->hceS, 10);
+	WMSetSliderAction(panel->hceS, edgeCallback, panel);
+
+	panel->hceL = WMCreateLabel(panel->hceF);
+	WMResizeWidget(panel->hceL, 100, 15);
+	WMMoveWidget(panel->hceL, 105, 18);
+
+	WMMapSubwidgets(panel->hceF);
+
+	panel->hcdescF = WMCreateFrame(panel->box);
+	WMResizeWidget(panel->hcdescF, 240, 95);
+	WMMoveWidget(panel->hcdescF, 15, 130);
+
+	panel->hcdescL = WMCreateLabel(panel->hcdescF);
+	WMResizeWidget(panel->hcdescL, 200, 60);
+	WMMoveWidget(panel->hcdescL, 15, 10);
+	WMSetLabelText(panel->hcdescL,
+		       _("Instructions:\n\n"
+			 " - assign command to corner\n"
+			 " - or leave it empty\n"));
+
+	WMMapSubwidgets(panel->hcdescF);
+
+    /***************** Hot Corner Action Delay *****************/
+	panel->hcdelayF = WMCreateFrame(panel->box);
+	WMResizeWidget(panel->hcdelayF, 245, 60);
+	WMMoveWidget(panel->hcdelayF, 265, 10);
+
+	WMSetFrameTitle(panel->hcdelayF, _("Hot Corner Delay"));
+
+	buf1 = wmalloc(strlen(DELAY_ICON) + 1);
+	buf2 = wmalloc(strlen(DELAY_ICON_S) + 1);
+
+	for (i = 0; i < 5; i++) {
+		char *path;
+
+		panel->hcdelayB[i] = WMCreateCustomButton(panel->hcdelayF, WBBStateChangeMask);
+		WMResizeWidget(panel->hcdelayB[i], 25, 25);
+		WMMoveWidget(panel->hcdelayB[i], 12 + (30 * i), 25);
+		WMSetButtonBordered(panel->hcdelayB[i], False);
+		WMSetButtonImagePosition(panel->hcdelayB[i], WIPImageOnly);
+		WMSetButtonAction(panel->hcdelayB[i], pushDelayButton, panel);
+		if (i > 0)
+			WMGroupButtons(panel->hcdelayB[0], panel->hcdelayB[i]);
+		sprintf(buf1, DELAY_ICON, i);
+		sprintf(buf2, DELAY_ICON_S, i);
+		path = LocateImage(buf1);
+		if (path) {
+			panel->icon = WMCreatePixmapFromFile(scr, path);
+			if (panel->icon) {
+				WMSetButtonImage(panel->hcdelayB[i], panel->icon);
+				WMReleasePixmap(panel->icon);
+			} else {
+				wwarning(_("could not load icon file %s"), path);
+			}
+			wfree(path);
+		}
+		path = LocateImage(buf2);
+		if (path) {
+			panel->icon = WMCreatePixmapFromFile(scr, path);
+			if (panel->icon) {
+				WMSetButtonAltImage(panel->hcdelayB[i], panel->icon);
+				WMReleasePixmap(panel->icon);
+			} else {
+				wwarning(_("could not load icon file %s"), path);
+			}
+			wfree(path);
+		}
+	}
+	wfree(buf1);
+	wfree(buf2);
+
+	panel->hcdelayT = WMCreateTextField(panel->hcdelayF);
+
+	WMResizeWidget(panel->hcdelayT, 36, 20);
+	WMMoveWidget(panel->hcdelayT, 165, 28);
+	WMAddNotificationObserver(delayTextChanged, panel, WMTextDidChangeNotification, panel->hcdelayT);
+
+	panel->hcdelayL = WMCreateLabel(panel->hcdelayF);
+	WMResizeWidget(panel->hcdelayL, 36, 16);
+	WMMoveWidget(panel->hcdelayL, 205, 32);
+	WMSetLabelText(panel->hcdelayL, _("ms"));
+
+	color = WMDarkGrayColor(scr);
+	font = WMSystemFontOfSize(scr, 10);
+
+	WMSetLabelTextColor(panel->hcdelayL, color);
+	WMSetLabelFont(panel->hcdelayL, font);
+
+	WMReleaseColor(color);
+	WMReleaseFont(font);
+
+	WMMapSubwidgets(panel->hcdelayF);
+
+    /***************** Set Hot Corner Actions ****************/
+	panel->hcactionsF = WMCreateFrame(panel->box);
+	WMSetFrameTitle(panel->hcactionsF, _("Hot Corner Actions"));
+	WMResizeWidget(panel->hcactionsF, 245, 148);
+	WMMoveWidget(panel->hcactionsF, 265, 77);
+
+	panel->icornerL = WMCreateLabel(panel->hcactionsF);
+	WMResizeWidget(panel->icornerL, 24, 24);
+	WMMoveWidget(panel->icornerL, 10, 18);
+	WMSetLabelImagePosition(panel->icornerL, WIPImageOnly);
+	CreateImages(scr, rc, xis, ICON_FILE, &panel->icon, NULL);
+	if (panel->icon)
+	{
+		WMPixmap *nicon;
+
+		panel->quarter[0] = XCreatePixmap(scr->display, WMWidgetXID(panel->parent), panel->icon->width/2, panel->icon->height/2, WMScreenDepth(scr));
+		XCopyArea(scr->display, WMGetPixmapXID(panel->icon), panel->quarter[0], gc, 0, 0, panel->icon->width/2, panel->icon->height/2,  0, 0);
+		nicon = WMCreatePixmapFromXPixmaps(scr, panel->quarter[0], WMGetPixmapMaskXID(panel->icon),
+                                     panel->icon->width/2, panel->icon->height/2, WMScreenDepth(scr));
+		WMSetLabelImage(panel->icornerL, nicon);
+		WMReleasePixmap(nicon);
+	}
+
+	panel->hcactionsT[0] = WMCreateTextField(panel->hcactionsF);
+	WMResizeWidget(panel->hcactionsT[0], 180, 20);
+	WMMoveWidget(panel->hcactionsT[0], 50, 20);
+
+	panel->icornerL = WMCreateLabel(panel->hcactionsF);
+	WMResizeWidget(panel->icornerL, 24, 24);
+	WMMoveWidget(panel->icornerL, 10, 48);
+	WMSetLabelImagePosition(panel->icornerL, WIPImageOnly);
+	if (panel->icon)
+	{
+		WMPixmap *nicon;
+
+		panel->quarter[1] = XCreatePixmap(scr->display, WMWidgetXID(panel->parent), panel->icon->width/2, panel->icon->height/2, WMScreenDepth(scr));
+		XCopyArea(scr->display, WMGetPixmapXID(panel->icon), panel->quarter[1], gc, panel->icon->width/2, 0, panel->icon->width/2, panel->icon->height/2,  0, 0);
+		nicon = WMCreatePixmapFromXPixmaps(scr, panel->quarter[1], WMGetPixmapMaskXID(panel->icon),
+                                     panel->icon->width/2, panel->icon->height/2, WMScreenDepth(scr));
+		WMSetLabelImage(panel->icornerL, nicon);
+		WMReleasePixmap(nicon);
+	}
+
+	panel->hcactionsT[1] = WMCreateTextField(panel->hcactionsF);
+	WMResizeWidget(panel->hcactionsT[1], 180, 20);
+	WMMoveWidget(panel->hcactionsT[1], 50, 50);
+
+	panel->icornerL = WMCreateLabel(panel->hcactionsF);
+	WMResizeWidget(panel->icornerL, 24, 24);
+	WMMoveWidget(panel->icornerL, 10, 78);
+	WMSetLabelImagePosition(panel->icornerL, WIPImageOnly);
+	if (panel->icon)
+	{
+		WMPixmap *nicon;
+
+		panel->quarter[2] = XCreatePixmap(scr->display, WMWidgetXID(panel->parent), panel->icon->width/2, panel->icon->height/2, WMScreenDepth(scr));
+		XCopyArea(scr->display, WMGetPixmapXID(panel->icon), panel->quarter[2], gc, 0, panel->icon->height/2, panel->icon->width/2, panel->icon->height/2,  0, 0);
+		nicon = WMCreatePixmapFromXPixmaps(scr, panel->quarter[2], WMGetPixmapMaskXID(panel->icon),
+                                     panel->icon->width/2, panel->icon->height/2, WMScreenDepth(scr));
+		WMSetLabelImage(panel->icornerL, nicon);
+		WMReleasePixmap(nicon);
+	}
+	panel->hcactionsT[2] = WMCreateTextField(panel->hcactionsF);
+	WMResizeWidget(panel->hcactionsT[2], 180, 20);
+	WMMoveWidget(panel->hcactionsT[2], 50, 80);
+
+	panel->icornerL = WMCreateLabel(panel->hcactionsF);
+	WMResizeWidget(panel->icornerL, 24, 24);
+	WMMoveWidget(panel->icornerL, 10, 108);
+	WMSetLabelImagePosition(panel->icornerL, WIPImageOnly);
+	if (panel->icon)
+	{
+		WMPixmap *nicon;
+
+		panel->quarter[3] = XCreatePixmap(scr->display, WMWidgetXID(panel->parent), panel->icon->width/2, panel->icon->height/2, WMScreenDepth(scr));
+		XCopyArea(scr->display, WMGetPixmapXID(panel->icon), panel->quarter[3], gc, panel->icon->width/2, panel->icon->height/2, panel->icon->width/2, panel->icon->height/2,  0, 0);
+		nicon = WMCreatePixmapFromXPixmaps(scr, panel->quarter[3], WMGetPixmapMaskXID(panel->icon),
+                                     panel->icon->width/2, panel->icon->height/2, WMScreenDepth(scr));
+		WMSetLabelImage(panel->icornerL, nicon);
+		WMReleasePixmap(nicon);
+	}
+
+	panel->hcactionsT[3] = WMCreateTextField(panel->hcactionsF);
+	WMResizeWidget(panel->hcactionsT[3], 180, 20);
+	WMMoveWidget(panel->hcactionsT[3], 50, 107);
+
+	WMMapSubwidgets(panel->hcactionsF);
+
+	if (xis)
+		RReleaseImage(xis);
+	XFreeGC(scr->display, gc);
+
+	WMRealizeWidget(panel->box);
+	WMMapSubwidgets(panel->box);
+
+	showData(panel);
+}
+static void prepareForClose(_Panel *panel)
+{
+	int i;
+	WMScreen *scr = WMWidgetScreen(panel->parent);
+
+	WMReleasePixmap(panel->icon);
+	for (i = 0; i < sizeof(panel->quarter) / sizeof(Pixmap); i++)
+		XFreePixmap(scr->display, panel->quarter[i]);
+}
+
+Panel *InitHotCornerShortcuts(WMWidget *parent)
+{
+	_Panel *panel;
+
+	panel = wmalloc(sizeof(_Panel));
+
+	panel->sectionName = _("Hot Corner Shortcut Preferences");
+	panel->description = _("Choose actions to perform when you move the\n"
+			       "mouse pointer to the screen corners.");
+	panel->parent = parent;
+
+	panel->callbacks.createWidgets = createPanel;
+	panel->callbacks.updateDomain = storeData;
+	panel->callbacks.prepareForClose = prepareForClose;
+
+	AddSection(panel, ICON_FILE);
+
+	return panel;
+}
@@ -84,11 +84,12 @@ static struct keyOption {
 	{ "RHMaximizeKey",  N_("Maximize active window right half") },
 	{ "THMaximizeKey",  N_("Maximize active window top half") },
 	{ "BHMaximizeKey",  N_("Maximize active window bottom half") },
-	{ "LTCMaximizeKey", N_("Maximize active window left top corner") },
-	{ "RTCMaximizeKey", N_("Maximize active window right top corner") },
-	{ "LBCMaximizeKey", N_("Maximize active window left bottom corner") },
-	{ "RBCMaximizeKey", N_("Maximize active window right bottom corner") },
-	{ "MaximusKey",     N_("Maximus: Tiled maximization ") },
+	{ "TLCMaximizeKey", N_("Maximize active window top left corner") },
+	{ "TRCMaximizeKey", N_("Maximize active window top right corner") },
+	{ "BLCMaximizeKey", N_("Maximize active window bottom left corner") },
+	{ "BRCMaximizeKey", N_("Maximize active window bottom right corner") },
+	{ "MaximusKey",     N_("Tile active window") },
+	{ "CenterKey",      N_("Center active window") },
 	{ "KeepOnTopKey",   N_("Toggle window on top status") },
 	{ "KeepAtBottomKey",N_("Toggle window at bottom status") },
 	{ "OmnipresentKey", N_("Toggle window omnipresent status") },
@@ -154,7 +155,7 @@ static struct keyOption {

 	/* Misc. */
 	{ "WindowRelaunchKey", N_("Launch new instance of application") },
-	{ "ScreenSwitchKey",   N_("Switch to Next Screen/Monitor") },
+	{ "ScreenSwitchKey",   N_("Switch to next screen/monitor") },
 	{ "RunKey",            N_("Run application") },
 	{ "ExitKey",            N_("Exit Window Maker") },
 	{ "DockRaiseLowerKey", N_("Raise/Lower Dock") },
@@ -550,7 +551,7 @@ static int cmpKeyOptions(const void *v1, const void *v2)
 	const struct keyOption *opt1 = (struct keyOption *)v1;
 	const struct keyOption *opt2 = (struct keyOption *)v2;

-	if ((rc = strcmp(opt1->title, opt2->title)) < 0)
+	if ((rc = strncmp(opt1->title, opt2->title, 20)) < 0)
 		return -1;
 	else if (rc > 0)
 		return 1;
@@ -35,6 +35,7 @@ WPrefs_SOURCES = \
 	Expert.c \
 	Focus.c \
 	FontSimple.c \
+	HotCornerShortcuts.c \
 	Icons.c \
 	KeyboardShortcuts.c \
 	Menu.c \
@@ -575,6 +575,7 @@ void Initialize(WMScreen * scr)
 	InitKeyboardSettings(WPrefs.banner);
 #endif
 	InitKeyboardShortcuts(WPrefs.banner);
+	InitHotCornerShortcuts(WPrefs.banner);
 	InitMouseSettings(WPrefs.banner);

 	InitAppearance(WPrefs.banner);
@@ -155,6 +155,7 @@ Panel *InitDocks(WMWidget *parent);
 Panel *InitExpert(WMWidget *parent);
 Panel *InitFocus(WMWidget *parent);
 Panel *InitFontSimple(WMWidget *parent);
+Panel *InitHotCornerShortcuts(WMWidget *parent);
 Panel *InitIcons(WMWidget *parent);
 Panel *InitKeyboardShortcuts(WMWidget *parent);
 Panel *InitMenu(WMWidget *parent);
@@ -14,6 +14,7 @@ POTFILES  = \
 	$(top_srcdir)/WPrefs.app/Expert.c \
 	$(top_srcdir)/WPrefs.app/Focus.c \
 	$(top_srcdir)/WPrefs.app/FontSimple.c \
+	$(top_srcdir)/WPrefs.app/HotCornerShortcuts.c \
 	$(top_srcdir)/WPrefs.app/Icons.c \
 	$(top_srcdir)/WPrefs.app/KeyboardShortcuts.c \
 	$(top_srcdir)/WPrefs.app/Menu.c \
@@ -15,6 +15,7 @@ dist_tiffdata_DATA = \
 	ergonomic.tiff \
 	expert.tiff \
 	fonts.tiff \
+	hotcorners.tiff \
 	iconprefs.tiff \
 	keyboard.tiff \
 	keyboardprefs.tiff \
@@ -15,6 +15,7 @@ dist_xpmdata_DATA = \
 	ergonomic.xpm \
 	expert.xpm \
 	fonts.xpm \
+	hotcorners.xpm \
 	iconprefs.xpm \
 	keyboard.xpm \
 	keyboardprefs.xpm \
@@ -0,0 +1,137 @@
+/* XPM */
+static char * hotcorners_xpm[] = {
+"48 48 86 1",
+" 	c #2C2C2C",
+".	c #FEFEFE",
+"+	c #505075",
+"@	c #4E4E74",
+"#	c #515176",
+"$	c #4B4B72",
+"%	c #494971",
+"&	c #515175",
+"*	c #4F4F74",
+"=	c #4C4C73",
+"-	c #696984",
+";	c #545477",
+">	c #5E5E7D",
+",	c #676783",
+"'	c #58587A",
+")	c #5B5B7C",
+"!	c #B1B1BB",
+"~	c #A5A5B1",
+"{	c #A1A1AE",
+"]	c #AEAEB9",
+"^	c #79798F",
+"/	c #5C5C7C",
+"(	c #D5D5DA",
+"_	c #E6E6E9",
+":	c #E8E8EB",
+"<	c #EDEDEF",
+"[	c #E7E7EA",
+"}	c #FDFDFD",
+"|	c #FFFFFF",
+"1	c #EBEBEC",
+"2	c #7F7F93",
+"3	c #484871",
+"4	c #7B7B85",
+"5	c #EFEFEF",
+"6	c #A6A6A6",
+"7	c #292959",
+"8	c #464670",
+"9	c #8C8C96",
+"0	c #F4F4F4",
+"a	c #F5F5F6",
+"b	c #F2F2F2",
+"c	c #9797A6",
+"d	c #474770",
+"e	c #4D4D73",
+"f	c #9393A3",
+"g	c #F4F4F5",
+"h	c #F3F3F3",
+"i	c #EBEBEE",
+"j	c #6D6D87",
+"k	c #9D9DAB",
+"l	c #F9F9F9",
+"m	c #F1F1F1",
+"n	c #A5A5A5",
+"o	c #EAEAEA",
+"p	c #6A6A86",
+"q	c #D3D3D6",
+"r	c #717171",
+"s	c #848484",
+"t	c #9F9FA3",
+"u	c #47476F",
+"v	c #323256",
+"w	c #9B9B9A",
+"x	c #888889",
+"y	c #000012",
+"z	c #6B6B6D",
+"A	c #757587",
+"B	c #46466D",
+"C	c #3B3B47",
+"D	c #2E2E50",
+"E	c #242447",
+"F	c #838383",
+"G	c #919191",
+"H	c #202041",
+"I	c #4F4F73",
+"J	c #4E4E72",
+"K	c #232343",
+"L	c #4F4F4F",
+"M	c #252548",
+"N	c #505074",
+"O	c #3A3A57",
+"P	c #404060",
+"Q	c #505076",
+"R	c #49496B",
+"S	c #31314E",
+"T	c #2F2F49",
+"U	c #434362",
+"                                               .",
+" ++++++++++++++++++++++++++++++++++++++++++++++.",
+" ++++++++++++++++++++++++++++++++++++++++++++++.",
+" ++@#$%&*=+++++++++++++++++++++++++++%-;>,')@++.",
+" ++)!~{]]^@++++++++++++++++++++++++++/(_:<[!#++.",
+" ++'[.}|12*++++++++++++++++++++++++++345||.~$++.",
+" ++,<||}67+++++++++++++++++++++++++++890||}{%++a",
+" ++>:|||bcd+++++++++++++++++++++++++efg||}|]&++.",
+" ++;_5h||ij+++++++++++++++++++++++++@kl|mno]*++.",
+" ++pqrshltu++++++++++++++++++++++++++vwoxyzAe++.",
+" ++BCDEFGHI++++++++++++++++++++++++++JKLMNOP+++.",
+" ++QR+*STJ++++++++++++++++++++++++++++JU*++++++.",
+" +++++++*++++++++++++++++++++++++++++++++++++++.",
+" ++++++++++++++++++++++++++++++++++++++++++++++.",
+" ++++++++++++++++++++++++++++++++++++++++++++++.",
+" ++++++++++++++++++++++++++++++++++++++++++++++.",
+" ++++++++++++++++++++++++++++++++++++++++++++++.",
+" ++++++++++++++++++++++++++++++++++++++++++++++.",
+" ++++++++++++++++++++++++++++++++++++++++++++++.",
+" ++++++++++++++++++++++++++++++++++++++++++++++.",
+" ++++++++++++++++++++++++++++++++++++++++++++++.",
+" ++++++++++++++++++++++++++++++++++++++++++++++.",
+" ++++++++++++++++++++++++++++++++++++++++++++++.",
+" ++++++++++++++++++++++++++++++++++++++++++++++.",
+" ++++++++++++++++++++++++++++++++++++++++++++++.",
+" ++++++++++++++++++++++++++++++++++++++++++++++.",
+" ++++++++++++++++++++++++++++++++++++++++++++++.",
+" ++++++++++++++++++++++++++++++++++++++++++++++.",
+" ++++++++++++++++++++++++++++++++++++++++++++++.",
+" ++++++++++++++++++++++++++++++++++++++++++++++.",
+" ++++++++++++++++++++++++++++++++++++++++++++++.",
+" ++++++++++++++++++++++++++++++++++++++++++++++.",
+" ++++++++++++++++++++++++++++++++++++++++++++++.",
+" ++++++++++++++++++++++++++++++++++++++++++++++.",
+" ++++++++++++++++++++++++++++++++++++++++++++++.",
+" ++++++++++++++++++++++++++++++++++++++++++++++.",
+" ++QR+*STJ++++++++++++++++++++++++++++JTS*+RQ++.",
+" ++BCDEFGHI++++++++++++++++++++++++++IHGFEDCB++.",
+" ++pqrshltu++++++++++++++++++++++++++utlhsrqp++.",
+" ++;_5h||ij++++++++++++++++++++++++++ji||h5_;++.",
+" ++>:|||bcd++++++++++++++++++++++++++dcb|||:>++.",
+" ++,<||}67++++++++++++++++++++++++++++76}||<,++.",
+" ++'[.}|12*++++++++++++++++++++++++++*21|}.['++.",
+" ++)!~{]]^@++++++++++++++++++++++++++@^]]{~!)++.",
+" ++@#$%&*=++++++++++++++++++++++++++++=*&%$#@++.",
+" ++++++++++++++++++++++++++++++++++++++++++++++.",
+" ++++++++++++++++++++++++++++++++++++++++++++++.",
+"................................................"};
@@ -171,10 +171,10 @@
 	RHMaximizeKey = None;
 	THMaximizeKey = None;
 	BHMaximizeKey = None;
-	LTCMaximizeKey = None;
-	RTCMaximizeKey = None;
-	LBCMaximizeKey = None;
-	RBCMaximizeKey = None;
+	TLCMaximizeKey = None;
+	TRCMaximizeKey = None;
+	BLCMaximizeKey = None;
+	BRCMaximizeKey = None;
 	MaximusKey = None;
 	KeepOnTopKey = None;
 	KeepAtBottomKey = None;
@@ -2,7 +2,7 @@ dnl ============================================================================
 dnl
 dnl Window Maker autoconf input
 dnl
-AC_COPYRIGHT([Copyright (c) 2001-2015 The Window Maker Team])
+AC_COPYRIGHT([Copyright (c) 2001-2023 The Window Maker Team])
 dnl
 dnl ============================================================================
 dnl
@@ -34,7 +34,7 @@ AC_PREREQ([2.69])

 dnl Configuration for Autoconf and Automake
 dnl =======================================
-AC_INIT([WindowMaker],[0.95.9],[wmaker-dev@googlegroups.com],[WindowMaker],[http://www.windowmaker.org/])
+AC_INIT([WindowMaker],[0.96.0],[wmaker-dev@googlegroups.com],[WindowMaker],[http://www.windowmaker.org/])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])

@@ -455,7 +455,6 @@ AC_CHECK_HEADERS([syslog.h], [AC_DEFINE([HAVE_SYSLOG], [1], [Check for syslog])]
 dnl Checks for header files
 dnl =======================
 AC_HEADER_SYS_WAIT
-AC_HEADER_TIME
 AC_CHECK_HEADERS(fcntl.h limits.h sys/ioctl.h libintl.h poll.h malloc.h ctype.h \
 		 string.h strings.h)

@@ -80,14 +80,14 @@ AS_VAR_PUSHDEF([VAR],[ax_cv_cflags_gcc_option_$2])dnl
 AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for gcc m4_ifval($2,$2,-option)],
 VAR,[VAR="no, unknown"
 AC_LANG_SAVE
- AC_LANG_C
+ AC_LANG(C)
 ac_save_[]FLAGS="$[]FLAGS"
 for ac_arg dnl
 in "-pedantic -Werror % m4_ifval($2,$2,-option)"  dnl   GCC
   "-pedantic % m4_ifval($2,$2,-option) %% no, obsolete"  dnl new GCC
   #
 do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
-   AC_TRY_COMPILE([],[return 0;],
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[return 0;])],
   [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
 done
 FLAGS="$ac_save_[]FLAGS"
@@ -116,14 +116,14 @@ AS_VAR_PUSHDEF([VAR],[ax_cv_cxxflags_gcc_option_$2])dnl
 AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for gcc m4_ifval($2,$2,-option)],
 VAR,[VAR="no, unknown"
 AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
+ AC_LANG(C++)
 ac_save_[]FLAGS="$[]FLAGS"
 for ac_arg dnl
 in "-pedantic -Werror % m4_ifval($2,$2,-option)"  dnl   GCC
   "-pedantic % m4_ifval($2,$2,-option) %% no, obsolete"  dnl new GCC
   #
 do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
-   AC_TRY_COMPILE([],[return 0;],
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[return 0;])],
   [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
 done
 FLAGS="$ac_save_[]FLAGS"
@@ -151,14 +151,14 @@ AS_VAR_PUSHDEF([VAR],[ax_cv_cflags_gcc_option_$1])dnl
 AC_CACHE_CHECK([m4_ifval($2,$2,FLAGS) for gcc m4_ifval($1,$1,-option)],
 VAR,[VAR="no, unknown"
 AC_LANG_SAVE
- AC_LANG_C
+ AC_LANG(C)
 ac_save_[]FLAGS="$[]FLAGS"
 for ac_arg dnl
 in "-pedantic -Werror % m4_ifval($1,$1,-option)"  dnl   GCC
   "-pedantic % m4_ifval($1,$1,-option) %% no, obsolete"  dnl new GCC
   #
 do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
-   AC_TRY_COMPILE([],[return 0;],
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[return 0;])],
   [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
 done
 FLAGS="$ac_save_[]FLAGS"
@@ -187,14 +187,14 @@ AS_VAR_PUSHDEF([VAR],[ax_cv_cxxflags_gcc_option_$1])dnl
 AC_CACHE_CHECK([m4_ifval($2,$2,FLAGS) for gcc m4_ifval($1,$1,-option)],
 VAR,[VAR="no, unknown"
 AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
+ AC_LANG(C++)
 ac_save_[]FLAGS="$[]FLAGS"
 for ac_arg dnl
 in "-pedantic -Werror % m4_ifval($1,$1,-option)"  dnl   GCC
   "-pedantic % m4_ifval($1,$1,-option) %% no, obsolete"  dnl new GCC
   #
 do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
-   AC_TRY_COMPILE([],[return 0;],
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[return 0;])],
   [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
 done
 FLAGS="$ac_save_[]FLAGS"
@@ -47,14 +47,15 @@ AC_DEFUN([WM_CHECK_XFT_VERSION],
 AC_CACHE_CHECK([whether libXft is at least version $1], [ac_cv_lib_xft_version_ok],
    [CPPFLAGS_save="$CPPFLAGS"
     CPPFLAGS="$CPPFLAGS $XFT_CFLAGS $inc_search_path"
-     AC_TRY_LINK([
+     AC_LINK_IFELSE(
+[AC_LANG_PROGRAM([
 #include <X11/Xlib.h>
 #include <X11/Xft/Xft.h>
 ], [
 #if !defined(XFT_VERSION) || XFT_VERSION < ]XFT_REQUIRED_VERSION[
 #error libXft on this system is too old. Consider upgrading to at least $1
 #endif
-], [ac_cv_lib_xft_version_ok=yes], [ac_cv_lib_xft_version_ok=no])
+])], [ac_cv_lib_xft_version_ok=yes], [ac_cv_lib_xft_version_ok=no])
     CPPFLAGS="$CPPFLAGS_save"])
 m4_undefine([XFT_REQUIRED_VERSION])dnl
 AS_IF([test "x$ac_cv_lib_xft_version_ok" != "xyes"], [$3], [$2])dnl
@@ -1,7 +1,7 @@
 # wm_i18n.m4 - Macros to check and enable translations in WindowMaker
 #
 # Copyright (c) 2014-2015 Christophe CURIS
-# Copyright (c) 2015 The Window Maker Tean
+# Copyright (c) 2015-2021 The Window Maker Tean
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -198,9 +198,9 @@ AC_DEFUN_ONCE([WM_IMGFMT_CHECK_WEBP],
         dnl a symbol without first using the header to handle it
         wm_save_LIBS="$LIBS"
         LIBS="$LIBS -lwebp"
-         AC_TRY_LINK(
-             [@%:@include <webp/decode.h>],
-             [WebPGetFeatures(NULL, 1024, NULL);],
+         AC_LINK_IFELSE(
+             [AC_LANG_PROGRAM([@%:@include <webp/decode.h>],
+                 [WebPGetFeatures(NULL, 1024, NULL);])],
             [wm_cv_imgfmt_webp="-lwebp"])
         LIBS="$wm_save_LIBS"
         AS_IF([test "x$enable_webp$wm_cv_imgfmt_webp" = "xyesno"],
@@ -1,6 +1,6 @@
 # wm_libexif.m4 - Macros to check proper libexif
 #
-# Copyright (c) 2014 Window Maker Team
+# Copyright (c) 2014-2015 Window Maker Team
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -1,5 +1,5 @@
 # Translation into Western Frisian for Window Maker
-# Copyright (C) 2015-2016 Window Maker Developers Team
+# Copyright (C) 2015-2020 Window Maker Developers Team
 # This file is distributed under the same license as the windowmaker package.
 # Original by Alwin <translations@ziggo.nl>, 2015.
 #
@@ -1,5 +1,5 @@
 # New translation into Dutch for Window Maker
-# Copyright (C) 2014-2016 Window Maker Developers Team
+# Copyright (C) 2014-2020 Window Maker Developers Team
 # This file is distributed under the same license as the windowmaker package.
 # Original by Alwin <translations@ziggo.nl>, 2014.
 #
@@ -4,7 +4,7 @@
 #  Window Maker window manager
 #
 #  Copyright (c) 2014 Christophe CURIS
-#  Copyright (c) 2014 Window Maker Team
+#  Copyright (c) 2014-2015 Window Maker Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -77,10 +77,8 @@ while [ $# -gt 0 ]; do

        -v)
            shift
-            # Version may be 'x:y:z', we keep only 'x'
-            version="`echo "$1" | sed -e 's,:.*$,,' `"
-            # the version should only be a number
-            echo "$version" | grep '^[1-9][0-9]*$' > /dev/null || \
+            version="$1"
+            echo "$version" | grep -E '^[1-9][0-9]*(:[0-9]+(:[0-9]+)?)?$' > /dev/null || \
                arg_error "version \"$1\" is not valid"
          ;;

@@ -109,9 +107,18 @@ fi
 # generate the rest of the script so that other symbols will not be kept.
 awk '
 BEGIN {
+  # Version number here uses only 1 number from the full version used in libtool
+  libversion="'"$version"'";
+  if (split(libversion, subversions, ":") > 1) {
+    # Calculate [CURRENT - AGE], the goal is that the number will not
+    # change when functions are added to the API, but it will be incremented
+    # when functions are removed or argument change (which breaks compat)
+    libversion = subversions[1] - subversions[3];
+  }
+
  print "/* Generated version-script for ld */";
  print "";
-  print "'"$libname$version"'";
+  print "'"$libname"'" libversion;
  print "{";
  print "  global:";
 }
@@ -4,7 +4,7 @@
 #  Window Maker window manager
 #
 #  Copyright (c) 2014-2015 Christophe CURIS
-#  Copyright (c) 2015 Window Maker Team
+#  Copyright (c) 2015-2019 Window Maker Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -2,7 +2,7 @@
 *  Window Maker window manager
 *
 *  Copyright (c) 1997-2003 Alfredo K. Kojima
- *  Copyright (c) 2014 Window Maker Team
+ *  Copyright (c) 2014-2023 Window Maker Team
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -474,6 +474,11 @@ extern struct WPreferences {

 	char show_clip_title;

+	char hot_corners;                  /* let corners execute actions */
+	int hot_corner_delay;		   /* Delay after which the hot corner is triggered */
+	int hot_corner_edge;		   /* Hot corner edge size */
+	char *hot_corner_actions[4];	   /* Action of each corner */
+
 	struct {
 #ifdef USE_ICCCM_WMREPLACE
 		unsigned int replace:1;               /* replace existing window manager */
@@ -4,7 +4,7 @@
 *
 *  Copyright (c) 1997-2003 Alfredo K. Kojima
 *  Copyright (c) 1998-2003 Dan Pascu
- *  Copyright (c) 2014 Window Maker Team
+ *  Copyright (c) 2014-2023 Window Maker Team
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -404,7 +404,7 @@ void wMaximizeWindow(WWindow *wwin, int directions, int head)
 	usableArea = wGetUsableAreaForHead(scr, head, &totalArea, True);

 	/* Only save directions, not kbd or xinerama hints */
-	directions &= (MAX_HORIZONTAL | MAX_VERTICAL | MAX_LEFTHALF | MAX_RIGHTHALF | MAX_TOPHALF | MAX_BOTTOMHALF | MAX_MAXIMUS);
+	directions &= (MAX_HORIZONTAL | MAX_VERTICAL | MAX_LEFTHALF | MAX_RIGHTHALF | MAX_TOPHALF | MAX_BOTTOMHALF | MAX_MAXIMUS | MAX_CENTRAL);

 	if (WFLAGP(wwin, full_maximize))
 		usableArea = totalArea;
@@ -431,12 +431,31 @@ void wMaximizeWindow(WWindow *wwin, int directions, int head)
 		wwin->maximus_y = new_y;
 		wwin->flags.old_maximized |= MAX_MAXIMUS;
 	} else {
+		/* center the window if can fit, if not sticking it to the screen edges */
+		if (directions & MAX_CENTRAL) {
+			if (wwin->frame->core->height > (usableArea.y2 - usableArea.y1)) {
+				new_y = usableArea.y1;
+				new_height = usableArea.y2 - usableArea.y1 - adj_size;
+			} else {
+				new_height = (wwin->old_geometry.height) ? wwin->old_geometry.height : wwin->frame->core->height;
+				new_height += wwin->frame->top_width + wwin->frame->bottom_width;
+				new_y = half_scr_height - new_height / 2;
+			}
+			if (wwin->frame->core->width > (usableArea.x2 - usableArea.x1)) {
+				new_x = usableArea.x1;
+				new_width = usableArea.x2 - usableArea.x1 - adj_size;
+			}
+			else {
+				new_width = (wwin->old_geometry.width) ? wwin->old_geometry.width : wwin->frame->core->width;
+				new_x = half_scr_width - new_width / 2;
+			}
+		}
 		/* set default values if no option set then */
-		if (!(directions & (MAX_HORIZONTAL | MAX_LEFTHALF | MAX_RIGHTHALF | MAX_MAXIMUS))) {
+		if (!(directions & (MAX_HORIZONTAL | MAX_LEFTHALF | MAX_RIGHTHALF | MAX_MAXIMUS | MAX_CENTRAL))) {
 			new_width = (wwin->old_geometry.width) ? wwin->old_geometry.width : wwin->frame->core->width;
 			new_x = (wwin->old_geometry.x) ? wwin->old_geometry.x : wwin->frame_x;
 		}
-		if (!(directions & (MAX_VERTICAL | MAX_TOPHALF | MAX_BOTTOMHALF | MAX_MAXIMUS))) {
+		if (!(directions & (MAX_VERTICAL | MAX_TOPHALF | MAX_BOTTOMHALF | MAX_MAXIMUS| MAX_CENTRAL))) {
 			new_height = (wwin->old_geometry.height) ? wwin->old_geometry.height : wwin->frame->core->height;
 			new_y = (wwin->old_geometry.y) ? wwin->old_geometry.y : wwin->frame_y;
 		}
@@ -445,17 +464,26 @@ void wMaximizeWindow(WWindow *wwin, int directions, int head)
 		if (directions & MAX_LEFTHALF) {
 			new_width = half_scr_width - adj_size;
 			new_x = usableArea.x1;
+			if (directions & MAX_CENTRAL) {
+				new_y = half_scr_height - wwin->old_geometry.height / 2;
+			}
 		} else if (directions & MAX_RIGHTHALF) {
 			new_width = half_scr_width - adj_size;
 			new_x = usableArea.x1 + half_scr_width;
+			if (directions & MAX_CENTRAL)
+				new_y = half_scr_height - wwin->old_geometry.height / 2;
 		}
 		/* top|bottom position */
 		if (directions & MAX_TOPHALF) {
 			new_height = half_scr_height - adj_size;
 			new_y = usableArea.y1;
+			if (directions & MAX_CENTRAL)
+				new_x = half_scr_width - wwin->old_geometry.width / 2;
 		} else if (directions & MAX_BOTTOMHALF) {
 			new_height = half_scr_height - adj_size;
 			new_y = usableArea.y1 + half_scr_height;
+			if (directions & MAX_CENTRAL)
+				new_x = half_scr_width - wwin->old_geometry.width / 2;
 		}

 		/* vertical|horizontal position */
@@ -494,7 +522,7 @@ void wMaximizeWindow(WWindow *wwin, int directions, int head)
 void handleMaximize(WWindow *wwin, int directions)
 {
 	int current = wwin->flags.maximized;
-	int requested = directions & (MAX_HORIZONTAL | MAX_VERTICAL | MAX_LEFTHALF | MAX_RIGHTHALF | MAX_TOPHALF | MAX_BOTTOMHALF | MAX_MAXIMUS);
+	int requested = directions & (MAX_HORIZONTAL | MAX_VERTICAL | MAX_LEFTHALF | MAX_RIGHTHALF | MAX_TOPHALF | MAX_BOTTOMHALF | MAX_MAXIMUS | MAX_CENTRAL);
 	int effective = requested ^ current;
 	int flags = directions & ~requested;
 	int head = wGetHeadForWindow(wwin);
@@ -625,11 +653,24 @@ void handleMaximize(WWindow *wwin, int directions)
 				head);

 	else {
+
 		if ((requested == (MAX_HORIZONTAL | MAX_VERTICAL)) ||
 				(requested == MAX_MAXIMUS))
 			effective = requested;
 		else {
-			if (requested & MAX_LEFTHALF) {
+			if (requested & MAX_CENTRAL) {
+				effective |= MAX_CENTRAL;
+				if (current & (MAX_HORIZONTAL | MAX_VERTICAL))
+					effective &= ~(MAX_HORIZONTAL | MAX_VERTICAL);
+				else if (current & MAX_TOPHALF && current & MAX_LEFTHALF)
+					effective &= ~(MAX_TOPHALF | MAX_LEFTHALF);
+				else if (current & MAX_TOPHALF && current & MAX_RIGHTHALF)
+					effective &= ~(MAX_TOPHALF | MAX_RIGHTHALF);
+				else if (current & MAX_BOTTOMHALF && current & MAX_LEFTHALF)
+					effective &= ~(MAX_BOTTOMHALF | MAX_LEFTHALF);
+				else if (current & MAX_BOTTOMHALF && current & MAX_RIGHTHALF)
+					effective &= ~(MAX_BOTTOMHALF | MAX_RIGHTHALF);
+			} else if (requested & MAX_LEFTHALF) {
 				if (!(requested & (MAX_TOPHALF | MAX_BOTTOMHALF)))
 					effective |= MAX_VERTICAL;
 				else
@@ -2215,7 +2256,7 @@ void wMakeWindowVisible(WWindow *wwin)
 	}
 }

-void movePionterToWindowCenter(WWindow *wwin)
+void movePointerToWindowCenter(WWindow *wwin)
 {
 	if (!wPreferences.pointer_with_half_max_windows)
 		return;
@@ -30,8 +30,9 @@
 #define MAX_TOPHALF            (1 << 4)
 #define MAX_BOTTOMHALF         (1 << 5)
 #define MAX_MAXIMUS            (1 << 6)
-#define MAX_IGNORE_XINERAMA    (1 << 7)
-#define MAX_KEYBOARD           (1 << 8)
+#define MAX_CENTRAL	       (1 << 7)
+#define MAX_IGNORE_XINERAMA    (1 << 8)
+#define MAX_KEYBOARD           (1 << 9)

 #define SAVE_GEOMETRY_X        (1 << 0)
 #define SAVE_GEOMETRY_Y        (1 << 1)
@@ -84,7 +85,7 @@ void wUnfullscreenWindow(WWindow *wwin);
 void animateResize(WScreen *scr, int x, int y, int w, int h, int fx, int fy, int fw, int fh);
 void update_saved_geometry(WWindow *wwin);

-void movePionterToWindowCenter(WWindow *wwin);
+void movePointerToWindowCenter(WWindow *wwin);
 void moveBetweenHeads(WWindow *wwin, int direction);

 #endif
@@ -2,7 +2,7 @@
 *  Window Maker window manager
 *
 *  Copyright (c) 1998-2003 Alfredo K. Kojima
- *  Copyright (c) 2014 Window Maker Team
+ *  Copyright (c) 2014-2016 Window Maker Team
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -240,9 +240,9 @@ void wClientConfigure(WWindow * wwin, XConfigureRequestEvent * xcre)
 			return;

 		if (nwidth != wwin->old_geometry.width)
-			wwin->flags.maximized &= ~(MAX_HORIZONTAL | MAX_TOPHALF | MAX_BOTTOMHALF | MAX_MAXIMUS);
+			wwin->flags.maximized &= ~(MAX_HORIZONTAL | MAX_TOPHALF | MAX_BOTTOMHALF | MAX_MAXIMUS | MAX_CENTRAL);
 		if (nheight != wwin->old_geometry.height)
-			wwin->flags.maximized &= ~(MAX_VERTICAL | MAX_LEFTHALF | MAX_RIGHTHALF | MAX_MAXIMUS);
+			wwin->flags.maximized &= ~(MAX_VERTICAL | MAX_LEFTHALF | MAX_RIGHTHALF | MAX_MAXIMUS | MAX_CENTRAL);

 		wWindowConstrainSize(wwin, (unsigned int *)&nwidth, (unsigned int *)&nheight);
 		wWindowConfigure(wwin, nx, ny, nwidth, nheight);
@@ -25,7 +25,56 @@ static unsigned char MENU_SHADE_INDICATOR_XBM_DATA[] = {
    0xff, 0x01, 0xff, 0x01, 0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00};

+#define MENU_SNAP_INDICATOR_W_XBM_SIZE 10
+#define MENU_SNAP_INDICATOR_H_XBM_SIZE 9

+static unsigned char MENU_SNAP_V_INDICATOR_XBM_DATA[] = {
+   0xff, 0x03, 0x1d, 0x02, 0x1d, 0x02, 0x1d, 0x02, 0x1d, 0x02, 0x1d, 0x02,
+   0x1d, 0x02, 0x1d, 0x02, 0xff, 0x03 };
+
+static unsigned char MENU_SNAP_H_INDICATOR_XBM_DATA[] = {
+   0xff, 0x03, 0x01, 0x02, 0xff, 0x03, 0xff, 0x03, 0xff, 0x03, 0x01, 0x02,
+   0x01, 0x02, 0x01, 0x02, 0xff, 0x03 };
+
+static unsigned char MENU_CENTRAL_INDICATOR_XBM_DATA[] = {
+   0xff, 0x03, 0x01, 0x02, 0x79, 0x02, 0x79, 0x02, 0x79, 0x02, 0x79, 0x02,
+   0x79, 0x02, 0x01, 0x02, 0xff, 0x03 };
+
+static unsigned char MENU_SNAP_RH_INDICATOR_XBM_DATA[] = {
+   0xff, 0x03, 0x01, 0x02, 0xe1, 0x02, 0xe1, 0x02, 0xe1, 0x02, 0xe1, 0x02,
+   0xe1, 0x02, 0x01, 0x02, 0xff, 0x03 };
+
+static unsigned char MENU_SNAP_LH_INDICATOR_XBM_DATA[] = {
+   0xff, 0x03, 0x01, 0x02, 0x1d, 0x02, 0x1d, 0x02, 0x1d, 0x02, 0x1d, 0x02,
+   0x1d, 0x02, 0x01, 0x02, 0xff, 0x03 };
+
+static unsigned char MENU_SNAP_TH_INDICATOR_XBM_DATA[] = {
+   0xff, 0x03, 0x01, 0x02, 0xfd, 0x02, 0xfd, 0x02, 0xfd, 0x02, 0x01, 0x02,
+   0x01, 0x02, 0x01, 0x02, 0xff, 0x03 };
+
+static unsigned char MENU_SNAP_BH_INDICATOR_XBM_DATA[] = {
+   0xff, 0x03, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0xfd, 0x02, 0xfd, 0x02,
+   0xfd, 0x02, 0x01, 0x02, 0xff, 0x03 };
+
+static unsigned char MENU_SNAP_TL_INDICATOR_XBM_DATA[] = {
+   0xff, 0x03, 0x1f, 0x02, 0x1f, 0x02, 0x1f, 0x02, 0x01, 0x02, 0x01, 0x02,
+   0x01, 0x02, 0x01, 0x02, 0xff, 0x03 };
+
+static unsigned char MENU_SNAP_TR_INDICATOR_XBM_DATA[] = {
+   0xff, 0x03, 0xe1, 0x03, 0xe1, 0x03, 0xe1, 0x03, 0x01, 0x02, 0x01, 0x02,
+   0x01, 0x02, 0x01, 0x02, 0xff, 0x03 };
+
+static unsigned char MENU_SNAP_BL_INDICATOR_XBM_DATA[] = {
+   0xff, 0x03, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x1f, 0x02,
+   0x1f, 0x02, 0x1f, 0x02, 0xff, 0x03 };
+
+static unsigned char MENU_SNAP_BR_INDICATOR_XBM_DATA[] = {
+   0xff, 0x03, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0xe1, 0x03,
+   0xe1, 0x03, 0xe1, 0x03, 0xff, 0x03 };
+
+static unsigned char MENU_SNAP_TILED_INDICATOR_XBM_DATA[] = {
+   0xff, 0x03, 0x1f, 0x02, 0x1f, 0x02, 0x1f, 0x02, 0x1f, 0x02, 0x1f, 0x02,
+   0xdf, 0x03, 0xdf, 0x03, 0xff, 0x03 };

 /* button pixmaps */
 /* the first one is for normal state, the second is for when
@@ -4,7 +4,7 @@
 *
 *  Copyright (c) 1997-2003 Alfredo K. Kojima
 *  Copyright (c) 1998-2003 Dan Pascu
- *  Copyright (c) 2014 Window Maker Team
+ *  Copyright (c) 2014-2023 Window Maker Team

 *
 *  This program is free software; you can redistribute it and/or modify
@@ -151,6 +151,7 @@ static WDECallbackUpdate setSwPOptions;
 static WDECallbackUpdate updateUsableArea;

 static WDECallbackUpdate setModifierKeyLabels;
+static WDECallbackUpdate setHotCornerActions;

 static WDECallbackConvert getCursor;
 static WDECallbackUpdate setCursor;
@@ -525,6 +526,14 @@ WDefaultEntry optionList[] = {
 	{"KeepDockOnPrimaryHead", "NO", NULL,
 	    &wPreferences.keep_dock_on_primary_head, getBool, updateDock,
 	    NULL, NULL},
+	{"HotCorners", "NO", NULL,
+	    &wPreferences.hot_corners, getBool, NULL, NULL, NULL},
+	{"HotCornerDelay", "250", (void *)&wPreferences.hot_corner_delay,
+	    &wPreferences.hot_corner_delay, getInt, NULL, NULL, NULL},
+	{"HotCornerEdge", "2", (void *)&wPreferences.hot_corner_edge,
+	    &wPreferences.hot_corner_edge, getInt, NULL, NULL, NULL},
+	{"HotCornerActions", "(\"None\", \"None\", \"None\", \"None\")", &wPreferences,
+	    NULL, getPropList, setHotCornerActions, NULL, NULL},

 	/* style options */

@@ -662,16 +671,18 @@ WDefaultEntry optionList[] = {
 		NULL, getKeybind, setKeyGrab, NULL, NULL},
 	{"BHMaximizeKey", "None", (void*)WKBD_BHMAXIMIZE,
 		NULL, getKeybind, setKeyGrab, NULL, NULL},
-	{"LTCMaximizeKey", "None", (void*)WKBD_LTCMAXIMIZE,
+	{"TLCMaximizeKey", "None", (void*)WKBD_LTCMAXIMIZE,
 		NULL, getKeybind, setKeyGrab, NULL, NULL},
-	{"RTCMaximizeKey", "None", (void*)WKBD_RTCMAXIMIZE,
+	{"TRCMaximizeKey", "None", (void*)WKBD_RTCMAXIMIZE,
 		NULL, getKeybind, setKeyGrab, NULL, NULL},
-	{"LBCMaximizeKey", "None", (void*)WKBD_LBCMAXIMIZE,
+	{"BLCMaximizeKey", "None", (void*)WKBD_LBCMAXIMIZE,
 		NULL, getKeybind, setKeyGrab, NULL, NULL},
-	{"RBCMaximizeKey", "None", (void*)WKBD_RBCMAXIMIZE,
+	{"BRCMaximizeKey", "None", (void*)WKBD_RBCMAXIMIZE,
 		NULL, getKeybind, setKeyGrab, NULL, NULL},
 	{"MaximusKey", "None", (void*)WKBD_MAXIMUS,
 		NULL, getKeybind, setKeyGrab, NULL, NULL},
+	{"CenterKey", "None", (void *)WKBD_CENTRAL,
+	    NULL, getKeybind, setKeyGrab, NULL, NULL},
 	{"KeepOnTopKey", "None", (void *)WKBD_KEEP_ON_TOP,
 	    NULL, getKeybind, setKeyGrab, NULL, NULL},
 	{"KeepAtBottomKey", "None", (void *)WKBD_KEEP_AT_BOTTOM,
@@ -3461,6 +3472,43 @@ static int setModifierKeyLabels(WScreen * scr, WDefaultEntry * entry, void *tdat
 	return 0;
 }

+static int setHotCornerActions(WScreen * scr, WDefaultEntry * entry, void *tdata, void *foo)
+{
+	WMPropList *array = tdata;
+	int i;
+	struct WPreferences *prefs = foo;
+
+	if (!WMIsPLArray(array) || WMGetPropListItemCount(array) != 4) {
+		wwarning(_("Value for option \"%s\" must be an array of 4 strings"), entry->key);
+		WMReleasePropList(array);
+		return 0;
+	}
+
+	DestroyWindowMenu(scr);
+
+	for (i = 0; i < 4; i++) {
+		if (prefs->hot_corner_actions[i])
+			wfree(prefs->hot_corner_actions[i]);
+
+		if (WMIsPLString(WMGetFromPLArray(array, i))) {
+			const char *val;
+			val = WMGetFromPLString(WMGetFromPLArray(array, i));
+			if (strcasecmp(val, "NONE") != 0)
+				prefs->hot_corner_actions[i] = wstrdup(val);
+			else
+				prefs->hot_corner_actions[i] = NULL;
+		} else {
+			wwarning(_("Invalid argument for option \"%s\" item %d"), entry->key, i);
+			prefs->hot_corner_actions[i] = NULL;
+		}
+	}
+
+	WMReleasePropList(array);
+
+	return 0;
+}
+
+
 static int setDoubleClick(WScreen *scr, WDefaultEntry *entry, void *tdata, void *foo)
 {
 	int *value = tdata;
@@ -4,7 +4,7 @@
 *
 *  Copyright (c) 1997-2003 Alfredo K. Kojima
 *  Copyright (c) 1998-2003 Dan Pascu
- *  Copyright (c) 2014 Window Maker Team
+ *  Copyright (c) 2014-2023 Window Maker Team
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -1383,6 +1383,10 @@ void wShowInfoPanel(WScreen *scr)
 	case 32:
 		strbuf = wstrappend(strbuf, _("(16 million colors)\n"));
 		break;
+	case 30:
+	case 40:
+		strbuf = wstrappend(strbuf, _("(1 billion colors)\n"));
+		break;
 	default:
 		snprintf(buffer, sizeof(buffer), _("(%d colors)\n"), 1 << scr->w_depth);
 		strbuf = wstrappend(strbuf, buffer);
@@ -4,6 +4,7 @@
 *
 *  Copyright (c) 1997-2003 Alfredo K. Kojima
 *  Copyright (c) 1998-2003 Dan Pascu
+ *  Copyright (c) 2009-2023 Window Maker Team
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -3038,7 +3039,6 @@ void wDockSwap(WDock *dock)
 	WAppIcon *btn;
 	int x, i;

-
 	x = getDockXPosition(scr, dock->on_right_side);
 	swapDrawers(scr, x);
 	dock->x_pos = x;
@@ -4619,7 +4619,10 @@ static void swapDrawer(WDock *drawer, int new_x)
 		ai = drawer->icon_array[i];
 		if (ai == NULL)
 			continue;
-		ai->xindex *= -1; /* so A B C becomes C B A */
+		if (drawer->on_right_side)
+			ai->xindex = -abs(ai->xindex);
+		else
+			ai->xindex = abs(ai->xindex);
 		ai->x_pos = new_x + ai->xindex * ICON_SIZE;

 		/* Update drawer's tile */
@@ -4923,6 +4926,13 @@ static WDock * drawerRestoreState(WScreen *scr, WMPropList *drawer_state)
 		drawer->icon_array[drawer->icon_count] = aicon;

 		if (aicon) {
+			/* don't trust the stored direction sign as the dock is
+			 * dynamically positioned depending on the screen size
+			 */
+			if (drawer->screen_ptr->dock->on_right_side)
+				aicon->xindex = -abs(aicon->xindex);
+			else
+				aicon->xindex = abs(aicon->xindex);
 			aicon->dock = drawer;
 			aicon->x_pos = drawer->x_pos + (aicon->xindex * ICON_SIZE);
 			aicon->y_pos = drawer->y_pos + (aicon->yindex * ICON_SIZE);
@@ -3,7 +3,7 @@
 *  Window Maker window manager
 *
 *  Copyright (c) 1997-2003 Alfredo K. Kojima
- *  Copyright (c) 2014 Window Maker Team
+ *  Copyright (c) 2014-2023 Window Maker Team
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -1512,7 +1512,15 @@ static void handleKeyPress(XEvent * event)
 			CloseWindowMenu(scr);

 			handleMaximize(wwin, MAX_HORIZONTAL | MAX_KEYBOARD);
-			movePionterToWindowCenter(wwin);
+			movePointerToWindowCenter(wwin);
+		}
+		break;
+	case WKBD_CENTRAL:
+		if (ISMAPPED(wwin) && ISFOCUSED(wwin) && IS_RESIZABLE(wwin)) {
+			CloseWindowMenu(scr);
+
+			handleMaximize(wwin, MAX_CENTRAL | MAX_KEYBOARD);
+			movePointerToWindowCenter(wwin);
 		}
 		break;
 	case WKBD_LHMAXIMIZE:
@@ -1520,7 +1528,7 @@ static void handleKeyPress(XEvent * event)
 			CloseWindowMenu(scr);

 			handleMaximize(wwin, MAX_VERTICAL | MAX_LEFTHALF | MAX_KEYBOARD);
-			movePionterToWindowCenter(wwin);
+			movePointerToWindowCenter(wwin);
 		}
 		break;
 	case WKBD_RHMAXIMIZE:
@@ -1528,7 +1536,7 @@ static void handleKeyPress(XEvent * event)
 			CloseWindowMenu(scr);

 			handleMaximize(wwin, MAX_VERTICAL | MAX_RIGHTHALF | MAX_KEYBOARD);
-			movePionterToWindowCenter(wwin);
+			movePointerToWindowCenter(wwin);
 		}
 		break;
 	case WKBD_THMAXIMIZE:
@@ -1536,7 +1544,7 @@ static void handleKeyPress(XEvent * event)
 			CloseWindowMenu(scr);

 			handleMaximize(wwin, MAX_HORIZONTAL | MAX_TOPHALF | MAX_KEYBOARD);
-			movePionterToWindowCenter(wwin);
+			movePointerToWindowCenter(wwin);
 		}
 		break;
 	case WKBD_BHMAXIMIZE:
@@ -1544,7 +1552,7 @@ static void handleKeyPress(XEvent * event)
 			CloseWindowMenu(scr);

 			handleMaximize(wwin, MAX_HORIZONTAL | MAX_BOTTOMHALF | MAX_KEYBOARD);
-			movePionterToWindowCenter(wwin);
+			movePointerToWindowCenter(wwin);
 		}
 		break;
 	case WKBD_LTCMAXIMIZE:
@@ -1552,7 +1560,7 @@ static void handleKeyPress(XEvent * event)
 			CloseWindowMenu(scr);

 			handleMaximize(wwin, MAX_LEFTHALF | MAX_TOPHALF | MAX_KEYBOARD);
-			movePionterToWindowCenter(wwin);
+			movePointerToWindowCenter(wwin);
 		}
 		break;
 	case WKBD_RTCMAXIMIZE:
@@ -1560,7 +1568,7 @@ static void handleKeyPress(XEvent * event)
 			CloseWindowMenu(scr);

 			handleMaximize(wwin, MAX_RIGHTHALF | MAX_TOPHALF | MAX_KEYBOARD);
-			movePionterToWindowCenter(wwin);
+			movePointerToWindowCenter(wwin);
 		}
 		break;
 	case WKBD_LBCMAXIMIZE:
@@ -1568,7 +1576,7 @@ static void handleKeyPress(XEvent * event)
 			CloseWindowMenu(scr);

 			handleMaximize(wwin, MAX_LEFTHALF | MAX_BOTTOMHALF | MAX_KEYBOARD);
-			movePionterToWindowCenter(wwin);
+			movePointerToWindowCenter(wwin);
 		}
 		 break;
 	case WKBD_RBCMAXIMIZE:
@@ -1576,7 +1584,7 @@ static void handleKeyPress(XEvent * event)
 			CloseWindowMenu(scr);

 			handleMaximize(wwin, MAX_RIGHTHALF | MAX_BOTTOMHALF | MAX_KEYBOARD);
-			movePionterToWindowCenter(wwin);
+			movePointerToWindowCenter(wwin);
 		}
 		break;
 	case WKBD_MAXIMUS:
@@ -1928,27 +1936,104 @@ static void handleKeyPress(XEvent * event)
 	}
 }

-static void handleMotionNotify(XEvent * event)
-{
-	WScreen *scr = wScreenForRootWindow(event->xmotion.root);
+#define CORNER_NONE 0
+#define CORNER_TOPLEFT 1
+#define CORNER_TOPRIGHT 2
+#define CORNER_BOTTOMLEFT 3
+#define CORNER_BOTTOMRIGHT 4

-	if (wPreferences.scrollable_menus) {
+static int get_corner(WMRect rect, WMPoint p)
+{
+	if (p.x <= (rect.pos.x + wPreferences.hot_corner_edge) && p.y <= (rect.pos.y + wPreferences.hot_corner_edge))
+		return CORNER_TOPLEFT;
+	if (p.x >= (rect.pos.x + rect.size.width - wPreferences.hot_corner_edge) && p.y <= (rect.pos.y + wPreferences.hot_corner_edge))
+		return CORNER_TOPRIGHT;
+	if (p.x <= (rect.pos.x + wPreferences.hot_corner_edge) && p.y >= (rect.pos.y + rect.size.height - wPreferences.hot_corner_edge))
+		return CORNER_BOTTOMLEFT;
+	if (p.x >= (rect.pos.x + rect.size.width - wPreferences.hot_corner_edge) && p.y >= (rect.pos.y + rect.size.height - wPreferences.hot_corner_edge))
+		return CORNER_BOTTOMRIGHT;
+	return CORNER_NONE;
+}
+
+static void hotCornerDelay(void *data)
+{
+	WScreen *scr = (WScreen *) data;
+	if (scr->flags.in_hot_corner && wPreferences.hot_corner_actions[scr->flags.in_hot_corner - 1])
+		ExecuteShellCommand(scr, wPreferences.hot_corner_actions[scr->flags.in_hot_corner - 1]);
+	WMDeleteTimerHandler(scr->hot_corner_timer);
+	scr->hot_corner_timer = NULL;
+}
+
+static void handleMotionNotify(XEvent *event)
+{
+	if (wPreferences.scrollable_menus || wPreferences.hot_corners) {
+		WScreen *scr = wScreenForRootWindow(event->xmotion.root);
 		WMPoint p = wmkpoint(event->xmotion.x_root, event->xmotion.y_root);
 		WMRect rect = wGetRectForHead(scr, wGetHeadForPoint(scr, p));

-		if (scr->flags.jump_back_pending ||
-		    p.x <= (rect.pos.x + 1) ||
-		    p.x >= (rect.pos.x + rect.size.width - 2) ||
-		    p.y <= (rect.pos.y + 1) || p.y >= (rect.pos.y + rect.size.height - 2)) {
-			WMenu *menu;
+		if (wPreferences.hot_corners) {
+			if (!scr->flags.in_hot_corner) {
+				scr->flags.in_hot_corner = get_corner(rect, p);
+				if (scr->flags.in_hot_corner && !scr->hot_corner_timer)
+					scr->hot_corner_timer = WMAddTimerHandler(wPreferences.hot_corner_delay, hotCornerDelay, scr);
+			} else {
+				int out_hot_corner = 0;

-			menu = wMenuUnderPointer(scr);
-			if (menu != NULL)
-				wMenuScroll(menu);
+				switch (scr->flags.in_hot_corner) {
+					case CORNER_TOPLEFT:
+						if ((p.x > (rect.pos.x + wPreferences.hot_corner_edge)) ||
+						    (p.y > (rect.pos.y + wPreferences.hot_corner_edge)))
+							out_hot_corner = 1;
+						break;
+					case CORNER_TOPRIGHT:
+						if ((p.x < (rect.pos.x + rect.size.width - wPreferences.hot_corner_edge)) ||
+						    (p.y > (rect.pos.y + wPreferences.hot_corner_edge)))
+							out_hot_corner = 1;
+						break;
+					case CORNER_BOTTOMLEFT:
+						if ((p.x > (rect.pos.x + wPreferences.hot_corner_edge)) ||
+						    (p.y < (rect.pos.y + rect.size.height - wPreferences.hot_corner_edge)))
+							out_hot_corner = 1;
+						break;
+					case CORNER_BOTTOMRIGHT:
+						if ((p.x < (rect.pos.x + rect.size.width - wPreferences.hot_corner_edge)) ||
+						    (p.y < (rect.pos.y + rect.size.height - wPreferences.hot_corner_edge)))
+							out_hot_corner = 1;
+						break;
+
+				}
+				if (out_hot_corner) {
+					scr->flags.in_hot_corner = CORNER_NONE;
+					if (scr->hot_corner_timer) {
+						WMDeleteTimerHandler(scr->hot_corner_timer);
+						scr->hot_corner_timer = NULL;
+					}
+				}
+
+			}
+		}
+
+		if (wPreferences.scrollable_menus) {
+			if (scr->flags.jump_back_pending ||
+			    p.x <= (rect.pos.x + 1) ||
+			    p.x >= (rect.pos.x + rect.size.width - 2) ||
+			    p.y <= (rect.pos.y + 1) || p.y >= (rect.pos.y + rect.size.height - 2)) {
+				WMenu *menu;
+
+				menu = wMenuUnderPointer(scr);
+				if (menu != NULL)
+					wMenuScroll(menu);
+			}
 		}
 	}
 }

+#undef CORNER_NONE
+#undef CORNER_TOPLEFT
+#undef CORNER_TOPRIGHT
+#undef CORNER_BOTTOMLEFT
+#undef CORNER_BOTTOMRIGHT
+
 static void handleVisibilityNotify(XEvent * event)
 {
 	WWindow *wwin;
@@ -2,7 +2,7 @@
 *  Window Maker window manager
 *
 *  Copyright (c) 1997-2003 Alfredo K. Kojima
- *  Copyright (c) 2014 Window Maker Team
+ *  Copyright (c) 2014-2023 Window Maker Team
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -76,6 +76,7 @@ enum {
 	WKBD_FOCUSPREV,
 	WKBD_GROUPNEXT,
 	WKBD_GROUPPREV,
+	WKBD_CENTRAL,

 	/* window, menu */
 	WKBD_CLOSE,
@@ -724,9 +724,12 @@ static void paintEntry(WMenu * menu, int index, int selected)
 	/* draw indicator */
 	if (entry->flags.indicator && entry->flags.indicator_on) {
 		int iw, ih;
-		WPixmap *indicator;
+		WPixmap *indicator = NULL;

 		switch (entry->flags.indicator_type) {
+		case MI_DIAMOND:
+			indicator = scr->menu_radio_indicator;
+			break;
 		case MI_CHECK:
 			indicator = scr->menu_check_indicator;
 			break;
@@ -739,35 +742,72 @@ static void paintEntry(WMenu * menu, int index, int selected)
 		case MI_SHADED:
 			indicator = scr->menu_shade_indicator;
 			break;
-		case MI_DIAMOND:
+		case MI_SNAP_V:
+			indicator = scr->menu_snap_vertical_indicator;
+			break;
+		case MI_SNAP_H:
+			indicator = scr->menu_snap_horizontal_indicator;
+			break;
+		case MI_CENTRAL:
+			indicator = scr->menu_central_indicator;
+			break;
+		case MI_SNAP_RH:
+			indicator = scr->menu_snap_rh_indicator;
+			break;
+		case MI_SNAP_LH:
+			indicator = scr->menu_snap_lh_indicator;
+			break;
+		case MI_SNAP_TH:
+			indicator = scr->menu_snap_th_indicator;
+			break;
+		case MI_SNAP_BH:
+			indicator = scr->menu_snap_bh_indicator;
+			break;
+		case MI_SNAP_TL:
+			indicator = scr->menu_snap_tl_indicator;
+			break;
+		case MI_SNAP_TR:
+			indicator = scr->menu_snap_tr_indicator;
+			break;
+		case MI_SNAP_BL:
+			indicator = scr->menu_snap_bl_indicator;
+			break;
+		case MI_SNAP_BR:
+			indicator = scr->menu_snap_br_indicator;
+			break;
+		case MI_SNAP_TILED:
+			indicator = scr->menu_snap_tiled_indicator;
+			break;
+		case MI_NONE:
 		default:
-			indicator = scr->menu_radio_indicator;
 			break;
 		}

-		iw = indicator->width;
-		ih = indicator->height;
-		XSetClipMask(dpy, scr->copy_gc, indicator->mask);
-		XSetClipOrigin(dpy, scr->copy_gc, 5, y + (h - ih) / 2);
-		if (selected) {
-			if (entry->flags.enabled) {
-				XSetForeground(dpy, scr->copy_gc, WMColorPixel(scr->select_text_color));
+		if (indicator) {
+			iw = indicator->width;
+			ih = indicator->height;
+			XSetClipMask(dpy, scr->copy_gc, indicator->mask);
+			XSetClipOrigin(dpy, scr->copy_gc, 5, y + (h - ih) / 2);
+			if (selected) {
+				if (entry->flags.enabled) {
+					XSetForeground(dpy, scr->copy_gc, WMColorPixel(scr->select_text_color));
+				} else {
+					XSetForeground(dpy, scr->copy_gc, WMColorPixel(scr->dtext_color));
+				}
 			} else {
-				XSetForeground(dpy, scr->copy_gc, WMColorPixel(scr->dtext_color));
-			}
-		} else {
-			if (entry->flags.enabled) {
-				XSetForeground(dpy, scr->copy_gc, WMColorPixel(scr->mtext_color));
-			} else {
-				XSetForeground(dpy, scr->copy_gc, WMColorPixel(scr->dtext_color));
+				if (entry->flags.enabled) {
+					XSetForeground(dpy, scr->copy_gc, WMColorPixel(scr->mtext_color));
+				} else {
+					XSetForeground(dpy, scr->copy_gc, WMColorPixel(scr->dtext_color));
+				}
 			}
+			XFillRectangle(dpy, win, scr->copy_gc, 5, y + (h - ih) / 2, iw, ih);
+			/*
+			 XCopyArea(dpy, indicator->image, win, scr->copy_gc, 0, 0,
+			 iw, ih, 5, y+(h-ih)/2);
+			*/
+			XSetClipOrigin(dpy, scr->copy_gc, 0, 0);
 		}
-		XFillRectangle(dpy, win, scr->copy_gc, 5, y + (h - ih) / 2, iw, ih);
-		/*
-		   XCopyArea(dpy, indicator->image, win, scr->copy_gc, 0, 0,
-		   iw, ih, 5, y+(h-ih)/2);
-		 */
-		XSetClipOrigin(dpy, scr->copy_gc, 0, 0);
 	}

 	/* draw right text */
@@ -23,11 +23,24 @@

 #include "wcore.h"

-#define MI_DIAMOND	0
-#define MI_CHECK	1
-#define MI_MINIWINDOW	2
-#define MI_HIDDEN	3
-#define MI_SHADED	4
+#define MI_NONE		0
+#define MI_DIAMOND	1
+#define MI_CHECK	2
+#define MI_MINIWINDOW	3
+#define MI_HIDDEN	4
+#define MI_SHADED	5
+#define MI_SNAP_V	6
+#define MI_SNAP_H	7
+#define MI_SNAP_RH	8
+#define MI_SNAP_LH	9
+#define MI_SNAP_TH	10
+#define MI_SNAP_BH	11
+#define MI_SNAP_TL	12
+#define MI_SNAP_TR	13
+#define MI_SNAP_BL	14
+#define MI_SNAP_BR	15
+#define MI_SNAP_TILED	16
+#define MI_CENTRAL	17

 typedef struct WMenuEntry {
 	int order;
@@ -44,7 +57,7 @@ typedef struct WMenuEntry {
 		unsigned int enabled:1;	       /* entry is selectable */
 		unsigned int indicator:1;      /* left indicator */
 		unsigned int indicator_on:1;
-		unsigned int indicator_type:3;
+		unsigned int indicator_type:5;
 		unsigned int editable:1;
 	} flags;
 } WMenuEntry;
@@ -2,7 +2,7 @@
 *  Window Maker window manager
 *
 *  Copyright (c) 1997-2003 Alfredo K. Kojima
- *  Copyright (c) 2013 Window Maker Team
+ *  Copyright (c) 2013-2023 Window Maker Team
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -62,7 +62,7 @@ typedef struct {
 	long functions;
 	long decorations;
 	long inputMode;
-	long unknown;
+	long status;
 } MWMHints;

 static Atom _XA_MOTIF_WM_HINTS;
@@ -180,7 +180,7 @@ static int getMWMHints(Window window, MWMHints *mwmhints)
 		mwmhints->decorations = data[2];
 		mwmhints->inputMode = data[3];
 		if (count > 5)
-			mwmhints->unknown = data[4];
+			mwmhints->status = data[4];
 	}
 	XFree(data);

@@ -1665,10 +1665,10 @@ int wKeyboardMoveResizeWindow(WWindow * wwin)
 					}
 				} else {
 					if (ww != original_w)
-						wwin->flags.maximized &= ~(MAX_HORIZONTAL | MAX_TOPHALF | MAX_BOTTOMHALF | MAX_MAXIMUS);
+						wwin->flags.maximized &= ~(MAX_HORIZONTAL | MAX_TOPHALF | MAX_BOTTOMHALF | MAX_MAXIMUS | MAX_CENTRAL);

 					if (wh != original_h)
-						wwin->flags.maximized &= ~(MAX_VERTICAL | MAX_LEFTHALF | MAX_RIGHTHALF | MAX_MAXIMUS);
+						wwin->flags.maximized &= ~(MAX_VERTICAL | MAX_LEFTHALF | MAX_RIGHTHALF | MAX_MAXIMUS | MAX_CENTRAL);

 					wWindowConfigure(wwin, src_x + off_x, src_y + off_y, ww, wh - vert_border);
 					wWindowSynthConfigureNotify(wwin);
@@ -2283,10 +2283,10 @@ void wMouseResizeWindow(WWindow * wwin, XEvent * ev)
 				XUngrabServer(dpy);

 				if (fw != original_fw)
-					wwin->flags.maximized &= ~(MAX_HORIZONTAL | MAX_TOPHALF | MAX_BOTTOMHALF | MAX_MAXIMUS);
+					wwin->flags.maximized &= ~(MAX_HORIZONTAL | MAX_TOPHALF | MAX_BOTTOMHALF | MAX_MAXIMUS | MAX_CENTRAL);

 				if (fh != original_fh)
-					wwin->flags.maximized &= ~(MAX_VERTICAL | MAX_LEFTHALF | MAX_RIGHTHALF | MAX_MAXIMUS);
+					wwin->flags.maximized &= ~(MAX_VERTICAL | MAX_LEFTHALF | MAX_RIGHTHALF | MAX_MAXIMUS | MAX_CENTRAL);

 				wWindowConfigure(wwin, fx, fy, fw, fh - vert_border);
 				wWindowSynthConfigureNotify(wwin);
@@ -3,7 +3,7 @@
 *  Window Maker window manager
 *
 *  Copyright (c) 1997-2003 Alfredo K. Kojima
- *  Copyright (c) 2013 Window Maker Team
+ *  Copyright (c) 2013-2016 Window Maker Team
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -4,7 +4,7 @@
 *
 *  Copyright (c) 1997-2003 Alfredo K. Kojima
 *  Copyright (c) 1998-2003 Dan Pascu
- *  Copyright (c) 2014 Window Maker Team
+ *  Copyright (c) 2014-2023 Window Maker Team
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -484,45 +484,34 @@ static void createPixmaps(WScreen * scr)
 	WPixmap *pix;

 	/* load pixmaps */
-	pix = wPixmapCreateFromXBMData(scr, (char *)MENU_RADIO_INDICATOR_XBM_DATA,
-				       (char *)MENU_RADIO_INDICATOR_XBM_DATA,
-				       MENU_RADIO_INDICATOR_XBM_SIZE,
-				       MENU_RADIO_INDICATOR_XBM_SIZE, scr->black_pixel, scr->white_pixel);
-	if (pix != NULL)
-		pix->shared = 1;
-	scr->menu_radio_indicator = pix;
+#define LOADPIXMAPINDICATOR(XBM,W,I) {\
+	pix = wPixmapCreateFromXBMData(scr, (char *)XBM, (char *)XBM,\
+					W, MENU_SNAP_INDICATOR_H_XBM_SIZE,\
+					scr->black_pixel, scr->white_pixel);\
+	if (pix != NULL)\
+		pix->shared = 1;\
+	scr->I = pix;}

-	pix = wPixmapCreateFromXBMData(scr, (char *)MENU_CHECK_INDICATOR_XBM_DATA,
-				       (char *)MENU_CHECK_INDICATOR_XBM_DATA,
-				       MENU_CHECK_INDICATOR_XBM_SIZE,
-				       MENU_CHECK_INDICATOR_XBM_SIZE, scr->black_pixel, scr->white_pixel);
-	if (pix != NULL)
-		pix->shared = 1;
-	scr->menu_check_indicator = pix;
+	LOADPIXMAPINDICATOR(MENU_RADIO_INDICATOR_XBM_DATA, MENU_RADIO_INDICATOR_XBM_SIZE, menu_radio_indicator)
+	LOADPIXMAPINDICATOR(MENU_CHECK_INDICATOR_XBM_DATA, MENU_CHECK_INDICATOR_XBM_SIZE, menu_check_indicator)
+	LOADPIXMAPINDICATOR(MENU_MINI_INDICATOR_XBM_DATA, MENU_MINI_INDICATOR_XBM_SIZE, menu_mini_indicator)
+	LOADPIXMAPINDICATOR(MENU_HIDE_INDICATOR_XBM_DATA, MENU_HIDE_INDICATOR_XBM_SIZE, menu_hide_indicator)
+	LOADPIXMAPINDICATOR(MENU_SHADE_INDICATOR_XBM_DATA, MENU_SHADE_INDICATOR_XBM_SIZE, menu_shade_indicator)

-	pix = wPixmapCreateFromXBMData(scr, (char *)MENU_MINI_INDICATOR_XBM_DATA,
-				       (char *)MENU_MINI_INDICATOR_XBM_DATA,
-				       MENU_MINI_INDICATOR_XBM_SIZE,
-				       MENU_MINI_INDICATOR_XBM_SIZE, scr->black_pixel, scr->white_pixel);
-	if (pix != NULL)
-		pix->shared = 1;
-	scr->menu_mini_indicator = pix;
+	LOADPIXMAPINDICATOR(MENU_SNAP_V_INDICATOR_XBM_DATA, MENU_SNAP_INDICATOR_W_XBM_SIZE, menu_snap_vertical_indicator)
+	LOADPIXMAPINDICATOR(MENU_SNAP_H_INDICATOR_XBM_DATA, MENU_SNAP_INDICATOR_W_XBM_SIZE, menu_snap_horizontal_indicator)
+	LOADPIXMAPINDICATOR(MENU_CENTRAL_INDICATOR_XBM_DATA, MENU_SNAP_INDICATOR_W_XBM_SIZE, menu_central_indicator)
+	LOADPIXMAPINDICATOR(MENU_SNAP_RH_INDICATOR_XBM_DATA, MENU_SNAP_INDICATOR_W_XBM_SIZE, menu_snap_rh_indicator)
+	LOADPIXMAPINDICATOR(MENU_SNAP_LH_INDICATOR_XBM_DATA, MENU_SNAP_INDICATOR_W_XBM_SIZE, menu_snap_lh_indicator)
+	LOADPIXMAPINDICATOR(MENU_SNAP_TH_INDICATOR_XBM_DATA, MENU_SNAP_INDICATOR_W_XBM_SIZE, menu_snap_th_indicator)
+	LOADPIXMAPINDICATOR(MENU_SNAP_BH_INDICATOR_XBM_DATA, MENU_SNAP_INDICATOR_W_XBM_SIZE, menu_snap_bh_indicator)
+	LOADPIXMAPINDICATOR(MENU_SNAP_TL_INDICATOR_XBM_DATA, MENU_SNAP_INDICATOR_W_XBM_SIZE, menu_snap_tl_indicator)
+	LOADPIXMAPINDICATOR(MENU_SNAP_TR_INDICATOR_XBM_DATA, MENU_SNAP_INDICATOR_W_XBM_SIZE, menu_snap_tr_indicator)
+	LOADPIXMAPINDICATOR(MENU_SNAP_BL_INDICATOR_XBM_DATA, MENU_SNAP_INDICATOR_W_XBM_SIZE, menu_snap_bl_indicator)
+	LOADPIXMAPINDICATOR(MENU_SNAP_BR_INDICATOR_XBM_DATA, MENU_SNAP_INDICATOR_W_XBM_SIZE, menu_snap_br_indicator)
+	LOADPIXMAPINDICATOR(MENU_SNAP_TILED_INDICATOR_XBM_DATA, MENU_SNAP_INDICATOR_W_XBM_SIZE, menu_snap_tiled_indicator)

-	pix = wPixmapCreateFromXBMData(scr, (char *)MENU_HIDE_INDICATOR_XBM_DATA,
-				       (char *)MENU_HIDE_INDICATOR_XBM_DATA,
-				       MENU_HIDE_INDICATOR_XBM_SIZE,
-				       MENU_HIDE_INDICATOR_XBM_SIZE, scr->black_pixel, scr->white_pixel);
-	if (pix != NULL)
-		pix->shared = 1;
-	scr->menu_hide_indicator = pix;
-
-	pix = wPixmapCreateFromXBMData(scr, (char *)MENU_SHADE_INDICATOR_XBM_DATA,
-				       (char *)MENU_SHADE_INDICATOR_XBM_DATA,
-				       MENU_SHADE_INDICATOR_XBM_SIZE,
-				       MENU_SHADE_INDICATOR_XBM_SIZE, scr->black_pixel, scr->white_pixel);
-	if (pix != NULL)
-		pix->shared = 1;
-	scr->menu_shade_indicator = pix;
+#undef LOADPIXMAPINDICATOR

 	create_logo_image(scr);

@@ -1304,8 +1293,11 @@ void ScreenCapture(WScreen *scr, int mode)
 	}

 	switch (mode) {
+		WWindow *wwin;
+		XImage *pimg;
+
 		case PRINT_WINDOW:
-			WWindow *wwin = scr->focused_window;
+			wwin = scr->focused_window;
 			if (wwin && !wwin->flags.shaded) {
 				/*
 				 * check if hint WM_TAKE_FOCUS is set, if it's the case
@@ -1316,7 +1308,6 @@ void ScreenCapture(WScreen *scr, int mode)
 				}
 				else {
 					/* we will only capture the visible window part */
-					XImage *pimg;
 					int x_crop = 0;
 					int y_crop = 0;
 					int w_crop = wwin->client.width;
@@ -1345,8 +1336,6 @@ void ScreenCapture(WScreen *scr, int mode)
 			}
 			break;
 		case PRINT_PARTIAL:
-			XImage *pimg;
-
 			pimg = imageCaptureArea(scr);
 			if (pimg) {
 				img = RCreateImageFromXImage(scr->rcontext, pimg, None);
@@ -214,6 +214,19 @@ typedef struct _WScreen {
    struct WPixmap *menu_mini_indicator;   /* for miniwindow */
    struct WPixmap *menu_hide_indicator;   /* for hidden window */
    struct WPixmap *menu_shade_indicator;  /* for shaded window */
+    struct WPixmap *menu_snap_vertical_indicator;  /* for vertical snap window */
+    struct WPixmap *menu_snap_horizontal_indicator;  /* for horizontal snap window */
+    struct WPixmap *menu_snap_rh_indicator;  /* for righ half snap window */
+    struct WPixmap *menu_snap_lh_indicator;  /* for left half snap window */
+    struct WPixmap *menu_snap_th_indicator;  /* for top half snap window */
+    struct WPixmap *menu_snap_bh_indicator;  /* for bottom half snap window */
+    struct WPixmap *menu_snap_tl_indicator;  /* for top left snap window */
+    struct WPixmap *menu_snap_tr_indicator;  /* for top rigt snap window */
+    struct WPixmap *menu_snap_bl_indicator;  /* for bottom left snap window */
+    struct WPixmap *menu_snap_br_indicator;  /* for bottom right snap window */
+    struct WPixmap *menu_snap_tiled_indicator;  /* for tiled window */
+    struct WPixmap *menu_central_indicator;  /* for central window */
+
    int app_menu_x, app_menu_y;	       /* position for application menus */

    struct WMenu *root_menu;	       /* root window menu */
@@ -283,6 +296,8 @@ typedef struct _WScreen {
    WMHandlerID *autoRaiseTimer;
    Window autoRaiseWindow;	       /* window that is scheduled to be
                                        * raised */
+    /* for hot-corners delay */
+    WMHandlerID *hot_corner_timer;

    /* for window shortcuts */
    WMArray *shortcutWindows[MAX_WINDOW_SHORTCUTS];
@@ -311,6 +326,7 @@ typedef struct _WScreen {
        unsigned int doing_alt_tab:1;
        unsigned int jump_back_pending:1;
        unsigned int ignore_focus_events:1;
+        unsigned int in_hot_corner:3;
    } flags;
 } WScreen;

@@ -3,6 +3,7 @@
 *  Window Maker window manager
 *
 *  Copyright (c) 1997-2003 Alfredo K. Kojima
+ *  Copyright (c) 2008-2023 Window Maker Team
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -1900,25 +1901,20 @@ void wWindowConstrainSize(WWindow *wwin, unsigned int *nwidth, unsigned int *nhe
 	int baseW = 0;
 	int baseH = 0;

-	/*
-	 * X11 proto defines width and height as a CARD16
-	 * if window size is guaranteed to fail, failsafe to a reasonable size
-	 */
-	if (width > USHRT_MAX && height > USHRT_MAX) {
-		width = 640;
-		height = 480;
-		return;
-	}
-
 	if (wwin->normal_hints) {
 		if (!wwin->flags.maximized) {
 			winc = wwin->normal_hints->width_inc;
 			hinc = wwin->normal_hints->height_inc;
 		}
-		minW = wwin->normal_hints->min_width;
-		minH = wwin->normal_hints->min_height;
-		maxW = wwin->normal_hints->max_width;
-		maxH = wwin->normal_hints->max_height;
+		if (wwin->normal_hints->min_width > minW)
+			minW = wwin->normal_hints->min_width;
+		if (wwin->normal_hints->min_height > minH)
+			minH = wwin->normal_hints->min_height;
+		if (wwin->normal_hints->max_width < maxW)
+			maxW = wwin->normal_hints->max_width;
+		if (wwin->normal_hints->max_height < maxH)
+			maxH = wwin->normal_hints->max_height;
+
 		if (wwin->normal_hints->flags & PAspect) {
 			minAX = wwin->normal_hints->min_aspect.x;
 			minAY = wwin->normal_hints->min_aspect.y;
@@ -1937,11 +1933,14 @@ void wWindowConstrainSize(WWindow *wwin, unsigned int *nwidth, unsigned int *nhe
 		height = minH;

 	/* if only one dimension is over the top, set a default 4/3 ratio */
-	if (width > maxW && height < maxH) {
+	if (width > maxW && height < maxH)
 		width = height * 4 / 3;
-	} else {
-		if(height > maxH && width < maxW)
-			height = width * 3 / 4;
+	else if(height > maxH && width < maxW)
+		height = width * 3 / 4;
+	else if(width > maxW && height > maxH) {
+		/* if both are over the top, set size to almost fullscreen */
+		height = wwin->screen_ptr->scr_height - 2 * wPreferences.icon_size;
+		width = wwin->screen_ptr->scr_width - 2 * wPreferences.icon_size;
 	}

 	/* aspect ratio code borrowed from olwm */
@@ -2149,12 +2148,6 @@ void wWindowConfigure(WWindow *wwin, int req_x, int req_y, int req_width, int re
 	int resize;

 	resize = (req_width != wwin->client.width || req_height != wwin->client.height);
-	/*
-	 * if the window is being moved but not resized then
-	 * send a synthetic ConfigureNotify
-	 */
-	if ((req_x != wwin->frame_x || req_y != wwin->frame_y) && !resize)
-		synth_notify = True;

 	if (WFLAGP(wwin, dont_move_off))
 		wScreenBringInside(wwin->screen_ptr, &req_x, &req_y, req_width, req_height);
@@ -2191,10 +2184,17 @@ void wWindowConfigure(WWindow *wwin, int req_x, int req_y, int req_width, int re
 		wwin->client.width = req_width;
 		wwin->client.height = req_height;
 	} else {
-		wwin->client.x = req_x;
-		wwin->client.y = req_y + wwin->frame->top_width;
-
-		XMoveWindow(dpy, wwin->frame->core->window, req_x, req_y);
+		if (req_x != wwin->frame_x || req_y != wwin->frame_y) {
+			wwin->client.x = req_x;
+			wwin->client.y = req_y + wwin->frame->top_width;
+			XMoveWindow(dpy, wwin->frame->core->window, req_x, req_y);
+		}
+		/*
+		 * if the window is being moved but not resized
+		 * or if we change nothing then
+		 * send a synthetic ConfigureNotify
+		 */
+		synth_notify = True;
 	}
 	wwin->frame_x = req_x;
 	wwin->frame_y = req_y;
@@ -2913,17 +2913,18 @@ static void titlebarDblClick(WCoreWindow *sender, void *data, XEvent *event)
 			} 
 		}
 		
-		if (wPreferences.double_click_fullscreen){
+		if (wPreferences.double_click_fullscreen) {
 			int dir = 0;
+
 			if (event->xbutton.state == 0) {
 				/* maximize window full screen*/
 				dir |= (MAX_VERTICAL|MAX_HORIZONTAL);
 				int ndir = dir ^ wwin->flags.maximized;
+				if (ndir != 0)
 					wMaximizeWindow(wwin, ndir, wGetHeadForWindow(wwin));
-			
-			} 
-
-					
+				else
+					wUnmaximizeWindow(wwin);
+			}
 		} else {
 			int dir = 0;

@@ -251,8 +251,8 @@ typedef struct WWindow {
 		unsigned int miniaturized:1;
 		unsigned int hidden:1;
 		unsigned int shaded:1;
-		unsigned int maximized:7;
-		unsigned int old_maximized:7;
+		unsigned int maximized:10;
+		unsigned int old_maximized:10;
 		unsigned int fullscreen:1;
 		long fullscreen_monitors[4];
 		unsigned int omnipresent:1;
@@ -119,21 +119,23 @@ static const char *const menu_options_entries[] = {
 * Defines the menu entries for the Other maximization sub-menu
 */
 static const struct {
+	unsigned int indicator;
 	const char *label;
 	unsigned int shortcut_idx;
 	int maxim_direction;
 } menu_maximize_entries[] = {
-	{ N_("Maximize vertically"), WKBD_VMAXIMIZE, MAX_VERTICAL },
-	{ N_("Maximize horizontally"), WKBD_HMAXIMIZE, MAX_HORIZONTAL },
-	{ N_("Maximize left half"), WKBD_LHMAXIMIZE, MAX_VERTICAL | MAX_LEFTHALF },
-	{ N_("Maximize right half"), WKBD_RHMAXIMIZE, MAX_VERTICAL | MAX_RIGHTHALF },
-	{ N_("Maximize top half"), WKBD_THMAXIMIZE, MAX_HORIZONTAL | MAX_TOPHALF },
-	{ N_("Maximize bottom half"), WKBD_BHMAXIMIZE, MAX_HORIZONTAL | MAX_BOTTOMHALF },
-	{ N_("Maximize left top corner"), WKBD_LTCMAXIMIZE, MAX_LEFTHALF | MAX_TOPHALF },
-	{ N_("Maximize right top corner"), WKBD_RTCMAXIMIZE, MAX_RIGHTHALF | MAX_TOPHALF },
-	{ N_("Maximize left bottom corner"), WKBD_LBCMAXIMIZE, MAX_LEFTHALF | MAX_BOTTOMHALF },
-	{ N_("Maximize right bottom corner"), WKBD_RBCMAXIMIZE, MAX_RIGHTHALF | MAX_BOTTOMHALF },
-	{ N_("Maximus: tiled maximization"), WKBD_MAXIMUS, MAX_MAXIMUS }
+	{ MI_SNAP_V, N_("Vertical"), WKBD_VMAXIMIZE, MAX_VERTICAL },
+	{ MI_SNAP_H, N_("Horizontal"), WKBD_HMAXIMIZE, MAX_HORIZONTAL },
+	{ MI_CENTRAL, N_("Central"), WKBD_CENTRAL, MAX_CENTRAL },
+	{ MI_SNAP_LH, N_("Left half"), WKBD_LHMAXIMIZE, MAX_VERTICAL | MAX_LEFTHALF },
+	{ MI_SNAP_RH, N_("Right half"), WKBD_RHMAXIMIZE, MAX_VERTICAL | MAX_RIGHTHALF },
+	{ MI_SNAP_TH, N_("Top half"), WKBD_THMAXIMIZE, MAX_HORIZONTAL | MAX_TOPHALF },
+	{ MI_SNAP_BH, N_("Bottom half"), WKBD_BHMAXIMIZE, MAX_HORIZONTAL | MAX_BOTTOMHALF },
+	{ MI_SNAP_TL, N_("Top left"), WKBD_LTCMAXIMIZE, MAX_LEFTHALF | MAX_TOPHALF },
+	{ MI_SNAP_TR, N_("Top right"), WKBD_RTCMAXIMIZE, MAX_RIGHTHALF | MAX_TOPHALF },
+	{ MI_SNAP_BL, N_("Bottom left"), WKBD_LBCMAXIMIZE, MAX_LEFTHALF | MAX_BOTTOMHALF },
+	{ MI_SNAP_BR, N_("Bottom right"), WKBD_RBCMAXIMIZE, MAX_RIGHTHALF | MAX_BOTTOMHALF },
+	{ MI_SNAP_TILED, N_("Tiled"), WKBD_MAXIMUS, MAX_MAXIMUS }
 };

 static void updateOptionsMenu(WMenu * menu, WWindow * wwin);
@@ -180,7 +182,7 @@ static void updateUnmaximizeShortcut(WMenuEntry * entry, int flags)
 {
 	int key;

-	switch (flags & (MAX_HORIZONTAL | MAX_VERTICAL | MAX_LEFTHALF | MAX_RIGHTHALF | MAX_TOPHALF | MAX_BOTTOMHALF | MAX_MAXIMUS)) {
+	switch (flags & (MAX_HORIZONTAL | MAX_VERTICAL | MAX_LEFTHALF | MAX_RIGHTHALF | MAX_TOPHALF | MAX_BOTTOMHALF | MAX_MAXIMUS | MAX_CENTRAL)) {
 	case MAX_HORIZONTAL:
 		key = WKBD_HMAXIMIZE;
 		break;
@@ -189,6 +191,10 @@ static void updateUnmaximizeShortcut(WMenuEntry * entry, int flags)
 		key = WKBD_VMAXIMIZE;
 		break;

+	case MAX_CENTRAL:
+		key = WKBD_CENTRAL;
+		break;
+
 	case MAX_LEFTHALF | MAX_VERTICAL:
 		key = WKBD_LHMAXIMIZE;
 		break;
@@ -562,6 +568,7 @@ static WMenu *makeOptionsMenu(WScreen * scr)
 static WMenu *makeMaximizeMenu(WScreen * scr)
 {
 	WMenu *menu;
+	WMenuEntry *entry;
 	int i;

 	menu = wMenuCreate(scr, NULL, False);
@@ -570,8 +577,11 @@ static WMenu *makeMaximizeMenu(WScreen * scr)
 		return NULL;
 	}

-	for (i = 0; i < wlengthof(menu_maximize_entries); i++)
-		wMenuAddCallback(menu, _(menu_maximize_entries[i].label), execMaximizeCommand, NULL);
+	for (i = 0; i < wlengthof(menu_maximize_entries); i++) {
+		entry = wMenuAddCallback(menu, _(menu_maximize_entries[i].label), execMaximizeCommand, NULL);
+		entry->flags.indicator = entry->flags.indicator_on = 1;
+		entry->flags.indicator_type = menu_maximize_entries[i].indicator;
+	}

 	return menu;
 }
@@ -2,7 +2,7 @@
 *
 *  Window Maker window manager
 *
- *  Copyright (c) 2014 Window Maker Team - David Maciejak
+ *  Copyright (c) 2014-2023 Window Maker Team - David Maciejak
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -256,7 +256,7 @@ static WMPixmap *dummy_background_pixmap(WWorkspaceMap *wsmap)
 	RImage *img;
 	WMPixmap *icon;

-	img = RCreateImage(wsmap->wswidth, wsmap->wsheight, 0);
+	img = RCreateImage(wsmap->mini_workspace_width, wsmap->mini_workspace_height, 0);

 	if (!img)
 		return NULL;
@@ -327,7 +327,7 @@ static void hide_mini_workspace(W_WorkspaceMap *wsmap_array, int i)
 static  WMPixmap *get_mini_workspace(WWorkspaceMap *wsmap, int index)
 {
 	if (!wsmap->scr->workspaces[index]->map)
-		return dummy_background_pixmap(wsmap);
+		return NULL;

 	if (index == wsmap->scr->current_workspace)
 		return enlight_workspace(wsmap->scr, wsmap->scr->workspaces[index]->map);
@@ -486,12 +486,15 @@ static void handle_event(WWorkspaceMap *wsmap, W_WorkspaceMap *wsmap_array)

 	w_global.process_workspacemap_event = True;
 	while (w_global.process_workspacemap_event) {
-		WMMaskEvent(dpy, KeyPressMask | KeyReleaseMask | ExposureMask
-		            | PointerMotionMask | ButtonPressMask | ButtonReleaseMask | EnterWindowMask, &ev);
+		WMMaskEvent(dpy, KeyPressMask | KeyReleaseMask | ExposureMask | PointerMotionMask |
+		             ButtonPressMask | ButtonReleaseMask | EnterWindowMask | FocusChangeMask, &ev);

 		modifiers = ev.xkey.state & w_global.shortcut.modifiers_mask;

 		switch (ev.type) {
+			WMScreen *wmscr;
+			WMColor *black;
+
 		case KeyPress:
 			if (ev.xkey.keycode == escKey || (wKeyBindings[WKBD_WORKSPACEMAP].keycode != 0 &&
 			                                  wKeyBindings[WKBD_WORKSPACEMAP].keycode == ev.xkey.keycode &&
@@ -530,6 +533,29 @@ static void handle_event(WWorkspaceMap *wsmap, W_WorkspaceMap *wsmap_array)
 			}
 			break;

+		case  FocusIn:
+			wmscr = wsmap->scr->wmscreen;
+			black = WMBlackColor(wmscr);
+			const char *text = "?";
+			WMFont *bold = WMBoldSystemFontOfSize(wmscr, wsmap->mini_workspace_width / 3);
+			int x = (wsmap->mini_workspace_width / 2) - (WMWidthOfString(bold, text, strlen(text)) / 2);
+			int y = (wsmap->mini_workspace_height / 2) - (WMFontHeight(bold) / 2);
+			WMPixmap *icon = dummy_background_pixmap(wsmap);
+
+			if (icon) {
+				int i;
+
+				WMDrawString(wmscr, WMGetPixmapXID(icon),
+						black, bold, x, y, text, strlen(text));
+				for (i = 0; i < wsmap->scr->workspace_count; i++) {
+					if (!wsmap->scr->workspaces[i]->map)
+						WMSetButtonImage(wsmap_array[i].workspace_img_button, icon);
+				}
+				WMReleasePixmap(icon);
+			}
+			WMHandleEvent(&ev);
+			break;
+
 		default:
 			WMHandleEvent(&ev);
 			break;
@@ -2,7 +2,7 @@
 *  Window Maker window manager
 *
 *  Copyright (c) 1997-2003 Alfredo K. Kojima
- *  Copyright (c) 2014 Window Maker Team
+ *  Copyright (c) 2014-2015 Window Maker Team
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -1,7 +1,7 @@
 /*
 *  Window Maker window manager
 *
- *  Copyright (c) 2014 Window Maker Team - David Maciejak
+ *  Copyright (c) 2014-2023 Window Maker Team - David Maciejak
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -63,8 +63,6 @@ RImage *img;
 Pixmap pix;

 const char *APPNAME = "wmiv";
-int APPVERSION_MAJOR = 0;
-int APPVERSION_MINOR = 7;
 int NEXT = 0;
 int PREV = 1;
 float zoom_factor = 0;
@@ -740,7 +738,7 @@ int main(int argc, char **argv)
 			argv[0]);
 			return EXIT_SUCCESS;
 		case 'v':
-			fprintf(stderr, "%s version %d.%d\n", APPNAME, APPVERSION_MAJOR, APPVERSION_MINOR);
+			printf("%s version %s\n", APPNAME, VERSION);
 			return EXIT_SUCCESS;
 		case '?':
 			return EXIT_FAILURE;
@@ -2,7 +2,7 @@
 *
 * Raster graphics library
 *
- * Copyright (c) 2014 Window Maker Team
+ * Copyright (c) 2014-2021 Window Maker Team
 *
 *  This library is free software; you can redistribute it and/or
 *  modify it under the terms of the GNU Library General Public
@@ -3,7 +3,7 @@
 * Raster graphics library
 *
 * Copyright (c) 1997-2003 Alfredo K. Kojima
- * Copyright (c) 2014 Window Maker Team
+ * Copyright (c) 2014-2021 Window Maker Team
 *
 *  This library is free software; you can redistribute it and/or
 *  modify it under the terms of the GNU Library General Public
@@ -2,7 +2,7 @@
 *
 * Raster graphics library
 *
- * Copyright (c) 2014 Window Maker Team
+ * Copyright (c) 2014-2021 Window Maker Team
 *
 *  This library is free software; you can redistribute it and/or
 *  modify it under the terms of the GNU Library General Public
@@ -3,7 +3,7 @@
 * Raster graphics library
 *
 * Copyright (c) 1997-2003 Alfredo K. Kojima
- * Copyright (c) 2014 Window Maker Team
+ * Copyright (c) 2014-2021 Window Maker Team
 *
 *  This library is free software; you can redistribute it and/or
 *  modify it under the terms of the GNU Library General Public
@@ -2,7 +2,7 @@
 *
 * Raster graphics library
 *
- * Copyright (c) 2014 Window Maker Team
+ * Copyright (c) 2014-2021 Window Maker Team
 *
 *  This library is free software; you can redistribute it and/or
 *  modify it under the terms of the GNU Library General Public
@@ -3,7 +3,7 @@
 * Raster graphics library
 *
 * Copyright (c) 1997-2003 Alfredo K. Kojima
- * Copyright (c) 2014 Window Maker Team
+ * Copyright (c) 2014-2021 Window Maker Team
 *
 *  This library is free software; you can redistribute it and/or
 *  modify it under the terms of the GNU Library General Public
Author	SHA1	Message	Date
Carlos R. Mafra	93b049356f	Revert "WUtil: Be more strict about base directory for wmkdirhier()" This reverts commit `a0b283a60f`, as it breaks saving the history in ~GNUstep/.AppInfo/WindowMaker/History by restricting modifications to either ~GNUstep/Defaults or ~GNUstep/Library. Thanks to Paul Selig for reporting this issue.	2023-08-21 22:22:32 +01:00
Carlos R. Mafra	75f353bef4	Update .gitignore Since `fc63d72032` (WINGs: Fix incorrect use of macro USE_PANGO in installed header) and `0e274dc979` (WRaster: Fix incorrect use of macro USE_XSHM in installed header) the files wrlib/wraster.h and WINGs/WINGs/WINGsP.h are generated by the compilation, so add them to .gitignore	2023-08-21 21:35:30 +01:00
Christophe CURIS	2264ed9de6	Fix calculation of version number in the library mapfiles As reported by Andreas Metzler, the latest API change in lib WRaster caused a compatibility issue because the internal version number was increased. To correctly handle this situation, this patch does 2 things: - do not discard the 2 last number in the "c:r:a" version, because we need them; - when calculating the version for the mapfile, use the formula that is suggested in libtool's documentation. The purpose of the formula is that when API is changed, if a new function is added then the version is not incremented to reflect that we are still compatible with current binaries, it will be incremented only when there is a break in compatibility.	2023-08-12 21:53:52 +01:00
Carlos R. Mafra	d0aa2cefcd	Window Maker 0.96.0	2023-08-05 08:46:23 +01:00
David Maciejak	a52d13c8b8	Fix autoconf obsolete macros autogen.sh is reporting some warnings as below ./autogen.sh 2>&1 \|grep "obsolete" libtoolize: copying file 'm4/lt~obsolete.m4' configure.ac:115: warning: The macro `AC_LANG_C' is obsolete. configure.ac:115: warning: The macro `AC_TRY_COMPILE' is obsolete. configure.ac:134: warning: The macro `AC_LANG_C' is obsolete. configure.ac:134: warning: The macro `AC_TRY_COMPILE' is obsolete. configure.ac:135: warning: The macro `AC_LANG_C' is obsolete. configure.ac:135: warning: The macro `AC_TRY_COMPILE' is obsolete. configure.ac:146: warning: The macro `AC_LANG_C' is obsolete. configure.ac:146: warning: The macro `AC_TRY_COMPILE' is obsolete. configure.ac:146: warning: The macro `AC_LANG_C' is obsolete. configure.ac:146: warning: The macro `AC_TRY_COMPILE' is obsolete. configure.ac:373: warning: The macro `AC_LANG_C' is obsolete. configure.ac:373: warning: The macro `AC_TRY_COMPILE' is obsolete. configure.ac:458: warning: The macro `AC_HEADER_TIME' is obsolete. configure.ac:681: warning: The macro `AC_TRY_LINK' is obsolete. configure.ac:807: warning: The macro `AC_TRY_LINK' is obsolete. As the minimum autoconf version required is v2.69, we need to make sure to update obsolete macros as described at https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Obsolete-Macros.html	2023-04-14 23:45:00 +01:00
David Maciejak	215b6ee2e6	Set proper motif wm hints name Just a cosmetic change as the variable is currently not in use. According to the Motif Toolkit API and MwmUtil.h, the last long variable from the Motif WM Hints struct is currenlty used for the status.	2023-04-09 10:42:52 +01:00
David Maciejak	ab45c6c6c2	Add central position feature for active window This patch adds a new Central feature under the window menu "Other maximization" entry. Shortcut can be configured via WPrefs "Center active window" action. When called the active window is centered on the screen head. If the window height or width are bigger than the head size, the window is resized to fit. There are some transitions defined as below: from fullscreen to center from any corner to center from top half to center top half from bottom half to center bottom half from left half to center left half from right half to center right half Undoing the action is done via the window menu "Unmaximize" entry or the shortcut.	2023-03-31 09:11:38 +01:00
David Maciejak	3344f2b040	NEWS: Hot corners feature description Add an entry in the NEWS to describe the Hot Corners feature.	2023-03-26 10:35:33 +01:00
David Maciejak	ecef2b2890	WPrefs: Hot corner preferences Add a new "Hot Corner Shortcut Preferences" section to WPrefs to configure the Hot Corners feature.	2023-03-26 10:35:33 +01:00
David Maciejak	802cbc0d75	Hot corners feature core Add mouse pointer position detection to trigger the corner actions. Screen corners can be assigned an external command to be executed when the mouse pointer is entering those areas. In WPrefs, "Hot Corner Shortcut Preferences" can be used for configuration or by manually adding a "HotCorners" key and value to "YES" in the ~/GNUstep/Defaults/WindowMaker file. Actions are specified by the "HotCornerActions" and are defined as a four entries list ("top left action", "top right action", "bottom left action", "bottom right action"). A screen corner area is a cube shape defined by the "HotCornerEdge" which is a number of pixels from 2 (by default) to 10. To lower the risk of triggering that feature accidentally a "HotCornerDelay" key can be used which is the time before the action is triggered while the pointer is in one of the screen corner. Default value is 250 ms. Hot Corners feature is disabled by default.	2023-03-26 10:35:33 +01:00
David Maciejak	157d1ba85f	Fix internal function name typo The patch is to fix a typo in the fct name movePionterToWindowCenter	2023-03-23 12:57:58 +00:00
David Maciejak	91e7f37074	WPrefs: fix keyboard shortcut sorting order That patch is fixing some Actions entries that are not sorted properly. One is using some upper/lower cases. And the other one, is displaying numbers while alphabetic sorting is not working properly on numbers. For example: Shortcut for window 1 Shortcut for window 10 Shortcut for window 2 ...	2023-03-21 15:20:19 +00:00
David Maciejak	18a539b372	Add some more cases to handle window unusual size request As discussed on the ML, the test to check for CARD16 limit is probably innacurate. Check instead for maxH and maxW which are set by default to twice the size of the screen or to the max values passed by the window normal hints property.	2023-03-16 15:02:18 +00:00
David Maciejak	eae9200c5d	Fix ICCM ConfigureNotify request According to ICCM specs at [1] Not changing the size, location, border width, or stacking order of the window at all. A client will receive a synthetic ConfigureNotify event that describes the (unchanged) geometry of the window. The (x,y) coordinates will be in the root coordinate system, adjusted for the border width the client requested, irrespective of any reparenting that has taken place. The border_width will be the border width the client requested. The client will not receive a real ConfigureNotify event because no change has actually taken place. Moving or restacking the window without resizing it or changing its border width. A client will receive a synthetic ConfigureNotify event following the change that describes the new geometry of the window. The event's (x,y) coordinates will be in the root coordinate system adjusted for the border width the client requested. The border_width will be the border width the client requested. The client may not receive a real ConfigureNotify event that describes this change because the window manager may have reparented the top-level window. If the client does receive a real event, the synthetic event will follow the real one. *Resizing the window or changing its border width (regardless of whether the window was also moved or restacked). A client that has selected for StructureNotify events will receive a real ConfigureNotify event. Note that the coordinates in this event are relative to the parent, which may not be the root if the window has been reparented. The coordinates will reflect the actual border width of the window (which the window manager may have changed). The TranslateCoordinates request can be used to convert the coordinates if required. In Window Maker, the first case is not implemented: doing a synthetic ConfigureNotify to notify no changes were done. That's creating some issues with app like Citrix icaclient when sometime windows are blank and need to be moved to be refreshed. [1]https://x.org/releases/X11R7.6/doc/xorg-docs/specs/ICCCM/icccm.html#configuring_the_window	2023-03-16 15:02:18 +00:00
David Maciejak	25cb9d208a	Update window.c copyright Just updating the copyright line in the file header.	2023-03-16 15:02:18 +00:00
David Maciejak	23471b2e21	WPrefs: update maximization feature descriptions Align the old maximization descriptions to the new visual indicator names. The internal shortcut names had also been updated, meaning a reconfiguration of the shortcuts in WPrefs is required.	2023-03-16 11:36:02 +00:00
David Maciejak	258ffc8b97	Window menu: add maximization visual indicators Add visual indicators for the maximization options in the window menu.	2023-03-14 12:27:16 +00:00
David Maciejak	86b7ec1a58	Restore proper drawer direction when screen was resized Since `48d4820dee` the dock is positioned dynamically based on the screen midpoint. The side issue using such method is if in case the screen was temporarily resized the dock as a chance to be displayed on the other side making the drawer saved configuration from WMState esp the direction wrong when wm is started again. For example, the dock and drawer are displayed on the right of the screen. Then the screen resolution is downsized temporaily to half or less of the previous size. The position stored in WMState will be updated and the direction of the drawer is still opening on the left. But on next wm start, when reading the conf. The position of the dock and drawer are corresponding to the middle or less of the unresized screen. The dock and drawer will be sticked on the left. But the drawer direction was not updated and still opening on the left (which is out of the screen).	2023-03-14 12:27:16 +00:00
Doug Torrance	9831e3f72a	Move declarations to beginning of switch statements Several variable declarations were recently added immediately after labels, but this causes compile errors in GCC versions prior to 11, e.g., wsmap.c: In function ‘handle_event’: wsmap.c:534:4: error: a label can only be part of a statement and a declaration is not a statement 534 \| WMScreen *wmscr = wsmap->scr->wmscreen; \| ^~~~~~~~ We move these declarations to the top of the corresponding switch statements so that Window Maker can compile on these older versions of GCC.	2023-03-13 15:33:21 +00:00
David Maciejak	0a55facac0	wmiv: align version with wm Use wm version for the wmiv util.	2023-03-13 15:32:19 +00:00
David Maciejak	0ecf7d3540	KeepDockOnPrimaryHead: fix drawer direction When that option is on, swapping drawer does not always mean swapping drawer direction. For example if drawer is on the left side of the second head and moving to the left side of the first head, the direction should be the same.	2023-03-13 15:32:19 +00:00
David Maciejak	4576b5bf1e	Info Panel: display proper number of colors in deepcolor env Instead of displaying a number of unitary colors in 10bit env, display a more human readable message.	2023-03-13 15:32:19 +00:00
David Maciejak	0526ddfc54	WINGs: Make the Extras examples to compile There is a table view example which is not compiling cause of a missing lib, also fixed some warnings.	2023-03-12 09:44:10 +00:00
David Maciejak	4c52232ee7	Window titlebar double click to unmaximize Commit `6e2075f3df` from 2020 added a feature to maximize window when double clicking on the titlebar. But unmaximizing is not supported so when double clicking again on the window titlebar the window geometry was not reverted back.	2023-03-12 09:44:10 +00:00
David Maciejak	43edd37ee2	Update file headers year copyright Update copyright year for Window Maker Team entries.	2023-03-12 09:44:10 +00:00
David Maciejak	e95aea2e30	Workspace pager: display ? on non visited mini workspace When the workspace pager is displayed it's showing grey mini workspaces for non rendered/non visited workspaces. That patch is adding an exclamation mark in the middle of the dummy grey background mini workspaces.	2023-03-11 11:38:25 +00:00