Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_box.c ewl_mvc.c ewl_object.h ewl_popup.c ewl_progressbar.h
ewl_range.c ewl_range.h ewl_scrollbar.h ewl_scrollpane.c
ewl_scrollpane.h ewl_seeker.c ewl_seeker.h ewl_table.c
ewl_table.h ewl_text.c ewl_widget.h ewl_window.h
Log Message:
- formatting
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_box.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- ewl_box.c 30 Sep 2006 18:41:01 -0000 1.31
+++ ewl_box.c 6 Dec 2006 16:27:10 -0000 1.32
@@ -160,15 +160,16 @@
/*
* Setup the container size change handlers.
*/
- ewl_container_resize_notify_set(EWL_CONTAINER(b),
ewl_box_cb_child_resize);
+ ewl_container_resize_notify_set(EWL_CONTAINER(b),
+ ewl_box_cb_child_resize);
ewl_container_show_notify_set(EWL_CONTAINER(b), ewl_box_cb_child_show);
ewl_container_hide_notify_set(EWL_CONTAINER(b), ewl_box_cb_child_hide);
/*
* Attach the default layout callback.
*/
- ewl_callback_append(w, EWL_CALLBACK_CONFIGURE, ewl_box_cb_configure,
- NULL);
+ ewl_callback_append(w, EWL_CALLBACK_CONFIGURE,
+ ewl_box_cb_configure, NULL);
/*
* Check if the info structs have been created yet, if not create
@@ -202,7 +203,7 @@
{
Ewl_Container *c;
Ewl_Widget *child;
- char *appearance;
+ char *appearance;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("b", b);
@@ -221,7 +222,7 @@
* the appearance if it is still set to box. Otherwise we might end
* up wipeing out the appearance of an inheriting widget (like
* menubar */
- appearance = ewl_widget_appearance_get(EWL_WIDGET(b));
+ appearance = ewl_widget_appearance_get(EWL_WIDGET(b));
if ((b->orientation == EWL_ORIENTATION_HORIZONTAL)
&& (!strcmp(appearance, "vbox")))
ewl_widget_appearance_set(EWL_WIDGET(b), "hbox");
@@ -230,7 +231,7 @@
&& (!strcmp(appearance, "hbox")))
ewl_widget_appearance_set(EWL_WIDGET(b), "vbox");
- IF_FREE(appearance);
+ IF_FREE(appearance);
/* we need to reset the preferred size of the box after chaning the
* orientation. We'll cheat by calling ewl_box_child_show_cb foreach
@@ -540,7 +541,7 @@
*/
ecore_dlist_goto_first(EWL_CONTAINER(b)->children);
while ((child = ecore_dlist_next(EWL_CONTAINER(b)->children))) {
- int change;
+ int change;
/*
* Place the child on a list depending on it's matching
@@ -976,7 +977,7 @@
* These are the valid fill policies for this widget.
*/
ewl_box_vertical->f_policy =
- EWL_FLAG_FILL_VSHRINK | EWL_FLAG_FILL_VFILL;
+ EWL_FLAG_FILL_VSHRINK | EWL_FLAG_FILL_VFILL;
/*
* This sets the aligments for the non-filling direction.
@@ -1017,7 +1018,7 @@
* These are the valid fill policies for this widget.
*/
ewl_box_horizontal->f_policy =
- EWL_FLAG_FILL_HSHRINK | EWL_FLAG_FILL_HFILL;
+ EWL_FLAG_FILL_HSHRINK | EWL_FLAG_FILL_HFILL;
/*
* This sets the aligments for the non-filling direction.
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_mvc.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- ewl_mvc.c 17 Nov 2006 05:20:19 -0000 1.11
+++ ewl_mvc.c 6 Dec 2006 16:27:10 -0000 1.12
@@ -722,7 +722,7 @@
multi_select = TRUE;
modifiers = ewl_ev_modifiers_get();
- if (multi_select && (modifiers & EWL_KEY_MODIFIER_SHIFT))
+ if (multi_select && (modifiers & EWL_KEY_MODIFIER_SHIFT))
{
/* is this the first click? */
if (ewl_mvc_selected_count_get(mvc) > 0)
@@ -791,14 +791,14 @@
else
ewl_mvc_selected_set(mvc, row, column);
}
- else if (multi_select && (modifiers & EWL_KEY_MODIFIER_CTRL))
- {
- if (ewl_mvc_selected_is(mvc, row, column))
- ewl_mvc_selected_rm(mvc, row, column);
- else
- ewl_mvc_selected_add(mvc, row, column);
- }
- else
+ else if (multi_select && (modifiers & EWL_KEY_MODIFIER_CTRL))
+ {
+ if (ewl_mvc_selected_is(mvc, row, column))
+ ewl_mvc_selected_rm(mvc, row, column);
+ else
+ ewl_mvc_selected_add(mvc, row, column);
+ }
+ else
ewl_mvc_selected_set(mvc, row, column);
DLEAVE_FUNCTION(DLEVEL_STABLE);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_object.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- ewl_object.h 15 Aug 2006 15:06:51 -0000 1.14
+++ ewl_object.h 6 Dec 2006 16:27:10 -0000 1.15
@@ -65,16 +65,16 @@
{
struct
{
- int x, /**< Horizontal position */
- y; /**< Vertical position */
- int w, /**< Width */
- h; /**< Height */
+ int x, /**< Horizontal position */
+ y; /**< Vertical position */
+ int w, /**< Width */
+ h; /**< Height */
} current; /**< The current size and position of an object. */
struct
{
- int w, /**< Width */
- h; /**< Height */
+ int w, /**< Width */
+ h; /**< Height */
}
preferred, /**< The optimal size of the object in ideal circumstances */
maximum, /**< The guaranteed maximum size this object will receive. */
@@ -82,10 +82,10 @@
struct
{
- int l, /**< Left value */
- r, /**< Right value */
- t, /**< Top value */
- b; /**< Bottom value */
+ int l, /**< Left value */
+ r, /**< Right value */
+ t, /**< Top value */
+ b; /**< Bottom value */
} pad, /**< The space padded around the outside of the object. */
insets; /**< The space inside where children should not be laid out. */
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_popup.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ewl_popup.c 1 Dec 2006 19:10:34 -0000 1.4
+++ ewl_popup.c 6 Dec 2006 16:27:10 -0000 1.5
@@ -206,11 +206,11 @@
*/
void
ewl_popup_cb_show(Ewl_Widget *w, void *ev_data __UNUSED__,
- void *user_data __UNUSED__)
+ void *user_data __UNUSED__)
{
- DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("w", w);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR("w", w);
+ DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
ewl_popup_size_check(EWL_POPUP(w));
ewl_popup_position_check(EWL_POPUP(w));
@@ -220,7 +220,7 @@
if (ewl_window_keyboard_grab_get(EWL_WINDOW(w)))
ewl_window_keyboard_grab_set(EWL_WINDOW(w), TRUE);
- DLEAVE_FUNCTION(DLEVEL_STABLE);
+ DLEAVE_FUNCTION(DLEVEL_STABLE);
}
/**
@@ -233,20 +233,20 @@
*/
void
ewl_popup_cb_destroy(Ewl_Widget *w, void *ev_data __UNUSED__,
- void *user_data __UNUSED__)
+ void *user_data __UNUSED__)
{
- Ewl_Popup *p;
+ Ewl_Popup *p;
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("w", w);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_PARAM_PTR("w", w);
+ DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
p = EWL_POPUP(w);
if (p->follow)
ewl_callback_del_with_data(p->follow, EWL_CALLBACK_DESTROY,
ewl_popup_cb_follow_destroy, p);
- DLEAVE_FUNCTION(DLEVEL_STABLE);
+ DLEAVE_FUNCTION(DLEVEL_STABLE);
}
/**
@@ -261,17 +261,17 @@
ewl_popup_cb_follow_configure(Ewl_Widget *w __UNUSED__,
void *ev_data __UNUSED__, void *user_data)
{
- Ewl_Popup *p;
+ Ewl_Popup *p;
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("user_data", user_data);
- DCHECK_TYPE("user_data", user_data, EWL_POPUP_TYPE);
+ DCHECK_PARAM_PTR("user_data", user_data);
+ DCHECK_TYPE("user_data", user_data, EWL_POPUP_TYPE);
p = EWL_POPUP(user_data);
ewl_popup_size_check(p);
ewl_popup_position_check(p);
- DLEAVE_FUNCTION(DLEVEL_STABLE);
+ DLEAVE_FUNCTION(DLEVEL_STABLE);
}
/**
@@ -284,13 +284,13 @@
*/
void
ewl_popup_cb_follow_destroy(Ewl_Widget *w __UNUSED__, void *ev_data __UNUSED__,
- void *user_data)
+ void *user_data)
{
- Ewl_Popup *p;
+ Ewl_Popup *p;
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("user_data", user_data);
- DCHECK_TYPE("user_data", user_data, EWL_POPUP_TYPE);
+ DCHECK_PARAM_PTR("user_data", user_data);
+ DCHECK_TYPE("user_data", user_data, EWL_POPUP_TYPE);
p = EWL_POPUP(user_data);
p->follow = NULL;
@@ -298,7 +298,7 @@
if (p->type != EWL_POPUP_TYPE_NONE)
ewl_widget_hide(EWL_WIDGET(p));
- DLEAVE_FUNCTION(DLEVEL_STABLE);
+ DLEAVE_FUNCTION(DLEVEL_STABLE);
}
/**
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_progressbar.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- ewl_progressbar.h 4 Dec 2006 07:16:39 -0000 1.12
+++ ewl_progressbar.h 6 Dec 2006 16:27:10 -0000 1.13
@@ -41,10 +41,10 @@
*/
struct Ewl_Progressbar
{
- Ewl_Range range; /**< Inherit from Ewl_Range */
- Ewl_Widget *bar; /**< The moving bar on top */
- Ewl_Widget *label; /**< text label on the bar */
- int auto_label; /**< flag if user is setting label or not
*/
+ Ewl_Range range; /**< Inherit from Ewl_Range */
+ Ewl_Widget *bar; /**< The moving bar on top */
+ Ewl_Widget *label; /**< text label on the bar */
+ int auto_label; /**< flag if user is setting label or not */
};
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_range.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ewl_range.c 14 Aug 2006 14:56:56 -0000 1.3
+++ ewl_range.c 6 Dec 2006 16:27:10 -0000 1.4
@@ -56,12 +56,12 @@
if (r->value == v)
DRETURN(DLEVEL_STABLE);
- if (v < r->min_val)
- r->value = r->min_val;
- else if (v > r->max_val)
- r->value = r->max_val;
- else
- r->value = v;
+ if (v < r->min_val)
+ r->value = r->min_val;
+ else if (v > r->max_val)
+ r->value = r->max_val;
+ else
+ r->value = v;
ewl_callback_call(EWL_WIDGET(r), EWL_CALLBACK_VALUE_CHANGED);
ewl_widget_configure(EWL_WIDGET(r));
@@ -96,17 +96,17 @@
void
ewl_range_minimum_value_set(Ewl_Range *r, double minv)
{
- DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("r", r);
- DCHECK_TYPE("r", r, EWL_RANGE_TYPE);
+ DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR("r", r);
+ DCHECK_TYPE("r", r, EWL_RANGE_TYPE);
- r->min_val = minv;
+ r->min_val = minv;
/* update to the min value if needed */
if (r->value < r->min_val)
ewl_range_value_set(r, r->min_val);
- DLEAVE_FUNCTION(DLEVEL_STABLE);
+ DLEAVE_FUNCTION(DLEVEL_STABLE);
}
/**
@@ -135,17 +135,17 @@
void
ewl_range_maximum_value_set(Ewl_Range *r, double maxv)
{
- DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("r", r);
- DCHECK_TYPE("r", r, EWL_RANGE_TYPE);
+ DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR("r", r);
+ DCHECK_TYPE("r", r, EWL_RANGE_TYPE);
- r->max_val = maxv;
+ r->max_val = maxv;
/* update to max value if needed */
if (r->value > r->max_val)
ewl_range_value_set(r, r->max_val);
- DLEAVE_FUNCTION(DLEVEL_STABLE);
+ DLEAVE_FUNCTION(DLEVEL_STABLE);
}
/**
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_range.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ewl_range.h 4 Dec 2006 07:16:39 -0000 1.3
+++ ewl_range.h 6 Dec 2006 16:27:10 -0000 1.4
@@ -36,13 +36,13 @@
*/
struct Ewl_Range
{
- Ewl_Container container; /**< Inherit from Ewl_Container */
+ Ewl_Container container; /**< Inherit from Ewl_Container */
- double value; /**< Currently chosen value */
- double min_val; /**< Minimal valide value */
- double max_val; /**< Maximal valide value */
- double step; /**< Size of increments in the range */
- int invert; /**< Invert the axis */
+ double value; /**< Currently chosen value */
+ double min_val; /**< Minimal valide value */
+ double max_val; /**< Maximal valide value */
+ double step; /**< Size of increments in the range */
+ int invert; /**< Invert the axis */
};
int ewl_range_init(Ewl_Range *r);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_scrollbar.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- ewl_scrollbar.h 4 Dec 2006 07:16:39 -0000 1.12
+++ ewl_scrollbar.h 6 Dec 2006 16:27:10 -0000 1.13
@@ -52,18 +52,18 @@
*/
struct Ewl_Scrollbar
{
- Ewl_Box box; /**< Inherit from Ewl_Box */
+ Ewl_Box box; /**< Inherit from Ewl_Box */
- Ewl_Widget *seeker; /**< The internal Ewl_Seeker */
- Ewl_Widget *decrement; /**< The internal decrement button */
- Ewl_Widget *increment; /**< The internal increment button */
- unsigned int buttons_alignment; /**< The ordering of buttons */
+ Ewl_Widget *seeker; /**< The internal Ewl_Seeker */
+ Ewl_Widget *decrement; /**< The internal decrement button */
+ Ewl_Widget *increment; /**< The internal increment button */
+ unsigned int buttons_alignment; /**< The ordering of buttons */
- double fill_percentage; /**< Ratio of size for draggable */
- double start_time; /**< Time scrolling began */
- Ecore_Timer *timer; /**< Repeating timer for scrolling */
- signed char direction; /**< Direction for the scrollbar */
- signed char invert; /**< Invert the scrolling direction
*/
+ double fill_percentage; /**< Ratio of size for draggable */
+ double start_time; /**< Time scrolling began */
+ Ecore_Timer *timer; /**< Repeating timer for scrolling */
+ signed char direction; /**< Direction for the scrollbar */
+ signed char invert; /**< Invert the scrolling direction */
};
Ewl_Widget *ewl_scrollbar_new(void);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_scrollpane.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- ewl_scrollpane.c 30 Sep 2006 18:41:01 -0000 1.18
+++ ewl_scrollpane.c 6 Dec 2006 16:27:10 -0000 1.19
@@ -282,7 +282,7 @@
/**
* @param s: the scrollpane to retrieve its vertical scrollbar stepping
* @return Returns the value of the stepping of the vertical scrollbar
- * in @a s on success.
+ * in @a s on success.
* @brief Retrives the value of the stepping of the vertical scrollbar in @a s.
*/
double
@@ -299,7 +299,7 @@
/**
* @param s: the scrollpane to retrieve its vertical scrollbar stepping
* @return Returns the value of the stepping of the vertical scrollbar
- * in @a s on success.
+ * in @a s on success.
* @brief Retrives the value of the stepping of the vertical scrollbar in @a s.
*/
double
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_scrollpane.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- ewl_scrollpane.h 4 Dec 2006 07:16:39 -0000 1.12
+++ ewl_scrollpane.h 6 Dec 2006 16:27:10 -0000 1.13
@@ -41,14 +41,14 @@
*/
struct Ewl_Scrollpane
{
- Ewl_Container container; /**< Inherit from Ewl_Container */
+ Ewl_Container container; /**< Inherit from Ewl_Container */
- Ewl_Widget *overlay; /**< Clips the enclosed widget */
- Ewl_Widget *box; /**< Lays out enclosed widget */
- Ewl_Widget *hscrollbar; /**< Horizontal scrollbar */
- Ewl_Widget *vscrollbar; /**< Vertical scrollbar */
- Ewl_Scrollpane_Flags hflag; /**< Flags for horizontal scrollbar */
- Ewl_Scrollpane_Flags vflag; /**< Flags for vertical scrollbar */
+ Ewl_Widget *overlay; /**< Clips the enclosed widget */
+ Ewl_Widget *box; /**< Lays out enclosed widget */
+ Ewl_Widget *hscrollbar; /**< Horizontal scrollbar */
+ Ewl_Widget *vscrollbar; /**< Vertical scrollbar */
+ Ewl_Scrollpane_Flags hflag; /**< Flags for horizontal scrollbar */
+ Ewl_Scrollpane_Flags vflag; /**< Flags for vertical scrollbar */
};
Ewl_Widget *ewl_scrollpane_new(void);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_seeker.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- ewl_seeker.c 30 Sep 2006 18:41:01 -0000 1.20
+++ ewl_seeker.c 6 Dec 2006 16:27:10 -0000 1.21
@@ -168,13 +168,13 @@
s->orientation = o;
if (o == EWL_ORIENTATION_HORIZONTAL) {
ewl_widget_appearance_set(EWL_WIDGET(s), "hseeker");
- ewl_widget_appearance_set(s->button, "hbutton");
+ ewl_widget_appearance_set(s->button, "hbutton");
ewl_object_fill_policy_set(EWL_OBJECT(s), EWL_FLAG_FILL_HFILL |
EWL_FLAG_FILL_HSHRINK);
}
else {
ewl_widget_appearance_set(EWL_WIDGET(s), "vseeker");
- ewl_widget_appearance_set(s->button, "vbutton");
+ ewl_widget_appearance_set(s->button, "vbutton");
ewl_object_fill_policy_set(EWL_OBJECT(s), EWL_FLAG_FILL_VFILL |
EWL_FLAG_FILL_VSHRINK);
}
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_seeker.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- ewl_seeker.h 4 Dec 2006 07:16:39 -0000 1.15
+++ ewl_seeker.h 6 Dec 2006 16:27:10 -0000 1.16
@@ -43,13 +43,13 @@
*/
struct Ewl_Seeker
{
- Ewl_Range range; /**< Inherit from Ewl_Range */
+ Ewl_Range range; /**< Inherit from Ewl_Range */
Ewl_Orientation orientation; /**< Indicates layout direction */
- Ewl_Widget *button; /**< Draggable widget for selecting value */
- int dragstart; /**< The coordinate where the drag starts */
- int autohide; /**< Indicator to hide when not scrollable */
- Ecore_Timer *timer; /**< Timer for scroll repeating */
- double start_time; /**< Time the timer was started */
+ Ewl_Widget *button; /**< Draggable widget for selecting value */
+ int dragstart; /**< The coordinate where the drag starts */
+ int autohide; /**< Indicator to hide when not scrollable */
+ Ecore_Timer *timer; /**< Timer for scroll repeating */
+ double start_time; /**< Time the timer was started */
};
Ewl_Widget *ewl_seeker_new(void);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_table.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- ewl_table.c 30 Sep 2006 18:41:01 -0000 1.21
+++ ewl_table.c 6 Dec 2006 16:27:10 -0000 1.22
@@ -110,7 +110,7 @@
* Append callbacks
*/
ewl_callback_append(EWL_WIDGET(t), EWL_CALLBACK_CONFIGURE,
- ewl_table_cb_configure, NULL);
+ ewl_table_cb_configure, NULL);
DRETURN_INT(TRUE, DLEVEL_STABLE);
}
@@ -127,9 +127,9 @@
*/
void
ewl_table_add(Ewl_Table *table, Ewl_Widget *w,
- int start_col, int end_col, int start_row, int end_row)
+ int start_col, int end_col, int start_row, int end_row)
{
- Ewl_Cell *cell;
+ Ewl_Cell *cell;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("table", table);
@@ -143,14 +143,14 @@
ewl_container_child_append(EWL_CONTAINER(table->grid),
EWL_WIDGET(cell));
if (table->col_headers)
- ewl_grid_child_position_set(table->grid, EWL_WIDGET(cell),
- start_col, end_col, start_row + 1, end_row + 1);
+ ewl_grid_child_position_set(table->grid, EWL_WIDGET(cell),
+ start_col, end_col, start_row + 1, end_row + 1);
else
- ewl_grid_child_position_set(table->grid, EWL_WIDGET(cell),
- start_col, end_col, start_row, end_row);
+ ewl_grid_child_position_set(table->grid, EWL_WIDGET(cell),
+ start_col, end_col, start_row, end_row);
ewl_callback_prepend(EWL_WIDGET(cell), EWL_CALLBACK_MOUSE_UP,
- ewl_table_cb_child_select, table);
+ ewl_table_cb_child_select, table);
ewl_widget_show(EWL_WIDGET(cell));
@@ -223,7 +223,7 @@
*/
Ecore_List *
ewl_table_find(Ewl_Table *t, int start_col, int end_col,
- int start_row, int end_row)
+ int start_row, int end_row)
{
/*---------------------------------
* DEVELOPER NOTE:
@@ -249,10 +249,10 @@
ecore_dlist_goto_first(children);
while ((child = ecore_dlist_next(children)) != NULL) {
gc = (Ewl_Grid_Child *) ewl_widget_data_get(child,
- (void *) t->grid);
+ (void *) t->grid);
if (start_col >= gc->start_col && end_col <= gc->end_col &&
- start_row >= gc->start_row && end_row <= gc->end_row) {
+ start_row >= gc->start_row && end_row <= gc->end_row) {
ecore_list_append(list, child);
}
}
@@ -409,12 +409,12 @@
ecore_dlist_goto_first(children);
while ((child = ecore_dlist_next(children)) != NULL) {
gc = (Ewl_Grid_Child *) ewl_widget_data_get(child,
- (void *) t->grid);
+ (void *) t->grid);
if (t->selected.start_c == gc->start_col &&
- t->selected.start_r == gc->start_row &&
- t->selected.end_c == gc->end_col &&
- t->selected.end_r == gc->end_row) {
+ t->selected.start_r == gc->start_row &&
+ t->selected.end_c == gc->end_col &&
+ t->selected.end_r == gc->end_row) {
tw = (Ewl_Text *) ecore_dlist_goto_first(
EWL_CONTAINER(child)->children);
@@ -487,11 +487,11 @@
o = EWL_OBJECT(w);
ewl_object_geometry_request(EWL_OBJECT(table->grid),
- CURRENT_X(o), CURRENT_Y(o),
- CURRENT_W(o) - INSET_LEFT(o) +
- INSET_RIGHT(o),
- CURRENT_H(o) - INSET_TOP(o) +
- INSET_BOTTOM(o));
+ CURRENT_X(o), CURRENT_Y(o),
+ CURRENT_W(o) - INSET_LEFT(o) +
+ INSET_RIGHT(o),
+ CURRENT_H(o) - INSET_TOP(o) +
+ INSET_BOTTOM(o));
ecore_dlist_goto_first(EWL_CONTAINER(table->grid)->children);
while ((child =
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_table.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- ewl_table.h 4 Dec 2006 07:16:39 -0000 1.16
+++ ewl_table.h 6 Dec 2006 16:27:10 -0000 1.17
@@ -40,14 +40,14 @@
*/
struct Ewl_Table
{
- Ewl_Container container; /**< Inherit from Ewl_Container
*/
- Ewl_Grid *grid; /**< Table uses a grid based
layout */
+ Ewl_Container container; /**< Inherit from Ewl_Container
*/
+ Ewl_Grid *grid; /**< Table uses a grid based layout */
- char **col_headers; /**< The column headers */
- int row_select; /**< boolean: select entire
rows */
+ char **col_headers; /**< The column headers */
+ int row_select; /**< boolean: select entire rows */
- unsigned int homogeneous_h; /**< Horizontal homogeneous
flag */
- unsigned int homogeneous_v; /**< Vertical homogeneous flag
*/
+ unsigned int homogeneous_h; /**< Horizontal homogeneous flag */
+ unsigned int homogeneous_v; /**< Vertical homogeneous flag */
struct {
int start_r; /**< Selection start row */
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_text.c,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -3 -r1.143 -r1.144
--- ewl_text.c 28 Nov 2006 19:49:22 -0000 1.143
+++ ewl_text.c 6 Dec 2006 16:27:10 -0000 1.144
@@ -23,19 +23,19 @@
static Ecore_Hash *context_hash = NULL;
static const char ewl_text_trailing_bytes[256] = {
- 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
- 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
- 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
- 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
- 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
- 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
- 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
- 3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3, 4,4,4,4,4,4,4,4,5,5,5,5,6,6,6,6
+ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+ 3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3, 4,4,4,4,4,4,4,4,5,5,5,5,6,6,6,6
};
/* returns length of the next utf-8 sequence */
#define EWL_TEXT_CHAR_BYTE_LEN(s) \
- (ewl_text_trailing_bytes[(unsigned int)(unsigned char)((s)[0])])
+ (ewl_text_trailing_bytes[(unsigned int)(unsigned char)((s)[0])])
static Ewl_Text_Fmt *ewl_text_fmt_get(Ewl_Text *t, unsigned int char_idx);
static void ewl_text_current_fmt_set(Ewl_Text *t, unsigned int context_mask,
@@ -2818,15 +2818,15 @@
{
case 2:
/* 2 byte */
- if ((t[1] & 0xc0) != 0x80)
- DRETURN_INT(FALSE, DLEVEL_STABLE);
+ if ((t[1] & 0xc0) != 0x80)
+ DRETURN_INT(FALSE, DLEVEL_STABLE);
break;
case 3:
/* 3 byte */
if (((t[1] & 0xc0) != 0x80)
|| ((t[2] & 0xc0) != 0x80))
- DRETURN_INT(FALSE, DLEVEL_STABLE);
+ DRETURN_INT(FALSE, DLEVEL_STABLE);
break;
case 4:
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_widget.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -3 -r1.48 -r1.49
--- ewl_widget.h 4 Dec 2006 07:16:39 -0000 1.48
+++ ewl_widget.h 6 Dec 2006 16:27:10 -0000 1.49
@@ -127,29 +127,29 @@
*/
struct Ewl_Widget
{
- Ewl_Object object; /**< Inherit the base Object class */
- Ewl_Widget *parent; /**< The parent widget, actually a container */
+ Ewl_Object object; /**< Inherit the base Object class */
+ Ewl_Widget *parent; /**< The parent widget, actually a container */
Ewl_Callback_Chain callbacks[EWL_CALLBACK_MAX + 1];
/**< Callback chain array */
Ewl_Attach_List *attach; /**< List of attachments on the widget */
- Evas_Object *smart_object; /**< Smart Object for the layer stuff */
- Evas_Object *fx_clip_box; /**< Clipping rectangle of widget */
+ Evas_Object *smart_object; /**< Smart Object for the layer stuff */
+ Evas_Object *fx_clip_box; /**< Clipping rectangle of widget */
- Evas_Object *theme_object; /**< Appearance shown on canvas */
- const char *bit_path; /**< Path to the file for loading */
- const char *bit_group; /**< Group in theme to use */
- const char *bit_state; /**< State of the appearance */
- const char *appearance; /**< Key to lookup appearance in theme */
- const char *inheritance; /**< Inheritance of path widget */
- int layer; /**< the layer relative to the parent */
- int toplayered; /**< Indicates if the widget should
+ Evas_Object *theme_object; /**< Appearance shown on canvas */
+ const char *bit_path; /**< Path to the file for loading */
+ const char *bit_group; /**< Group in theme to use */
+ const char *bit_state; /**< State of the appearance */
+ const char *appearance; /**< Key to lookup appearance in theme */
+ const char *inheritance; /**< Inheritance of path widget */
+ int layer; /**< the layer relative to the parent */
+ int toplayered; /**< Indicates if the widget should
be on the top of the layer
stack */
- Ecore_Hash *theme; /**< Overriding theme settings */
- Ewl_Pair_List theme_text; /**< Overriding text in theme */
- Ecore_Hash *data; /**< Arbitrary data attached to widget */
+ Ecore_Hash *theme; /**< Overriding theme settings */
+ Ewl_Pair_List theme_text; /**< Overriding text in theme */
+ Ecore_Hash *data; /**< Arbitrary data attached to widget */
};
int ewl_widget_init(Ewl_Widget * w);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_window.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- ewl_window.h 4 Dec 2006 07:16:39 -0000 1.24
+++ ewl_window.h 6 Dec 2006 16:27:10 -0000 1.25
@@ -41,45 +41,45 @@
*/
struct Ewl_Window
{
- Ewl_Embed embed; /**< Inherits from the Ewl_Embed class */
+ Ewl_Embed embed; /**< Inherits from the Ewl_Embed class */
- void *window; /**< Provides a window for drawing */
- Ewl_Window *transient; /**< Window to be transient for */
+ void *window; /**< Provides a window for drawing */
+ Ewl_Window *transient; /**< Window to be transient for */
- char *title; /**< The current title on the provided window */
- char *name; /**< Current name on the provided window */
- char *classname; /**< Current class on the provided window */
+ char *title; /**< The current title on the provided window */
+ char *name; /**< Current name on the provided window */
+ char *classname; /**< Current class on the provided window */
Ewl_Window_Flags flags; /**< Flags indicating window properties */
};
-Ewl_Widget *ewl_window_new(void);
-int ewl_window_init(Ewl_Window *win);
-Ewl_Window *ewl_window_window_find(void *window);
-void ewl_window_title_set(Ewl_Window *win, const char *title);
-char *ewl_window_title_get(Ewl_Window *win);
-void ewl_window_name_set(Ewl_Window *win, const char *name);
-char *ewl_window_name_get(Ewl_Window *win);
-void ewl_window_class_set(Ewl_Window *win, const char *classname);
-char *ewl_window_class_get(Ewl_Window *win);
-void ewl_window_borderless_set(Ewl_Window *win);
-void ewl_window_dialog_set(Ewl_Window *win, int dialog);
-int ewl_window_dialog_get(Ewl_Window *win);
-void ewl_window_fullscreen_set(Ewl_Window *win,
+Ewl_Widget *ewl_window_new(void);
+int ewl_window_init(Ewl_Window *win);
+Ewl_Window *ewl_window_window_find(void *window);
+void ewl_window_title_set(Ewl_Window *win, const char *title);
+char *ewl_window_title_get(Ewl_Window *win);
+void ewl_window_name_set(Ewl_Window *win, const char *name);
+char *ewl_window_name_get(Ewl_Window *win);
+void ewl_window_class_set(Ewl_Window *win, const char *classname);
+char *ewl_window_class_get(Ewl_Window *win);
+void ewl_window_borderless_set(Ewl_Window *win);
+void ewl_window_dialog_set(Ewl_Window *win, int dialog);
+int ewl_window_dialog_get(Ewl_Window *win);
+void ewl_window_fullscreen_set(Ewl_Window *win,
unsigned int fullscreen);
-unsigned int ewl_window_fullscreen_get(Ewl_Window *win);
-void ewl_window_move(Ewl_Window *win, int x, int y);
-void ewl_window_raise(Ewl_Window *win);
-void ewl_window_lower(Ewl_Window *win);
-void ewl_window_transient_for(Ewl_Window *win, Ewl_Window *forwin);
-void ewl_window_modal_for(Ewl_Window *win, Ewl_Window *forwin);
-void ewl_window_keyboard_grab_set(Ewl_Window *win, int grab);
-int ewl_window_keyboard_grab_get(Ewl_Window *win);
-void ewl_window_pointer_grab_set(Ewl_Window *win, int grab);
-int ewl_window_pointer_grab_get(Ewl_Window *win);
-void ewl_window_override_set(Ewl_Window *win, int override);
-int ewl_window_override_get(Ewl_Window *win);
-void ewl_window_selection_text_set(Ewl_Window *win, const char
*txt);
+unsigned int ewl_window_fullscreen_get(Ewl_Window *win);
+void ewl_window_move(Ewl_Window *win, int x, int y);
+void ewl_window_raise(Ewl_Window *win);
+void ewl_window_lower(Ewl_Window *win);
+void ewl_window_transient_for(Ewl_Window *win, Ewl_Window *forwin);
+void ewl_window_modal_for(Ewl_Window *win, Ewl_Window *forwin);
+void ewl_window_keyboard_grab_set(Ewl_Window *win, int grab);
+int ewl_window_keyboard_grab_get(Ewl_Window *win);
+void ewl_window_pointer_grab_set(Ewl_Window *win, int grab);
+int ewl_window_pointer_grab_get(Ewl_Window *win);
+void ewl_window_override_set(Ewl_Window *win, int override);
+int ewl_window_override_get(Ewl_Window *win);
+void ewl_window_selection_text_set(Ewl_Window *win, const char
*txt);
/*
* Internally used callbacks, override at your own risk.
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
