summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/widget/widget.c23
-rw-r--r--src/widget/widget_button.c19
-rw-r--r--src/widget/widget_buttonimage.c13
-rw-r--r--src/widget/widget_catchkey.c13
-rw-r--r--src/widget/widget_check.c11
-rw-r--r--src/widget/widget_choicegroup.c19
-rw-r--r--src/widget/widget_image.c9
-rw-r--r--src/widget/widget_label.c7
-rw-r--r--src/widget/widget_select.c15
-rw-r--r--src/widget/widget_statusbar.c42
-rw-r--r--src/widget/widget_textfield.c79
11 files changed, 125 insertions, 125 deletions
diff --git a/src/widget/widget.c b/src/widget/widget.c
index 9cf2e7e..4e4143e 100644
--- a/src/widget/widget.c
+++ b/src/widget/widget.c
@@ -1,4 +1,3 @@
-
#include <stdlib.h>
#include <assert.h>
@@ -22,37 +21,41 @@ widget_t *widget_new(int type, int x, int y, int w, int h, void *private_data)
return new;
}
-void widget_set_location(widget_t * p, int x, int y)
+void widget_set_location(widget_t *p, int x, int y)
{
p->x = x;
p->y = y;
}
-void widget_get_location(widget_t * p, int *x, int *y)
+void widget_get_location(widget_t *p, int *x, int *y)
{
- if (x != NULL)
+ if (x != NULL) {
*x = p->x;
+ }
- if (y != NULL)
+ if (y != NULL) {
*y = p->y;
+ }
}
-void widget_get_size(widget_t * p, int w, int h)
+void widget_get_size(widget_t *p, int w, int h)
{
p->w = w;
p->h = h;
}
-void widget_set_size(widget_t * p, int *w, int *h)
+void widget_set_size(widget_t *p, int *w, int *h)
{
- if (w != NULL)
+ if (w != NULL) {
*w = p->w;
+ }
- if (h != NULL)
+ if (h != NULL) {
*h = p->h;
+ }
}
-void widget_destroy(widget_t * p)
+void widget_destroy(widget_t *p)
{
free(p);
}
diff --git a/src/widget/widget_button.c b/src/widget/widget_button.c
index f0031ce..26c153a 100644
--- a/src/widget/widget_button.c
+++ b/src/widget/widget_button.c
@@ -1,4 +1,3 @@
-
#include <stdlib.h>
#include <assert.h>
@@ -21,10 +20,10 @@ widget_t *button_new(char *text, int x, int y, void (*fce_event) (void *))
font_text_size(text, &(new->w), &(new->h));
return widget_new(WIDGET_TYPE_BUTTON, x, y,
- WIDGET_BUTTON_WIDTH, WIDGET_BUTTON_HEIGHT, new);
+ WIDGET_BUTTON_WIDTH, WIDGET_BUTTON_HEIGHT, new);
}
-void button_draw(widget_t * widget)
+void button_draw(widget_t *widget)
{
widget_button_t *p;
static image_t *g_button0 = NULL;
@@ -42,8 +41,7 @@ void button_draw(widget_t * widget)
}
if (g_button1 == NULL) {
- g_button1 =
- image_add("button1.png", IMAGE_ALPHA, "button1", IMAGE_GROUP_BASE);
+ g_button1 = image_add("button1.png", IMAGE_ALPHA, "button1", IMAGE_GROUP_BASE);
}
if (x >= widget->x && x <= widget->x + WIDGET_BUTTON_WIDTH &&
@@ -53,12 +51,13 @@ void button_draw(widget_t * widget)
image_draw(g_button0, widget->x, widget->y, 0, 0, g_button0->w, g_button0->h);
}
- //font_draw(p->text, p->x+WIDGET_BUTTON_WIDTH/2-p->w/2, p->y+p->h/2, COLOR_WHITE);
+ /*font_draw(p->text, p->x+WIDGET_BUTTON_WIDTH/2-p->w/2, p->y+p->h/2, COLOR_WHITE);*/
font_draw(p->text, widget->x + WIDGET_BUTTON_WIDTH / 2 - p->w / 2,
- widget->y + WIDGET_BUTTON_HEIGHT / 2 - p->h / 2, COLOR_WHITE);
+ widget->y + WIDGET_BUTTON_HEIGHT / 2 - p->h / 2,
+ COLOR_WHITE);
}
-void button_event(widget_t * widget)
+void button_event(widget_t *widget)
{
widget_button_t *p;
static int my_time = 0;
@@ -81,13 +80,13 @@ void button_event(widget_t * widget)
interface_is_mouse_clicket()) {
my_time = WIDGET_BUTTON_TIME;
- DEBUG_MSG(_("Event caught\n"));
+ DEBUG_MSG(_("[Debug] Caught some button event\n"));
p->fce_event(widget);
}
}
-void button_destroy(widget_t * widget)
+void button_destroy(widget_t *widget)
{
widget_button_t *p;
diff --git a/src/widget/widget_buttonimage.c b/src/widget/widget_buttonimage.c
index ce453fd..a22d4fe 100644
--- a/src/widget/widget_buttonimage.c
+++ b/src/widget/widget_buttonimage.c
@@ -1,4 +1,3 @@
-
#include <stdlib.h>
#include <assert.h>
@@ -10,7 +9,7 @@
#include "widget.h"
#include "widget_buttonimage.h"
-widget_t *button_image_new(image_t * image, int x, int y, void (*fce_event) (void *))
+widget_t *button_image_new(image_t *image, int x, int y, void (*fce_event) (void *))
{
widget_buttonimage_t *new;
@@ -24,7 +23,7 @@ widget_t *button_image_new(image_t * image, int x, int y, void (*fce_event) (voi
return widget_new(WIDGET_TYPE_BUTTONIMAGE, x, y, new->w, new->h, new);
}
-void button_image_set_active(widget_t * widget, bool_t active)
+void button_image_set_active(widget_t *widget, bool_t active)
{
widget_buttonimage_t *p;
@@ -35,7 +34,7 @@ void button_image_set_active(widget_t * widget, bool_t active)
p->active = active;
}
-void button_image_draw(widget_t * widget)
+void button_image_draw(widget_t *widget)
{
widget_buttonimage_t *p;
@@ -43,10 +42,10 @@ void button_image_draw(widget_t * widget)
assert(widget->type == WIDGET_TYPE_BUTTONIMAGE);
p = (widget_buttonimage_t *) widget->private_data;
- image_draw(p->image, widget->x, widget->y, p->active * p->w, 0, p->w, p->h);
+ image_draw(p->image, widget->x, widget->y, p->active *p->w, 0, p->w, p->h);
}
-void button_image_event(widget_t * widget)
+void button_image_event(widget_t *widget)
{
widget_buttonimage_t *p;
static int my_time = 0;
@@ -72,7 +71,7 @@ void button_image_event(widget_t * widget)
}
}
-void button_image_destroy(widget_t * widget)
+void button_image_destroy(widget_t *widget)
{
widget_buttonimage_t *p;
diff --git a/src/widget/widget_catchkey.c b/src/widget/widget_catchkey.c
index b9d1b2d..b961012 100644
--- a/src/widget/widget_catchkey.c
+++ b/src/widget/widget_catchkey.c
@@ -1,4 +1,3 @@
-
#include <stdlib.h>
#include <assert.h>
@@ -21,7 +20,7 @@ widget_t *catch_key_new(int key, int x, int y, void *event)
return widget_new(WIDGET_TYPE_CATCHKEY, x, y, WIDGET_CATCHKEY_WIDTH, WIDGET_CATCHKEY_HEIGHT, new);
}
-int catch_key_get(widget_t * widget)
+int catch_key_get(widget_t *widget)
{
widget_catchkey_t *p;
@@ -33,7 +32,7 @@ int catch_key_get(widget_t * widget)
return p->key;
}
-void catch_key_set(widget_t * widget, int key)
+void catch_key_set(widget_t *widget, int key)
{
widget_catchkey_t *p;
@@ -45,7 +44,7 @@ void catch_key_set(widget_t * widget, int key)
p->key = key;
}
-void catch_key_draw(widget_t * widget)
+void catch_key_draw(widget_t *widget)
{
widget_catchkey_t *p;
char *name;
@@ -79,7 +78,7 @@ static int getPessAnyKey()
mapa = SDL_GetKeyState(NULL);
for (i = SDLK_FIRST; i <= SDLK_COMPOSE; i++) {
- if (i == SDLK_NUMLOCK || // black key
+ if (i == SDLK_NUMLOCK || /* black key */
i == SDLK_CAPSLOCK ||
i == SDLK_SCROLLOCK) {
continue;
@@ -93,7 +92,7 @@ static int getPessAnyKey()
return WIDGET_CATCHKEY_NOKEY;
}
-void catch_key_event(widget_t * widget)
+void catch_key_event(widget_t *widget)
{
widget_catchkey_t *p;
int x, y;
@@ -126,7 +125,7 @@ void catch_key_event(widget_t * widget)
}
}
-void catch_key_destroy(widget_t * widget)
+void catch_key_destroy(widget_t *widget)
{
widget_catchkey_t *p;
diff --git a/src/widget/widget_check.c b/src/widget/widget_check.c
index 07c5da5..3d7814c 100644
--- a/src/widget/widget_check.c
+++ b/src/widget/widget_check.c
@@ -1,4 +1,3 @@
-
#include <stdlib.h>
#include <assert.h>
@@ -21,7 +20,7 @@ widget_t *check_new(int x, int y, bool_t status, void (*fce_event) (void *))
return widget_new(WIDGET_TYPE_CHECK, x, y, WIDGET_CHECK_WIDTH, WIDGET_CHECK_HEIGHT, new);
}
-void check_draw(widget_t * widget)
+void check_draw(widget_t *widget)
{
widget_check_t *p;
static image_t *g_check = NULL;
@@ -48,7 +47,7 @@ void check_draw(widget_t * widget)
image_draw(g_check, widget->x, widget->y, offset, 0, WIDGET_CHECK_WIDTH, WIDGET_CHECK_HEIGHT);
}
-void check_event(widget_t * widget)
+void check_event(widget_t *widget)
{
widget_check_t *p;
int x, y;
@@ -82,7 +81,7 @@ void check_event(widget_t * widget)
}
}
-bool_t check_get_status(widget_t * widget)
+bool_t check_get_status(widget_t *widget)
{
widget_check_t *p;
@@ -94,7 +93,7 @@ bool_t check_get_status(widget_t * widget)
return p->status;
}
-void check_set_status(widget_t * widget, bool_t status)
+void check_set_status(widget_t *widget, bool_t status)
{
widget_check_t *p;
@@ -105,7 +104,7 @@ void check_set_status(widget_t * widget, bool_t status)
p->status = status;
}
-void check_destroy(widget_t * widget)
+void check_destroy(widget_t *widget)
{
widget_check_t *p;
diff --git a/src/widget/widget_choicegroup.c b/src/widget/widget_choicegroup.c
index 0f5ba13..ee3894e 100644
--- a/src/widget/widget_choicegroup.c
+++ b/src/widget/widget_choicegroup.c
@@ -1,4 +1,3 @@
-
#include <stdlib.h>
#include <assert.h>
@@ -9,7 +8,7 @@
#include "widget.h"
#include "widget_choicegroup.h"
-widget_t *choice_group_new(int x, int y, bool_t status, list_t * list, void (*fce_event) (void *))
+widget_t *choice_group_new(int x, int y, bool_t status, list_t *list, void (*fce_event) (void *))
{
widget_choicegroup_t *new;
widget_t *widget;
@@ -27,7 +26,7 @@ widget_t *choice_group_new(int x, int y, bool_t status, list_t * list, void (*fc
return widget;
}
-void choice_group_draw(widget_t * widget)
+void choice_group_draw(widget_t *widget)
{
widget_choicegroup_t *p;
static image_t *g_choicegroup = NULL;
@@ -52,10 +51,10 @@ void choice_group_draw(widget_t * widget)
}
image_draw(g_choicegroup, widget->x, widget->y, offset, 0,
- WIDGET_CHOICEGROUP_WIDTH, WIDGET_CHOICEGROUP_HEIGHT);
+ WIDGET_CHOICEGROUP_WIDTH, WIDGET_CHOICEGROUP_HEIGHT);
}
-void choice_group_set_active(widget_t * widget)
+void choice_group_set_active(widget_t *widget)
{
widget_choicegroup_t *p;
int i;
@@ -82,7 +81,7 @@ void choice_group_set_active(widget_t * widget)
}
}
-bool_t choice_group_get_status(widget_t * widget)
+bool_t choice_group_get_status(widget_t *widget)
{
widget_choicegroup_t *p;
@@ -94,7 +93,7 @@ bool_t choice_group_get_status(widget_t * widget)
return p->status;
}
-void choiceGroup_set_status(widget_t * widget, bool_t status)
+void choiceGroup_set_status(widget_t *widget, bool_t status)
{
widget_choicegroup_t *p;
@@ -105,7 +104,7 @@ void choiceGroup_set_status(widget_t * widget, bool_t status)
p->status = status;
}
-void choice_group_event(widget_t * widget)
+void choice_group_event(widget_t *widget)
{
widget_choicegroup_t *p;
int x, y;
@@ -124,12 +123,12 @@ void choice_group_event(widget_t * widget)
if (x >= widget->x && x <= widget->x + WIDGET_CHOICEGROUP_WIDTH &&
y >= widget->y && y <= widget->y + WIDGET_CHOICEGROUP_HEIGHT &&
- interface_is_mouse_clicket()) {
+ interface_is_mouse_clicket()) {
choice_group_set_active(widget);
}
}
-void choice_group_destroy(widget_t * widget)
+void choice_group_destroy(widget_t *widget)
{
widget_choicegroup_t *p;
int my_index;
diff --git a/src/widget/widget_image.c b/src/widget/widget_image.c
index ed07cb0..51f935a 100644
--- a/src/widget/widget_image.c
+++ b/src/widget/widget_image.c
@@ -1,4 +1,3 @@
-
#include <stdlib.h>
#include <assert.h>
@@ -11,7 +10,7 @@
#include "widget.h"
#include "widget_image.h"
-widget_t *wid_image_new(int x, int y, image_t * image)
+widget_t *wid_image_new(int x, int y, image_t *image)
{
widget_image_t *new;
@@ -21,7 +20,7 @@ widget_t *wid_image_new(int x, int y, image_t * image)
return widget_new(WIDGET_TYPE_IMAGE, x, y, image->w, image->h, new);
}
-void wid_image_draw(widget_t * widget)
+void wid_image_draw(widget_t *widget)
{
widget_image_t *p;
@@ -32,13 +31,13 @@ void wid_image_draw(widget_t * widget)
image_draw(p->image, widget->x, widget->y, 0, 0, p->image->w, p->image->h);
}
-void wid_image_event(widget_t * widget)
+void wid_image_event(widget_t *widget)
{
assert(widget != NULL);
assert(widget->type == WIDGET_TYPE_IMAGE);
}
-void wid_image_destroy(widget_t * widget)
+void wid_image_destroy(widget_t *widget)
{
widget_image_t *p;
diff --git a/src/widget/widget_label.c b/src/widget/widget_label.c
index ecac34f..7cc7186 100644
--- a/src/widget/widget_label.c
+++ b/src/widget/widget_label.c
@@ -1,4 +1,3 @@
-
#include <stdlib.h>
#include <assert.h>
@@ -20,7 +19,7 @@ widget_t *label_new(char *text, int x, int y, int bind)
return widget_new(WIDGET_TYPE_LABEL, x, y, new->w, new->h, new);
}
-void label_draw(widget_t * widget)
+void label_draw(widget_t *widget)
{
widget_label_t *p;
@@ -42,13 +41,13 @@ void label_draw(widget_t * widget)
}
}
-void label_event(widget_t * widget)
+void label_event(widget_t *widget)
{
assert(widget != NULL);
assert(widget->type == WIDGET_TYPE_LABEL);
}
-void label_destroy(widget_t * widget)
+void label_destroy(widget_t *widget)
{
widget_label_t *p;
diff --git a/src/widget/widget_select.c b/src/widget/widget_select.c
index 88b22ac..d847113 100644
--- a/src/widget/widget_select.c
+++ b/src/widget/widget_select.c
@@ -1,4 +1,3 @@
-
#include <stdlib.h>
#include <assert.h>
@@ -21,7 +20,7 @@ widget_t *select_new(int x, int y, void (*fce_event) (void *))
return widget_new(WIDGET_TYPE_SELECT, x, y, 0, 0, new);
}
-char *select_get_item(widget_t * widget)
+char *select_get_item(widget_t *widget)
{
widget_select_t *p;
@@ -37,7 +36,7 @@ char *select_get_item(widget_t * widget)
return (char *) p->list->list[p->select];
}
-int select_get_index(widget_t * widget)
+int select_get_index(widget_t *widget)
{
widget_select_t *p;
@@ -49,7 +48,7 @@ int select_get_index(widget_t * widget)
return p->select;
}
-void select_add(widget_t * widget, char *s)
+void select_add(widget_t *widget, char *s)
{
widget_select_t *p;
@@ -61,7 +60,7 @@ void select_add(widget_t * widget, char *s)
list_add(p->list, strdup(s));
}
-void select_remove_all(widget_t * widget)
+void select_remove_all(widget_t *widget)
{
widget_select_t *p;
@@ -75,7 +74,7 @@ void select_remove_all(widget_t * widget)
}
}
-void select_draw(widget_t * widget)
+void select_draw(widget_t *widget)
{
widget_select_t *p;
int x, y, w, h;
@@ -107,7 +106,7 @@ void select_draw(widget_t * widget)
}
}
-void select_event(widget_t * widget)
+void select_event(widget_t *widget)
{
widget_select_t *p;
int x, y, w, h;
@@ -135,7 +134,7 @@ void select_event(widget_t * widget)
}
}
-void select_destroy(widget_t * widget)
+void select_destroy(widget_t *widget)
{
widget_select_t *p;
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;
diff --git a/src/widget/widget_textfield.c b/src/widget/widget_textfield.c
index a634af1..be0f016 100644
--- a/src/widget/widget_textfield.c
+++ b/src/widget/widget_textfield.c
@@ -1,4 +1,3 @@
-
#include <stdlib.h>
#include <assert.h>
@@ -30,7 +29,7 @@ widget_t *text_field_new(char *text, int filter, int x, int y)
return widget_new(WIDGET_TYPE_TEXTFILED, x, y, WIDGET_TEXTFIELD_WIDTH, WIDGET_TEXTFIELD_HEIGHT, new);
}
-static void drawBackground(widget_t * widget)
+static void drawBackground(widget_t *widget)
{
static image_t *g_textfield0 = NULL;
static image_t *g_textfield1 = NULL;
@@ -41,19 +40,22 @@ static void drawBackground(widget_t * widget)
p = (widget_textfield_t *) widget->private_data;
- if (g_textfield0 == NULL)
+ if (g_textfield0 == NULL) {
g_textfield0 = image_add("textfield0.png", IMAGE_ALPHA, "textfiled0", IMAGE_GROUP_BASE);
+ }
- if (g_textfield1 == NULL)
+ if (g_textfield1 == NULL) {
g_textfield1 = image_add("textfield1.png", IMAGE_ALPHA, "textfiled1", IMAGE_GROUP_BASE);
+ }
- if (p->active)
+ if (p->active) {
image_draw(g_textfield1, widget->x, widget->y, 0, 0, g_textfield1->w, g_textfield1->h);
- else
+ } else {
image_draw(g_textfield0, widget->x, widget->y, 0, 0, g_textfield0->w, g_textfield0->h);
+ }
}
-static void drawText(widget_t * widget)
+static void drawText(widget_t *widget)
{
char str[STR_SIZE];
widget_textfield_t *p;
@@ -65,22 +67,27 @@ static void drawText(widget_t * widget)
strcpy(str, p->text);
- if (p->timeBlick > WIDGET_TEXTFIELD_TIME_BLICK_CURSOR / 2 && p->active == TRUE)
+ if (p->timeBlick > WIDGET_TEXTFIELD_TIME_BLICK_CURSOR / 2 && p->active == TRUE) {
strcat(str, "\f");
+ }
p->timeBlick++;
- if (p->timeBlick == WIDGET_TEXTFIELD_TIME_BLICK_CURSOR)
+ if (p->timeBlick == WIDGET_TEXTFIELD_TIME_BLICK_CURSOR) {
p->timeBlick = 0;
+ }
- //font_draw(str, p->x+WIDGET_TEXTFIELD_TEXT_OFFSET_X, p->y+p->h/2, COLOR_WHITE);
- //printf("p->y: %d\nheight: %d\n p->h: %d\n", p->y, WIDGET_TEXTFIELD_HEIGHT, p->h);
+ /*
+ font_draw(str, p->x+WIDGET_TEXTFIELD_TEXT_OFFSET_X, p->y+p->h/2, COLOR_WHITE);
+ printf("p->y: %d\nheight: %d\n p->h: %d\n", p->y, WIDGET_TEXTFIELD_HEIGHT, p->h);
+ */
font_draw(str, widget->x + WIDGET_TEXTFIELD_TEXT_OFFSET_X,
- widget->y + WIDGET_TEXTFIELD_HEIGHT / 2 - p->h / 2, COLOR_WHITE);
+ widget->y + WIDGET_TEXTFIELD_HEIGHT / 2 - p->h / 2,
+ COLOR_WHITE);
}
-void text_field_draw(widget_t * widget)
+void text_field_draw(widget_t *widget)
{
assert(widget != NULL);
assert(widget->type == WIDGET_TYPE_TEXTFILED);
@@ -89,7 +96,7 @@ void text_field_draw(widget_t * widget)
drawText(widget);
}
-void text_field_set_text(widget_t * widget, char *text)
+void text_field_set_text(widget_t *widget, char *text)
{
widget_textfield_t *p;
@@ -154,7 +161,7 @@ static void checkText(widget_textfield_t *p, unsigned len)
break;
default:
- assert(!_("Bad filter!"));
+ assert(!_("[Error] Bad text filter!"));
break;
}
@@ -169,7 +176,7 @@ static void checkText(widget_textfield_t *p, unsigned len)
}
-static void readKey (widget_textfield_t *p)
+static void readKey(widget_textfield_t *p)
{
int len;
int i;
@@ -188,27 +195,30 @@ static void readKey (widget_textfield_t *p)
')', '(',
};
- if (p->active == FALSE)
+ if (p->active == FALSE) {
return;
+ }
- len = strlen (p->text);
+ len = strlen(p->text);
- for (i = 0; keyboard_buffer_is_any_key(); i ++) {
- SDL_keysym k = keyboard_buffer_pop ();
+ for (i = 0; keyboard_buffer_is_any_key(); i++) {
+ SDL_keysym k = keyboard_buffer_pop();
- char *name = (char *) SDL_GetKeyName (k.sym);
+ char *name = (char *) SDL_GetKeyName(k.sym);
- if (name == NULL)
+ if (name == NULL) {
continue;
+ }
- if (len >= STR_SIZE)
+ if (len >= STR_SIZE) {
break;
+ }
char c = '\0';
/* printf("name %s : %d\n", name, k.sym); */
- switch (strlen (name)) {
+ switch (strlen(name)) {
case 1:
c = name[0];
break;
@@ -217,16 +227,17 @@ static void readKey (widget_textfield_t *p)
break;
}
- if (k.sym == SDLK_SPACE || k.sym == SDLK_TAB)
+ if (k.sym == SDLK_SPACE || k.sym == SDLK_TAB) {
c = ' ';
- else if (k.sym == SDLK_BACKSPACE && len > 0 ) {
+ } else if (k.sym == SDLK_BACKSPACE && len > 0 ) {
p->text[len-1] = '\0';
- checkText (p, len);
+ checkText(p, len);
break;
}
- if (c == '\0' || p->w > WIDGET_TEXTFIELD_WIDTH - 40)
+ if (c == '\0' || p->w > WIDGET_TEXTFIELD_WIDTH - 40) {
continue;
+ }
p->text[len] = c;
@@ -234,7 +245,7 @@ static void readKey (widget_textfield_t *p)
unsigned int n;
int m = 0;
- for (n = 0; n < sizeof (shift_map); n += 2) {
+ for (n = 0; n < sizeof(shift_map); n += 2) {
if (c == shift_map[n]) {
p->text[len] = shift_map[n+1];
m ++;
@@ -242,8 +253,9 @@ static void readKey (widget_textfield_t *p)
}
}
- if (!m)
+ if (!m) {
p->text[len] -= 32;
+ }
}
/*
@@ -281,12 +293,11 @@ static void readKey (widget_textfield_t *p)
}
*/
len ++;
- checkText (p, len);
-
+ checkText(p, len);
}
}
-void text_field_event(widget_t * widget)
+void text_field_event(widget_t *widget)
{
widget_textfield_t *p;
int x, y;
@@ -312,7 +323,7 @@ void text_field_event(widget_t * widget)
readKey(p);
}
-void text_field_destroy(widget_t * widget)
+void text_field_destroy(widget_t *widget)
{
widget_textfield_t *p;
generated by cgit v1.2.3 (git 2.46.0) at 2026-09-13 09:45:09 +0000