diff options
Diffstat (limited to 'util')
-rw-r--r-- | util/fluxbox-update_configs.cc | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/util/fluxbox-update_configs.cc b/util/fluxbox-update_configs.cc index 069b112..9062b57 100644 --- a/util/fluxbox-update_configs.cc +++ b/util/fluxbox-update_configs.cc | |||
@@ -167,8 +167,8 @@ void update_move_toolbar_wheeling_to_keys_file(FbTk::ResourceManager& rm, | |||
167 | FbTk::BoolResource rc_reverse(rm, false, | 167 | FbTk::BoolResource rc_reverse(rm, false, |
168 | "screen0.reversewheeling", | 168 | "screen0.reversewheeling", |
169 | "Screen0.ReverseWheeling"); | 169 | "Screen0.ReverseWheeling"); |
170 | if (strcasecmp((*rc_wheeling).c_str(), "On") == 0 || | 170 | if (strcasecmp(rc_wheeling->c_str(), "On") == 0 || |
171 | (strcasecmp((*rc_wheeling).c_str(), "Screen") == 0 && *rc_screen)) { | 171 | (strcasecmp(rc_wheeling->c_str(), "Screen") == 0 && *rc_screen)) { |
172 | keep_changes = true; | 172 | keep_changes = true; |
173 | if (*rc_reverse) { // if you ask me, this should have been default | 173 | if (*rc_reverse) { // if you ask me, this should have been default |
174 | new_keyfile += "OnToolbar Mouse4 :PrevWorkspace\n"; | 174 | new_keyfile += "OnToolbar Mouse4 :PrevWorkspace\n"; |
@@ -202,13 +202,13 @@ void update_move_modkey_to_keys_file(FbTk::ResourceManager& rm, | |||
202 | "modKey", | 202 | "modKey", |
203 | "ModKey"); | 203 | "ModKey"); |
204 | 204 | ||
205 | new_keyfile += "OnWindow " + *rc_modkey + | 205 | new_keyfile += "OnWindow " + rc_modkey.get() + |
206 | " Mouse1 :MacroCmd {Raise} {Focus} {StartMoving}\n"; | 206 | " Mouse1 :MacroCmd {Raise} {Focus} {StartMoving}\n"; |
207 | new_keyfile += "OnWindow " + *rc_modkey + | 207 | new_keyfile += "OnWindow " + rc_modkey.get() + |
208 | " Mouse3 :MacroCmd {Raise} {Focus} {StartResizing "; | 208 | " Mouse3 :MacroCmd {Raise} {Focus} {StartResizing "; |
209 | if (strcasecmp((*rc_mode).c_str(), "Quadrant") == 0) { | 209 | if (strcasecmp(rc_mode->c_str(), "Quadrant") == 0) { |
210 | new_keyfile += "NearestCorner}\n"; | 210 | new_keyfile += "NearestCorner}\n"; |
211 | } else if (strcasecmp((*rc_mode).c_str(), "Center") == 0) { | 211 | } else if (strcasecmp(rc_mode->c_str(), "Center") == 0) { |
212 | new_keyfile += "Center}\n"; | 212 | new_keyfile += "Center}\n"; |
213 | } else { | 213 | } else { |
214 | new_keyfile += "BottomRight}\n"; | 214 | new_keyfile += "BottomRight}\n"; |
@@ -262,7 +262,7 @@ void update_move_titlebar_actions_to_keys_file(FbTk::ResourceManager& rm, | |||
262 | 262 | ||
263 | FbTk::BoolResource rc_reverse(rm, false,"screen0.reversewheeling", "Screen0.ReverseWheeling"); | 263 | FbTk::BoolResource rc_reverse(rm, false,"screen0.reversewheeling", "Screen0.ReverseWheeling"); |
264 | FbTk::StringResource scroll_action(rm, "", "screen0.windowScrollAction", "Screen0.WindowScrollAction"); | 264 | FbTk::StringResource scroll_action(rm, "", "screen0.windowScrollAction", "Screen0.WindowScrollAction"); |
265 | if (strcasecmp((*scroll_action).c_str(), "shade") == 0) { | 265 | if (strcasecmp(scroll_action->c_str(), "shade") == 0) { |
266 | if (*rc_reverse) { | 266 | if (*rc_reverse) { |
267 | new_keyfile += "OnTitlebar Mouse5 :ShadeOn\n"; | 267 | new_keyfile += "OnTitlebar Mouse5 :ShadeOn\n"; |
268 | new_keyfile += "OnTitlebar Mouse4 :ShadeOff\n"; | 268 | new_keyfile += "OnTitlebar Mouse4 :ShadeOff\n"; |
@@ -270,7 +270,7 @@ void update_move_titlebar_actions_to_keys_file(FbTk::ResourceManager& rm, | |||
270 | new_keyfile += "OnTitlebar Mouse4 :ShadeOn\n"; | 270 | new_keyfile += "OnTitlebar Mouse4 :ShadeOn\n"; |
271 | new_keyfile += "OnTitlebar Mouse5 :ShadeOff\n"; | 271 | new_keyfile += "OnTitlebar Mouse5 :ShadeOff\n"; |
272 | } | 272 | } |
273 | } else if (strcasecmp((*scroll_action).c_str(), "nexttab") == 0) { | 273 | } else if (strcasecmp(scroll_action->c_str(), "nexttab") == 0) { |
274 | if (*rc_reverse) { | 274 | if (*rc_reverse) { |
275 | new_keyfile += "OnTitlebar Mouse5 :PrevTab\n"; | 275 | new_keyfile += "OnTitlebar Mouse5 :PrevTab\n"; |
276 | new_keyfile += "OnTitlebar Mouse4 :NextTab\n"; | 276 | new_keyfile += "OnTitlebar Mouse4 :NextTab\n"; |
@@ -329,14 +329,14 @@ void update_change_format_of_split_placement_menu(FbTk::ResourceManager& rm, | |||
329 | "screen0.slit.direction", | 329 | "screen0.slit.direction", |
330 | "Screen0.Slit.Direction"); | 330 | "Screen0.Slit.Direction"); |
331 | 331 | ||
332 | if (strcasecmp((**direction).c_str(), "vertical") == 0) { | 332 | if (strcasecmp((*direction)->c_str(), "vertical") == 0) { |
333 | if (strcasecmp((**placement).c_str(), "BottomRight") == 0) | 333 | if (strcasecmp((*placement)->c_str(), "BottomRight") == 0) |
334 | *placement = "RightBottom"; | 334 | *placement = "RightBottom"; |
335 | else if (strcasecmp((**placement).c_str(), "BottomLeft") == 0) | 335 | else if (strcasecmp((*placement)->c_str(), "BottomLeft") == 0) |
336 | *placement = "LeftBottom"; | 336 | *placement = "LeftBottom"; |
337 | else if (strcasecmp((**placement).c_str(), "TopRight") == 0) | 337 | else if (strcasecmp((*placement)->c_str(), "TopRight") == 0) |
338 | *placement = "RightTop"; | 338 | *placement = "RightTop"; |
339 | else if (strcasecmp((**placement).c_str(), "TopLeft") == 0) | 339 | else if (strcasecmp((*placement)->c_str(), "TopLeft") == 0) |
340 | *placement = "LeftTop"; | 340 | *placement = "LeftTop"; |
341 | } | 341 | } |
342 | } | 342 | } |