summaryrefslogtreecommitdiff
path: root/src/menu.c
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2011-08-10 19:38:16 +0200
committerDaniel Friesel <derf@finalrewind.org>2011-08-10 19:38:16 +0200
commit72fc88a9a11f73817d8dc609a4c104ca0445722d (patch)
tree0f989ecce2712f7196706253349b561012d0fb2b /src/menu.c
parentae1de0d884fbe931914e04c7a191b932b7a5904c (diff)
Remove unused variables
Diffstat (limited to 'src/menu.c')
-rw-r--r--src/menu.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/menu.c b/src/menu.c
index ef30d03..7a70368 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -439,14 +439,12 @@ void feh_menu_show_at_submenu(feh_menu * m, feh_menu * parent_m, feh_menu_item *
void feh_menu_move(feh_menu * m, int x, int y)
{
- int dx, dy;
-
if (!m)
return;
- dx = x - m->x;
- dy = y - m->y;
+
if (m->visible)
XMoveWindow(disp, m->win, x, y);
+
m->x = x;
m->y = y;
return;
@@ -580,7 +578,6 @@ void feh_menu_entry_get_size(feh_menu * m, feh_menu_item * i, int *w, int *h)
}
return;
- m = NULL;
}
void feh_menu_calc_size(feh_menu * m)
@@ -621,16 +618,14 @@ void feh_menu_calc_size(feh_menu * m)
im = i->icon;
if (im) {
- int iw, ih, ow, oh;
+ int iw, ih, ow;
iw = gib_imlib_image_get_width(im);
ih = gib_imlib_image_get_height(im);
if (ih <= max_h) {
ow = iw;
- oh = ih;
} else {
ow = (iw * max_h) / ih;
- oh = max_h;
}
if (ow > icon_w)
icon_w = ow;