Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_container.c ewl_enums.h ewl_misc.c ewl_object.h
ewl_widget.c
Log Message:
- make flag names more descriptive
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_container.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -3 -r1.65 -r1.66
--- ewl_container.c 11 Sep 2007 01:33:32 -0000 1.65
+++ ewl_container.c 10 Nov 2007 06:03:18 -0000 1.66
@@ -654,7 +654,7 @@
DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
if (!size || !REALIZED(w) || ewl_object_queued_has(EWL_OBJECT(w),
- EWL_FLAG_QUEUED_RSCHEDULED))
+
EWL_FLAG_QUEUED_SCHEDULED_REVEAL))
DRETURN(DLEVEL_STABLE);
c = EWL_CONTAINER(w->parent);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_enums.h,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -3 -r1.81 -r1.82
--- ewl_enums.h 23 Aug 2007 05:26:50 -0000 1.81
+++ ewl_enums.h 10 Nov 2007 06:03:18 -0000 1.82
@@ -138,13 +138,13 @@
/*
* Flags to indicate queues this object is on.
*/
- EWL_FLAG_QUEUED_CSCHEDULED = 0x100000, /**< Configure scheduled */
- EWL_FLAG_QUEUED_RSCHEDULED = 0x200000, /**< Reveal scheduled */
- EWL_FLAG_QUEUED_DSCHEDULED = 0x400000, /**< Delete scheduled */
-
- EWL_FLAG_QUEUED_CPROCESS = 0x800000, /**< Configure in progress */
- EWL_FLAG_QUEUED_RPROCESS = 0x1000000, /**< Reveal in progress */
- EWL_FLAG_QUEUED_DPROCESS = 0x2000000, /**< Delete in progress */
+ EWL_FLAG_QUEUED_SCHEDULED_CONFIGURE = 0x100000, /**< Configure
scheduled */
+ EWL_FLAG_QUEUED_SCHEDULED_REVEAL = 0x200000, /**< Reveal scheduled */
+ EWL_FLAG_QUEUED_SCHEDULED_DESTROY = 0x400000, /**< Delete scheduled */
+
+ EWL_FLAG_QUEUED_PROCESS_CONFIGURE = 0x800000, /**< Configure in
progress */
+ EWL_FLAG_QUEUED_PROCESS_REVEAL = 0x1000000, /**< Reveal in progress
*/
+ EWL_FLAG_QUEUED_PROCESS_DESTROY = 0x2000000, /**< Delete in progress
*/
/*
* The state enum specifies the current state of a widget, ie. has it
@@ -201,10 +201,10 @@
* @def EWL_FLAGS_QUEUED_MASK
* The queue mask
*/
-#define EWL_FLAGS_QUEUED_MASK (EWL_FLAG_QUEUED_CSCHEDULED | \
- EWL_FLAG_QUEUED_RSCHEDULED | EWL_FLAG_QUEUED_DSCHEDULED | \
- EWL_FLAG_QUEUED_CPROCESS | EWL_FLAG_QUEUED_RPROCESS | \
- EWL_FLAG_QUEUED_DPROCESS)
+#define EWL_FLAGS_QUEUED_MASK (EWL_FLAG_QUEUED_SCHEDULED_CONFIGURE | \
+ EWL_FLAG_QUEUED_SCHEDULED_REVEAL |
EWL_FLAG_QUEUED_SCHEDULED_DESTROY | \
+ EWL_FLAG_QUEUED_PROCESS_CONFIGURE |
EWL_FLAG_QUEUED_PROCESS_REVEAL | \
+ EWL_FLAG_QUEUED_PROCESS_DESTROY)
/**
* @def EWL_FLAGS_STATE_MASK
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_misc.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -3 -r1.103 -r1.104
--- ewl_misc.c 28 Sep 2007 07:30:05 -0000 1.103
+++ ewl_misc.c 10 Nov 2007 06:03:18 -0000 1.104
@@ -750,9 +750,9 @@
* Widget scheduled for destruction, configuration, or is being called
* within a configure callback.
*/
- if (ewl_object_queued_has(o, (EWL_FLAG_QUEUED_DSCHEDULED |
- EWL_FLAG_QUEUED_CSCHEDULED |
- EWL_FLAG_QUEUED_CPROCESS)))
+ if (ewl_object_queued_has(o, (EWL_FLAG_QUEUED_SCHEDULED_DESTROY |
+ EWL_FLAG_QUEUED_SCHEDULED_CONFIGURE |
+ EWL_FLAG_QUEUED_PROCESS_CONFIGURE)))
DRETURN(DLEVEL_STABLE);
/*
@@ -763,7 +763,7 @@
while (search->parent) {
search = search->parent;
if (ewl_object_queued_has(EWL_OBJECT(search),
- EWL_FLAG_QUEUED_CSCHEDULED))
+ EWL_FLAG_QUEUED_SCHEDULED_CONFIGURE))
DRETURN(DLEVEL_TESTING);
}
@@ -771,7 +771,7 @@
* Verify top level widget is not queued for configure.
*/
if (ewl_object_queued_has(EWL_OBJECT(search),
- EWL_FLAG_QUEUED_CSCHEDULED))
+ EWL_FLAG_QUEUED_SCHEDULED_CONFIGURE))
DRETURN(DLEVEL_TESTING);
/*
@@ -785,7 +785,7 @@
* No parent of this widget is queued so add it to the queue. All
* children widgets should have been removed by this point.
*/
- ewl_object_queued_add(EWL_OBJECT(w), EWL_FLAG_QUEUED_CSCHEDULED);
+ ewl_object_queued_add(EWL_OBJECT(w),
EWL_FLAG_QUEUED_SCHEDULED_CONFIGURE);
queue_buffer = ecore_list_last_goto(configure_active);
@@ -836,7 +836,7 @@
* Remove the flag that the widget is scheduled for
* configuration.
*/
- ewl_object_queued_remove(EWL_OBJECT(w), EWL_FLAG_QUEUED_CSCHEDULED);
+ ewl_object_queued_remove(EWL_OBJECT(w),
EWL_FLAG_QUEUED_SCHEDULED_CONFIGURE);
/*
* Items that are off screen should be queued to give up their
@@ -851,11 +851,11 @@
if (OBSCURED(w))
ecore_list_prepend(reveal_list, w);
- ewl_object_queued_add(EWL_OBJECT(w), EWL_FLAG_QUEUED_CPROCESS);
+ ewl_object_queued_add(EWL_OBJECT(w),
EWL_FLAG_QUEUED_PROCESS_CONFIGURE);
if (REALIZED(w) && VISIBLE(w) && !OBSCURED(w))
ewl_callback_call(w, EWL_CALLBACK_CONFIGURE);
ewl_object_queued_remove(EWL_OBJECT(w),
- EWL_FLAG_QUEUED_CPROCESS);
+ EWL_FLAG_QUEUED_PROCESS_CONFIGURE);
}
DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -918,7 +918,7 @@
tmp = queue_buffer->buffer[i];
if (tmp == w) {
ewl_object_queued_remove(EWL_OBJECT(w),
-
EWL_FLAG_QUEUED_CSCHEDULED);
+
EWL_FLAG_QUEUED_SCHEDULED_CONFIGURE);
if (i < queue_buffer->end - 1)
memmove(queue_buffer->buffer + i,
queue_buffer->buffer + i + 1,
@@ -946,7 +946,7 @@
DCHECK_PARAM_PTR("w", w);
DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
- if (ewl_object_queued_has(EWL_OBJECT(w), EWL_FLAG_QUEUED_RSCHEDULED))
+ if (ewl_object_queued_has(EWL_OBJECT(w),
EWL_FLAG_QUEUED_SCHEDULED_REVEAL))
DRETURN(DLEVEL_STABLE);
if (!ewl_object_flags_get(EWL_OBJECT(w), EWL_FLAG_PROPERTY_TOPLEVEL)) {
@@ -955,13 +955,13 @@
DRETURN(DLEVEL_STABLE);
if (!ewl_object_queued_has(EWL_OBJECT(o),
- EWL_FLAG_QUEUED_RPROCESS)) {
+ EWL_FLAG_QUEUED_PROCESS_REVEAL)) {
if (!REALIZED(o))
DRETURN(DLEVEL_STABLE);
}
}
- ewl_object_queued_add(EWL_OBJECT(w), EWL_FLAG_QUEUED_RSCHEDULED);
+ ewl_object_queued_add(EWL_OBJECT(w), EWL_FLAG_QUEUED_SCHEDULED_REVEAL);
ecore_list_append(realize_list, w);
DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -986,7 +986,7 @@
if (ecore_list_current(realize_list) == w)
{
ewl_object_queued_remove(EWL_OBJECT(w),
- EWL_FLAG_QUEUED_RSCHEDULED);
+ EWL_FLAG_QUEUED_SCHEDULED_REVEAL);
ecore_list_remove(realize_list);
}
@@ -1014,10 +1014,10 @@
while ((w = ecore_list_first_remove(realize_list))) {
if (VISIBLE(w) && !REALIZED(w)) {
ewl_object_queued_add(EWL_OBJECT(w),
- EWL_FLAG_QUEUED_RPROCESS);
+ EWL_FLAG_QUEUED_PROCESS_REVEAL);
ewl_widget_realize(EWL_WIDGET(w));
ewl_object_queued_remove(EWL_OBJECT(w),
- EWL_FLAG_QUEUED_RPROCESS);
+ EWL_FLAG_QUEUED_PROCESS_REVEAL);
ecore_list_prepend(child_add_list, w);
}
}
@@ -1047,7 +1047,7 @@
* Indicate widget no longer on the realize queue.
*/
ewl_object_queued_remove(EWL_OBJECT(w),
- EWL_FLAG_QUEUED_RSCHEDULED);
+ EWL_FLAG_QUEUED_SCHEDULED_REVEAL);
}
DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -1074,7 +1074,7 @@
if (CONFIGURED(w))
ewl_configure_cancel_request(w);
- ewl_object_queued_add(EWL_OBJECT(w), EWL_FLAG_QUEUED_DSCHEDULED);
+ ewl_object_queued_add(EWL_OBJECT(w), EWL_FLAG_QUEUED_SCHEDULED_DESTROY);
/*
* Must prepend to ensure children are freed before parents.
@@ -1148,7 +1148,7 @@
while ((cleanup < EWL_GC_LIMIT) &&
(w = ecore_list_first_remove(destroy_list))) {
if (ewl_object_queued_has(EWL_OBJECT(w),
- EWL_FLAG_QUEUED_CSCHEDULED))
+ EWL_FLAG_QUEUED_SCHEDULED_CONFIGURE))
ewl_configure_cancel_request(w);
ewl_callback_call(w, EWL_CALLBACK_DESTROY);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_object.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- ewl_object.h 23 Aug 2007 05:26:51 -0000 1.25
+++ ewl_object.h 10 Nov 2007 06:03:18 -0000 1.26
@@ -552,18 +552,18 @@
* Used to determine if a widget has been destroyed
*/
#define DESTROYED(o) (ewl_object_queued_has(EWL_OBJECT(o), \
- EWL_FLAG_QUEUED_DSCHEDULED) \
+ EWL_FLAG_QUEUED_SCHEDULED_DESTROY) \
|| ewl_object_queued_has(EWL_OBJECT(o), \
- EWL_FLAG_QUEUED_DPROCESS))
+ EWL_FLAG_QUEUED_PROCESS_DESTROY))
/**
* @def CONFIGURED(o)
* Used to determine if a widget is scheduled for configure
*/
#define CONFIGURED(o) (ewl_object_queued_has(EWL_OBJECT(o), \
- EWL_FLAG_QUEUED_CSCHEDULED) \
+ EWL_FLAG_QUEUED_SCHEDULED_CONFIGURE) \
|| ewl_object_queued_has(EWL_OBJECT(o), \
- EWL_FLAG_QUEUED_CPROCESS))
+ EWL_FLAG_QUEUED_PROCESS_CONFIGURE))
/**
* @def DISABLED(o)
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_widget.c,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -3 -r1.145 -r1.146
--- ewl_widget.c 8 Nov 2007 07:02:39 -0000 1.145
+++ ewl_widget.c 10 Nov 2007 06:03:18 -0000 1.146
@@ -206,9 +206,9 @@
if (REALIZED(w))
DRETURN(DLEVEL_STABLE);
- if (ewl_object_queued_has(EWL_OBJECT(w), EWL_FLAG_QUEUED_RSCHEDULED)
+ if (ewl_object_queued_has(EWL_OBJECT(w),
EWL_FLAG_QUEUED_SCHEDULED_REVEAL)
&& !ewl_object_queued_has(EWL_OBJECT(w),
- EWL_FLAG_QUEUED_RPROCESS))
+ EWL_FLAG_QUEUED_PROCESS_REVEAL))
ewl_realize_cancel_request(w);
/*
@@ -218,10 +218,10 @@
ewl_widget_realize(w->parent);
else if (w->parent || ewl_object_toplevel_get(EWL_OBJECT(w))) {
- ewl_object_queued_add(EWL_OBJECT(w), EWL_FLAG_QUEUED_RPROCESS);
+ ewl_object_queued_add(EWL_OBJECT(w),
EWL_FLAG_QUEUED_PROCESS_REVEAL);
ewl_callback_call(w, EWL_CALLBACK_REALIZE);
ewl_object_queued_remove(EWL_OBJECT(w),
- EWL_FLAG_QUEUED_RPROCESS);
+ EWL_FLAG_QUEUED_PROCESS_REVEAL);
ewl_object_visible_add(EWL_OBJECT(w),
EWL_FLAG_VISIBLE_REALIZED);
@@ -249,7 +249,7 @@
DCHECK_PARAM_PTR("w", w);
DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
- if (ewl_object_queued_has(EWL_OBJECT(w), EWL_FLAG_QUEUED_RSCHEDULED))
+ if (ewl_object_queued_has(EWL_OBJECT(w),
EWL_FLAG_QUEUED_SCHEDULED_REVEAL))
ewl_realize_cancel_request(w);
if (!REALIZED(w))
@@ -314,7 +314,7 @@
ewl_object_visible_add(EWL_OBJECT(w), EWL_FLAG_VISIBLE_OBSCURED);
if (REALIZED(w) || ewl_object_queued_has(EWL_OBJECT(w),
- EWL_FLAG_QUEUED_RSCHEDULED))
+ EWL_FLAG_QUEUED_SCHEDULED_REVEAL))
ewl_callback_call(w, EWL_CALLBACK_OBSCURE);
DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -375,7 +375,7 @@
DCHECK_PARAM_PTR("w", w);
DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
- if (ewl_object_queued_has(EWL_OBJECT(w), EWL_FLAG_QUEUED_RSCHEDULED))
+ if (ewl_object_queued_has(EWL_OBJECT(w),
EWL_FLAG_QUEUED_SCHEDULED_REVEAL))
ewl_realize_cancel_request(w);
/*
-------------------------------------------------------------------------
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
