This commit was manufactured by cvs2svn to create tag

'openbox-0_99_1'.

diff --git a/ChangeLog b/ChangeLog
index 338776d9e92150ee564144208a8705dd51c92841..dded95bd3cb366e989a9ed3d56e51205f549ca04 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
 Changelog for Openbox:
 
-0.99.0:
+0.99.1:
+ * forced a redraw of the close button after pressing
+   it. Some applications (eg. acroread) ignore the
+   close request and you end up with a funky close
+   button.                                              (Scott Moynes)
+       
+0.99.0
+       
  * renamed header files from *.hh to *.h.               (Ben Jansens)
 
  * fix clipping of the date/time in the toolbar with

diff --git a/autom4te.cache/requests b/autom4te.cache/requests
index b14da9fdcca66a45b74a2581e0acd837af5a4f96..3452fdffa5559dea0db9ffbafe84fb181a4465e2 100644 (file)
--- a/autom4te.cache/requests
+++ b/autom4te.cache/requests
@@ -24,8 +24,8 @@
                         'AC_FUNC_SETVBUF_REVERSED' => 1,
                         'AC_HEADER_SYS_WAIT' => 1,
                         'AC_TYPE_UID_T' => 1,
-                        'AM_CONDITIONAL' => 1,
                         'AC_CHECK_LIB' => 1,
+                        'AM_CONDITIONAL' => 1,
                         'AC_PROG_LN_S' => 1,
                         'AC_FUNC_MEMCMP' => 1,
                         'AC_FUNC_FORK' => 1,
@@ -47,8 +47,8 @@
                         'AC_TYPE_MODE_T' => 1,
                         'AC_CHECK_TYPES' => 1,
                         'AC_PROG_YACC' => 1,
-                        'AC_TYPE_PID_T' => 1,
                         'AC_FUNC_STRERROR_R' => 1,
+                        'AC_TYPE_PID_T' => 1,
                         'AC_STRUCT_ST_BLOCKS' => 1,
                         'AC_PROG_GCC_TRADITIONAL' => 1,
                         'AC_TYPE_SIGNAL' => 1,
@@ -83,11 +83,11 @@
                         'AC_FUNC_MALLOC' => 1,
                         'AC_FUNC_ERROR_AT_LINE' => 1,
                         'AC_FUNC_FSEEKO' => 1,
-                        'AC_FUNC_MMAP' => 1,
                         'AC_STRUCT_TM' => 1,
+                        'AC_FUNC_MMAP' => 1,
                         'AC_SUBST' => 1,
-                        'AC_PROG_CC' => 1,
-                        'AC_PROG_LIBTOOL' => 1
+                        'AC_PROG_LIBTOOL' => 1,
+                        'AC_PROG_CC' => 1
                       }
                     ], 'Request' )
            );

diff --git a/configure.in b/configure.in
index 65699008971b7b97fffbc3b6f427eb9c0166b8c7..20c778fc903a0b6ed08e4ce7f73ae3a5f89d5ef0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl configure.in for Openbox
 dnl Initialize autoconf and automake
 AC_INIT(src/openbox.cc)
-AM_INIT_AUTOMAKE(openbox,0.99.0,no-define)
+AM_INIT_AUTOMAKE(openbox,0.99.1,no-define)
 
 dnl Determine default prefix
 test x$prefix = "xNONE" && prefix="$ac_default_prefix"

diff --git a/data/Makefile.am b/data/Makefile.am
index 3fdf19d2a74b6d311cffeb36ff22d4933de3d84a..745d8e53566668e0116793762acc79f686d7d12a 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -15,3 +15,7 @@ menu: menu.in
 install-data-local: menu
        test -f $(DESTDIR)$(pkgdatadir)/menu || \
        $(INSTALL_DATA) menu $(DESTDIR)$(pkgdatadir)
+
+uninstall-am:
+       rm -f $(DESTDIR)$(pkgdatadir)/menu
+

diff --git a/data/Makefile.in b/data/Makefile.in
index a7e35d4423f466eed1b35a89fe45be9d6c320f10..a21707f96df57623e4a8733b6ac931aa1de4164f 100644 (file)
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -303,6 +303,9 @@ install-data-local: menu
        test -f $(DESTDIR)$(pkgdatadir)/menu || \
        $(INSTALL_DATA) menu $(DESTDIR)$(pkgdatadir)
 
+uninstall-am:
+       rm -f $(DESTDIR)$(pkgdatadir)/menu
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

diff --git a/data/styles/Makefile.am b/data/styles/Makefile.am
index 380535889465fc8f94456e016527ef25deb5ebd3..a55ef4ba81543abcd75a28bec70ae9c1a0ae55e9 100644 (file)
--- a/data/styles/Makefile.am
+++ b/data/styles/Makefile.am
@@ -6,3 +6,5 @@ style_DATA = artwiz bluebox cthulhain flux nyz nyzclone operation outcomes shade
 
 distclean-local:
        rm -f *\~
+uninstall-am:
+       rmdir $(styledir)

diff --git a/data/styles/Makefile.in b/data/styles/Makefile.in
index 6df1f4b028317692756df22a79596fffe62d0822..f75b9cbe099b0725ccef5d687f8dbe2a01324de9 100644 (file)
--- a/data/styles/Makefile.in
+++ b/data/styles/Makefile.in
@@ -209,6 +209,8 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 distclean-local:
        rm -f *\~
+uninstall-am:
+       rmdir $(styledir)
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

diff --git a/src/BaseDisplay.cc b/src/BaseDisplay.cc
index 258e3eab2573d9669d7cfeb38074e428e802b4de..0474fd1eeb5caa594adadbe0fd427f1ae3811745 100644 (file)
--- a/src/BaseDisplay.cc
+++ b/src/BaseDisplay.cc
@@ -379,6 +379,9 @@ BaseDisplay::BaseDisplay(char *app_name, char *dpy_name) {
   MaskListLength = sizeof(MaskList) / sizeof(MaskList[0]);
   
   if (modmap) XFreeModifiermap(const_cast<XModifierKeymap*>(modmap));
+#else
+  NumLockMask = Mod2Mask;
+  ScrollLockMask = Mod5Mask;
 #endif // NOCLOBBER
 }
 

diff --git a/src/Window.cc b/src/Window.cc
index 4133ac0080b737e22f9879cc7624f2ff4d8993d9..3f51ed3ea35c3188d6acd36f2e3d361998db2e98 100644 (file)
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -2688,9 +2688,10 @@ void OpenboxWindow::buttonReleaseEvent(XButtonEvent *re) {
           (re->x >= 0) && ((unsigned) re->x <= frame.button_w) &&
           (re->y >= 0) && ((unsigned) re->y <= frame.button_h)) {
           close();
-      } else {
-        redrawCloseButton(False);
       }
+      //we should always redraw the close button. some applications
+      //eg. acroread don't honour the close.
+      redrawCloseButton(False);
     }
   // middle button released
   } else if (re->button == 2) {