all repos — fluxbox @ aaa72eada26a8e63ea685d940332bf2fd4795df8

custom fork of the fluxbox windowmanager

minor fixes
fluxgen fluxgen
commit

aaa72eada26a8e63ea685d940332bf2fd4795df8

parent

9b494abdcee52dbfe9c05b9be0353b9d3e27766d

1 files changed, 6 insertions(+), 7 deletions(-)

jump to
M src/Screen.ccsrc/Screen.cc

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: Screen.cc,v 1.279 2004/06/07 11:46:04 rathnor Exp $ +// $Id: Screen.cc,v 1.280 2004/06/07 21:22:42 fluxgen Exp $ #include "Screen.hh"

@@ -356,10 +356,6 @@

m_current_workspace = m_workspaces_list.front(); -#ifdef SLIT - m_slit.reset(new Slit(*this, *layerManager().getLayer(Fluxbox::instance()->getDesktopLayer()), - Fluxbox::instance()->getSlitlistFilename().c_str())); -#endif // SLIT //!! TODO: we shouldn't do this more than once, but since slit handles their // own resources we must do this.

@@ -389,6 +385,11 @@ *resource.gc_line_style,

*resource.gc_cap_style, *resource.gc_join_style); +#ifdef SLIT + m_slit.reset(new Slit(*this, *layerManager().getLayer(Fluxbox::instance()->getDesktopLayer()), + Fluxbox::instance()->getSlitlistFilename().c_str())); +#endif // SLIT + rm.unlock(); XFlush(disp);

@@ -750,7 +751,6 @@ WinClient *cyc = 0;

if (cycling_window != focused_list.end()) cyc = *cycling_window; - WinClient *focused = Fluxbox::instance()->getFocusedWindow(); focused_list.remove(&client); if (cyc == &client) { cycling_window = focused_list.end();

@@ -1793,7 +1793,6 @@ *resource.antialias, save_and_reconfigure);

#undef _BOOLITEM - //!! TODO: antialias FbTk::MenuItem *menu_alpha_item = new IntResMenuItem("Menu Alpha", resource.menu_alpha, 0, 255); menu_alpha_item->setCommand(saverc_cmd);