Mabox/tint2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed segfault with multi-monitor

Browse Source 
git-svn-id: http://tint2.googlecode.com/svn/trunk@223 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
lorthiois@bbsoft.fr
2009-10-22 17:55:23 +00:00
parent 7f05ebe6ac
commit c3b63e8c45
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/panel.c
View File

@@ -74,6 +74,10 @@ void init_panel()
cleanup_taskbar(); cleanup_taskbar();
for (i=0 ; i < nb_panel ; i++) { for (i=0 ; i < nb_panel ; i++) {
free_area(&panel1[i].area); free_area(&panel1[i].area);
if (panel1[i].temp_pmap) {
XFreePixmap(server.dsp, panel1[i].temp_pmap);
panel1[i].temp_pmap = 0;
}
} }
// alloc panels (one monitor or all monitors) // alloc panels (one monitor or all monitors)
@@ -82,26 +86,29 @@ void init_panel()
nb_panel = 1; nb_panel = 1;
else else
nb_panel = server.nb_monitor; nb_panel = server.nb_monitor;
fprintf(stderr, "tint2 : nb monitor %d, nb desktop %d\n", nb_panel, server.nb_desktop);
/* if (nb_panel < old_nb_panel) { if (nb_panel < old_nb_panel) {
// freed old panels // freed old panels
for (i=nb_panel ; i < old_nb_panel ; i++) { for (i=nb_panel ; i < old_nb_panel ; i++) {
if (panel1[i].main_win)
XDestroyWindow(server.dsp, panel1[i].main_win);
} }
}*/
if (nb_panel != old_nb_panel)
new_panel = realloc(panel1, nb_panel * sizeof(Panel)); new_panel = realloc(panel1, nb_panel * sizeof(Panel));
}
else if (nb_panel > old_nb_panel) {
new_panel = realloc(panel1, nb_panel * sizeof(Panel));
// init new panel
for (i=old_nb_panel ; i < nb_panel ; i++) {
memcpy(&new_panel[i], &panel_config, sizeof(Panel));
}
}
else else
new_panel = panel1; new_panel = panel1;
fprintf(stderr, "tint2 : nb monitor %d, nb desktop %d\n", nb_panel, server.nb_desktop);
for (i=0 ; i < nb_panel ; i++) { for (i=0 ; i < nb_panel ; i++) {
p = &new_panel[i]; p = &new_panel[i];
if (i >= old_nb_panel) {
// new panel
memcpy(p, &panel_config, sizeof(Panel));
}
p->monitor = i; p->monitor = i;
p->area.parent = p; p->area.parent = p;
p->area.panel = p; p->area.panel = p;
@@ -138,7 +145,7 @@ void init_panel()
if (i >= old_nb_panel) { if (i >= old_nb_panel) {
// new panel // new panel
printf("new panel %d, %d, %d, %d\n", p->posx, p->posy, p->area.width, p->area.height); printf("new panel %d : %d, %d, %d, %d\n", i, p->posx, p->posy, p->area.width, p->area.height);
// Catch some events // Catch some events
long event_mask = ExposureMask|ButtonPressMask|ButtonReleaseMask; long event_mask = ExposureMask|ButtonPressMask|ButtonReleaseMask;
@@ -154,7 +161,7 @@ void init_panel()
} }
else { else {
// old panel // old panel
printf("old panel %d, %d, %d, %d\n", p->posx, p->posy, p->area.width, p->area.height); printf("old panel %d : %d, %d, %d, %d\n", i, p->posx, p->posy, p->area.width, p->area.height);
XMoveResizeWindow(server.dsp, p->main_win, p->posx, p->posy, p->area.width, p->area.height); XMoveResizeWindow(server.dsp, p->main_win, p->posx, p->posy, p->area.width, p->area.height);
set_panel_background(p); set_panel_background(p);
} }
@@ -162,6 +169,7 @@ void init_panel()
panel1 = new_panel; panel1 = new_panel;
panel_refresh = 1; panel_refresh = 1;
refresh_systray = 1;
init_taskbar(); init_taskbar();
visible_object(); visible_object();
task_refresh_tasklist(); task_refresh_tasklist();