aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2004-07-15 18:23:03 (GMT)
committerfluxgen <fluxgen>2004-07-15 18:23:03 (GMT)
commit601ae51604441e9b2d6ffea72f9336cc02934a99 (patch)
tree499a95d0d60918e174bac374b9109f5802c719d2
parent38bd7f47d929fab76b55ea4e6a479eda981d3603 (diff)
downloadfluxbox-601ae51604441e9b2d6ffea72f9336cc02934a99.zip
fluxbox-601ae51604441e9b2d6ffea72f9336cc02934a99.tar.bz2
resource bool fix and setting input focus on menus when we bring them up with the mouse
-rw-r--r--src/fluxbox.cc11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 377c78a..291e62e 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: fluxbox.cc,v 1.247 2004/07/15 13:42:50 fluxgen Exp $ 25// $Id: fluxbox.cc,v 1.248 2004/07/15 18:23:03 fluxgen Exp $
26 26
27#include "fluxbox.hh" 27#include "fluxbox.hh"
28 28
@@ -159,14 +159,9 @@ setFromString(const char *strval) {
159template<> 159template<>
160void FbTk::Resource<bool>:: 160void FbTk::Resource<bool>::
161setFromString(char const *strval) { 161setFromString(char const *strval) {
162 if (strcasecmp(strval, "true")==0) 162 *this = (bool)!strcasecmp(strval, "true");
163 *this = true;
164 else
165 *this = false;
166} 163}
167 164
168
169
170template<> 165template<>
171void FbTk::Resource<Fluxbox::TitlebarList>:: 166void FbTk::Resource<Fluxbox::TitlebarList>::
172setFromString(char const *strval) { 167setFromString(char const *strval) {
@@ -1117,6 +1112,7 @@ void Fluxbox::handleButtonEvent(XButtonEvent &be) {
1117 if (! screen->getWorkspacemenu().isVisible()) { 1112 if (! screen->getWorkspacemenu().isVisible()) {
1118 screen->getWorkspacemenu().removeParent(); 1113 screen->getWorkspacemenu().removeParent();
1119 screen->getWorkspacemenu().show(); 1114 screen->getWorkspacemenu().show();
1115 screen->getWorkspacemenu().grabInputFocus();
1120 } 1116 }
1121 } else if (be.button == 3) { 1117 } else if (be.button == 3) {
1122 //calculate placement of root menu 1118 //calculate placement of root menu
@@ -1147,6 +1143,7 @@ void Fluxbox::handleButtonEvent(XButtonEvent &be) {
1147 if (! screen->getRootmenu().isVisible()) { 1143 if (! screen->getRootmenu().isVisible()) {
1148 checkMenu(); 1144 checkMenu();
1149 screen->getRootmenu().show(); 1145 screen->getRootmenu().show();
1146 screen->getRootmenu().grabInputFocus();
1150 } 1147 }
1151 } else if (screen->isDesktopWheeling() && be.button == 4) { 1148 } else if (screen->isDesktopWheeling() && be.button == 4) {
1152 screen->nextWorkspace(1); 1149 screen->nextWorkspace(1);