From 44daf03024fbf7cbffa10349044786f6ab784821 Mon Sep 17 00:00:00 2001 From: "Tomas Chvatal (scarabeus)" Date: Wed, 22 Oct 2008 22:51:24 +0200 Subject: Revert "X" This reverts commit e12753d2ec9db83ec08bb9db63902a82fb245cdd. --- src/widget/widget_choicegroup.c | 209 ++++++++++++++++++++-------------------- 1 file changed, 102 insertions(+), 107 deletions(-) (limited to 'src/widget/widget_choicegroup.c') diff --git a/src/widget/widget_choicegroup.c b/src/widget/widget_choicegroup.c index e68935d..fc4fd01 100644 --- a/src/widget/widget_choicegroup.c +++ b/src/widget/widget_choicegroup.c @@ -9,152 +9,147 @@ #include "widget.h" #include "widget_choicegroup.h" -widget_t * -newWidgetChoicegroup(int x, int y, bool_t status, list_t * list, - void (*fce_event) (void *)) +widget_t* newWidgetChoicegroup(int x, int y, bool_t status, list_t *list, void (*fce_event)(void *)) { - widget_choicegroup_t *new; - widget_t *widget; + widget_choicegroup_t *new; + widget_t *widget; - new = malloc(sizeof(widget_choicegroup_t)); - new->time = 0; - new->status = status; - new->fce_event = fce_event; - new->list = list; + new = malloc( sizeof(widget_choicegroup_t) ); + new->time = 0; + new->status = status; + new->fce_event = fce_event; + new->list = list; - widget = - newWidget(WIDGET_TYPE_CHOICE, x, y, WIDGET_CHOICEGROUP_WIDTH, - WIDGET_CHOICEGROUP_HEIGHT, new); - addList(new->list, widget); + widget = newWidget(WIDGET_TYPE_CHOICE, x, y, WIDGET_CHOICEGROUP_WIDTH, WIDGET_CHOICEGROUP_HEIGHT, new); + addList(new->list, widget); - return widget; + return widget; } -void -drawWidgetChoicegroup(widget_t * widget) +void drawWidgetChoicegroup(widget_t *widget) { - widget_choicegroup_t *p; - static image_t *g_choicegroup = NULL; - int x, y; - int offset; + widget_choicegroup_t *p; + static image_t *g_choicegroup = NULL; + int x, y; + int offset; - assert(widget != NULL); - assert(widget->type == WIDGET_TYPE_CHOICE); + assert( widget != NULL ); + assert( widget->type == WIDGET_TYPE_CHOICE ); - p = (widget_choicegroup_t *) widget->private_data; + p = (widget_choicegroup_t *) widget->private_data; - getMousePosition(&x, &y); + getMousePosition(&x, &y); - if (g_choicegroup == NULL) { - g_choicegroup = - addImageData("choice.png", IMAGE_ALPHA, "choicegroup", - IMAGE_GROUP_BASE); - } + if( g_choicegroup == NULL ) + { + g_choicegroup = addImageData("choice.png", IMAGE_ALPHA, "choicegroup", IMAGE_GROUP_BASE); + } - if (p->status == TRUE) { - offset = 0; - } - else { - offset = WIDGET_CHOICEGROUP_WIDTH; - } + if( p->status == TRUE ) + { + offset = 0; + } + else + { + offset = WIDGET_CHOICEGROUP_WIDTH; + } - drawImage(g_choicegroup, widget->x, widget->y, offset, 0, - WIDGET_CHOICEGROUP_WIDTH, WIDGET_CHOICEGROUP_HEIGHT); + drawImage(g_choicegroup, widget->x, widget->y, offset, 0, WIDGET_CHOICEGROUP_WIDTH, WIDGET_CHOICEGROUP_HEIGHT); } -void -setWidgetChoiceActive(widget_t * widget) +void setWidgetChoiceActive(widget_t *widget) { - widget_choicegroup_t *p; - int i; - - assert(widget != NULL); - assert(widget->type == WIDGET_TYPE_CHOICE); - - p = (widget_choicegroup_t *) widget->private_data; - - for (i = 0; i < p->list->count; i++) { - widget_t *this; - widget_choicegroup_t *thisChoice; - - this = (widget_t *) p->list->list[i]; - thisChoice = (widget_choicegroup_t *) this->private_data; - - if (widget == this) { - thisChoice->status = TRUE; - thisChoice->time = WIDGET_CHOICEGROUP_TIME_SWITCH_STATUS; - thisChoice->fce_event(p); - } - else { - thisChoice->status = FALSE; - } - } + widget_choicegroup_t *p; + int i; + + assert( widget != NULL ); + assert( widget->type == WIDGET_TYPE_CHOICE ); + + p = (widget_choicegroup_t *) widget->private_data; + + for( i = 0 ; i < p->list->count ; i++ ) + { + widget_t *this; + widget_choicegroup_t *thisChoice; + + this = (widget_t *) p->list->list[i]; + thisChoice = (widget_choicegroup_t *) this->private_data; + + if( widget == this ) + { + thisChoice->status = TRUE; + thisChoice->time = WIDGET_CHOICEGROUP_TIME_SWITCH_STATUS; + thisChoice->fce_event(p); + } + else + { + thisChoice->status = FALSE; + } + } } -bool_t -getWidgetChoiceStatus(widget_t * widget) +bool_t getWidgetChoiceStatus(widget_t *widget) { - widget_choicegroup_t *p; + widget_choicegroup_t *p; - assert(widget != NULL); - assert(widget->type == WIDGET_TYPE_CHOICE); + assert( widget != NULL ); + assert( widget->type == WIDGET_TYPE_CHOICE ); - p = (widget_choicegroup_t *) widget->private_data; + p = (widget_choicegroup_t *) widget->private_data; - return p->status; + return p->status; } -void -setWidgetChoiceStatus(widget_t * widget, bool_t status) +void setWidgetChoiceStatus(widget_t *widget, bool_t status) { - widget_choicegroup_t *p; + widget_choicegroup_t *p; - assert(widget != NULL); - assert(widget->type == WIDGET_TYPE_CHOICE); + assert( widget != NULL ); + assert( widget->type == WIDGET_TYPE_CHOICE ); - p = (widget_choicegroup_t *) widget->private_data; - p->status = status; + p = (widget_choicegroup_t *) widget->private_data; + p->status = status; } -void -eventWidgetChoicegroup(widget_t * widget) +void eventWidgetChoicegroup(widget_t *widget) { - widget_choicegroup_t *p; - int x, y; + widget_choicegroup_t *p; + int x, y; - assert(widget != NULL); - assert(widget->type == WIDGET_TYPE_CHOICE); + assert( widget != NULL ); + assert( widget->type == WIDGET_TYPE_CHOICE ); - p = (widget_choicegroup_t *) widget->private_data; + p = (widget_choicegroup_t *) widget->private_data; - if (p->time > 0) { - p->time--; - return; - } + if( p->time > 0 ) + { + p->time--; + return; + } - getMousePosition(&x, &y); + getMousePosition(&x, &y); - if (x >= widget->x && x <= widget->x + WIDGET_CHOICEGROUP_WIDTH && - y >= widget->y && y <= widget->y + WIDGET_CHOICEGROUP_HEIGHT && - isMouseClicked()) { - setWidgetChoiceActive(widget); - } + if( x >= widget->x && x <= widget->x+WIDGET_CHOICEGROUP_WIDTH && + y >= widget->y && y <= widget->y+WIDGET_CHOICEGROUP_HEIGHT && + isMouseClicked() ) + { + setWidgetChoiceActive(widget); + } } -void -destroyWidgetChoicegroup(widget_t * widget) +void destroyWidgetChoicegroup(widget_t *widget) { - widget_choicegroup_t *p; - int index; + widget_choicegroup_t *p; + int index; - assert(widget != NULL); - assert(widget->type == WIDGET_TYPE_CHOICE); + assert( widget != NULL ); + assert( widget->type == WIDGET_TYPE_CHOICE ); - p = (widget_choicegroup_t *) widget->private_data; - index = searchListItem(p->list, widget); - assert(index != -1); - delList(p->list, index); + p = (widget_choicegroup_t *) widget->private_data; + index = searchListItem(p->list, widget); + assert( index != -1 ); + delList(p->list, index); - free(p); - destroyWidget(widget); + free(p); + destroyWidget(widget); } -- cgit v1.2.3