From 1f71a0db724902df37f349738379e93c8b8ca34c Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Fri, 25 May 2007 15:49:16 +0000 Subject: [PATCH] small optimization heh for screen_set_desktop - set the root proerty less initialize screen_last_desktop properly --- openbox/screen.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/openbox/screen.c b/openbox/screen.c index 381753ae..6a64c025 100644 --- a/openbox/screen.c +++ b/openbox/screen.c @@ -368,6 +368,7 @@ void screen_startup(gboolean reconfig) else screen_set_num_desktops(config_desktops_num); + screen_desktop = screen_num_desktops; /* something invalid */ /* start on the current desktop when a wm was already running */ if (PROP_GET32(RootWindow(ob_display, ob_screen), net_current_desktop, cardinal, &d) && @@ -380,6 +381,7 @@ void screen_startup(gboolean reconfig) else screen_set_desktop(MIN(config_screen_firstdesk, screen_num_desktops) - 1, FALSE); + screen_last_desktop = screen_desktop; /* don't start in showing-desktop mode */ screen_showing_desktop = FALSE; @@ -506,13 +508,13 @@ void screen_set_desktop(guint num, gboolean dofocus) g_assert(num < screen_num_desktops); + if (old == num) return; + old = screen_desktop; screen_desktop = num; PROP_SET32(RootWindow(ob_display, ob_screen), net_current_desktop, cardinal, num); - if (old == num) return; - screen_last_desktop = old; ob_debug("Moving to desktop %d\n", num+1); -- 2.45.2