[repo.or.cz] wmaker-crm.git branch master updated: wmaker-0.96.0-58-gae6b03e50f01

[crmafra]

This is an automated email generated because a ref change occurred in the
git repository for project wmaker-crm.git.

The branch, master has been updated
via ae6b03e50f01c81f9235859c96b4adc5784ab5d6 (commit)
via 128ba2ddc7e025a0832155d6f54cceae5e5cc565 (commit)
via 7ca96b9ed63c319a2e9a8de0e36dae26db3e442f (commit)
from 839061a25a87877d741abf68699095b40c5f86a6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ae6b03e50f01c81f9235859c96b4adc5784ab5d6
Author: David Maciejak <david.m...@gmail.com>
Date: Sun, 8 Feb 2026 17:02:16 -0500
URL: <https://repo.or.cz/wmaker-crm.git/ae6b03e50f01c81f>

wmiv: fix default window size

Set default windows size to 10x10 as 1x1 is unmanaged since
commit 839061a25a87877d741abf68699095b40c5f86a6.
---
util/wmiv.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/wmiv.c b/util/wmiv.c
index cf5dac1f39e0..c56208e768ec 100755
--- a/util/wmiv.c
+++ b/util/wmiv.c
@@ -1858,7 +1858,7 @@ int main(int argc, char **argv)

merge_with_background(img);

- win = XCreateSimpleWindow(dpy, DefaultRootWindow(dpy), 0, 0, 1, 1, 0, 0, BlackPixel(dpy, screen_num));
+ win = XCreateSimpleWindow(dpy, DefaultRootWindow(dpy), 0, 0, 10, 10, 0, 0, BlackPixel(dpy, screen_num));
XSelectInput(dpy, win, KeyPressMask|StructureNotifyMask|ExposureMask|ButtonPressMask|ButtonReleaseMask|PointerMotionMask|FocusChangeMask|PropertyChangeMask);

size_hints = XAllocSizeHints();

commit 128ba2ddc7e025a0832155d6f54cceae5e5cc565
Author: David Maciejak <david.m...@gmail.com>
Date: Sun, 8 Feb 2026 17:07:19 -0500
URL: <https://repo.or.cz/wmaker-crm.git/128ba2ddc7e025a0>

wmaker: use appicon icons in the switchpanel when existing

This patch is making sure the icons shown in the switchpanel
are also those used for the appicon. For example, for xterm
the icon used in the switchpanel is the default app and not the
icon provided by xterm app.
Seems that issue is also present in vanilla wmaker 0.96.
---
src/switchpanel.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/switchpanel.c b/src/switchpanel.c
index e12b97f97c02..d11d4e45ea1b 100644
--- a/src/switchpanel.c
+++ b/src/switchpanel.c
@@ -186,12 +186,18 @@ static void addIconForWindow(WSwitchPanel *panel, WMWidget *parent, WWindow *wwi
{
WMFrame *icon = WMCreateFrame(parent);
RImage *image = NULL;
+ WApplication *wapp;

WMSetFrameRelief(icon, WRFlat);
WMResizeWidget(icon, icon_tile_size, icon_tile_size);
WMMoveWidget(icon, x, y);

- if (!WFLAGP(wwin, always_user_icon) && wwin->net_icon_image)
+ wapp = wApplicationOf(wwin->main_window);
+ if (wapp && wapp->app_icon && wapp->app_icon->icon && wapp->app_icon->icon->file_image) {
+ image = RRetainImage(wapp->app_icon->icon->file_image);
+ }
+
+ if (!image && !WFLAGP(wwin, always_user_icon) && wwin->net_icon_image)
image = RRetainImage(wwin->net_icon_image);

/* get_icon_image() includes the default icon image */

commit 7ca96b9ed63c319a2e9a8de0e36dae26db3e442f
Author: David Maciejak <david.m...@gmail.com>
Date: Sun, 8 Feb 2026 17:15:06 -0500
URL: <https://repo.or.cz/wmaker-crm.git/7ca96b9ed63c319a>

wmaker: fix titlebar glitch issues with modelock

This patch is fixing 2 issues with the modelock language pixmap
located in the titlebar.

If wmaker is compiled with modelock support but modelock is disabled
from the expert preferences, dialog windows like run command or exit
will not show the language pixmap but will show empty frame borders.

When modelock is enabled from the expert preferences, it needs a
warm restart for the titlebars to be updated with the language pixmap.
If afterwards, modelock is disabled from the expert preferences,
any old windows that is gettting focus will be repainted and the language
pixmap will be destroyed but the empty frame borders will still be
present. Now to fully disable modelock for existing opened windows,
wmaker needs a warm restart.
---
src/framewin.c | 2 +-
src/window.c | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/framewin.c b/src/framewin.c
index b11f414ebc86..e72d881d54dd 100644
--- a/src/framewin.c
+++ b/src/framewin.c
@@ -1394,7 +1394,7 @@ static void handleButtonExpose(WObjDescriptor * desc, XEvent * event)

#ifdef XKB_BUTTON_HINT
if (button == fwin->language_button) {
- if (wPreferences.modelock)
+ if (!fwin->flags.hide_language_button)
paintButton(button, fwin->title_texture[fwin->flags.state],
WMColorPixel(fwin->title_color[fwin->flags.state]),
fwin->languagebutton_image, False);
diff --git a/src/window.c b/src/window.c
index 8a14a03427a6..80b384307b8f 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1437,7 +1437,8 @@ WWindow *wManageInternalWindow(WScreen *scr, Window window, Window owner,
foo = WFF_RIGHT_BUTTON | WFF_BORDER;
foo |= WFF_TITLEBAR;
#ifdef XKB_BUTTON_HINT
- foo |= WFF_LANGUAGE_BUTTON;
+ if (wPreferences.modelock)
+ foo |= WFF_LANGUAGE_BUTTON;
#endif

wwin->frame = wFrameWindowCreate(scr, WMFloatingLevel,

-----------------------------------------------------------------------

Summary of changes:
src/framewin.c | 2 +-
src/switchpanel.c | 8 +++++++-
src/window.c | 3 ++-
util/wmiv.c | 2 +-
4 files changed, 11 insertions(+), 4 deletions(-)


repo.or.cz automatic notification. Contact project admin crm...@gmail.com
if you want to unsubscribe, or site admin ad...@repo.or.cz if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")