summaryrefslogtreecommitdiff
path: root/src/widget/widget_statusbar.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/widget/widget_statusbar.c')
-rw-r--r--src/widget/widget_statusbar.c42
1 files changed, 18 insertions, 24 deletions
diff --git a/src/widget/widget_statusbar.c b/src/widget/widget_statusbar.c
index 0c20c7f..0ee5cc0 100644
--- a/src/widget/widget_statusbar.c
+++ b/src/widget/widget_statusbar.c
@@ -1,4 +1,3 @@
-
#include <stdlib.h>
#include <assert.h>
@@ -14,14 +13,14 @@ typedef struct item_struct {
list_t *text;
} item_t;
-static item_t* item_new(widget_t *widget, char *text)
+static item_t *item_new(widget_t *widget, char *text)
{
item_t *item;
char *copy;
char *s;
- assert( widget != NULL );
- assert( text != NULL );
+ assert(widget != NULL);
+ assert(text != NULL);
item = malloc(sizeof(item_t));
item->widget = widget;
@@ -31,8 +30,7 @@ static item_t* item_new(widget_t *widget, char *text)
s = strtok(copy, "\n");
- while( s != NULL )
- {
+ while(s != NULL) {
list_add(item->text, strdup(s));
s = strtok(NULL, "\n");
}
@@ -44,7 +42,7 @@ static item_t* item_new(widget_t *widget, char *text)
static void item_destroy(item_t *item)
{
- assert( item != NULL );
+ assert(item != NULL);
list_destroy_item(item->text, free);
free(item);
@@ -61,7 +59,7 @@ widget_t *statusbar_new(int x, int y)
return widget_new(WIDGET_TYPE_STATUSBAR, x, y, WIDGET_STATUSBAR_WIDTH, WIDGET_STATUSBAR_HEIGHT, new);
}
-void statusbar_add(widget_t *widget, widget_t * widget_catch, char *text)
+void statusbar_add(widget_t *widget, widget_t *widget_catch, char *text)
{
widget_statusbar_t *p;
@@ -72,10 +70,10 @@ void statusbar_add(widget_t *widget, widget_t * widget_catch, char *text)
p = (widget_statusbar_t *) widget->private_data;
- list_add(p->listElement, item_new(widget_catch, text) );
+ list_add(p->listElement, item_new(widget_catch, text));
}
-void statusbar_draw(widget_t * widget)
+void statusbar_draw(widget_t *widget)
{
static image_t *g_image = NULL;
widget_statusbar_t *p;
@@ -91,24 +89,22 @@ void statusbar_draw(widget_t * widget)
image_draw(g_image, widget->x, widget->y, 0, 0, g_image->w, g_image->h);
- if( p->selectElement != WIDGET_STATUSBAR_NONE_SELECT_ELEMENT )
- {
+ if (p->selectElement != WIDGET_STATUSBAR_NONE_SELECT_ELEMENT) {
item_t *item;
int i;
- item = (item_t *)p->listElement->list[p->selectElement];
+ item = (item_t *) p->listElement->list[p->selectElement];
- for( i = 0 ; i < item->text->count ; i++ )
- {
+ for (i = 0 ; i < item->text->count; i++) {
char *s;
s = (char *) item->text->list[i];
- font_draw(s, widget->x, widget->y+i*(font_get_size()+5), COLOR_WHITE);
+ font_draw(s, widget->x, widget->y + i * (font_get_size() + 5), COLOR_WHITE);
}
}
}
-void statusbar_event(widget_t * widget)
+void statusbar_event(widget_t *widget)
{
widget_statusbar_t *p;
int x, y;
@@ -123,21 +119,19 @@ void statusbar_event(widget_t * widget)
p->selectElement = WIDGET_STATUSBAR_NONE_SELECT_ELEMENT;
- for( i = 0 ; i < p->listElement->count ; i++ )
- {
+ for (i = 0 ; i < p->listElement->count; i++) {
item_t *item;
- item = (item_t *)p->listElement->list[i];
+ item = (item_t *) p->listElement->list[i];
- if( x >= item->widget->x && x <= item->widget->x+item->widget->w &&
- y >= item->widget->y && y <= item->widget->y+item->widget->h )
- {
+ if (x >= item->widget->x && x <= item->widget->x + item->widget->w &&
+ y >= item->widget->y && y <= item->widget->y + item->widget->h) {
p->selectElement = i;
}
}
}
-void statusbar_destroy(widget_t * widget)
+void statusbar_destroy(widget_t *widget)
{
widget_statusbar_t *p;