/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
screen.c for the Openbox window manager
+ Copyright (c) 2006 Mikael Magnusson
Copyright (c) 2003 Ben Jansens
This program is free software; you can redistribute it and/or modify
XSetWindowAttributes attrib;
pid_t pid;
gint i, num_support;
- guint32 *supported;
+ gulong *supported;
/* create the netwm support window */
attrib.override_redirect = TRUE;
ob_screen);
XDestroyWindow(ob_display, screen_support_win);
- return FALSE;
+ return FALSE;
}
/* set the _NET_SUPPORTED_ATOMS hint */
num_support = 51;
i = 0;
- supported = g_new(guint32, num_support);
+ supported = g_new(gulong, num_support);
supported[i++] = prop_atoms.net_current_desktop;
supported[i++] = prop_atoms.net_number_of_desktops;
supported[i++] = prop_atoms.net_desktop_geometry;
screen_num_desktops = 0;
screen_set_num_desktops(config_desktops_num);
if (!reconfig) {
- screen_set_desktop(0);
+ screen_set_desktop(MIN(config_screen_firstdesk, screen_num_desktops)
+ - 1);
/* don't start in showing-desktop mode */
screen_showing_desktop = FALSE;
static gint oldw = 0, oldh = 0;
gint w, h;
GList *it;
- guint32 geometry[2];
+ gulong geometry[2];
w = WidthOfScreen(ScreenOfDisplay(ob_display, ob_screen));
h = HeightOfScreen(ScreenOfDisplay(ob_display, ob_screen));
net_desktop_geometry, cardinal, geometry, 2);
if (ob_state() == OB_STATE_STARTING)
- return;
+ return;
screen_update_areas();
dock_configure();
void screen_set_num_desktops(guint num)
{
guint i, old;
- guint32 *viewport;
+ gulong *viewport;
GList *it;
g_assert(num > 0);
net_number_of_desktops, cardinal, num);
/* set the viewport hint */
- viewport = g_new0(guint32, num * 2);
+ viewport = g_new0(gulong, num * 2);
PROP_SETA32(RootWindow(ob_display, ob_screen),
net_desktop_viewport, cardinal, viewport, num * 2);
g_free(viewport);
/* change our desktop if we're on one that no longer exists! */
if (screen_desktop >= screen_num_desktops)
- screen_set_desktop(num - 1);
+ screen_set_desktop(num - 1);
/* update the focus lists */
/* free our lists for the desktops which have disappeared */
screen_num_desktops + 1);
screen_desktop_names[screen_num_desktops] = NULL;
for (; i < screen_num_desktops; ++i)
- screen_desktop_names[i] = g_strdup("Unnamed Desktop");
+ screen_desktop_names[i] = g_strdup_printf("Desktop %i", i + 1);
}
}
void screen_update_areas()
{
guint i, x;
- guint32 *dims;
+ gulong *dims;
GList *it;
gint o;
area[i] = g_new0(Rect, screen_num_monitors + 1);
area[i] = NULL;
- dims = g_new(guint32, 4 * screen_num_desktops);
+ dims = g_new(gulong, 4 * screen_num_desktops);
for (i = 0; i < screen_num_desktops + 1; ++i) {
Strut *struts;
if (head > screen_num_monitors)
return NULL;
if (desktop >= screen_num_desktops) {
- if (desktop == DESKTOP_ALL)
- return &area[screen_num_desktops][head];
- return NULL;
+ if (desktop == DESKTOP_ALL)
+ return &area[screen_num_desktops][head];
+ return NULL;
}
return &area[desktop][head];
}