small optimization heh for screen_set_desktop - set the root proerty less initialize screen_last_desktop properly
Dana Jansens danakj@orodu.net
1 files changed,
4 insertions(+),
2 deletions(-)
jump to
M
openbox/screen.c
→
openbox/screen.c
@@ -368,6 +368,7 @@ screen_set_num_desktops(session_num_desktops);
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 @@ screen_num_desktops), FALSE);
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,12 +508,12 @@ guint old;
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;