aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkt <markt>2007-02-18 17:47:38 (GMT)
committermarkt <markt>2007-02-18 17:47:38 (GMT)
commitca710b371b500d29c6849e568c43f746a787bc5f (patch)
tree29b62e214b546c3e16f8991d1495deef23e3e9b1
parent9212e1d7c81934720d764c03f2d27e41d31edb56 (diff)
downloadfluxbox-ca710b371b500d29c6849e568c43f746a787bc5f.zip
fluxbox-ca710b371b500d29c6849e568c43f746a787bc5f.tar.bz2
little cleanup
-rw-r--r--doc/asciidoc/fluxbox.txt10
-rw-r--r--src/Screen.cc3
-rw-r--r--src/Window.cc1
3 files changed, 3 insertions, 11 deletions
diff --git a/doc/asciidoc/fluxbox.txt b/doc/asciidoc/fluxbox.txt
index c0484ed..437ebab 100644
--- a/doc/asciidoc/fluxbox.txt
+++ b/doc/asciidoc/fluxbox.txt
@@ -970,8 +970,9 @@ session.screen0.imageDither: <boolean>
970 False 970 False
971 971
972session.screen0.opaqueMove: <boolean> 972session.screen0.opaqueMove: <boolean>
973 Sets the visibility level of application windows while being 973 When moving a window, setting this to True will draw the window
974 dragged. Default: <boolean> 974 contents as it moves (this is nasty on slow systems). If False, it
975 will only draw an outline of the window border. Default: False
975 976
976session.screen0.workspaces: <integer> 977session.screen0.workspaces: <integer>
977 Set this to the number of workspaces the users wants. Default: 4 978 Set this to the number of workspaces the users wants. Default: 4
@@ -1022,11 +1023,6 @@ session.ignoreBorder: <boolean>
1022session.numLayers: <integer> 1023session.numLayers: <integer>
1023 This controls how many layers fluxbox should have. Default: 13 1024 This controls how many layers fluxbox should have. Default: 13
1024 1025
1025session.opaqueMove: <boolean>
1026 When moving a window, setting this to True will draw the window
1027 contents as it moves (this is nasty on slow systems). If False, it
1028 will only draw an outline of the window border. Default: False
1029
1030session.tabPadding: <integer> 1026session.tabPadding: <integer>
1031 This specifies the spacing between tabs. Default: 0 1027 This specifies the spacing between tabs. Default: 0
1032 1028
diff --git a/src/Screen.cc b/src/Screen.cc
index 2a4ea9b..b676a8b 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -1764,9 +1764,6 @@ void BScreen::setupConfigmenu(FbTk::Menu &menu) {
1764 "Workspace Warping", 1764 "Workspace Warping",
1765 "Workspace Warping - dragging windows to the edge and onto the next workspace", 1765 "Workspace Warping - dragging windows to the edge and onto the next workspace",
1766 *resource.workspace_warping, saverc_cmd); 1766 *resource.workspace_warping, saverc_cmd);
1767 _BOOLITEM(menu, Configmenu, DesktopWheeling,
1768 "Desktop MouseWheel Switching", "Workspace switching using mouse wheel",
1769 *resource.desktop_wheeling, saverc_cmd);
1770 _BOOLITEM(menu, Configmenu, DecorateTransient, 1767 _BOOLITEM(menu, Configmenu, DecorateTransient,
1771 "Decorate Transient Windows", "Decorate Transient Windows", 1768 "Decorate Transient Windows", "Decorate Transient Windows",
1772 *resource.decorate_transient, saverc_cmd); 1769 *resource.decorate_transient, saverc_cmd);
diff --git a/src/Window.cc b/src/Window.cc
index 0deecd2..36bd271 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -596,7 +596,6 @@ void FluxboxWindow::attachClient(WinClient &client, int x, int y) {
596 // figure out which client to raise at the end 596 // figure out which client to raise at the end
597 if (FocusControl::focusedFbWindow() == old_win) { 597 if (FocusControl::focusedFbWindow() == old_win) {
598 was_focused = true; 598 was_focused = true;
599 focused_win = FocusControl::focusedWindow();
600 } else if (FocusControl::focusedFbWindow() != this) { 599 } else if (FocusControl::focusedFbWindow() != this) {
601 FocusControl::FocusedWindows focus_list = 600 FocusControl::FocusedWindows focus_list =
602 screen().focusControl().focusedOrderList(); 601 screen().focusControl().focusedOrderList();