sync with bb-cvs

diff --git a/AUTHORS b/AUTHORS
index 8c4e92e..56693f0 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -47,7 +47,6 @@ Contributors:
        Matt Wilson <mwilson@quicksilver.net.nz>
         - for noticing all of the little things
 
-
 nls contributors:
        Mads Martin Joergensen <mmj@suse.de>
         - Danish (da_DK) nls support

diff --git a/CHANGELOG.Blackbox b/CHANGELOG.Blackbox
index 04fb3e9..71ba31f 100644 (file)
--- a/CHANGELOG.Blackbox
+++ b/CHANGELOG.Blackbox
@@ -11,21 +11,20 @@ Changes from 0.62.1 to 0.65.0:
   - huge amounts of internal cleanups
   - added emacs local variables to each file that prevent the addition of tabs
   - added a Util.cc file which contains useful functions with no obvious home.
-  - removed several unused variables and otherwise reduced the memory usage
-    of the objects in Blackbox.  For the record we are about 100k larger than
-    0.62.0 and that is mostly due to the STL.  However for the most part
-    blackbox runs faster and is still one of the leanest window managers out
-    there today.
   - move code over to the STL
+  - removed several unused variables and otherwise reduced the memory usage
+    of the objects in Blackbox.  For the record the binary is roughly 100k
+    larger than 0.62.0 and that is mostly due to the STL but there is also a
+    fair bit of new code.  However for the most part blackbox runs faster and
+    is still one of the leanest window managers out there today.
   - bsetroot now sets _XROOTPMAP_ID, so pseudo transparent apps will be happy
   - beginnings of a strut implementation.  toolbar and slit are removed from
     the available screen area if 'full maximize' is not set
-  - handle the odd edge case where a reparent event occurs while the window
-    is unmapped.  XReparentWindow sends an UnmapNotify to the window manager
-    however the window is already unmapped so the window manager never gets
-    the event and the unmapNotify event is where reparentNotify was handled.
-    Added a reparentNotifyEvent handler in the BlackboxWindow class and a new
-    case in the Blackbox class's process_event function.
+  - XReparentWindow sends an UnmapNotify to the window manager however
+    in certain cases the window is already unmapped so the window manager
+    never gets the event and the unmapNotify event is where reparentNotify was
+    handled.  Added a reparentNotifyEvent handler in the BlackboxWindow class
+    and a new case in the Blackbox class's process_event function.
   - no more blackbox->grab/ungrab calls everywhere
   - compression of motion and expose
   - Now we have one function which turns ~/ into /home/user/.  This is now
@@ -40,9 +39,9 @@ Changes from 0.62.1 to 0.65.0:
   - update transient handling, should solve issues with apps like acroread.
     added a getTransientInfo() method of the BlackboxWindow class which
     handles checking the transient state in X and setting the appropriate
-    variables on the window.  To further attack the infinite loops this
-    function ensures that client.transient != this.  We also check for loops
-    of the forms A -> B -> C -> A.  The new transient code also allows for one
+    variables on the window.  To attack the infinite loops this
+    function ensures that client.transient != this and we check for loops
+    of the form A -> B -> C -> A.  The new transient code also allows for one
     window to have multiple transients so applications like xmms and web
     browsers are better behaved.
   - even better ICCCM support and focus handling

diff --git a/configure.in b/configure.in
index 4aef1c1..2093d4e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -45,6 +45,29 @@ CXXFLAGS="$CXXFLAGS $X_CFLAGS"
 LIBS="$LIBS $X_LIBS"
 LDFLAGS="$LDFLAGS $LIBS $X_PRE_LIBS"
 
+AC_MSG_CHECKING(for GCC)
+if test x$GCC = "xyes"; then
+  AC_MSG_RESULT([yes])
+  CXXFLAGS="${CXXFLAGS} -Wall -W"
+else
+  AC_MSG_RESULT([no, trying other compilers])
+  AC_MSG_CHECKING(for MIPSpro)
+  mips_pro_ver=`$CC -version 2>&1 | grep -i mipspro | cut -f4 -d ' '`
+  if test "x$mips_pro_ver" = "x"; then
+    AC_MSG_RESULT([no])
+  else
+    AC_MSG_RESULT([yes, version $mips_pro_ver.])
+    AC_MSG_CHECKING(for -LANG:std in CXXFLAGS)
+    lang_std_not_set=`echo $CXXFLAGS | grep "\-LANG:std"`
+    if test "x$lang_std_not_set" = "x"; then
+      AC_MSG_RESULT([not set, setting.])
+      CXXFLAGS="${CXXFLAGS} -LANG:std"
+    else
+      AC_MSG_RESULT([already set.])
+    fi
+  fi
+fi
+
 dnl Check for required functions in -lX11
 AC_CHECK_LIB(X11, XOpenDisplay,
   LIBS="$LIBS -lX11",
@@ -166,7 +189,11 @@ AC_ARG_ENABLE(debug,
   [  --enable-debug          include verbose debugging code [default=no]],
   if test x$enableval = "xyes"; then
     AC_MSG_RESULT([yes])
-    DEBUG="-DDEBUG -Wall -W -fno-inline"
+    if test x$GCC = "xyes"; then
+       DEBUG="-DDEBUG -fno-inline -g"
+    else
+       DEBUG="-DDEBUG"
+    fi
   else
     AC_MSG_RESULT([no])
     DEBUG="-DNDEBUG"

diff --git a/nls/hu_HU/Configmenu.m b/nls/hu_HU/Configmenu.m
index eafb850..c5ad305 100644 (file)
--- a/nls/hu_HU/Configmenu.m
+++ b/nls/hu_HU/Configmenu.m
@@ -16,12 +16,16 @@ $ #FocusNew
 # Új ablak kapja a fókuszt
 $ #FocusLast
 # Munkaasztal váltása után fókusz az utolsó ablakon
+$ #DisableBindings
+# Scroll Lock-n?l nem figyeli a billenty?zetet
 $ #ClickToFocus
 # Kattintás fókuszhoz
 $ #SloppyFocus
 # A fókusz követi az egeret
 $ #AutoRaise
 # Autómatikus elõreugró ablakok
+$ #ClickRaise
+# Kattint?ssal az el?t?rbe
 $ #SmartRows
 # Optimális ablakrendezés (sorok)
 $ #SmartCols

diff --git a/nls/sv_SE/Configmenu.m b/nls/sv_SE/Configmenu.m
index e7606cd..840cded 100644 (file)
--- a/nls/sv_SE/Configmenu.m
+++ b/nls/sv_SE/Configmenu.m
@@ -16,12 +16,16 @@ $ #FocusNew
 # Fokus på nya fönster
 $ #FocusLast
 # Fokusera fönster vid skrivbordsbyte
+$ #DisableBindings
+# G?r s? att bindningar inte fungerar med Scroll Lock
 $ #ClickToFocus
 # Klicka för fokus
 $ #SloppyFocus
 # Hafsig fokus
 $ #AutoRaise
 # Höj automatiskt
+$ #ClickRaise
+# Klicka f?r att h?ja
 $ #SmartRows
 # Smart placering (Rader)
 $ #SmartCols