nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

resource bool fix and setting input focus on menus when we bring them up with the mouse

Browse source
This commit is contained in:
fluxgen 2004-07-15 18:23:03 +00:00
parent 38bd7f47d9
commit 601ae51604
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/fluxbox.cc
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: fluxbox.cc,v 1.247 2004/07/15 13:42:50 fluxgen Exp $ // $Id: fluxbox.cc,v 1.248 2004/07/15 18:23:03 fluxgen Exp $
#include "fluxbox.hh" #include "fluxbox.hh"
@ -159,14 +159,9 @@ setFromString(const char *strval) {
template<> template<>
void FbTk::Resource<bool>:: void FbTk::Resource<bool>::
setFromString(char const *strval) { setFromString(char const *strval) {
if (strcasecmp(strval, "true")==0) *this = (bool)!strcasecmp(strval, "true");
*this = true;
else
*this = false;
} }
template<> template<>
void FbTk::Resource<Fluxbox::TitlebarList>:: void FbTk::Resource<Fluxbox::TitlebarList>::
setFromString(char const *strval) { setFromString(char const *strval) {
@ -1117,6 +1112,7 @@ void Fluxbox::handleButtonEvent(XButtonEvent &be) {
if (! screen->getWorkspacemenu().isVisible()) { if (! screen->getWorkspacemenu().isVisible()) {
screen->getWorkspacemenu().removeParent(); screen->getWorkspacemenu().removeParent();
screen->getWorkspacemenu().show(); screen->getWorkspacemenu().show();
screen->getWorkspacemenu().grabInputFocus();
} }
} else if (be.button == 3) { } else if (be.button == 3) {
//calculate placement of root menu //calculate placement of root menu
@ -1147,6 +1143,7 @@ void Fluxbox::handleButtonEvent(XButtonEvent &be) {
if (! screen->getRootmenu().isVisible()) { if (! screen->getRootmenu().isVisible()) {
checkMenu(); checkMenu();
screen->getRootmenu().show(); screen->getRootmenu().show();
screen->getRootmenu().grabInputFocus();
} }
} else if (screen->isDesktopWheeling() && be.button == 4) { } else if (screen->isDesktopWheeling() && be.button == 4) {
screen->nextWorkspace(1); screen->nextWorkspace(1);