diff options
| author | Mikael Magnusson <mikachu@gmail.com> | 2009-11-05 22:29:38 +0100 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2009-11-07 17:07:05 -0500 |
| commit | fa0ae17adbc8f73b707c33836d37841e81b9303a (patch) | |
| tree | dc6aaf1f7cd386f3d0c0862bd9985486c9b58aca /openbox/popup.c | |
| parent | a170ad7c85b5f23fafe64d28a3f183a7ce42ce53 (diff) | |
Make clang happier
Add asserts to default: in switch statements
Store pointed to variables locally so it knows they don't change
Remove some dead assignments
Mark ob_exit_with_error as noreturn
Use "%s", msg instead of just msg to printf style functions
Use the c_pfocus variable
Diffstat (limited to 'openbox/popup.c')
| -rw-r--r-- | openbox/popup.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/openbox/popup.c b/openbox/popup.c index bddf137d..af1c511c 100644 --- a/openbox/popup.c +++ b/openbox/popup.c @@ -157,11 +157,12 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text) gint textx, texty, textw, texth; gint iconx, icony, iconw, iconh; Rect *area, mon; + gboolean hasicon = self->hasicon; /* when there is no icon and the text is not parent relative, then fill the whole dialog with the text appearance, don't use the bg at all */ - if (self->hasicon || self->a_text->surface.grad == RR_SURFACE_PARENTREL) + if (hasicon || self->a_text->surface.grad == RR_SURFACE_PARENTREL) RrMargins(self->a_bg, &l, &t, &r, &b); else l = t = r = b = 0; @@ -189,7 +190,7 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text) iconx = textx = l + ob_rr_theme->paddingx; emptyx = l + r + ob_rr_theme->paddingx * 2; - if (self->hasicon) { + if (hasicon) { iconw = texth * self->iconwm; iconh = texth * self->iconhm; textx += iconw + ob_rr_theme->paddingx; @@ -204,7 +205,7 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text) /* when there is no icon, then fill the whole dialog with the text appearance */ - if (!self->hasicon) + if (!hasicon) { textx = texty = 0; texth += emptyy; @@ -276,7 +277,7 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text) /* when there is no icon and the text is not parent relative, then fill the whole dialog with the text appearance, don't use the bg at all */ - if (self->hasicon || self->a_text->surface.grad == RR_SURFACE_PARENTREL) + if (hasicon || self->a_text->surface.grad == RR_SURFACE_PARENTREL) RrPaint(self->a_bg, self->bg, w, h); if (textw) { @@ -287,7 +288,7 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text) RrPaint(self->a_text, self->text, textw, texth); } - if (self->hasicon) + if (hasicon) self->draw_icon(iconx, icony, iconw, iconh, self->draw_icon_data); /* do the actual showing */ |