From b7fa41a30b2e3271c4489a780c24ea82597ea18d Mon Sep 17 00:00:00 2001 From: Scott Moynes Date: Sat, 13 Apr 2002 21:26:00 +0000 Subject: [PATCH] Fixed a bug in the bsetroot build that caused really strange behaviour --- src/BaseDisplay.cc | 3 +++ util/Makefile.am | 2 +- util/Makefile.in | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) 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(modmap)); +#else + NumLockMask = Mod2Mask; + ScrollLockMask = Mod5Mask; #endif // NOCLOBBER } diff --git a/util/Makefile.am b/util/Makefile.am index 3c75a4c4..50a0aebf 100644 --- a/util/Makefile.am +++ b/util/Makefile.am @@ -1,7 +1,7 @@ # util/Makefile.am for Openbox CPPFLAGS= @CPPFLAGS@ @DEBUG@ @NLS@ @TIMEDCACHE@ @NEWWMSPEC@ @INTERLACE@ \ -@ORDEREDPSEUDO@ +@ORDEREDPSEUDO@ @CLOBBER@ bin_SCRIPTS = bsetbg bin_PROGRAMS = bsetroot diff --git a/util/Makefile.in b/util/Makefile.in index aefa5e99..27dc6bd8 100644 --- a/util/Makefile.in +++ b/util/Makefile.in @@ -77,7 +77,7 @@ VERSION = @VERSION@ gencat_cmd = @gencat_cmd@ regex_cmd = @regex_cmd@ -CPPFLAGS = @CPPFLAGS@ @DEBUG@ @NLS@ @TIMEDCACHE@ @NEWWMSPEC@ @INTERLACE@ @ORDEREDPSEUDO@ +CPPFLAGS = @CPPFLAGS@ @DEBUG@ @NLS@ @TIMEDCACHE@ @NEWWMSPEC@ @INTERLACE@ @ORDEREDPSEUDO@ @CLOBBER@ bin_SCRIPTS = bsetbg -- 2.45.2