[repo.or.cz] wmaker-crm.git branch master updated: wmaker-0.96.0-86-g4b4abf4c502b

[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 4b4abf4c502bebf8fe97ec64a141d601def71017 (commit)
via a631e3060ec8c181f6f2edb8cc3ce6b48d86a66f (commit)
via 6c5c3e618125ea4f429ad88d79817d3ede41b119 (commit)
from 329f82f6e762b11a4045a029445912e43df40c04 (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 4b4abf4c502bebf8fe97ec64a141d601def71017
Author: David Maciejak <david.m...@gmail.com>
Date: Thu, 26 Mar 2026 21:57:40 -0400
URL: <https://repo.or.cz/wmaker-crm.git/4b4abf4c502bebf8>

wmaker: update callback function checks

This patch is adding the check for the getString function
that was added in commit be495bedbcc0904ec80601b894d63a56b7c8bb82.
---
src/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index daf7307d9c4f..81b5113be476 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -195,5 +195,5 @@ defaults-callbacks-dynamic:
--source "$(srcdir)/defaults.c" --structure "optionList" \
--field-value-ptr 4 --field-callback 5 \
--struct-def "wPreferences=$(srcdir)/WindowMaker.h" \
- --callback "getBool=char, getEnum=char, getInt=int" \
+ --callback "getBool=char, getEnum=char, getInt=int, getString=char*" \
--callback "getPathList=char*, getCoord=WCoord"

commit a631e3060ec8c181f6f2edb8cc3ce6b48d86a66f
Author: David Maciejak <david.m...@gmail.com>
Date: Thu, 26 Mar 2026 21:38:08 -0400
URL: <https://repo.or.cz/wmaker-crm.git/a631e3060ec8c181>

wmaker: remove apercu struct check artefact

This patch is removing the check for the legacy_minipreview_config struct
which was removed in commit fa8121ee6106bb0843fc90f441dd33a2c8cc09d0
Without it we can see the error below when running make check:

Error: structure "legacy_minipreview_config" was not found in ./defaults.c
---
src/Makefile.am | 1 -
1 file changed, 1 deletion(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index d05a9a01c6c0..daf7307d9c4f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -195,6 +195,5 @@ defaults-callbacks-dynamic:
--source "$(srcdir)/defaults.c" --structure "optionList" \
--field-value-ptr 4 --field-callback 5 \
--struct-def "wPreferences=$(srcdir)/WindowMaker.h" \
- --struct-def "legacy_minipreview_config=$(srcdir)/defaults.c" \
--callback "getBool=char, getEnum=char, getInt=int" \
--callback "getPathList=char*, getCoord=WCoord"

commit 6c5c3e618125ea4f429ad88d79817d3ede41b119
Author: David Maciejak <david.m...@gmail.com>
Date: Thu, 26 Mar 2026 18:13:42 -0400
URL: <https://repo.or.cz/wmaker-crm.git/6c5c3e618125ea4f>

wmaker: fix wire frame drawing when snapping

This patch is fixing the wire frame dimension which
was computed wrongly when FrameBorderWidth was set
and the window snapped top half or bottom half.
In such case, drawTransparentFrame was passed the
width and height of the screen while it should have
used an inner frame size (meaning without frame border).
The result bug was that the wire frame width was too large
and the right edge displayed out of the monitor head.
---
src/moveres.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/moveres.c b/src/moveres.c
index c7dbf867f5cc..e6653e6cfd24 100644
--- a/src/moveres.c
+++ b/src/moveres.c
@@ -457,11 +457,10 @@ static void drawTransparentFrame(WWindow * wwin, int x, int y, int width, int he
GC gc = wwin->screen_ptr->frame_gc;
int h = 0;
int bottom = 0;
+ int fb = 0;

- if (HAS_BORDER_WITH_SELECT(wwin)) {
- x += wwin->screen_ptr->frame_border_width;
- y += wwin->screen_ptr->frame_border_width;
- }
+ if (HAS_BORDER_WITH_SELECT(wwin))
+ fb = wwin->screen_ptr->frame_border_width;

if (HAS_TITLEBAR(wwin) && !wwin->flags.shaded) {
h = WMFontHeight(wwin->screen_ptr->title_font) + (wPreferences.window_title_clearance +
@@ -478,13 +477,13 @@ static void drawTransparentFrame(WWindow * wwin, int x, int y, int width, int he
(e.g. interactive placement), frame does not point to anything. */
bottom = RESIZEBAR_HEIGHT;
}
- XDrawRectangle(dpy, root, gc, x - 1, y - 1, width + 1, height + 1);
+ XDrawRectangle(dpy, root, gc, x, y, width - 1 + 2 * fb, height - 1 + 2 * fb);

if (h > 0) {
- XDrawLine(dpy, root, gc, x, y + h - 1, x + width, y + h - 1);
+ XDrawLine(dpy, root, gc, x, y + fb + h - 1, x + 2 * fb + width, y + fb + h - 1);
}
if (bottom > 0) {
- XDrawLine(dpy, root, gc, x, y + height - bottom, x + width, y + height - bottom);
+ XDrawLine(dpy, root, gc, x, y + fb + height - bottom, x + 2 * fb + width, y + fb + height - bottom);
}
}

@@ -1200,7 +1199,7 @@ updateWindowPosition(WWindow * wwin, MoveData * data, Bool doResistance,
static void draw_snap_frame(WWindow *wwin, int direction)
{
WScreen *scr;
- int head, x, y;
+ int head, x, y, fb;
unsigned int width, height;
WMRect rect;

@@ -1212,6 +1211,7 @@ static void draw_snap_frame(WWindow *wwin, int direction)
y = rect.pos.y;
width = rect.size.width;
height = rect.size.height;
+ fb = HAS_BORDER_WITH_SELECT(wwin) ? 2 * wwin->screen_ptr->frame_border_width : 0;

switch (direction) {
case SNAP_LEFT:
@@ -1258,7 +1258,7 @@ static void draw_snap_frame(WWindow *wwin, int direction)
break;
}

- drawTransparentFrame(wwin, x, y, width, height);
+ drawTransparentFrame(wwin, x, y, width - fb, height - fb);
}

static int get_snap_direction(WScreen *scr, int x, int y)

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

Summary of changes:
src/Makefile.am | 3 +--
src/moveres.c | 18 +++++++++---------
2 files changed, 10 insertions(+), 11 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")