diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/fluxbox.cc | 11 |
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) { | |||
159 | template<> | 159 | template<> |
160 | void FbTk::Resource<bool>:: | 160 | void FbTk::Resource<bool>:: |
161 | setFromString(char const *strval) { | 161 | setFromString(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 | |||
170 | template<> | 165 | template<> |
171 | void FbTk::Resource<Fluxbox::TitlebarList>:: | 166 | void FbTk::Resource<Fluxbox::TitlebarList>:: |
172 | setFromString(char const *strval) { | 167 | setFromString(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); |