nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Some fixes for the pager popups, and avoid a crash if you destroy a popup while it is going to be shown later by a delay."

Browse source 
This reverts commit 33328583a1.
This commit is contained in:
Dana Jansens 2009-12-09 17:03:27 -05:00
parent aa329719b9
commit d3976a51fb
2 changed files with 15 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
openbox/popup.c
View file

@ -65,8 +65,6 @@ ObPopup *popup_new(void)
void popup_free(ObPopup *self) void popup_free(ObPopup *self)
{ {
if (self) { if (self) {
popup_hide(self); /* make sure it's not showing or is being delayed and
will be shown */
XDestroyWindow(ob_display, self->bg); XDestroyWindow(ob_display, self->bg);
XDestroyWindow(ob_display, self->text); XDestroyWindow(ob_display, self->text);
RrAppearanceFree(self->a_bg); RrAppearanceFree(self->a_bg);

40
openbox/screen.c
View file

@ -57,7 +57,7 @@ static void screen_tell_ksplash(void);
static void screen_fallback_focus(void); static void screen_fallback_focus(void);
guint screen_num_desktops; guint screen_num_desktops;
guint screen_num_monitors = 0; guint screen_num_monitors;
guint screen_desktop; guint screen_desktop;
guint screen_last_desktop; guint screen_last_desktop;
gboolean screen_showing_desktop; gboolean screen_showing_desktop;
@ -77,7 +77,7 @@ static GSList *struts_left = NULL;
static GSList *struts_right = NULL; static GSList *struts_right = NULL;
static GSList *struts_bottom = NULL; static GSList *struts_bottom = NULL;
static ObPagerPopup **desktop_popup = NULL; static ObPagerPopup **desktop_popup;
/*! The number of microseconds that you need to be on a desktop before it will /*! The number of microseconds that you need to be on a desktop before it will
replace the remembered "last desktop" */ replace the remembered "last desktop" */
@ -355,19 +355,20 @@ void screen_startup(gboolean reconfig)
if (reconfig) { if (reconfig) {
guint i; guint i;
/* recreate the pager popups to use any new theme stuff. it was
freed in screen_shutdown() already. */
desktop_popup = g_new(ObPagerPopup*, screen_num_monitors); desktop_popup = g_new(ObPagerPopup*, screen_num_monitors);
for (i = 0; i < screen_num_monitors; i++) { for (i = 0; i < screen_num_monitors; i++) {
desktop_popup[i] = pager_popup_new(); desktop_popup[i] = pager_popup_new();
pager_popup_height(desktop_popup[i], POPUP_HEIGHT); pager_popup_height(desktop_popup[i], POPUP_HEIGHT);
/* update the pager popup's width */
pager_popup_text_width_to_strings(desktop_popup[i], pager_popup_text_width_to_strings(desktop_popup[i],
screen_desktop_names, screen_desktop_names,
screen_num_desktops); screen_num_desktops);
} }
return; return;
} else {
desktop_popup = NULL;
} }
/* get the initial size */ /* get the initial size */
@ -459,10 +460,10 @@ void screen_shutdown(gboolean reconfig)
{ {
guint i; guint i;
for (i = 0; i < screen_num_monitors; i++) for (i = 0; i < screen_num_monitors; i++) {
pager_popup_free(desktop_popup[i]); pager_popup_free(desktop_popup[i]);
}
g_free(desktop_popup); g_free(desktop_popup);
desktop_popup = NULL;
if (reconfig) if (reconfig)
return; return;
@ -509,7 +510,6 @@ void screen_resize(void)
screen_update_areas(); screen_update_areas();
dock_configure(); dock_configure();
/* make sure all windows are visible */
for (it = client_list; it; it = g_list_next(it)) for (it = client_list; it; it = g_list_next(it))
client_move_onscreen(it->data, FALSE); client_move_onscreen(it->data, FALSE);
} }
@ -1349,32 +1349,22 @@ typedef struct {
void screen_update_areas(void) void screen_update_areas(void)
{ {
guint i, j, onum; guint i, j;
gulong *dims; gulong *dims;
GList *it; GList *it;
GSList *sit; GSList *sit;
onum = screen_num_monitors;
g_free(monitor_area); g_free(monitor_area);
extensions_xinerama_screens(&monitor_area, &screen_num_monitors); extensions_xinerama_screens(&monitor_area, &screen_num_monitors);
if (screen_num_monitors < onum) { if (!desktop_popup) {
/* free some of the pager popups */ desktop_popup = g_new(ObPagerPopup*, screen_num_monitors);
for (i = screen_num_monitors; i < onum; ++i) for (i = 0; i < screen_num_monitors; i++) {
pager_popup_free(desktop_popup[i]);
desktop_popup = g_renew(ObPagerPopup*, desktop_popup,
screen_num_monitors);
}
else {
/* add some more pager popups */
desktop_popup = g_renew(ObPagerPopup*, desktop_popup,
screen_num_monitors);
for (i = onum; i < screen_num_monitors; ++i) {
desktop_popup[i] = pager_popup_new(); desktop_popup[i] = pager_popup_new();
pager_popup_height(desktop_popup[i], POPUP_HEIGHT); pager_popup_height(desktop_popup[i], POPUP_HEIGHT);
if (screen_desktop_names) /* the areas are initialized before the
desktop names */ if (screen_desktop_names)
/* update the pager popup's width */
pager_popup_text_width_to_strings(desktop_popup[i], pager_popup_text_width_to_strings(desktop_popup[i],
screen_desktop_names, screen_desktop_names,
screen_num_desktops); screen_num_desktops);