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

Remove dead code

Browse Source
This commit is contained in:
o9000
2018-01-19 20:49:38 +00:00
parent b70edc437c
commit 28b1174c0f
9 changed files with 15 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/util/area.c
View File

@@ -929,10 +929,8 @@ void area_compute_text_geometry(Area *area,
const char *line2,
PangoFontDescription *line1_font_desc,
PangoFontDescription *line2_font_desc,
int *line1_height_ink,
int *line1_height,
int *line1_width,
int *line2_height_ink,
int *line2_height,
int *line2_width)
{
@@ -941,7 +939,6 @@ void area_compute_text_geometry(Area *area,
if (line1 && line1[0])
get_text_size2(line1_font_desc,
line1_height_ink,
line1_height,
line1_width,
available_h,
@@ -953,11 +950,10 @@ void area_compute_text_geometry(Area *area,
FALSE,
((Panel*)area->panel)->scale);
else
*line1_width = *line1_height_ink = *line1_height = 0;
*line1_width = *line1_height = 0;
if (line2 && line2[0])
get_text_size2(line2_font_desc,
line2_height_ink,
line2_height,
line2_width,
available_h,
@@ -969,7 +965,7 @@ void area_compute_text_geometry(Area *area,
FALSE,
((Panel*)area->panel)->scale);
else
*line2_width = *line2_height_ink = *line2_height = 0;
*line2_width = *line2_height = 0;
}
int text_area_compute_desired_size(Area *area,
@@ -978,16 +974,14 @@ int text_area_compute_desired_size(Area *area,
PangoFontDescription *line1_font_desc,
PangoFontDescription *line2_font_desc)
{
int line1_height_ink, line1_height, line1_width, line2_height_ink, line2_height, line2_width;
int line1_height, line1_width, line2_height, line2_width;
area_compute_text_geometry(area,
line1,
line2,
line1_font_desc,
line2_font_desc,
&line1_height_ink,
&line1_height,
&line1_width,
&line2_height_ink,
&line2_height,
&line2_width);
@@ -1012,17 +1006,15 @@ gboolean resize_text_area(Area *area,
schedule_redraw(area);
int line1_height_ink, line1_height, line1_width;
int line2_height_ink, line2_height, line2_width;
int line1_height, line1_width;
int line2_height, line2_width;
area_compute_text_geometry(area,
line1,
line2,
line1_font_desc,
line2_font_desc,
&line1_height_ink,
&line1_height,
&line1_width,
&line2_height_ink,
&line2_height,
&line2_width);

2
src/util/area.h
View File

@@ -273,10 +273,8 @@ void area_compute_text_geometry(Area *area,
const char *line2,
PangoFontDescription *line1_font_desc,
PangoFontDescription *line2_font_desc,
int *line1_height_ink,
int *line1_height,
int *line1_width,
int *line2_height_ink,
int *line2_height,
int *line2_width);
int text_area_compute_desired_size(Area *area,

2
src/util/common.c
View File

@@ -925,7 +925,6 @@ void clear_pixmap(Pixmap p, int x, int y, int w, int h)
}
void get_text_size2(const PangoFontDescription *font,
int *height_ink,
int *height,
int *width,
int available_height,
@@ -962,7 +961,6 @@ void get_text_size2(const PangoFontDescription *font,
pango_layout_set_markup(layout, text, text_len);
pango_layout_get_pixel_extents(layout, &rect_ink, &rect);
*height_ink = rect_ink.height;
*height = rect.height;
*width = rect.width;
// fprintf(stderr, "tint2: dimension : %d - %d\n", rect_ink.height, rect.height);

1
src/util/common.h
View File

@@ -114,7 +114,6 @@ void create_heuristic_mask(DATA32 *data, int w, int h);
void render_image(Drawable d, int x, int y);
void get_text_size2(const PangoFontDescription *font,
int *height_ink,
int *height,
int *width,
int available_height,