summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/widget/widget.h41
-rw-r--r--src/widget/widget_button.h25
-rw-r--r--src/widget/widget_buttonimage.h24
-rw-r--r--src/widget/widget_catchkey.h25
-rw-r--r--src/widget/widget_check.h29
-rw-r--r--src/widget/widget_choicegroup.h34
-rw-r--r--src/widget/widget_image.h20
-rw-r--r--src/widget/widget_label.h22
-rw-r--r--src/widget/widget_select.h26
-rw-r--r--src/widget/widget_statusbar.h27
-rw-r--r--src/widget/widget_textfield.h40
11 files changed, 143 insertions, 170 deletions
diff --git a/src/widget/widget.h b/src/widget/widget.h
index c21ace4..2d6b717 100644
--- a/src/widget/widget.h
+++ b/src/widget/widget.h
@@ -1,20 +1,18 @@
-
#ifndef WIDGET_H
+#define WIDGET_H
-# define WIDGET_H
-
-# include "main.h"
+#include "main.h"
-# define WIDGET_TYPE_LABEL 1
-# define WIDGET_TYPE_BUTTON 2
-# define WIDGET_TYPE_BUTTONIMAGE 3
-# define WIDGET_TYPE_TEXTFILED 4
-# define WIDGET_TYPE_CATCHKEY 4
-# define WIDGET_TYPE_CHECK 5
-# define WIDGET_TYPE_CHOICE 6
-# define WIDGET_TYPE_IMAGE 7
-# define WIDGET_TYPE_SELECT 8
-# define WIDGET_TYPE_STATUSBAR 9
+#define WIDGET_TYPE_LABEL 1
+#define WIDGET_TYPE_BUTTON 2
+#define WIDGET_TYPE_BUTTONIMAGE 3
+#define WIDGET_TYPE_TEXTFILED 4
+#define WIDGET_TYPE_CATCHKEY 4
+#define WIDGET_TYPE_CHECK 5
+#define WIDGET_TYPE_CHOICE 6
+#define WIDGET_TYPE_IMAGE 7
+#define WIDGET_TYPE_SELECT 8
+#define WIDGET_TYPE_STATUSBAR 9
typedef struct widget_struct {
int type;
@@ -23,12 +21,11 @@ typedef struct widget_struct {
void *private_data;
} widget_t;
-extern widget_t *widget_new(int type, int x, int y, int w, int h,
- void *private_data);
-extern void widget_set_location(widget_t * p, int x, int y);
-extern void widget_get_location(widget_t * p, int *x, int *y);
-extern void widget_get_size(widget_t * p, int w, int h);
-extern void widget_set_size(widget_t * p, int *w, int *h);
-extern void widget_destroy(widget_t * p);
+extern widget_t *widget_new(int type, int x, int y, int w, int h, void *private_data);
+extern void widget_set_location(widget_t *p, int x, int y);
+extern void widget_get_location(widget_t *p, int *x, int *y);
+extern void widget_get_size(widget_t *p, int w, int h);
+extern void widget_set_size(widget_t *p, int *w, int *h);
+extern void widget_destroy(widget_t *p);
-#endif
+#endif /* WIDGET_H */
diff --git a/src/widget/widget_button.h b/src/widget/widget_button.h
index a42e35c..2ec4ae3 100644
--- a/src/widget/widget_button.h
+++ b/src/widget/widget_button.h
@@ -1,15 +1,13 @@
-
#ifndef WIDGET_BUTTON_H
+#define WIDGET_BUTTON_H
-# define WIDGET_BUTTON_H
-
-# include "main.h"
-# include "widget.h"
+#include "main.h"
+#include "widget.h"
-# define WIDGET_BUTTON_TIME 10
+#define WIDGET_BUTTON_TIME 10
-# define WIDGET_BUTTON_WIDTH 125
-# define WIDGET_BUTTON_HEIGHT 36
+#define WIDGET_BUTTON_WIDTH 125
+#define WIDGET_BUTTON_HEIGHT 36
typedef struct widget_button {
char *text;
@@ -17,10 +15,9 @@ typedef struct widget_button {
void (*fce_event) (void *);
} widget_button_t;
-extern widget_t *button_new(char *text, int x, int y,
- void (*fce_event) (void *));
-extern void button_draw(widget_t * widget);
-extern void button_event(widget_t * widget);
-extern void button_destroy(widget_t * widget);
+extern widget_t *button_new(char *text, int x, int y, void (*fce_event) (void *));
+extern void button_draw(widget_t *widget);
+extern void button_event(widget_t *widget);
+extern void button_destroy(widget_t *widget);
-#endif
+#endif /* WIDGET_BUTTON_H */
diff --git a/src/widget/widget_buttonimage.h b/src/widget/widget_buttonimage.h
index 58321a4..197b79b 100644
--- a/src/widget/widget_buttonimage.h
+++ b/src/widget/widget_buttonimage.h
@@ -1,13 +1,10 @@
-
#ifndef WIDGET_BUTTONIMAGE_H
+#define WIDGET_BUTTONIMAGE_H
-# include "main.h"
-
-# define WIDGET_BUTTONIMAGE_H
-
-# define WIDGET_BUTTONIMAGE_TIME 10
+#include "main.h"
+#include "widget.h"
-# include "widget.h"
+#define WIDGET_BUTTONIMAGE_TIME 10
typedef struct widget_buttonimageimage {
int w, h;
@@ -16,12 +13,11 @@ typedef struct widget_buttonimageimage {
void (*fce_event) (void *);
} widget_buttonimage_t;
-extern widget_t *button_image_new(image_t * image, int x, int y,
- void (*fce_event) (void *));
+extern widget_t *button_image_new(image_t *image, int x, int y, void (*fce_event) (void *));
-extern void button_image_set_active(widget_t * widget, bool_t active);
-extern void button_image_draw(widget_t * widget);
-extern void button_image_event(widget_t * widget);
-extern void button_image_destroy(widget_t * widget);
+extern void button_image_set_active(widget_t *widget, bool_t active);
+extern void button_image_draw(widget_t *widget);
+extern void button_image_event(widget_t *widget);
+extern void button_image_destroy(widget_t *widget);
-#endif
+#endif /* WIDGET_BUTTONIMAGE_H */
diff --git a/src/widget/widget_catchkey.h b/src/widget/widget_catchkey.h
index 9a1da1c..a030f6e 100644
--- a/src/widget/widget_catchkey.h
+++ b/src/widget/widget_catchkey.h
@@ -1,14 +1,13 @@
#ifndef WIDGET_CATCHKEY_H
+#define WIDGET_CATCHKEY_H
-# define WIDGET_CATCHKEY_H
+#include "main.h"
+#include "widget.h"
-# include "main.h"
-# include "widget.h"
+#define WIDGET_CATCHKEY_NOKEY -1
-# define WIDGET_CATCHKEY_WIDTH 110
-# define WIDGET_CATCHKEY_HEIGHT 12
-
-# define WIDGET_CATCHKEY_NOKEY -1
+#define WIDGET_CATCHKEY_WIDTH 110
+#define WIDGET_CATCHKEY_HEIGHT 12
typedef struct widget_catchkey_struct {
int w, h;
@@ -18,10 +17,10 @@ typedef struct widget_catchkey_struct {
} widget_catchkey_t;
extern widget_t *catch_key_new(int key, int x, int y, void *event);
-extern int catch_key_get(widget_t * p);
-extern void catch_key_set(widget_t * p, int key);
-extern void catch_key_draw(widget_t * p);
-extern void catch_key_event(widget_t * p);
-extern void catch_key_destroy(widget_t * p);
+extern int catch_key_get(widget_t *p);
+extern void catch_key_set(widget_t *p, int key);
+extern void catch_key_draw(widget_t *p);
+extern void catch_key_event(widget_t *p);
+extern void catch_key_destroy(widget_t *p);
-#endif
+#endif /* WIDGET_CATCHKEY_H */
diff --git a/src/widget/widget_check.h b/src/widget/widget_check.h
index 5969541..3df8c23 100644
--- a/src/widget/widget_check.h
+++ b/src/widget/widget_check.h
@@ -1,15 +1,13 @@
-
#ifndef WIDGET_CHECK_H
+#define WIDGET_CHECK_H
-# define WIDGET_CHECK_H
-
-# include "main.h"
-# include "widget.h"
+#include "main.h"
+#include "widget.h"
-# define WIDGET_CHECK_TIME_SWITCH_STATUS 5
+#define WIDGET_CHECK_TIME_SWITCH_STATUS 5
-# define WIDGET_CHECK_WIDTH 25
-# define WIDGET_CHECK_HEIGHT 25
+#define WIDGET_CHECK_WIDTH 25
+#define WIDGET_CHECK_HEIGHT 25
typedef struct widget_check {
bool_t status;
@@ -17,12 +15,11 @@ typedef struct widget_check {
void (*fce_event) (void *);
} widget_check_t;
-extern widget_t *check_new(int x, int y, bool_t status,
- void (*fce_event) (void *));
-extern void check_draw(widget_t * widget);
-extern void check_event(widget_t * widget);
-extern bool_t check_get_status(widget_t * widget);
-extern void check_set_status(widget_t * widget, bool_t status);
-extern void check_destroy(widget_t * widget);
+extern widget_t *check_new(int x, int y, bool_t status, void (*fce_event) (void *));
+extern void check_draw(widget_t *widget);
+extern void check_event(widget_t *widget);
+extern bool_t check_get_status(widget_t *widget);
+extern void check_set_status(widget_t *widget, bool_t status);
+extern void check_destroy(widget_t *widget);
-#endif
+#endif /* WIDGET_CHECK_H */
diff --git a/src/widget/widget_choicegroup.h b/src/widget/widget_choicegroup.h
index 64f8ce4..9bdadfc 100644
--- a/src/widget/widget_choicegroup.h
+++ b/src/widget/widget_choicegroup.h
@@ -1,16 +1,14 @@
-
#ifndef WIDGET_CHOICEGROUP_H
+#define WIDGET_CHOICEGROUP_H
-# define WIDGET_CHOICEGROUP_H
-
-# include "main.h"
-# include "list.h"
-# include "widget.h"
+#include "main.h"
+#include "list.h"
+#include "widget.h"
-# define WIDGET_CHOICEGROUP_TIME_SWITCH_STATUS 5
+#define WIDGET_CHOICEGROUP_TIME_SWITCH_STATUS 5
-# define WIDGET_CHOICEGROUP_WIDTH 25
-# define WIDGET_CHOICEGROUP_HEIGHT 25
+#define WIDGET_CHOICEGROUP_WIDTH 25
+#define WIDGET_CHOICEGROUP_HEIGHT 25
typedef struct widget_choicegroup {
bool_t status;
@@ -19,15 +17,13 @@ typedef struct widget_choicegroup {
list_t *list;
} widget_choicegroup_t;
-extern widget_t *choice_group_new(int x, int y, bool_t status,
- list_t * list,
- void (*fce_event) (void *));
+extern widget_t *choice_group_new(int x, int y, bool_t status, list_t *list, void (*fce_event) (void *));
-extern void choice_group_draw(widget_t * p);
-extern void choice_group_set_active(widget_t * widget);
-extern bool_t choice_group_get_status(widget_t * widget);
-extern void choiceGroup_set_status(widget_t * widget, bool_t status);
-extern void choice_group_event(widget_t * p);
-extern void choice_group_destroy(widget_t * p);
+extern void choice_group_draw(widget_t *p);
+extern void choice_group_set_active(widget_t *widget);
+extern bool_t choice_group_get_status(widget_t *widget);
+extern void choiceGroup_set_status(widget_t *widget, bool_t status);
+extern void choice_group_event(widget_t *p);
+extern void choice_group_destroy(widget_t *p);
-#endif
+#endif /* WIDGET_CHOICEGROUP_H */
diff --git a/src/widget/widget_image.h b/src/widget/widget_image.h
index 2af63e6..ad7104d 100644
--- a/src/widget/widget_image.h
+++ b/src/widget/widget_image.h
@@ -1,19 +1,17 @@
-
#ifndef WIDGET_IMAGE_H
+#define WIDGET_IMAGE_H
-# define WIDGET_IMAGE_H
-
-# include "main.h"
-# include "interface.h"
-# include "widget.h"
+#include "main.h"
+#include "interface.h"
+#include "widget.h"
typedef struct widget_image {
image_t *image;
} widget_image_t;
-extern widget_t *wid_image_new(int x, int y, image_t * image);
-extern void wid_image_draw(widget_t * p);
-extern void wid_image_event(widget_t * p);
-extern void wid_image_destroy(widget_t * p);
+extern widget_t *wid_image_new(int x, int y, image_t *image);
+extern void wid_image_draw(widget_t *p);
+extern void wid_image_event(widget_t *p);
+extern void wid_image_destroy(widget_t *p);
-#endif
+#endif /* WIDGET_IMAGE_H */
diff --git a/src/widget/widget_label.h b/src/widget/widget_label.h
index a2c7a2a..bd1b531 100644
--- a/src/widget/widget_label.h
+++ b/src/widget/widget_label.h
@@ -1,10 +1,12 @@
-
#ifndef WIDGET_LABEL_H
+#define WIDGET_LABEL_H
-# define WIDGET_LABEL_H
+#include "main.h"
+#include "widget.h"
-# include "main.h"
-# include "widget.h"
+#define WIDGET_LABEL_RIGHT 1
+#define WIDGET_LABEL_LEFT 2
+#define WIDGET_LABEL_CENTER 3
typedef struct widget_label {
int w, h;
@@ -12,13 +14,9 @@ typedef struct widget_label {
int bind;
} widget_label_t;
-# define WIDGET_LABEL_RIGHT 1
-# define WIDGET_LABEL_LEFT 2
-# define WIDGET_LABEL_CENTER 3
-
extern widget_t *label_new(char *text, int x, int y, int bind);
-extern void label_draw(widget_t * widget);
-extern void label_event(widget_t * widget);
-extern void label_destroy(widget_t * widget);
+extern void label_draw(widget_t *widget);
+extern void label_event(widget_t *widget);
+extern void label_destroy(widget_t *widget);
-#endif
+#endif /* WIDGET_LABEL_H */
diff --git a/src/widget/widget_select.h b/src/widget/widget_select.h
index 36a9890..11116a9 100644
--- a/src/widget/widget_select.h
+++ b/src/widget/widget_select.h
@@ -1,11 +1,9 @@
-
#ifndef WIDGET_SELECT_H
+#define WIDGET_SELECT_H
-# define WIDGET_SELECT_H
-
-# include "main.h"
-# include "list.h"
-# include "widget.h"
+#include "main.h"
+#include "list.h"
+#include "widget.h"
typedef struct widget_select {
int w, h;
@@ -15,12 +13,12 @@ typedef struct widget_select {
} widget_select_t;
extern widget_t *select_new(int x, int y, void (*fce_event) (void *));
-extern char *select_get_item(widget_t * widget);
-extern int select_get_index(widget_t * widget);
-extern void select_add(widget_t * widget, char *s);
-extern void select_remove_all(widget_t * widget);
-extern void select_draw(widget_t * widget);
-extern void select_event(widget_t * widget);
-extern void select_destroy(widget_t * widget);
+extern char *select_get_item(widget_t *widget);
+extern int select_get_index(widget_t *widget);
+extern void select_add(widget_t *widget, char *s);
+extern void select_remove_all(widget_t *widget);
+extern void select_draw(widget_t *widget);
+extern void select_event(widget_t *widget);
+extern void select_destroy(widget_t *widget);
-#endif
+#endif /* WIDGET_SELECT_H */
diff --git a/src/widget/widget_statusbar.h b/src/widget/widget_statusbar.h
index 6b81cf3..217c1a5 100644
--- a/src/widget/widget_statusbar.h
+++ b/src/widget/widget_statusbar.h
@@ -1,25 +1,24 @@
-
#ifndef WIDGET_STATUSBAR_H
+#define WIDGET_STATUSBAR_H
-# define WIDGET_STATUSBAR_H
-
-# include "main.h"
-# include "widget.h"
-# include "list.h"
+#include "main.h"
+#include "widget.h"
+#include "list.h"
typedef struct widget_statusbar {
list_t *listElement;
int selectElement;
} widget_statusbar_t;
-# define WIDGET_STATUSBAR_NONE_SELECT_ELEMENT -1
-# define WIDGET_STATUSBAR_WIDTH 250
-# define WIDGET_STATUSBAR_HEIGHT 65
+#define WIDGET_STATUSBAR_NONE_SELECT_ELEMENT -1
+
+#define WIDGET_STATUSBAR_WIDTH 250
+#define WIDGET_STATUSBAR_HEIGHT 65
extern widget_t *statusbar_new(int x, int y);
-extern void statusbar_add(widget_t *widget, widget_t * widget_catch, char *text);
-extern void statusbar_draw(widget_t * widget);
-extern void statusbar_event(widget_t * widget);
-extern void statusbar_destroy(widget_t * widget);
+extern void statusbar_add(widget_t *widget, widget_t *widget_catch, char *text);
+extern void statusbar_draw(widget_t *widget);
+extern void statusbar_event(widget_t *widget);
+extern void statusbar_destroy(widget_t *widget);
-#endif
+#endif /* WIDGET_STATUSBAR_H */
diff --git a/src/widget/widget_textfield.h b/src/widget/widget_textfield.h
index b255694..ef55b5f 100644
--- a/src/widget/widget_textfield.h
+++ b/src/widget/widget_textfield.h
@@ -1,24 +1,22 @@
-
#ifndef WIDGET_TEXTFIELD_H
+#define WIDGET_TEXTFIELD_H
-# define WIDGET_TEXTFIELD_H
-
-# include "main.h"
-# include "widget.h"
+#include "main.h"
+#include "widget.h"
-# define WIDGET_TEXTFIELD_WIDTH 175
-# define WIDGET_TEXTFIELD_HEIGHT 36
+#define WIDGET_TEXTFIELD_WIDTH 175
+#define WIDGET_TEXTFIELD_HEIGHT 36
-# define WIDGET_TEXTFIELD_TEXT_OFFSET_X 10
+#define WIDGET_TEXTFIELD_TEXT_OFFSET_X 10
-# define WIDGET_TEXTFIELD_TIME_MULTIPLE 10
-# define WIDGET_TEXTFIELD_TIME_READ_KEY 2
-# define WIDGET_TEXTFIELD_TIME_BLICK_CURSOR 20
+#define WIDGET_TEXTFIELD_TIME_MULTIPLE 10
+#define WIDGET_TEXTFIELD_TIME_READ_KEY 2
+#define WIDGET_TEXTFIELD_TIME_BLICK_CURSOR 20
-# define WIDGET_TEXTFIELD_FILTER_ALL 0
-# define WIDGET_TEXTFIELD_FILTER_NUM 2
-# define WIDGET_TEXTFIELD_FILTER_ALPHANUM 3
-# define WIDGET_TEXTFIELD_FILTER_IP_OR_DOMAIN 4
+#define WIDGET_TEXTFIELD_FILTER_ALL 0
+#define WIDGET_TEXTFIELD_FILTER_NUM 2
+#define WIDGET_TEXTFIELD_FILTER_ALPHANUM 3
+#define WIDGET_TEXTFIELD_FILTER_IP_OR_DOMAIN 4
typedef struct widget_textfield {
int w, h;
@@ -32,10 +30,10 @@ typedef struct widget_textfield {
} widget_textfield_t;
extern widget_t *text_field_new(char *text, int filter, int x, int y);
-extern void text_field_set_text(widget_t * widget, char *text);
-extern char *text_field_get_text(widget_t * widget);
-extern void text_field_draw(widget_t * widget);
-extern void text_field_event(widget_t * widget);
-extern void text_field_destroy(widget_t * widget);
+extern void text_field_set_text(widget_t *widget, char *text);
+extern char *text_field_get_text(widget_t *widget);
+extern void text_field_draw(widget_t *widget);
+extern void text_field_event(widget_t *widget);
+extern void text_field_destroy(widget_t *widget);
-#endif
+#endif /* WIDGET_TEXTFIELD_H */