cleanup code git-svn-id: http://tint2.googlecode.com/svn/trunk@439 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
3 files changed,
17 insertions(+),
46 deletions(-)
M
src/panel.c
→
src/panel.c
@@ -97,8 +97,9 @@ panel_dock = 0; // default not in the dock
panel_layer = BOTTOM_LAYER; // default is bottom layer wm_menu = 0; max_tick_urgent = 7; + backgrounds = g_array_new(0, 0, sizeof(Background)); + memset(&panel_config, 0, sizeof(Panel)); - backgrounds = g_array_new(0, 0, sizeof(Background)); // append full transparency background Background transparent_bg;@@ -130,8 +131,8 @@ }
void init_panel() { - int i, old_nb_panel; - Panel *new_panel, *p; + int i; + Panel *p; if (panel_config.monitor > (server.nb_monitor-1)) { // server.nb_monitor minimum value is 1 (see get_monitors())@@ -146,46 +147,20 @@ #ifdef ENABLE_BATTERY
init_battery(); #endif - cleanup_taskbar(); - for (i=0 ; i < nb_panel ; i++) { - autohide_show(&panel1[i]); - free_area(&panel1[i].area); - if (panel1[i].temp_pmap) { - XFreePixmap(server.dsp, panel1[i].temp_pmap); - panel1[i].temp_pmap = 0; - } - } - - // number of panels - old_nb_panel = nb_panel; + // number of panels (one monitor or 'all' monitors) if (panel_config.monitor >= 0) nb_panel = 1; else nb_panel = server.nb_monitor; - // freed old panels - for (i=nb_panel ; i < old_nb_panel ; i++) { - if (panel1[i].main_win) { - XDestroyWindow(server.dsp, panel1[i].main_win); - panel1[i].main_win = 0; - } - } - - // alloc & init new panel - Window old_win; - if (nb_panel != old_nb_panel) - new_panel = realloc(panel1, nb_panel * sizeof(Panel)); - else - new_panel = panel1; + panel1 = malloc(nb_panel * sizeof(Panel)); for (i=0 ; i < nb_panel ; i++) { - old_win = new_panel[i].main_win; - memcpy(&new_panel[i], &panel_config, sizeof(Panel)); - new_panel[i].main_win = old_win; + memcpy(&panel1[i], &panel_config, sizeof(Panel)); } fprintf(stderr, "tint2 : nb monitor %d, nb monitor used %d, nb desktop %d\n", server.nb_monitor, nb_panel, server.nb_desktop); for (i=0 ; i < nb_panel ; i++) { - p = &new_panel[i]; + p = &panel1[i]; if (panel_config.monitor < 0) p->monitor = i;@@ -216,16 +191,10 @@ p->area.list = g_slist_append(p->area.list, &systray);
refresh_systray = 1; } - if (i >= old_nb_panel) { - // new panel : catch some events - XSetWindowAttributes att = { .colormap=server.colormap, .background_pixel=0, .border_pixel=0 }; - unsigned long mask = CWEventMask|CWColormap|CWBackPixel|CWBorderPixel; - p->main_win = XCreateWindow(server.dsp, server.root_win, p->posx, p->posy, p->area.width, p->area.height, 0, server.depth, InputOutput, server.visual, mask, &att); - } - else { - // old panel - XMoveResizeWindow(server.dsp, p->main_win, p->posx, p->posy, p->area.width, p->area.height); - } + // catch some events + XSetWindowAttributes att = { .colormap=server.colormap, .background_pixel=0, .border_pixel=0 }; + unsigned long mask = CWEventMask|CWColormap|CWBackPixel|CWBorderPixel; + p->main_win = XCreateWindow(server.dsp, server.root_win, p->posx, p->posy, p->area.width, p->area.height, 0, server.depth, InputOutput, server.visual, mask, &att); long event_mask = ExposureMask|ButtonPressMask|ButtonReleaseMask|ButtonMotionMask; if (g_tooltip.enabled)@@ -241,7 +210,7 @@ }
//printf("panel %d : %d, %d, %d, %d\n", i, p->posx, p->posy, p->area.width, p->area.height); set_panel_properties(p); set_panel_background(p); - if (i >= old_nb_panel && snapshot_path == 0) { + if (snapshot_path == 0) { // if we are not in 'snapshot' mode then map new panel XMapWindow (server.dsp, p->main_win); }@@ -250,7 +219,6 @@ if (panel_autohide)
add_timeout(panel_autohide_hide_timeout, 0, autohide_hide, p); } - panel1 = new_panel; panel_refresh = 1; init_taskbar(); visible_object();
M
src/systray/systraybar.c
→
src/systray/systraybar.c
@@ -66,6 +66,7 @@ }
void cleanup_systray() { + stop_net(); systray_enabled = 0; systray_max_icon_size = 0; systray.area.on_screen = 0;@@ -372,6 +373,7 @@ XWindowAttributes attr;
if ( XGetWindowAttributes(server.dsp, id, &attr) == False ) return FALSE; unsigned long mask = 0; XSetWindowAttributes set_attr; + //printf("icon with depth: %d, width %d, height %d\n", attr.depth, attr.width, attr.height); printf("icon with depth: %d\n", attr.depth); if (attr.depth != server.depth || systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0) { set_attr.colormap = attr.colormap;@@ -575,6 +577,8 @@ if (image == 0)
return; imlib_context_set_image(image); + //if (traywin->depth == 24) + //imlib_save_image("/home/thil77/test.jpg"); imlib_image_set_has_alpha(1); DATA32* data = imlib_image_get_data(); if (traywin->depth == 24) {
M
src/tint.c
→
src/tint.c
@@ -151,7 +151,6 @@ void cleanup()
{ cleanup_timeout(); cleanup_systray(); - stop_net(); cleanup_panel(); cleanup_tooltip(); cleanup_clock();