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_buttonimage.c | 109 +++++++++++++++++++--------------------- 1 file changed, 53 insertions(+), 56 deletions(-) (limited to 'src/widget/widget_buttonimage.c') diff --git a/src/widget/widget_buttonimage.c b/src/widget/widget_buttonimage.c index a088a83..27e94a3 100644 --- a/src/widget/widget_buttonimage.c +++ b/src/widget/widget_buttonimage.c @@ -10,82 +10,79 @@ #include "widget.h" #include "widget_buttonimage.h" -widget_t * -newWidgetButtonimage(image_t * image, int x, int y, - void (*fce_event) (void *)) +widget_t* newWidgetButtonimage(image_t *image, int x, int y, void (*fce_event)(void *)) { - widget_buttonimage_t *new; + widget_buttonimage_t *new; - new = malloc(sizeof(widget_buttonimage_t)); - new->image = image; - new->w = image->w / 2; - new->h = image->h; - new->active = 0; - new->fce_event = fce_event; + new = malloc( sizeof(widget_buttonimage_t) ); + new->image = image; + new->w = image->w/2; + new->h = image->h; + new->active = 0; + new->fce_event = fce_event; - return newWidget(WIDGET_TYPE_BUTTONIMAGE, x, y, new->w, new->h, new); + return newWidget(WIDGET_TYPE_BUTTONIMAGE, x, y, new->w, new->h, new); } -void -setWidgetButtonimageActive(widget_t * widget, bool_t active) +void setWidgetButtonimageActive(widget_t *widget, bool_t active) { - widget_buttonimage_t *p; + widget_buttonimage_t *p; - assert(widget != NULL); - assert(widget->type == WIDGET_TYPE_BUTTONIMAGE); + assert( widget != NULL ); + assert( widget->type == WIDGET_TYPE_BUTTONIMAGE ); - p = (widget_buttonimage_t *) widget->private_data; - p->active = active; + p = (widget_buttonimage_t *)widget->private_data; + p->active = active; } -void -drawWidgetButtonimage(widget_t * widget) +void drawWidgetButtonimage(widget_t *widget) { - widget_buttonimage_t *p; + widget_buttonimage_t *p; - assert(widget != NULL); - assert(widget->type == WIDGET_TYPE_BUTTONIMAGE); + assert( widget != NULL ); + assert( widget->type == WIDGET_TYPE_BUTTONIMAGE ); - p = (widget_buttonimage_t *) widget->private_data; - drawImage(p->image, widget->x, widget->y, p->active * p->w, 0, p->w, p->h); + p = (widget_buttonimage_t *)widget->private_data; + drawImage(p->image, widget->x, widget->y, p->active*p->w, 0, p->w, p->h); } -void -eventWidgetButtonimage(widget_t * widget) +void eventWidgetButtonimage(widget_t *widget) { - widget_buttonimage_t *p; - static int time = 0; - int x, y; - - assert(widget != NULL); - assert(widget->type == WIDGET_TYPE_BUTTONIMAGE); - - p = (widget_buttonimage_t *) widget->private_data; - if (time > 0) { - time--; - return; - } - - getMousePosition(&x, &y); - - if (x >= widget->x && x <= widget->x + p->w && - y >= widget->y && y <= widget->y + p->h && isMouseClicked()) { - time = WIDGET_BUTTONIMAGE_TIME; - p->active = 1; - p->fce_event(widget); - } + widget_buttonimage_t *p; + static int time = 0; + int x, y; + + assert( widget != NULL ); + assert( widget->type == WIDGET_TYPE_BUTTONIMAGE ); + + p = (widget_buttonimage_t *) widget->private_data; + if( time > 0) + { + time--; + return; + } + + getMousePosition(&x, &y); + + if( x >= widget->x && x <= widget->x+p->w && + y >= widget->y && y <= widget->y+p->h && + isMouseClicked() ) + { + time = WIDGET_BUTTONIMAGE_TIME; + p->active = 1; + p->fce_event(widget); + } } -void -destroyWidgetButtonimage(widget_t * widget) +void destroyWidgetButtonimage(widget_t *widget) { - widget_buttonimage_t *p; + widget_buttonimage_t *p; - assert(widget != NULL); - assert(widget->type == WIDGET_TYPE_BUTTONIMAGE); + assert( widget != NULL ); + assert( widget->type == WIDGET_TYPE_BUTTONIMAGE ); - p = (widget_buttonimage_t *) widget->private_data; + p = (widget_buttonimage_t *) widget->private_data; - free(p); - destroyWidget(widget); + free(p); + destroyWidget(widget); } -- cgit v1.2.3