From 97794d0fd3d281d3f5d119c082001b9e7f5b3e27 Mon Sep 17 00:00:00 2001
From: unknown <unknown>
Date: Sun, 21 Apr 2002 04:18:47 +0000
Subject: [PATCH] This commit was manufactured by cvs2svn to create tag
 'openbox-0_99_1'.

---
 ChangeLog               |  9 ++++++++-
 autom4te.cache/requests | 10 +++++-----
 configure.in            |  2 +-
 data/Makefile.am        |  4 ++++
 data/Makefile.in        |  3 +++
 data/styles/Makefile.am |  2 ++
 data/styles/Makefile.in |  2 ++
 src/BaseDisplay.cc      |  3 +++
 src/Window.cc           |  5 +++--
 9 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 338776d9..dded95bd 100644
--- 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 b14da9fd..3452fdff 100644
--- 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 65699008..20c778fc 100644
--- 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 3fdf19d2..745d8e53 100644
--- 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 a7e35d44..a21707f9 100644
--- 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 38053588..a55ef4ba 100644
--- 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 6df1f4b0..f75b9cbe 100644
--- 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 258e3eab..0474fd1e 100644
--- 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 4133ac00..3f51ed3e 100644
--- 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) {
-- 
2.34.1