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

Memory management review: match char-malloc/strdup-free, gchar-g_str*/g_free; set pointers to null after free; initialize fonts/backgrounds correctly when missing from config

Browse Source 
git-svn-id: http://tint2.googlecode.com/svn/trunk@748 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
o9000
2015-04-11 09:51:10 +00:00
committed by mrovi9000@gmail.com
parent 321ccc0794
commit af003d0e19
18 changed files with 228 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/tooltip/tooltip.c
View File

@@ -51,17 +51,20 @@ void default_tooltip()
void cleanup_tooltip()
{
stop_tooltip_timeout();
tooltip_hide(0);
tooltip_copy_text(0);
if (g_tooltip.window) XDestroyWindow(server.dsp, g_tooltip.window);
if (g_tooltip.font_desc) pango_font_description_free(g_tooltip.font_desc);
tooltip_hide(NULL);
tooltip_copy_text(NULL);
if (g_tooltip.window)
XDestroyWindow(server.dsp, g_tooltip.window);
g_tooltip.window = 0;
pango_font_description_free(g_tooltip.font_desc);
g_tooltip.font_desc = NULL;
}
void init_tooltip()
{
if (!g_tooltip.font_desc)
g_tooltip.font_desc = pango_font_description_from_string("sans 10");
g_tooltip.font_desc = pango_font_description_from_string(DEFAULT_FONT);
if (g_tooltip.bg == 0)
g_tooltip.bg = &g_array_index(backgrounds, Background, 0);
@@ -72,7 +75,8 @@ void init_tooltip()
attr.background_pixel = 0;
attr.border_pixel = 0;
unsigned long mask = CWEventMask|CWColormap|CWBorderPixel|CWBackPixel|CWOverrideRedirect;
if (g_tooltip.window) XDestroyWindow(server.dsp, g_tooltip.window);
if (g_tooltip.window)
XDestroyWindow(server.dsp, g_tooltip.window);
g_tooltip.window = XCreateWindow(server.dsp, server.root_win, 0, 0, 100, 20, 0, server.depth, InputOutput, server.visual, mask, &attr);
}
@@ -296,10 +300,8 @@ void start_hide_timeout()
void stop_tooltip_timeout()
{
if (g_tooltip.timeout) {
stop_timeout(g_tooltip.timeout);
g_tooltip.timeout = 0;
}
stop_timeout(g_tooltip.timeout);
g_tooltip.timeout = NULL;
}
@@ -309,6 +311,6 @@ void tooltip_copy_text(Area* area)
if (area && area->_get_tooltip_text)
g_tooltip.tooltip_text = strdup(area->_get_tooltip_text(area));
else
g_tooltip.tooltip_text = 0;
g_tooltip.tooltip_text = NULL;
g_tooltip.area = area;
}