Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_attach.c ewl_box.c ewl_callback.c ewl_colorpicker.c
ewl_combo.c ewl_container.c ewl_dnd.c ewl_dnd.h ewl_entry.c
ewl_filelist.c ewl_filelist_column.c ewl_histogram.c
ewl_histogram.h ewl_image.c ewl_list.c ewl_media.c ewl_mvc.c
ewl_popup.c ewl_spectrum.c ewl_spectrum.h ewl_tree.c
ewl_tree2.c ewl_widget.c ewl_widget.h ewl_window.c
ewl_window.h
Log Message:
- cleanups
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_attach.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- ewl_attach.c 19 Aug 2007 18:48:31 -0000 1.46
+++ ewl_attach.c 20 Aug 2007 03:29:43 -0000 1.47
@@ -298,7 +298,7 @@
}
else
{
- int i;
+ unsigned int i;
Ewl_Attach *tmp;
/* replace if in list already */
@@ -380,7 +380,7 @@
}
else
{
- int i;
+ unsigned int i;
Ewl_Attach *tmp;
for (i = 0; i < list->len; i++)
@@ -430,7 +430,7 @@
}
else
{
- int i;
+ unsigned int i;
Ewl_Attach *tmp;
for (i = 0; i < list->len; i++)
@@ -494,7 +494,8 @@
/* XXX should we clean up _WIDGET in here? */
if ((attach->data_type == EWL_ATTACH_DATA_TYPE_TEXT)
- || (attach->type == EWL_ATTACH_DATA_TYPE_OTHER)) {
+ || (attach->data_type == EWL_ATTACH_DATA_TYPE_OTHER))
+ {
IF_FREE(attach->data);
}
@@ -528,7 +529,8 @@
/* make sure the timer gets cleaned up if the widget goes away */
if ((ewl_attach_tooltip) && (w == ewl_attach_tooltip->to)
- && (ewl_attach_tooltip->timer)) {
+ && (ewl_attach_tooltip->timer))
+ {
ecore_timer_del(ewl_attach_tooltip->timer);
ewl_attach_tooltip->timer = NULL;
}
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_box.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- ewl_box.c 25 Jul 2007 17:01:00 -0000 1.45
+++ ewl_box.c 20 Aug 2007 03:29:43 -0000 1.46
@@ -236,7 +236,7 @@
c = EWL_CONTAINER(b);
ecore_dlist_first_goto(c->children);
- while((child = ecore_dlist_next(c->children)))
+ while ((child = ecore_dlist_next(c->children)))
ewl_box_cb_child_show(c, child);
ewl_widget_configure(EWL_WIDGET(b));
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_callback.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- ewl_callback.c 29 Mar 2007 19:25:09 -0000 1.29
+++ ewl_callback.c 20 Aug 2007 03:29:43 -0000 1.30
@@ -156,7 +156,7 @@
ewl_callback_insert(Ewl_Widget *w, unsigned int t,
Ewl_Callback *cb, unsigned int pos)
{
- int place;
+ unsigned int place;
Ewl_Callback *old = NULL;
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -383,7 +383,8 @@
Ewl_Callback_Function after, void *after_data)
{
Ewl_Callback *search;
- int ret, pos = 0;
+ int ret;
+ unsigned int pos = 0;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR_RET("w", w, 0);
@@ -554,7 +555,7 @@
ewl_callback_del_cb_id(Ewl_Widget *w, unsigned int t, int cb_id)
{
Ewl_Callback *cb;
- int i;
+ unsigned int i;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
@@ -587,7 +588,7 @@
void
ewl_callback_clear(Ewl_Widget *w)
{
- int i;
+ unsigned int i;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
@@ -613,7 +614,7 @@
ewl_callback_del(Ewl_Widget *w, unsigned int t, Ewl_Callback_Function f)
{
Ewl_Callback *cb;
- int i;
+ unsigned int i;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
@@ -650,7 +651,7 @@
Ewl_Callback_Function f, void *d)
{
Ewl_Callback *cb;
- int i;
+ unsigned int i;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_colorpicker.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- ewl_colorpicker.c 1 Apr 2007 21:48:06 -0000 1.39
+++ ewl_colorpicker.c 20 Aug 2007 03:29:43 -0000 1.40
@@ -779,9 +779,8 @@
DCHECK_PARAM_PTR("ev", ev);
DCHECK_TYPE("w", w, EWL_COLORPICKER_TYPE);
- printf("Data %d bytes %d bits\n", event->len, event->format);
ewl_colorpicker_current_rgb_get(cp, &curcolors[0], &curcolors[1],
- &curcolors[2]);
+ &curcolors[2]);
curcolors[3] = ewl_colorpicker_alpha_get(cp);
if (event->format == 32) {
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_combo.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -3 -r1.59 -r1.60
--- ewl_combo.c 19 Aug 2007 06:07:22 -0000 1.59
+++ ewl_combo.c 20 Aug 2007 03:29:43 -0000 1.60
@@ -401,8 +401,7 @@
ewl_combo_popup_fill(Ewl_Combo *combo, Ewl_Container *c, Ewl_Model *model,
Ewl_View *view, void *mvc_data)
{
- int count;
- int i;
+ unsigned int count, i;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("combo", combo);
@@ -625,6 +624,7 @@
DCHECK_TYPE("w", w, EWL_COMBO_CELL_TYPE);
i = ewl_container_child_index_get(EWL_CONTAINER(w->parent), w);
+ if (i < 0) DRETURN(DLEVEL_STABLE);
combo = ewl_combo_cell_combo_get(EWL_COMBO_CELL(w));
model = ewl_combo_cell_model_get(EWL_COMBO_CELL(w));
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_container.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -3 -r1.62 -r1.63
--- ewl_container.c 25 Jul 2007 17:01:00 -0000 1.62
+++ ewl_container.c 20 Aug 2007 03:29:43 -0000 1.63
@@ -560,15 +560,16 @@
ewl_container_child_index_helper_get(Ewl_Container *parent, Ewl_Widget *w,
unsigned int skip)
{
- unsigned int idx = 0, ret = -1;
+ unsigned int idx = 0;
+ int ret = -1;
Ewl_Container *container;
Ewl_Widget *child;
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR_RET("parent", parent, idx);
- DCHECK_PARAM_PTR_RET("w", w, idx);
- DCHECK_TYPE_RET("parent", parent, EWL_CONTAINER_TYPE, idx);
- DCHECK_TYPE_RET("w", w, EWL_WIDGET_TYPE, idx);
+ DCHECK_PARAM_PTR_RET("parent", parent, ret);
+ DCHECK_PARAM_PTR_RET("w", w, ret);
+ DCHECK_TYPE_RET("parent", parent, EWL_CONTAINER_TYPE, ret);
+ DCHECK_TYPE_RET("w", w, EWL_WIDGET_TYPE, ret);
container = parent;
while (container->redirect) container = container->redirect;
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_dnd.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- ewl_dnd.c 29 Mar 2007 19:25:09 -0000 1.46
+++ ewl_dnd.c 20 Aug 2007 03:29:43 -0000 1.47
@@ -6,12 +6,12 @@
#define EWL_DND_WINDOW_ROOT 0
-int EWL_CALLBACK_DND_POSITION; /**< A DND position event **/
-int EWL_CALLBACK_DND_ENTER; /**< On enter of a widget **/
-int EWL_CALLBACK_DND_LEAVE; /**< On exit of a widget **/
-int EWL_CALLBACK_DND_DROP; /**< Drop event **/
-int EWL_CALLBACK_DND_DATA_RECEIVED; /**< Data received event **/
-int EWL_CALLBACK_DND_DATA_REQUEST; /**< Data request event **/
+unsigned int EWL_CALLBACK_DND_POSITION; /**< A DND position event **/
+unsigned int EWL_CALLBACK_DND_ENTER; /**< On enter of a widget **/
+unsigned int EWL_CALLBACK_DND_LEAVE; /**< On exit of a widget **/
+unsigned int EWL_CALLBACK_DND_DROP; /**< Drop event **/
+unsigned int EWL_CALLBACK_DND_DATA_RECEIVED; /**< Data received event **/
+unsigned int EWL_CALLBACK_DND_DATA_REQUEST; /**< Data request event **/
static int ewl_dragging_current;
static int ewl_dnd_status;
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_dnd.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- ewl_dnd.h 11 Mar 2007 22:35:56 -0000 1.22
+++ ewl_dnd.h 20 Aug 2007 03:29:43 -0000 1.23
@@ -8,12 +8,12 @@
* @{
*/
-extern int EWL_CALLBACK_DND_POSITION;
-extern int EWL_CALLBACK_DND_ENTER;
-extern int EWL_CALLBACK_DND_LEAVE;
-extern int EWL_CALLBACK_DND_DROP;
-extern int EWL_CALLBACK_DND_DATA_RECEIVED;
-extern int EWL_CALLBACK_DND_DATA_REQUEST;
+extern unsigned int EWL_CALLBACK_DND_POSITION;
+extern unsigned int EWL_CALLBACK_DND_ENTER;
+extern unsigned int EWL_CALLBACK_DND_LEAVE;
+extern unsigned int EWL_CALLBACK_DND_DROP;
+extern unsigned int EWL_CALLBACK_DND_DATA_RECEIVED;
+extern unsigned int EWL_CALLBACK_DND_DATA_REQUEST;
int ewl_dnd_init(void);
void ewl_dnd_shutdown(void);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_entry.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -3 -r1.77 -r1.78
--- ewl_entry.c 2 Aug 2007 23:15:50 -0000 1.77
+++ ewl_entry.c 20 Aug 2007 03:29:43 -0000 1.78
@@ -210,7 +210,7 @@
sel = EWL_TEXT_TRIGGER(ewl_text_selection_get(EWL_TEXT(e)));
if (sel)
{
- int len, pos;
+ unsigned int len, pos;
len = ewl_text_trigger_length_get(sel);
pos = ewl_text_trigger_start_pos_get(sel);
@@ -707,7 +707,7 @@
void
ewl_entry_delete_left(Ewl_Entry *e)
{
- int pos1;
+ unsigned int pos;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("e", e);
@@ -716,12 +716,13 @@
if (!EWL_TEXT(e)->text)
DRETURN(DLEVEL_STABLE);
- pos1 = ewl_entry_cursor_position_get(EWL_ENTRY_CURSOR(e->cursor));
+ pos = ewl_entry_cursor_position_get(EWL_ENTRY_CURSOR(e->cursor));
+
/* we cannot delete anything if we are at the beginning of the text */
- if (pos1 == 0)
+ if (pos == 0)
DRETURN(DLEVEL_STABLE);
- ewl_entry_cursor_position_set(EWL_ENTRY_CURSOR(e->cursor), pos1 - 1);
+ ewl_entry_cursor_position_set(EWL_ENTRY_CURSOR(e->cursor), pos - 1);
ewl_text_text_delete(EWL_TEXT(e), 1);
DLEAVE_FUNCTION(DLEVEL_STABLE);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_filelist.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- ewl_filelist.c 25 Jul 2007 17:01:00 -0000 1.33
+++ ewl_filelist.c 20 Aug 2007 03:29:43 -0000 1.34
@@ -241,29 +241,30 @@
ewl_filelist_size_get(off_t st_size)
{
double dsize;
- char size[1024];
+ char size[1024], *suffix;
DENTER_FUNCTION(DLEVEL_STABLE);
dsize = (double)st_size;
if (dsize < 1024)
- sprintf(size, "%'.0f b", dsize);
+ snprintf(size, sizeof(size), "%.0f b", dsize);
else
{
dsize /= 1024.0;
if (dsize < 1024)
- sprintf(size, "%'.1f kb", dsize);
+ suffix = "kb";
else
{
dsize /= 1024.0;
if (dsize < 1024)
- sprintf(size, "%'.1f mb", dsize);
+ suffix = "mb";
else
{
dsize /= 1024.0;
- sprintf(size, "%'.1f gb", dsize);
+ suffix = "gb";
}
}
+ snprintf(size, sizeof(size), "%.1f %s", dsize, suffix);
}
DRETURN_PTR(strdup(size), DLEVEL_STABLE);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_filelist_column.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- ewl_filelist_column.c 25 Jul 2007 17:01:00 -0000 1.34
+++ ewl_filelist_column.c 20 Aug 2007 03:29:43 -0000 1.35
@@ -210,7 +210,7 @@
/* remove all of the nodes after this one */
ecore_list_index_goto(list->dirs, i);
- while((d = ecore_list_remove(list->dirs)))
+ while ((d = ecore_list_remove(list->dirs)))
{
ewl_widget_destroy(d->list);
IF_FREE(d->dir);
@@ -219,7 +219,7 @@
/* build up our base path */
ecore_list_first_goto(path_list);
- while(count != i)
+ while (count != i)
{
strcat(path, ecore_list_next(path_list));
count ++;
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_histogram.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- ewl_histogram.c 20 Jul 2007 13:54:07 -0000 1.14
+++ ewl_histogram.c 20 Aug 2007 03:29:43 -0000 1.15
@@ -68,7 +68,8 @@
* @brief Changes the drawing color of a histogram.
*/
void
-ewl_histogram_color_set(Ewl_Histogram *hist, int r, int g, int b, int a)
+ewl_histogram_color_set(Ewl_Histogram *hist, unsigned int r, unsigned int g,
+ unsigned int b, unsigned int a)
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("hist", hist);
@@ -92,7 +93,8 @@
* @brief Get the current color values for drawing the histogram.
*/
void
-ewl_histogram_color_get(Ewl_Histogram *hist, int *r, int *g, int *b, int *a)
+ewl_histogram_color_get(Ewl_Histogram *hist, unsigned int *r, unsigned int *g,
+ unsigned int *b, unsigned int
*a)
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("hist", hist);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_histogram.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- ewl_histogram.h 4 Mar 2007 00:52:01 -0000 1.11
+++ ewl_histogram.h 20 Aug 2007 03:29:43 -0000 1.12
@@ -54,11 +54,11 @@
int ewl_histogram_init(Ewl_Histogram *histogram);
void ewl_histogram_color_set(Ewl_Histogram *histogram,
- int r, int g,
- int b, int a);
+ unsigned int r, unsigned int g,
+ unsigned int b, unsigned int a);
void ewl_histogram_color_get(Ewl_Histogram *histogram,
- int *r, int *g,
- int *b, int *a);
+ unsigned int *r, unsigned int
*g,
+ unsigned int *b, unsigned int
*a);
void ewl_histogram_image_set(Ewl_Histogram *histogram,
Ewl_Image *image);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_image.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -3 -r1.65 -r1.66
--- ewl_image.c 20 Jul 2007 13:54:07 -0000 1.65
+++ ewl_image.c 20 Aug 2007 03:29:43 -0000 1.66
@@ -739,8 +739,9 @@
void
ewl_image_thumbnail_request(Ewl_Image_Thumbnail *thumb, const char *path)
{
+#ifdef BUILD_EPSILON_SUPPORT
Ewl_Thumbnail_Size size;
-
+#endif
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("thumb", thumb);
DCHECK_TYPE("thumb", thumb, EWL_IMAGE_THUMBNAIL_TYPE);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_list.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- ewl_list.c 19 Aug 2007 05:03:01 -0000 1.24
+++ ewl_list.c 20 Aug 2007 03:29:43 -0000 1.25
@@ -151,7 +151,7 @@
ewl_list_cb_item_clicked(Ewl_Widget *w, void *ev __UNUSED__, void *data)
{
Ewl_Model *model;
- unsigned int row;
+ int row;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
@@ -161,6 +161,8 @@
model = ewl_mvc_model_get(EWL_MVC(data));
row = ewl_container_child_index_get(EWL_CONTAINER(data), w);
+ if (row < 0) DRETURN(DLEVEL_STABLE);
+
if (row > model->count(data))
{
if (!EWL_HIGHLIGHT_IS(w))
@@ -173,6 +175,7 @@
* widget for this highlight widget */
row = ewl_container_child_index_get(EWL_CONTAINER(data),
ewl_highlight_follow_get(EWL_HIGHLIGHT(w)));
+ if (row < 0) DRETURN(DLEVEL_STABLE);
}
ewl_mvc_handle_click(EWL_MVC(data), NULL,
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_media.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- ewl_media.c 20 Jul 2007 13:54:07 -0000 1.30
+++ ewl_media.c 20 Aug 2007 03:29:43 -0000 1.31
@@ -412,10 +412,10 @@
DCHECK_PARAM_PTR("m", m);
DCHECK_TYPE("m", m, EWL_MEDIA_TYPE);
- if (m->mute == mute)
+ if (m->mute == !!mute)
DRETURN(DLEVEL_STABLE);
- m->mute = mute;
+ m->mute = !!mute;
#ifdef BUILD_EMOTION_SUPPORT
if (m->video)
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_mvc.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- ewl_mvc.c 19 Aug 2007 18:48:31 -0000 1.31
+++ ewl_mvc.c 20 Aug 2007 03:29:43 -0000 1.32
@@ -23,8 +23,8 @@
static void ewl_mvc_range_merge(Ecore_List *list, Ewl_Model *model, void *data,
Ewl_Selection_Range *range, Ewl_Selection_Range *cur);
static Ewl_Selection *ewl_mvc_selection_make(Ewl_Model *model, void *data,
- int top, int left,
- int bottom, int right);
+ unsigned int top, unsigned int left,
+ unsigned int bottom, unsigned int
right);
static void ewl_mvc_selected_change_notify(Ewl_MVC *mvc);
static void ewl_mvc_highlight_do(Ewl_MVC *mvc, Ewl_Container *c,
@@ -326,7 +326,7 @@
ewl_mvc_selected_list_set(Ewl_MVC *mvc, Ecore_List *list)
{
Ewl_Selection *sel;
- int count = 0;
+ unsigned int count = 0;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("mvc", mvc);
@@ -895,8 +895,9 @@
}
static Ewl_Selection *
-ewl_mvc_selection_make(Ewl_Model *model, void *data, int top, int left,
- int bottom, int right)
+ewl_mvc_selection_make(Ewl_Model *model, void *data, unsigned int top,
+ unsigned int left, unsigned int bottom,
+ unsigned int right)
{
Ewl_Selection *sel;
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_popup.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- ewl_popup.c 3 Jun 2007 21:20:40 -0000 1.16
+++ ewl_popup.c 20 Aug 2007 03:29:43 -0000 1.17
@@ -160,8 +160,8 @@
ewl_popup_follow_get(Ewl_Popup *p)
{
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR_RET("p", p, EWL_POPUP_TYPE_NONE);
- DCHECK_TYPE_RET("p", p, EWL_POPUP_TYPE, EWL_POPUP_TYPE_NONE);
+ DCHECK_PARAM_PTR_RET("p", p, NULL);
+ DCHECK_TYPE_RET("p", p, EWL_POPUP_TYPE, NULL);
DRETURN_PTR(p->follow, DLEVEL_STABLE);
}
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_spectrum.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- ewl_spectrum.c 20 Jul 2007 13:54:07 -0000 1.38
+++ ewl_spectrum.c 20 Aug 2007 03:29:43 -0000 1.39
@@ -15,8 +15,9 @@
static void ewl_spectrum_cross_hairs_draw(Ewl_Spectrum *sp);
static void ewl_spectrum_mouse_process(Ewl_Spectrum *sp, int x, int y);
static void ewl_spectrum_hsv_to_rgb(double h, double s, double v,
- int *r, int *g, int *b);
-static void ewl_spectrum_rgb_to_hsv(int r, int g, int b,
+ unsigned int *r, unsigned int *g,
+ unsigned int *b);
+static void ewl_spectrum_rgb_to_hsv(unsigned int r, unsigned int g, unsigned
int b,
double *h, double *s, double *v);
static void ewl_spectrum_color_coord_map(Ewl_Spectrum *sp, int x, int y,
int w, int h, unsigned int *r,
@@ -509,7 +510,7 @@
static void
ewl_spectrum_hsv_to_rgb(double h, double s, double v,
- int *r, int *g, int *b)
+ unsigned int *r, unsigned int *g, unsigned int *b)
{
unsigned int r_tmp = 0, g_tmp = 0, b_tmp = 0;
@@ -591,7 +592,7 @@
}
static void
-ewl_spectrum_rgb_to_hsv(int r, int g, int b,
+ewl_spectrum_rgb_to_hsv(unsigned int r, unsigned int g, unsigned int b,
double *h, double *s, double *v)
{
unsigned int min, max;
@@ -752,7 +753,7 @@
ewl_spectrum_color_coord_map_vertical(Ewl_Spectrum *sp, int y, int img_h,
unsigned int *r, unsigned int *g,
unsigned int *b)
{
- int r_tmp, g_tmp, b_tmp;
+ unsigned int r_tmp, g_tmp, b_tmp;
double h, s, v;
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -809,7 +810,7 @@
ewl_spectrum_color_coord_map_square(Ewl_Spectrum *sp, int x, int y, int img_w,
int img_h,
unsigned int *r, unsigned int *g,
unsigned int *b)
{
- int r_tmp, g_tmp, b_tmp;
+ unsigned int r_tmp, g_tmp, b_tmp;
double h, s, v;
DENTER_FUNCTION(DLEVEL_STABLE);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_spectrum.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- ewl_spectrum.h 1 Jul 2007 20:14:09 -0000 1.21
+++ ewl_spectrum.h 20 Aug 2007 03:29:43 -0000 1.22
@@ -50,9 +50,9 @@
} cross_hairs; /**< Selection crosshairs */
struct {
- int r;
- int g;
- int b;
+ unsigned int r;
+ unsigned int g;
+ unsigned int b;
} rgb; /**< Current RBG colour of the spectrum
*/
struct {
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_tree.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -3 -r1.51 -r1.52
--- ewl_tree.c 25 Jul 2007 17:01:00 -0000 1.51
+++ ewl_tree.c 20 Aug 2007 03:29:43 -0000 1.52
@@ -54,7 +54,7 @@
int
ewl_tree_init(Ewl_Tree *tree, unsigned short columns)
{
- int i;
+ unsigned int i;
Ewl_Widget *header;
Ewl_Widget *button;
@@ -181,8 +181,7 @@
DCHECK_PARAM_PTR("tree", tree);
DCHECK_TYPE("tree", tree, EWL_TREE_TYPE);
- tree->headers_visible = visible;
-
+ tree->headers_visible = !!visible;
row = tree->header;
ewl_container_child_iterate_begin(EWL_CONTAINER(row));
@@ -225,7 +224,7 @@
DCHECK_PARAM_PTR("tree", tree);
DCHECK_TYPE("tree", tree, EWL_TREE_TYPE);
- tree->expands_visible = expand;
+ tree->expands_visible = !!expand;
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -262,7 +261,7 @@
Ewl_Widget *
ewl_tree_row_add(Ewl_Tree *tree, Ewl_Row *prow, Ewl_Widget **children)
{
- int i;
+ unsigned int i;
Ewl_Widget *w;
Ewl_Widget *row;
Ewl_Widget *node;
@@ -353,7 +352,7 @@
Ewl_Widget *
ewl_tree_text_row_add(Ewl_Tree *tree, Ewl_Row *prow, char **text)
{
- int i;
+ unsigned int i;
Ewl_Widget **texts;
Ewl_Widget *row;
@@ -399,7 +398,7 @@
Ewl_Widget *
ewl_tree_entry_row_add(Ewl_Tree *tree, Ewl_Row *prow, char **text)
{
- int i;
+ unsigned int i;
Ewl_Widget **entries;
Ewl_Widget *row;
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_tree2.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -3 -r1.82 -r1.83
--- ewl_tree2.c 25 Jul 2007 17:01:00 -0000 1.82
+++ ewl_tree2.c 20 Aug 2007 03:29:43 -0000 1.83
@@ -811,7 +811,7 @@
ewl_mvc_handle_click(EWL_MVC(tree), ewl_mvc_model_get(EWL_MVC(node)),
ewl_mvc_data_get(EWL_MVC(node)),
- node->row_num, -1);
+ node->row_num, 0);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -847,7 +847,7 @@
Ewl_Row *row;
Ewl_Tree2 *tree;
Ewl_Tree2_Node *node;
- unsigned int column;
+ int column;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
@@ -862,6 +862,7 @@
DRETURN(DLEVEL_STABLE);
column = ewl_container_child_index_get(EWL_CONTAINER(row), w);
+ if (column < 0) DRETURN(DLEVEL_STABLE);
ewl_mvc_handle_click(EWL_MVC(node->tree),
ewl_mvc_model_get(EWL_MVC(node)),
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_widget.c,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -3 -r1.142 -r1.143
--- ewl_widget.c 16 Aug 2007 04:25:26 -0000 1.142
+++ ewl_widget.c 20 Aug 2007 03:29:43 -0000 1.143
@@ -911,7 +911,7 @@
void
ewl_widget_appearance_part_text_set(Ewl_Widget *w, const char *part, const
char *text)
{
- int i;
+ unsigned int i;
Ewl_Pair *match = NULL;
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -1005,7 +1005,7 @@
const char *
ewl_widget_appearance_part_text_get(Ewl_Widget *w, const char *part)
{
- int i;
+ unsigned int i;
Ewl_Pair *match = NULL;
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -1970,7 +1970,8 @@
* @brief sets the colour of the widget
*/
void
-ewl_widget_color_set(Ewl_Widget *w, int r, int g, int b, int a)
+ewl_widget_color_set(Ewl_Widget *w, unsigned int r, unsigned int g,
+ unsigned int b, unsigned int a)
{
Ewl_Color_Set *color;
@@ -2001,7 +2002,8 @@
* @brief Gets the colour settings of the widget
*/
void
-ewl_widget_color_get(Ewl_Widget *w, int *r, int *g, int *b, int *a)
+ewl_widget_color_get(Ewl_Widget *w, unsigned int *r, unsigned int *g,
+ unsigned int *b, unsigned int *a)
{
Ewl_Color_Set *color;
@@ -2212,7 +2214,7 @@
FREE(EWL_PAIR(w->theme_text.list)->value);
}
else {
- int i;
+ unsigned int i;
for (i = 0; i < w->theme_text.len; i++) {
Ewl_Pair *pair =
EWL_PAIR(w->theme_text.list[i]);
IF_RELEASE(pair->key);
@@ -2405,7 +2407,7 @@
ewl_widget_appearance_part_text_apply(w, key,
value);
}
else {
- int i;
+ unsigned int i;
for (i = 0; i < w->theme_text.len; i++) {
key = w->theme_text.list[i]->key;
value = w->theme_text.list[i]->value;
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_widget.h,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -3 -r1.64 -r1.65
--- ewl_widget.h 17 Jul 2007 03:45:39 -0000 1.64
+++ ewl_widget.h 20 Aug 2007 03:29:43 -0000 1.65
@@ -236,8 +236,10 @@
void ewl_widget_ignore_focus_change_set(Ewl_Widget *w, unsigned int
val);
unsigned int ewl_widget_ignore_focus_change_get(Ewl_Widget *w);
-void ewl_widget_color_set(Ewl_Widget *w, int r, int g, int b, int
a);
-void ewl_widget_color_get(Ewl_Widget *w, int *r, int *g, int *b,
int *a);
+void ewl_widget_color_set(Ewl_Widget *w, unsigned int r, unsigned
int g,
+ unsigned int b,
unsigned int a);
+void ewl_widget_color_get(Ewl_Widget *w, unsigned int *r, unsigned
int *g,
+ unsigned int *b,
unsigned int *a);
int ewl_widget_parent_of(Ewl_Widget *c, Ewl_Widget *w);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_window.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -3 -r1.82 -r1.83
--- ewl_window.c 25 Jul 2007 17:01:00 -0000 1.82
+++ ewl_window.c 20 Aug 2007 03:29:43 -0000 1.83
@@ -5,8 +5,8 @@
#include "ewl_debug.h"
Ecore_List *ewl_window_list = NULL;
-int EWL_CALLBACK_EXPOSE = 0;
-int EWL_CALLBACK_DELETE_WINDOW = 0;
+unsigned int EWL_CALLBACK_EXPOSE = 0;
+unsigned int EWL_CALLBACK_DELETE_WINDOW = 0;
/**
* @return Returns a new window on success, or NULL on failure.
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_window.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- ewl_window.h 20 May 2007 19:13:43 -0000 1.36
+++ ewl_window.h 20 Aug 2007 03:29:43 -0000 1.37
@@ -68,8 +68,8 @@
Ewl_Window_Flags old_flags; /**< Flags used on our last state set call
*/
};
-extern int EWL_CALLBACK_EXPOSE; /**< Triggered when the window needs redrawing
*/
-extern int EWL_CALLBACK_DELETE_WINDOW; /**< The window is being closed */
+extern unsigned int EWL_CALLBACK_EXPOSE; /**< Triggered when the window needs
redrawing */
+extern unsigned int EWL_CALLBACK_DELETE_WINDOW; /**< The window is being
closed */
Ewl_Widget *ewl_window_new(void);
int ewl_window_init(Ewl_Window *win);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
