Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_container.c ewl_embed.c ewl_object.h ewl_widget.c
Log Message:
- add in a DISABLED macro
- add in a widget tests for enable/disable of widgets
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_container.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -3 -r1.42 -r1.43
--- ewl_container.c 26 May 2006 15:35:02 -0000 1.42
+++ ewl_container.c 27 May 2006 17:43:59 -0000 1.43
@@ -745,16 +745,16 @@
* Now move down through the tree of widgets until the bottom layer is
* found.
*/
- if (!ewl_object_state_has(EWL_OBJECT(child), EWL_FLAG_STATE_DISABLED))
+ if (!DISABLED(child))
child2 = ewl_container_child_at_get(EWL_CONTAINER(child), x, y);
+
while (child2) {
if (RECURSIVE(child2))
child = child2;
else
DRETURN_PTR(child2, DLEVEL_STABLE);
- if (!ewl_object_state_has(EWL_OBJECT(child),
- EWL_FLAG_STATE_DISABLED))
+ if (!DISABLED(child))
child2 =
ewl_container_child_at_get(EWL_CONTAINER(child), x, y);
else
child2 = NULL;
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_embed.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -3 -r1.63 -r1.64
--- ewl_embed.c 26 May 2006 15:35:02 -0000 1.63
+++ ewl_embed.c 27 May 2006 17:43:59 -0000 1.64
@@ -275,11 +275,9 @@
/* Clean the last.clicked up recursively.. */
temp = e->last.clicked;
while (temp) {
- if (!(ewl_object_state_has(EWL_OBJECT(temp),
- EWL_FLAG_STATE_DISABLED))) {
+ if (!DISABLED(temp))
ewl_object_state_remove(EWL_OBJECT(temp),
- EWL_FLAG_STATE_PRESSED);
- }
+ EWL_FLAG_STATE_PRESSED);
temp = temp->parent;
}
@@ -366,8 +364,7 @@
*/
temp = embed->last.focused;
while (temp) {
- if (!(ewl_object_state_has(EWL_OBJECT(temp),
- EWL_FLAG_STATE_DISABLED)))
+ if (!DISABLED(temp))
ewl_callback_call_with_event_data(temp,
EWL_CALLBACK_KEY_DOWN, &ev);
temp = temp->parent;
@@ -412,8 +409,7 @@
*/
temp = embed->last.focused;
while (temp) {
- if (!(ewl_object_state_has(EWL_OBJECT(temp),
- EWL_FLAG_STATE_DISABLED)))
+ if (!DISABLED(temp))
ewl_callback_call_with_event_data(temp,
EWL_CALLBACK_KEY_UP, &ev);
temp = temp->parent;
@@ -490,8 +486,7 @@
*/
temp = widget;
while (temp) {
- if (!(ewl_object_state_has(EWL_OBJECT(temp),
- EWL_FLAG_STATE_DISABLED))) {
+ if (!DISABLED(temp)) {
ewl_object_state_add(EWL_OBJECT(temp),
EWL_FLAG_STATE_PRESSED);
@@ -523,9 +518,7 @@
ewl_callback_call(deselect, EWL_CALLBACK_FOCUS_OUT);
}
- if (widget && !(ewl_object_state_has(EWL_OBJECT(widget),
- EWL_FLAG_STATE_DISABLED))
- && !DESTROYED(widget)) {
+ if (widget && !DISABLED(widget) && !DESTROYED(widget)) {
ewl_object_state_add(EWL_OBJECT(widget),
EWL_FLAG_STATE_FOCUSED);
ewl_callback_call(widget, EWL_CALLBACK_FOCUS_IN);
@@ -568,8 +561,7 @@
*/
temp = embed->last.clicked;
while (temp) {
- if (!(ewl_object_state_has(EWL_OBJECT(temp),
- EWL_FLAG_STATE_DISABLED))) {
+ if (!DISABLED(temp)) {
ewl_object_state_remove(EWL_OBJECT(temp),
EWL_FLAG_STATE_PRESSED);
ewl_callback_call_with_event_data(temp,
@@ -643,8 +635,7 @@
*/
embed->last.mouse_in = widget;
while (embed->last.mouse_in) {
- if (!(ewl_object_state_has(EWL_OBJECT(embed->last.mouse_in),
- EWL_FLAG_STATE_DISABLED))) {
+ if (!DISABLED(embed->last.mouse_in)) {
/*
* First mouse move event in a widget marks it focused.
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_object.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- ewl_object.h 25 May 2006 17:56:08 -0000 1.12
+++ ewl_object.h 27 May 2006 17:43:59 -0000 1.13
@@ -539,6 +539,13 @@
EWL_FLAG_QUEUED_CSCHEDULED) \
|| ewl_object_queued_has(EWL_OBJECT(o), \
EWL_FLAG_QUEUED_CPROCESS))
+
+/**
+ * @def DISABLED(o)
+ * Used to determine if a widget is disabled
+ */
+#define DISABLED(o) (ewl_object_state_has(EWL_OBJECT(o),
EWL_FLAG_STATE_DISABLED))
+
/**
* @}
*/
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_widget.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -3 -r1.82 -r1.83
--- ewl_widget.c 26 May 2006 19:01:56 -0000 1.82
+++ ewl_widget.c 27 May 2006 17:43:59 -0000 1.83
@@ -1025,7 +1025,7 @@
DCHECK_PARAM_PTR("w", w);
DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
- if (ewl_object_state_has(EWL_OBJECT(w), EWL_FLAG_STATE_DISABLED)) {
+ if (DISABLED(w)) {
ewl_object_state_remove(EWL_OBJECT(w), EWL_FLAGS_STATE_MASK);
ewl_object_state_add(EWL_OBJECT(w), EWL_FLAG_STATE_NORMAL);
ewl_callback_call(w, EWL_CALLBACK_WIDGET_ENABLE);
@@ -1048,7 +1048,7 @@
DCHECK_PARAM_PTR("w", w);
DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
- if (!ewl_object_state_has(EWL_OBJECT(w), EWL_FLAG_STATE_DISABLED)) {
+ if (!DISABLED(w)) {
ewl_object_state_remove(EWL_OBJECT(w), EWL_FLAGS_STATE_MASK);
ewl_object_state_add(EWL_OBJECT(w), EWL_FLAG_STATE_DISABLED);
ewl_callback_call(w, EWL_CALLBACK_WIDGET_DISABLE);
@@ -2241,8 +2241,7 @@
EWL_STATE_PERSISTENT);
}
- if (ewl_object_state_has(EWL_OBJECT(w),
- EWL_FLAG_STATE_DISABLED))
+ if (DISABLED(w))
ewl_widget_state_set(w, "disabled",
EWL_STATE_PERSISTENT);
@@ -2712,7 +2711,7 @@
DCHECK_PARAM_PTR("w", w);
DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
- if (ewl_object_state_has(EWL_OBJECT(w), EWL_FLAG_STATE_DISABLED))
+ if (DISABLED(w))
DRETURN(DLEVEL_STABLE);
ewl_widget_state_set(w, "focus,in", EWL_STATE_TRANSIENT);
@@ -2736,7 +2735,7 @@
DCHECK_PARAM_PTR("w", w);
DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
- if (ewl_object_state_has(EWL_OBJECT(w), EWL_FLAG_STATE_DISABLED))
+ if (DISABLED(w))
DRETURN(DLEVEL_STABLE);
ewl_widget_state_set(w, "focus,out", EWL_STATE_TRANSIENT);
@@ -2760,7 +2759,7 @@
DCHECK_PARAM_PTR("w", w);
DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
- if (ewl_object_state_has(EWL_OBJECT(w), EWL_FLAG_STATE_DISABLED))
+ if (DISABLED(w))
DRETURN(DLEVEL_STABLE);
ewl_widget_state_set(w, "mouse,in", EWL_STATE_TRANSIENT);
@@ -2784,7 +2783,7 @@
DCHECK_PARAM_PTR("w", w);
DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
- if (ewl_object_state_has(EWL_OBJECT(w), EWL_FLAG_STATE_DISABLED))
+ if (DISABLED(w))
DRETURN(DLEVEL_STABLE);
ewl_widget_state_set(w, "mouse,out", EWL_STATE_TRANSIENT);
@@ -2811,7 +2810,7 @@
DCHECK_PARAM_PTR("w", w);
DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
- if (ewl_object_state_has(EWL_OBJECT(w), EWL_FLAG_STATE_DISABLED))
+ if (DISABLED(w))
DRETURN(DLEVEL_STABLE);
snprintf(state, 14, "mouse,down,%i", e->button);
@@ -2839,7 +2838,7 @@
DCHECK_PARAM_PTR("w", w);
DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
- if (ewl_object_state_has(EWL_OBJECT(w), EWL_FLAG_STATE_DISABLED))
+ if (DISABLED(w))
DRETURN(DLEVEL_STABLE);
snprintf(state, 14, "mouse,up,%i", e->button);
-------------------------------------------------------
All the advantages of Linux Managed Hosting--Without the Cost and Risk!
Fully trained technicians. The highest number of Red Hat certifications in
the hosting industry. Fanatical Support. Click to learn more
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=107521&bid=248729&dat=121642
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
