This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project wmaker-crm.git.
The branch, next has been updated
via 3cd382bccc46b957c9a699fe5fa827f32704dfcd (commit)
via 27d55b3e33ebade69dcd5a5e5cc938ccafb69274 (commit)
from 2a025b2edddee55298076fad693683d53b7b3bd1 (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 -----------------------------------------------------------------
http://repo.or.cz/w/wmaker-crm.git/commit/3cd382bccc46b957c9a699fe5fa827f32704dfcd
commit 3cd382bccc46b957c9a699fe5fa827f32704dfcd
Author: Iain Patterson <[email protected]>
Date: Thu Nov 15 16:55:52 2012 -0800
Prevent windows from drifting on restart.
Bug report from Paul Seelig:
"Yet another rather strange glitch:
- open three terminal windows
- repeatedly restart wmaker
- all windows slowly drift to the left and up by just a few pixels
If i remember correctly, this is also a longstanding issue and nothing
new. It is no showstopper either, as one rarely restarts wmaker."
The slight drifting left and up seems to have been due to
wWindowConfigure() accounting for the window border when placing, which
was fixed in an earlier commit.
Windows could still shuffle down, however, because wWindowConfigure()
was moving the window down to make room for its window frame.
We now move it up by the titlebar height to cancel out that movement.
diff --git a/src/window.c b/src/window.c
index 9970c1a..b07d9d4 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1144,11 +1144,7 @@ WWindow *wManageWindow(WScreen *scr, Window window)
y -= wwin->frame->top_width + wwin->frame->bottom_width;
}
- /* wWindowConfigure() will account for the window border
- * when placing so the window would be shifted without
- * the adjustment below
- */
- if (HAS_BORDER(wwin)) {
+ {
WMRect rect;
WArea usableArea;
int head;
@@ -1161,10 +1157,24 @@ WWindow *wManageWindow(WScreen *scr, Window window)
head = wGetHeadForRect(scr, rect);
usableArea = wGetUsableAreaForHead(scr, head, NULL, True);
- if (x >= usableArea.x1 + 2 * FRAME_BORDER_WIDTH)
- x -= 2 * FRAME_BORDER_WIDTH;
- if (y >= usableArea.y1 + 2 * FRAME_BORDER_WIDTH)
- y -= 2 * FRAME_BORDER_WIDTH;
+ /* wWindowConfigure() will account for the frame
+ * when placing so the window would be shifted without
+ * the adjustment below
+ */
+
+ if (y >= usableArea.y1 + wwin->frame->top_width)
+ y -= wwin->frame->top_width;
+
+ /* wWindowConfigure() will account for the window border
+ * when placing so the window would be shifted without
+ * the adjustment below
+ */
+ if (HAS_BORDER(wwin)) {
+ if (x >= usableArea.x1 + FRAME_BORDER_WIDTH)
+ x -= FRAME_BORDER_WIDTH;
+ if (y >= usableArea.y1 + FRAME_BORDER_WIDTH)
+ y -= FRAME_BORDER_WIDTH;
+ }
}
/*
http://repo.or.cz/w/wmaker-crm.git/commit/27d55b3e33ebade69dcd5a5e5cc938ccafb69274
commit 27d55b3e33ebade69dcd5a5e5cc938ccafb69274
Author: Christophe CURIS <[email protected]>
Date: Fri Nov 16 01:24:07 2012 +0100
Added option to 'configure' to control debug information for compilation
As reported by Amadeusz SÅawiÅski, there were a number of debug-only
information printed by the menu parser, which had no reason to be
in a user package.
This patch removes all the hard-coded DEBUG definitions pointed
by Amadeusz and adds a new (standard-like) option '--enable-debug'
to the configure script, which activates debug stuff for the devs.
The default behaviour is now to not have them.
As a side effect, the option also disable optimisation, which are
generally annoying when trying to run a debugger.
diff --git a/WINGs/Examples/Makefile.am b/WINGs/Examples/Makefile.am
index 877f233..924d378 100644
--- a/WINGs/Examples/Makefile.am
+++ b/WINGs/Examples/Makefile.am
@@ -26,4 +26,4 @@ server_LDADD = $(top_builddir)/WINGs/libWUtil.la
@LIBRARY_SEARCH_PATH@ @INTLIBS@
INCLUDES = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src -
-DRESOURCE_PATH="$(datadir)/WINGs" @HEADER_SEARCH_PATH@ -DDEBUG
+ -DRESOURCE_PATH="$(datadir)/WINGs" @HEADER_SEARCH_PATH@
diff --git a/WINGs/Extras/Makefile.am b/WINGs/Extras/Makefile.am
index ef2b9ef..f1dc17f 100644
--- a/WINGs/Extras/Makefile.am
+++ b/WINGs/Extras/Makefile.am
@@ -21,7 +21,7 @@ libExtraWINGs_la_SOURCES = wtabledelegates.h
INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs -
-DRESOURCE_PATH="$(datadir)/WINGs" @HEADER_SEARCH_PATH@ -DDEBUG
+ -DRESOURCE_PATH="$(datadir)/WINGs" @HEADER_SEARCH_PATH@
LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la
$(top_builddir)/WINGs/libWUtil.la diff --git a/WINGs/Makefile.am
b/WINGs/Makefile.am
index 8a904ff..8792ae6 100644
--- a/WINGs/Makefile.am
+++ b/WINGs/Makefile.am
@@ -86,7 +86,7 @@ libWUtil_la_SOURCES = wutil.c
-AM_CPPFLAGS = -DLOCALEDIR="$(NLSDIR)" -DRESOURCE_PATH="$(datadir)/WINGs"
-DDEBUG
+AM_CPPFLAGS = -DLOCALEDIR="$(NLSDIR)" -DRESOURCE_PATH="$(datadir)/WINGs"
AM_CFLAGS =
INCLUDES = -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib
-I$(top_srcdir)/src diff --git a/WINGs/Tests/Makefile.am
b/WINGs/Tests/Makefile.am
index 54c90ff..2609171 100644
--- a/WINGs/Tests/Makefile.am
+++ b/WINGs/Tests/Makefile.am
@@ -17,6 +17,4 @@ wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
EXTRA_DIST = logo.xpm upbtn.xpm wm.html wm.png
INCLUDES = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src -
-DRESOURCE_PATH="$(datadir)/WINGs" @XFTFLAGS@ @HEADER_SEARCH_PATH@ - -DDEBUG
-
+ -DRESOURCE_PATH="$(datadir)/WINGs" @XFTFLAGS@ @HEADER_SEARCH_PATH@
diff --git a/configure.ac b/configure.ac
index ddec730..c55a5c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,6 +73,20 @@ AC_PROG_LN_S
AC_PROG_GCC_TRADITIONAL
AC_PROG_LIBTOOL
+
+dnl Debugging Options
+dnl =================
+AC_ARG_ENABLE(debug,
+ [AS_HELP_STRING([--enable-debug], [enable debugging options,
@<:@default=no@:>@])],
+ [AS_CASE(["$enableval"],
+ [yes], [debug=yes],
+ [no], [debug=no],
+ [AC_MSG_ERROR([bad value $enableval for --enable-debug])] )],
+ [debug=no])
+AS_IF([test "x$debug" = "xyes"],
+ [CFLAGS="-g -O0 -DDEBUG"])
+
+
AX_CFLAGS_GCC_OPTION(-Wall)
AX_CFLAGS_GCC_OPTION(-Wextra -Wno-sign-compare -Wno-unused-parameter)
@@ -94,7 +108,7 @@ case "${host}" in
;;
*-*-openbsd*)
WM_OSDEP="bsd"
- CFLAGS="$CFLAGS -DOPENBSD"
+ CFLAGS="$CFLAGS -DOPENBSD"
;;
*-*-dragonfly*)
WM_OSDEP="bsd"
@@ -901,6 +915,7 @@ dnl echo "Supported languages beside English : $languages"
if test "x$MOFILES" != "x"; then
echo "Installation path for translations : $NLSDIR" | sed -e
's|$(prefix)|'"$prefix|"
fi
+AS_IF([test "x$debug" = "xyes"], [echo "Debug information enabled :
$debug"])
echo
dnl WM_PRINT_REDCRAP_BUG_STATUS
-----------------------------------------------------------------------
Summary of changes:
WINGs/Examples/Makefile.am | 2 +-
WINGs/Extras/Makefile.am | 2 +-
WINGs/Makefile.am | 2 +-
WINGs/Tests/Makefile.am | 4 +---
configure.ac | 17 ++++++++++++++++-
src/window.c | 28 +++++++++++++++++++---------
6 files changed, 39 insertions(+), 16 deletions(-)
repo.or.cz automatic notification. Contact project admin [email protected]
if you want to unsubscribe, or site admin [email protected] if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")
--
To unsubscribe, send mail to [email protected].
