Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/bin/tests/callback
Modified Files:
ewl_callback_test.c
Log Message:
- change tabs to spaces (Ewl uses an 8 space indent now instead of a tab)
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/callback/ewl_callback_test.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ewl_callback_test.c 11 Dec 2007 05:51:21 -0000 1.4
+++ ewl_callback_test.c 6 May 2008 20:09:02 -0000 1.5
@@ -1,4 +1,4 @@
-/* vim: set sw=8 ts=8 sts=8 noexpandtab: */
+/* vim: set sw=8 ts=8 sts=8 expandtab: */
#include <limits.h>
#include "Ewl_Test.h"
#include "ewl_test_private.h"
@@ -53,40 +53,40 @@
static void delete_callback(Ewl_Widget *w, void *event, void *data);
static Ewl_Unit_Test callback_unit_tests[] = {
- {"append/get id", append_test_id, NULL, -1, 0},
- {"prepend/get id", prepend_test_id, NULL, -1, 0},
- {"insert after/get id", insert_after_test_id, NULL, -1, 0},
- {"shared id", shared_test_id, NULL, -1, 0},
- {"unique id", unique_test_id, NULL, -1, 0},
- {"del/call", del_test_call, NULL, -1, 0},
- {"del_id/call", del_id_test_call, NULL, -1, 0},
- {"del_data/call", del_data_test_call, NULL, -1, 0},
- {"del_type/call", del_type_test_call, NULL, -1, 0},
- {"del from empty", del_empty_test_call, NULL, -1, 0},
- {"clear/call", clear_test_call, NULL, -1, 0},
- {"append/call", append_test_call, NULL, -1, 0},
- {"prepend/call", prepend_test_call, NULL, -1, 0},
- {"parent notify", notify_test_call, NULL, -1, 0},
- {"parent intercept", intercept_test_call, NULL, -1, 0},
- {"append during call", append_in_chain_test_call, NULL, -1, 0},
- {"prepend during call", prepend_in_chain_test_call, NULL, -1,
0},
- {"insert after during call", insert_after_in_chain_test_call,
NULL, -1, 0},
- {"insert before during call", insert_before_in_chain_test_call,
NULL, -1, 0},
- {"delete after during call", delete_after_in_chain_test_call,
NULL, -1, 0},
- {"delete before during call", delete_before_in_chain_test_call,
NULL, -1, 0},
- {"delete nothing during call",
delete_nothing_in_chain_test_call, NULL, -1, 0},
- {"create custom callback", custom_callback_test_add, NULL, -1,
0},
- {"unique custom callback", custom_callback_test_unique, NULL,
-1, 0},
- {"append custom callback", custom_callback_test_append, NULL,
-1, 0},
- {"prepend custom callback", custom_callback_test_prepend, NULL,
-1, 0},
- {"insert after custom callback",
custom_callback_test_insert_after, NULL, -1, 0},
- {"delete single custom callback",
custom_callback_test_del_single, NULL, -1, 0},
- {"delete custom callback of multiple",
custom_callback_test_del_multiple, NULL, -1, 0},
- {"delete custom callback type",
custom_callback_test_del_type_single, NULL, -1, 0},
- {"delete custom callback type of multiple",
custom_callback_test_del_type_multiple, NULL, -1, 0},
- {"clear with custom callback", custom_callback_test_clear,
NULL, -1, 0},
- {NULL, NULL, NULL, -1, 0}
- };
+ {"append/get id", append_test_id, NULL, -1, 0},
+ {"prepend/get id", prepend_test_id, NULL, -1, 0},
+ {"insert after/get id", insert_after_test_id, NULL, -1, 0},
+ {"shared id", shared_test_id, NULL, -1, 0},
+ {"unique id", unique_test_id, NULL, -1, 0},
+ {"del/call", del_test_call, NULL, -1, 0},
+ {"del_id/call", del_id_test_call, NULL, -1, 0},
+ {"del_data/call", del_data_test_call, NULL, -1, 0},
+ {"del_type/call", del_type_test_call, NULL, -1, 0},
+ {"del from empty", del_empty_test_call, NULL, -1, 0},
+ {"clear/call", clear_test_call, NULL, -1, 0},
+ {"append/call", append_test_call, NULL, -1, 0},
+ {"prepend/call", prepend_test_call, NULL, -1, 0},
+ {"parent notify", notify_test_call, NULL, -1, 0},
+ {"parent intercept", intercept_test_call, NULL, -1, 0},
+ {"append during call", append_in_chain_test_call, NULL, -1, 0},
+ {"prepend during call", prepend_in_chain_test_call, NULL, -1,
0},
+ {"insert after during call", insert_after_in_chain_test_call,
NULL, -1, 0},
+ {"insert before during call", insert_before_in_chain_test_call,
NULL, -1, 0},
+ {"delete after during call", delete_after_in_chain_test_call,
NULL, -1, 0},
+ {"delete before during call", delete_before_in_chain_test_call,
NULL, -1, 0},
+ {"delete nothing during call",
delete_nothing_in_chain_test_call, NULL, -1, 0},
+ {"create custom callback", custom_callback_test_add, NULL, -1,
0},
+ {"unique custom callback", custom_callback_test_unique, NULL,
-1, 0},
+ {"append custom callback", custom_callback_test_append, NULL,
-1, 0},
+ {"prepend custom callback", custom_callback_test_prepend, NULL,
-1, 0},
+ {"insert after custom callback",
custom_callback_test_insert_after, NULL, -1, 0},
+ {"delete single custom callback",
custom_callback_test_del_single, NULL, -1, 0},
+ {"delete custom callback of multiple",
custom_callback_test_del_multiple, NULL, -1, 0},
+ {"delete custom callback type",
custom_callback_test_del_type_single, NULL, -1, 0},
+ {"delete custom callback type of multiple",
custom_callback_test_del_type_multiple, NULL, -1, 0},
+ {"clear with custom callback", custom_callback_test_clear,
NULL, -1, 0},
+ {NULL, NULL, NULL, -1, 0}
+ };
static unsigned int CALLBACK_CUSTOM_TYPE = 0;
static unsigned int CALLBACK_CUSTOM_TYPE2 = 0;
@@ -94,11 +94,11 @@
void
test_info(Ewl_Test *test)
{
- test->name = "Callback";
- test->tip = "The base callback manipulation.";
- test->filename = __FILE__;
- test->type = EWL_TEST_TYPE_MISC;
- test->unit_tests = callback_unit_tests;
+ test->name = "Callback";
+ test->tip = "The base callback manipulation.";
+ test->filename = __FILE__;
+ test->type = EWL_TEST_TYPE_MISC;
+ test->unit_tests = callback_unit_tests;
}
/*
@@ -107,22 +107,22 @@
static int
append_test_id(char *buf, int len)
{
- Ewl_Widget *w;
- int id;
- int ret = 0;
-
- w = ewl_widget_new();
- id = ewl_callback_append(w, EWL_CALLBACK_CONFIGURE, base_callback,
- NULL);
-
- if (id)
- ret = 1;
- else
- LOG_FAILURE(buf, len, "invalid callback id returned");
+ Ewl_Widget *w;
+ int id;
+ int ret = 0;
+
+ w = ewl_widget_new();
+ id = ewl_callback_append(w, EWL_CALLBACK_CONFIGURE, base_callback,
+ NULL);
+
+ if (id)
+ ret = 1;
+ else
+ LOG_FAILURE(buf, len, "invalid callback id returned");
- ewl_widget_destroy(w);
+ ewl_widget_destroy(w);
- return ret;
+ return ret;
}
/*
@@ -131,22 +131,22 @@
static int
prepend_test_id(char *buf, int len)
{
- Ewl_Widget *w;
- int id;
- int ret = 0;
-
- w = ewl_widget_new();
- id = ewl_callback_prepend(w, EWL_CALLBACK_CONFIGURE, base_callback,
- NULL);
-
- if (id)
- ret = 1;
- else
- LOG_FAILURE(buf, len, "invalid callback id returned");
+ Ewl_Widget *w;
+ int id;
+ int ret = 0;
+
+ w = ewl_widget_new();
+ id = ewl_callback_prepend(w, EWL_CALLBACK_CONFIGURE, base_callback,
+ NULL);
+
+ if (id)
+ ret = 1;
+ else
+ LOG_FAILURE(buf, len, "invalid callback id returned");
- ewl_widget_destroy(w);
+ ewl_widget_destroy(w);
- return ret;
+ return ret;
}
/*
@@ -155,24 +155,24 @@
static int
insert_after_test_id(char *buf, int len)
{
- Ewl_Widget *w;
- int id;
- int ret = 0;
-
- w = ewl_widget_new();
- ewl_callback_prepend(w, EWL_CALLBACK_CONFIGURE, base_callback,
- NULL);
- id = ewl_callback_insert_after(w, EWL_CALLBACK_CONFIGURE, base_callback,
- w, base_callback, NULL);
-
- if (id)
- ret = 1;
- else
- LOG_FAILURE(buf, len, "invalid callback id returned");
+ Ewl_Widget *w;
+ int id;
+ int ret = 0;
+
+ w = ewl_widget_new();
+ ewl_callback_prepend(w, EWL_CALLBACK_CONFIGURE, base_callback,
+ NULL);
+ id = ewl_callback_insert_after(w, EWL_CALLBACK_CONFIGURE,
base_callback,
+ w, base_callback, NULL);
+
+ if (id)
+ ret = 1;
+ else
+ LOG_FAILURE(buf, len, "invalid callback id returned");
- ewl_widget_destroy(w);
+ ewl_widget_destroy(w);
- return ret;
+ return ret;
}
/*
@@ -181,24 +181,24 @@
static int
shared_test_id(char *buf, int len)
{
- Ewl_Widget *w;
- int id, id2;
- int ret = 0;
-
- w = ewl_widget_new();
- id = ewl_callback_append(w, EWL_CALLBACK_CONFIGURE, base_callback,
- NULL);
- id2 = ewl_callback_append(w, EWL_CALLBACK_REALIZE, base_callback,
- NULL);
-
- if (id == id2)
- ret = 1;
- else
- LOG_FAILURE(buf, len, "callback id's don't match");
+ Ewl_Widget *w;
+ int id, id2;
+ int ret = 0;
+
+ w = ewl_widget_new();
+ id = ewl_callback_append(w, EWL_CALLBACK_CONFIGURE, base_callback,
+ NULL);
+ id2 = ewl_callback_append(w, EWL_CALLBACK_REALIZE, base_callback,
+ NULL);
+
+ if (id == id2)
+ ret = 1;
+ else
+ LOG_FAILURE(buf, len, "callback id's don't match");
- ewl_widget_destroy(w);
+ ewl_widget_destroy(w);
- return ret;
+ return ret;
}
/*
@@ -208,31 +208,31 @@
static int
unique_test_id(char *buf, int len)
{
- Ewl_Widget *w;
- int id, id2;
- int ret = 0;
-
- w = ewl_widget_new();
- id = ewl_callback_append(w, EWL_CALLBACK_CONFIGURE, base_callback,
- NULL);
- id2 = ewl_callback_append(w, EWL_CALLBACK_CONFIGURE, base_callback,
- w);
-
- if (id != id2) {
- id = ewl_callback_append(w, EWL_CALLBACK_CONFIGURE,
- differing_callback, w);
- if (id != id2)
- ret = 1;
- else
- LOG_FAILURE(buf, len, "callback with different
functions"
- " id's match");
- }
- else
- LOG_FAILURE(buf, len, "callback with different data id's
match");
+ Ewl_Widget *w;
+ int id, id2;
+ int ret = 0;
+
+ w = ewl_widget_new();
+ id = ewl_callback_append(w, EWL_CALLBACK_CONFIGURE, base_callback,
+ NULL);
+ id2 = ewl_callback_append(w, EWL_CALLBACK_CONFIGURE, base_callback,
+ w);
+
+ if (id != id2) {
+ id = ewl_callback_append(w, EWL_CALLBACK_CONFIGURE,
+ differing_callback, w);
+ if (id != id2)
+ ret = 1;
+ else
+ LOG_FAILURE(buf, len, "callback with different
functions"
+ " id's match");
+ }
+ else
+ LOG_FAILURE(buf, len, "callback with different data id's
match");
- ewl_widget_destroy(w);
+ ewl_widget_destroy(w);
- return ret;
+ return ret;
}
/*
@@ -241,22 +241,22 @@
static int
del_test_call(char *buf, int len)
{
- Ewl_Widget *w;
- int ret = 0;
+ Ewl_Widget *w;
+ int ret = 0;
- w = ewl_widget_new();
- ewl_callback_prepend(w, EWL_CALLBACK_CONFIGURE, base_callback, NULL);
- ewl_callback_del(w, EWL_CALLBACK_CONFIGURE, base_callback);
- ewl_callback_call(w, EWL_CALLBACK_CONFIGURE);
-
- if ((long)ewl_widget_data_get(w, w) != 1)
- ret = 1;
- else
- LOG_FAILURE(buf, len, "del failed to remove callback");
+ w = ewl_widget_new();
+ ewl_callback_prepend(w, EWL_CALLBACK_CONFIGURE, base_callback, NULL);
+ ewl_callback_del(w, EWL_CALLBACK_CONFIGURE, base_callback);
+ ewl_callback_call(w, EWL_CALLBACK_CONFIGURE);
+
+ if ((long)ewl_widget_data_get(w, w) != 1)
+ ret = 1;
+ else
+ LOG_FAILURE(buf, len, "del failed to remove callback");
- ewl_widget_destroy(w);
+ ewl_widget_destroy(w);
- return ret;
+ return ret;
}
/*
@@ -265,24 +265,24 @@
static int
del_id_test_call(char *buf, int len)
{
- Ewl_Widget *w;
- int id;
- int ret = 0;
-
- w = ewl_widget_new();
- id = ewl_callback_prepend(w, EWL_CALLBACK_CONFIGURE, base_callback,
- NULL);
- ewl_callback_del_cb_id(w, EWL_CALLBACK_CONFIGURE, id);
- ewl_callback_call(w, EWL_CALLBACK_CONFIGURE);
-
- if ((long)ewl_widget_data_get(w, w) != 1)
- ret = 1;
- else
- LOG_FAILURE(buf, len, "del failed to remove callback");
+ Ewl_Widget *w;
+ int id;
+ int ret = 0;
+
+ w = ewl_widget_new();
+ id = ewl_callback_prepend(w, EWL_CALLBACK_CONFIGURE, base_callback,
+ NULL);
+ ewl_callback_del_cb_id(w, EWL_CALLBACK_CONFIGURE, id);
+ ewl_callback_call(w, EWL_CALLBACK_CONFIGURE);
+
+ if ((long)ewl_widget_data_get(w, w) != 1)
+ ret = 1;
+ else
+ LOG_FAILURE(buf, len, "del failed to remove callback");
- ewl_widget_destroy(w);
+ ewl_widget_destroy(w);
- return ret;
+ return ret;
}
/*
@@ -291,36 +291,36 @@
static int
del_data_test_call(char *buf, int len)
{
- Ewl_Widget *w;
- int ret = 0;
+ Ewl_Widget *w;
+ int ret = 0;
- w = ewl_widget_new();
- ewl_callback_prepend(w, EWL_CALLBACK_CONFIGURE, base_callback, w);
- ewl_callback_del_with_data(w, EWL_CALLBACK_CONFIGURE, base_callback, w);
- ewl_callback_call(w, EWL_CALLBACK_CONFIGURE);
-
- if ((long)ewl_widget_data_get(w, w) != 1) {
-
- /*
- * Check that the data actually matches.
- */
- ewl_callback_prepend(w, EWL_CALLBACK_CONFIGURE, base_callback,
- w);
- ewl_callback_del_with_data(w, EWL_CALLBACK_CONFIGURE,
- base_callback, NULL);
- ewl_callback_call(w, EWL_CALLBACK_CONFIGURE);
-
- if ((long)ewl_widget_data_get(w, w) == 1)
- ret = 1;
- else
- LOG_FAILURE(buf, len, "del_data removed callback");
- }
- else
- LOG_FAILURE(buf, len, "del_data failed to remove callback");
+ w = ewl_widget_new();
+ ewl_callback_prepend(w, EWL_CALLBACK_CONFIGURE, base_callback, w);
+ ewl_callback_del_with_data(w, EWL_CALLBACK_CONFIGURE, base_callback,
w);
+ ewl_callback_call(w, EWL_CALLBACK_CONFIGURE);
+
+ if ((long)ewl_widget_data_get(w, w) != 1) {
+
+ /*
+ * Check that the data actually matches.
+ */
+ ewl_callback_prepend(w, EWL_CALLBACK_CONFIGURE, base_callback,
+ w);
+ ewl_callback_del_with_data(w, EWL_CALLBACK_CONFIGURE,
+ base_callback, NULL);
+ ewl_callback_call(w, EWL_CALLBACK_CONFIGURE);
+
+ if ((long)ewl_widget_data_get(w, w) == 1)
+ ret = 1;
+ else
+ LOG_FAILURE(buf, len, "del_data removed callback");
+ }
+ else
+ LOG_FAILURE(buf, len, "del_data failed to remove callback");
- ewl_widget_destroy(w);
+ ewl_widget_destroy(w);
- return ret;
+ return ret;
}
/*
@@ -330,22 +330,22 @@
static int
del_type_test_call(char *buf, int len)
{
- Ewl_Widget *w;
- int ret = 0;
+ Ewl_Widget *w;
+ int ret = 0;
- w = ewl_widget_new();
- ewl_callback_prepend(w, EWL_CALLBACK_CONFIGURE, base_callback, NULL);
- ewl_callback_del_type(w, EWL_CALLBACK_CONFIGURE);
- ewl_callback_call(w, EWL_CALLBACK_CONFIGURE);
-
- if ((long)ewl_widget_data_get(w, w) != 1)
- ret = 1;
- else
- LOG_FAILURE(buf, len, "del_type failed to remove callback");
+ w = ewl_widget_new();
+ ewl_callback_prepend(w, EWL_CALLBACK_CONFIGURE, base_callback, NULL);
+ ewl_callback_del_type(w, EWL_CALLBACK_CONFIGURE);
+ ewl_callback_call(w, EWL_CALLBACK_CONFIGURE);
+
+ if ((long)ewl_widget_data_get(w, w) != 1)
+ ret = 1;
+ else
+ LOG_FAILURE(buf, len, "del_type failed to remove callback");
- ewl_widget_destroy(w);
+ ewl_widget_destroy(w);
- return ret;
+ return ret;
}
/*
@@ -354,22 +354,22 @@
static int
del_empty_test_call(char *buf __UNUSED__, int len __UNUSED__)
{
- Ewl_Widget *w;
- int ret = 0;
+ Ewl_Widget *w;
+ int ret = 0;
- w = ewl_widget_new();
- ewl_callback_del_type(w, EWL_CALLBACK_CONFIGURE);
- ewl_callback_del(w, EWL_CALLBACK_CONFIGURE, base_callback);
- ewl_callback_call(w, EWL_CALLBACK_CONFIGURE);
-
- /*
- * If we reach here, no segv occurred and we passed.
- */
- ret = 1;
+ w = ewl_widget_new();
+ ewl_callback_del_type(w, EWL_CALLBACK_CONFIGURE);
+ ewl_callback_del(w, EWL_CALLBACK_CONFIGURE, base_callback);
+ ewl_callback_call(w, EWL_CALLBACK_CONFIGURE);
+
+ /*
+ * If we reach here, no segv occurred and we passed.
+ */
+ ret = 1;
- ewl_widget_destroy(w);
+ ewl_widget_destroy(w);
- return ret;
+ return ret;
}
/*
@@ -379,22 +379,22 @@
static int
clear_test_call(char *buf, int len)
{
- Ewl_Widget *w;
- int ret = 0;
+ Ewl_Widget *w;
+ int ret = 0;
- w = ewl_widget_new();
- ewl_callback_prepend(w, EWL_CALLBACK_CONFIGURE, base_callback, NULL);
- ewl_callback_clear(w);
- ewl_callback_call(w, EWL_CALLBACK_CONFIGURE);
-
- if ((long)ewl_widget_data_get(w, w) != 1)
- ret = 1;
- else
- LOG_FAILURE(buf, len, "clear failed to remove callback");
+ w = ewl_widget_new();
+ ewl_callback_prepend(w, EWL_CALLBACK_CONFIGURE, base_callback, NULL);
+ ewl_callback_clear(w);
+ ewl_callback_call(w, EWL_CALLBACK_CONFIGURE);
+
+ if ((long)ewl_widget_data_get(w, w) != 1)
+ ret = 1;
+ else
+ LOG_FAILURE(buf, len, "clear failed to remove callback");
- ewl_widget_destroy(w);
+ ewl_widget_destroy(w);
- return ret;
+ return ret;
}
/*
@@ -403,22 +403,22 @@
static int
append_test_call(char *buf, int len)
{
- Ewl_Widget *w;
- int ret = 0;
+ Ewl_Widget *w;
+ int ret = 0;
- w = ewl_widget_new();
- ewl_callback_del_type(w, EWL_CALLBACK_CONFIGURE);
- ewl_callback_append(w, EWL_CALLBACK_CONFIGURE, base_callback, NULL);
- ewl_callback_call(w, EWL_CALLBACK_CONFIGURE);
-
- if ((long)ewl_widget_data_get(w, w) == 1)
- ret = 1;
- else
- LOG_FAILURE(buf, len, "callback function not called");
+ w = ewl_widget_new();
+ ewl_callback_del_type(w, EWL_CALLBACK_CONFIGURE);
+ ewl_callback_append(w, EWL_CALLBACK_CONFIGURE, base_callback, NULL);
+ ewl_callback_call(w, EWL_CALLBACK_CONFIGURE);
+
+ if ((long)ewl_widget_data_get(w, w) == 1)
+ ret = 1;
+ else
+ LOG_FAILURE(buf, len, "callback function not called");
- ewl_widget_destroy(w);
+ ewl_widget_destroy(w);
- return ret;
+ return ret;
}
/*
@@ -427,22 +427,22 @@
static int
prepend_test_call(char *buf, int len)
{
- Ewl_Widget *w;
- int ret = 0;
+ Ewl_Widget *w;
+ int ret = 0;
- w = ewl_widget_new();
- ewl_callback_del_type(w, EWL_CALLBACK_CONFIGURE);
- ewl_callback_prepend(w, EWL_CALLBACK_CONFIGURE, base_callback, NULL);
- ewl_callback_call(w, EWL_CALLBACK_CONFIGURE);
-
- if ((long)ewl_widget_data_get(w, w) == 1)
- ret = 1;
- else
- LOG_FAILURE(buf, len, "callback function not called");
+ w = ewl_widget_new();
+ ewl_callback_del_type(w, EWL_CALLBACK_CONFIGURE);
+ ewl_callback_prepend(w, EWL_CALLBACK_CONFIGURE, base_callback, NULL);
+ ewl_callback_call(w, EWL_CALLBACK_CONFIGURE);
+
+ if ((long)ewl_widget_data_get(w, w) == 1)
+ ret = 1;
+ else
+ LOG_FAILURE(buf, len, "callback function not called");
- ewl_widget_destroy(w);
+ ewl_widget_destroy(w);
- return ret;
+ return ret;
}
/*
@@ -451,44 +451,44 @@
static int
notify_test_call(char *buf, int len)
{
- Ewl_Widget *parent;
- Ewl_Widget *w;
- int ret = 0;
-
- parent = ewl_cell_new();
- ewl_callback_del_type(parent, EWL_CALLBACK_CONFIGURE);
- ewl_container_callback_notify(EWL_CONTAINER(parent),
- EWL_CALLBACK_CONFIGURE);
-
- w = ewl_widget_new();
- ewl_container_child_append(EWL_CONTAINER(parent), w);
-
- /*
- * Add parent callback
- */
- ewl_callback_prepend(parent, EWL_CALLBACK_CONFIGURE, base_callback,
- NULL);
-
- /*
- * Add child callbacks.
- */
- ewl_callback_del_type(w, EWL_CALLBACK_CONFIGURE);
- ewl_callback_prepend(w, EWL_CALLBACK_CONFIGURE, differing_callback,
- NULL);
- ewl_callback_call(w, EWL_CALLBACK_CONFIGURE);
-
- if ((long)ewl_widget_data_get(parent, parent) == 1)
- if ((long)ewl_widget_data_get(w, w) == 2)
- ret = 1;
- else
- LOG_FAILURE(buf, len, "callback function not called");
- else
- LOG_FAILURE(buf, len, "notify function not called");
+ Ewl_Widget *parent;
+ Ewl_Widget *w;
+ int ret = 0;
+
+ parent = ewl_cell_new();
+ ewl_callback_del_type(parent, EWL_CALLBACK_CONFIGURE);
+ ewl_container_callback_notify(EWL_CONTAINER(parent),
+ EWL_CALLBACK_CONFIGURE);
+
+ w = ewl_widget_new();
+ ewl_container_child_append(EWL_CONTAINER(parent), w);
+
+ /*
+ * Add parent callback
+ */
+ ewl_callback_prepend(parent, EWL_CALLBACK_CONFIGURE, base_callback,
+ NULL);
+
+ /*
+ * Add child callbacks.
+ */
+ ewl_callback_del_type(w, EWL_CALLBACK_CONFIGURE);
+ ewl_callback_prepend(w, EWL_CALLBACK_CONFIGURE, differing_callback,
+ NULL);
+ ewl_callback_call(w, EWL_CALLBACK_CONFIGURE);
+
+ if ((long)ewl_widget_data_get(parent, parent) == 1)
+ if ((long)ewl_widget_data_get(w, w) == 2)
+ ret = 1;
+ else
+ LOG_FAILURE(buf, len, "callback function not called");
+ else
+ LOG_FAILURE(buf, len, "notify function not called");
- ewl_widget_destroy(w);
- ewl_widget_destroy(parent);
+ ewl_widget_destroy(w);
+ ewl_widget_destroy(parent);
- return ret;
+ return ret;
}
/*
@@ -497,45 +497,45 @@
static int
intercept_test_call(char *buf, int len)
{
- Ewl_Widget *parent;
- Ewl_Widget *w;
- int ret = 0;
-
- parent = ewl_cell_new();
- ewl_callback_del_type(parent, EWL_CALLBACK_CONFIGURE);
- ewl_container_callback_intercept(EWL_CONTAINER(parent),
- EWL_CALLBACK_CONFIGURE);
-
- w = ewl_widget_new();
- ewl_container_child_append(EWL_CONTAINER(parent), w);
-
- /*
- * Add parent callback
- */
- ewl_callback_prepend(parent, EWL_CALLBACK_CONFIGURE, base_callback,
- NULL);
-
- /*
- * Add child callbacks.
- */
- ewl_callback_del_type(w, EWL_CALLBACK_CONFIGURE);
- ewl_callback_prepend(w, EWL_CALLBACK_CONFIGURE, differing_callback,
- NULL);
- ewl_callback_call(w, EWL_CALLBACK_CONFIGURE);
-
- if ((long)ewl_widget_data_get(parent, parent) == 1) {
- if ((long)ewl_widget_data_get(w, w) == 2)
- LOG_FAILURE(buf, len, "callback function called");
- else
- ret = 1;
- }
- else
- LOG_FAILURE(buf, len, "intercept function not called");
+ Ewl_Widget *parent;
+ Ewl_Widget *w;
+ int ret = 0;
+
+ parent = ewl_cell_new();
+ ewl_callback_del_type(parent, EWL_CALLBACK_CONFIGURE);
+ ewl_container_callback_intercept(EWL_CONTAINER(parent),
+ EWL_CALLBACK_CONFIGURE);
+
+ w = ewl_widget_new();
+ ewl_container_child_append(EWL_CONTAINER(parent), w);
+
+ /*
+ * Add parent callback
+ */
+ ewl_callback_prepend(parent, EWL_CALLBACK_CONFIGURE, base_callback,
+ NULL);
+
+ /*
+ * Add child callbacks.
+ */
+ ewl_callback_del_type(w, EWL_CALLBACK_CONFIGURE);
+ ewl_callback_prepend(w, EWL_CALLBACK_CONFIGURE, differing_callback,
+ NULL);
+ ewl_callback_call(w, EWL_CALLBACK_CONFIGURE);
+
+ if ((long)ewl_widget_data_get(parent, parent) == 1) {
+ if ((long)ewl_widget_data_get(w, w) == 2)
+ LOG_FAILURE(buf, len, "callback function called");
+ else
+ ret = 1;
+ }
+ else
+ LOG_FAILURE(buf, len, "intercept function not called");
- ewl_widget_destroy(w);
- ewl_widget_destroy(parent);
+ ewl_widget_destroy(w);
+ ewl_widget_destroy(parent);
- return ret;
+ return ret;
}
/*
@@ -545,22 +545,22 @@
static int
append_in_chain_test_call(char *buf, int len)
{
- Ewl_Widget *w;
- int ret = 0;
+ Ewl_Widget *w;
+ int ret = 0;
- w = ewl_widget_new();
- ewl_callback_del_type(w, EWL_CALLBACK_CONFIGURE);
- ewl_callback_append(w, EWL_CALLBACK_CONFIGURE, append_callback, NULL);
- ewl_callback_call(w, EWL_CALLBACK_CONFIGURE);
-
- if ((long)ewl_widget_data_get(w, w) == 1)
- ret = 1;
- else
- LOG_FAILURE(buf, len, "callback function not called");
+ w = ewl_widget_new();
+ ewl_callback_del_type(w, EWL_CALLBACK_CONFIGURE);
+ ewl_callback_append(w, EWL_CALLBACK_CONFIGURE, append_callback, NULL);
+ ewl_callback_call(w, EWL_CALLBACK_CONFIGURE);
+
+ if ((long)ewl_widget_data_get(w, w) == 1)
+ ret = 1;
+ else
+ LOG_FAILURE(buf, len, "callback function not called");
- ewl_widget_destroy(w);
+ ewl_widget_destroy(w);
- return ret;
+ return ret;
}
/*
@@ -570,22 +570,22 @@
static int
prepend_in_chain_test_call(char *buf, int len)
{
- Ewl_Widget *w;
- int ret = 0;
+ Ewl_Widget *w;
+ int ret = 0;
- w = ewl_widget_new();
- ewl_callback_del_type(w, EWL_CALLBACK_CONFIGURE);
- ewl_callback_prepend(w, EWL_CALLBACK_CONFIGURE, prepend_callback, NULL);
- ewl_callback_call(w, EWL_CALLBACK_CONFIGURE);
-
- if ((long)ewl_widget_data_get(w, w) != 1)
- ret = 1;
- else
- LOG_FAILURE(buf, len, "callback function called");
+ w = ewl_widget_new();
+ ewl_callback_del_type(w, EWL_CALLBACK_CONFIGURE);
+ ewl_callback_prepend(w, EWL_CALLBACK_CONFIGURE, prepend_callback,
NULL);
+ ewl_callback_call(w, EWL_CALLBACK_CONFIGURE);
+
+ if ((long)ewl_widget_data_get(w, w) != 1)
+ ret = 1;
+ else
+ LOG_FAILURE(buf, len, "callback function called");
- ewl_widget_destroy(w);
+ ewl_widget_destroy(w);
- return ret;
+ return ret;
}
/*
@@ -595,25 +595,25 @@
static int
insert_after_in_chain_test_call(char *buf, int len)
{
- Ewl_Widget *w;
- int ret = 0;
+ Ewl_Widget *w;
+ int ret = 0;
- w = ewl_widget_new();
- ewl_callback_del_type(w, EWL_CALLBACK_CONFIGURE);
- ewl_callback_prepend(w, EWL_CALLBACK_CONFIGURE, insert_after_callback,
- NULL);
- ewl_callback_prepend(w, EWL_CALLBACK_CONFIGURE, differing_callback,
- NULL);
- ewl_callback_call(w, EWL_CALLBACK_CONFIGURE);
-
- if ((long)ewl_widget_data_get(w, w) == 1)
- ret = 1;
- else
- LOG_FAILURE(buf, len, "callback function not called");
+ w = ewl_widget_new();
+ ewl_callback_del_type(w, EWL_CALLBACK_CONFIGURE);
+ ewl_callback_prepend(w, EWL_CALLBACK_CONFIGURE, insert_after_callback,
+ NULL);
+ ewl_callback_prepend(w, EWL_CALLBACK_CONFIGURE, differing_callback,
+ NULL);
+ ewl_callback_call(w, EWL_CALLBACK_CONFIGURE);
+
+ if ((long)ewl_widget_data_get(w, w) == 1)
+ ret = 1;
+ else
+ LOG_FAILURE(buf, len, "callback function not called");
- ewl_widget_destroy(w);
+ ewl_widget_destroy(w);
- return ret;
+ return ret;
}
/*
@@ -623,25 +623,25 @@
static int
insert_before_in_chain_test_call(char *buf, int len)
{
- Ewl_Widget *w;
- int ret = 0;
+ Ewl_Widget *w;
+ int ret = 0;
- w = ewl_widget_new();
- ewl_callback_del_type(w, EWL_CALLBACK_CONFIGURE);
- ewl_callback_prepend(w, EWL_CALLBACK_CONFIGURE, insert_before_callback,
- NULL);
- ewl_callback_prepend(w, EWL_CALLBACK_CONFIGURE, differing_callback,
- NULL);
- ewl_callback_call(w, EWL_CALLBACK_CONFIGURE);
-
- if ((long)ewl_widget_data_get(w, w) == 2)
- ret = 1;
- else
- LOG_FAILURE(buf, len, "callback function called");
+ w = ewl_widget_new();
+ ewl_callback_del_type(w, EWL_CALLBACK_CONFIGURE);
+ ewl_callback_prepend(w, EWL_CALLBACK_CONFIGURE, insert_before_callback,
+ NULL);
+ ewl_callback_prepend(w, EWL_CALLBACK_CONFIGURE, differing_callback,
+ NULL);
+ ewl_callback_call(w, EWL_CALLBACK_CONFIGURE);
+
+ if ((long)ewl_widget_data_get(w, w) == 2)
+ ret = 1;
+ else
+ LOG_FAILURE(buf, len, "callback function called");
- ewl_widget_destroy(w);
+ ewl_widget_destroy(w);
- return ret;
+ return ret;
}
/*
@@ -651,27 +651,27 @@
static int
delete_before_in_chain_test_call(char *buf, int len)
{
- Ewl_Widget *w;
- int ret = 0;
+ Ewl_Widget *w;
+ int ret = 0;
- w = ewl_widget_new();
- ewl_callback_del_type(w, EWL_CALLBACK_CONFIGURE);
- ewl_callback_prepend(w, EWL_CALLBACK_CONFIGURE, differing_callback,
- NULL);
- ewl_callback_prepend(w, EWL_CALLBACK_CONFIGURE, delete_callback,
- NULL);
- ewl_callback_prepend(w, EWL_CALLBACK_CONFIGURE, base_callback,
- NULL);
- ewl_callback_call(w, EWL_CALLBACK_CONFIGURE);
-
- if ((long)ewl_widget_data_get(w, w) == 2)
- ret = 1;
- else
- LOG_FAILURE(buf, len, "callback function not called");
+ w = ewl_widget_new();
+ ewl_callback_del_type(w, EWL_CALLBACK_CONFIGURE);
+ ewl_callback_prepend(w, EWL_CALLBACK_CONFIGURE, differing_callback,
+ NULL);
+ ewl_callback_prepend(w, EWL_CALLBACK_CONFIGURE, delete_callback,
+ NULL);
+ ewl_callback_prepend(w, EWL_CALLBACK_CONFIGURE, base_callback,
+ NULL);
+ ewl_callback_call(w, EWL_CALLBACK_CONFIGURE);
+
+ if ((long)ewl_widget_data_get(w, w) == 2)
+ ret = 1;
+ else
+ LOG_FAILURE(buf, len, "callback function not called");
- ewl_widget_destroy(w);
+ ewl_widget_destroy(w);
- return ret;
+ return ret;
}
/*
@@ -681,27 +681,27 @@
static int
delete_after_in_chain_test_call(char *buf, int len)
{
- Ewl_Widget *w;
- int ret = 0;
+ Ewl_Widget *w;
+ int ret = 0;
- w = ewl_widget_new();
- ewl_callback_del_type(w, EWL_CALLBACK_CONFIGURE);
- ewl_callback_prepend(w, EWL_CALLBACK_CONFIGURE, base_callback,
- NULL);
- ewl_callback_prepend(w, EWL_CALLBACK_CONFIGURE, delete_callback,
- NULL);
- ewl_callback_prepend(w, EWL_CALLBACK_CONFIGURE, differing_callback,
- NULL);
- ewl_callback_call(w, EWL_CALLBACK_CONFIGURE);
-
- if ((long)ewl_widget_data_get(w, w) == 2)
- ret = 1;
- else
- LOG_FAILURE(buf, len, "callback function called");
+ w = ewl_widget_new();
+ ewl_callback_del_type(w, EWL_CALLBACK_CONFIGURE);
+ ewl_callback_prepend(w, EWL_CALLBACK_CONFIGURE, base_callback,
+ NULL);
+ ewl_callback_prepend(w, EWL_CALLBACK_CONFIGURE, delete_callback,
+ NULL);
+ ewl_callback_prepend(w, EWL_CALLBACK_CONFIGURE, differing_callback,
+ NULL);
+ ewl_callback_call(w, EWL_CALLBACK_CONFIGURE);
+
+ if ((long)ewl_widget_data_get(w, w) == 2)
+ ret = 1;
+ else
+ LOG_FAILURE(buf, len, "callback function called");
- ewl_widget_destroy(w);
+ ewl_widget_destroy(w);
- return ret;
+ return ret;
}
/*
@@ -711,25 +711,25 @@
static int
delete_nothing_in_chain_test_call(char *buf, int len)
{
- Ewl_Widget *w;
- int ret = 0;
+ Ewl_Widget *w;
+ int ret = 0;
- w = ewl_widget_new();
- ewl_callback_del_type(w, EWL_CALLBACK_CONFIGURE);
- ewl_callback_prepend(w, EWL_CALLBACK_CONFIGURE, delete_callback,
- NULL);
- ewl_callback_append(w, EWL_CALLBACK_CONFIGURE, differing_callback,
- NULL);
- ewl_callback_call(w, EWL_CALLBACK_CONFIGURE);
-
- if ((long)ewl_widget_data_get(w, w) == 2)
- ret = 1;
- else
- LOG_FAILURE(buf, len, "callback function not called");
+ w = ewl_widget_new();
+ ewl_callback_del_type(w, EWL_CALLBACK_CONFIGURE);
+ ewl_callback_prepend(w, EWL_CALLBACK_CONFIGURE, delete_callback,
+ NULL);
+ ewl_callback_append(w, EWL_CALLBACK_CONFIGURE, differing_callback,
+ NULL);
+ ewl_callback_call(w, EWL_CALLBACK_CONFIGURE);
+
+ if ((long)ewl_widget_data_get(w, w) == 2)
+ ret = 1;
+ else
+ LOG_FAILURE(buf, len, "callback function not called");
- ewl_widget_destroy(w);
+ ewl_widget_destroy(w);
- return ret;
+ return ret;
}
/*
@@ -738,15 +738,15 @@
static int
custom_callback_test_add(char *buf, int len)
{
- int ret = 0;
+ int ret = 0;
- CALLBACK_CUSTOM_TYPE = ewl_callback_type_add();
- if (CALLBACK_CUSTOM_TYPE > EWL_CALLBACK_MAX)
- ret = 1;
- else
- LOG_FAILURE(buf, len, "callback type registration failed");
+ CALLBACK_CUSTOM_TYPE = ewl_callback_type_add();
+ if (CALLBACK_CUSTOM_TYPE > EWL_CALLBACK_MAX)
+ ret = 1;
+ else
+ LOG_FAILURE(buf, len, "callback type registration failed");
- return ret;
+ return ret;
}
/*
@@ -755,15 +755,15 @@
static int
custom_callback_test_unique(char *buf, int len)
{
- int ret = 0;
+ int ret = 0;
- CALLBACK_CUSTOM_TYPE2 = ewl_callback_type_add();
- if (CALLBACK_CUSTOM_TYPE != CALLBACK_CUSTOM_TYPE2)
- ret = 1;
- else
- LOG_FAILURE(buf, len, "callback type not unique");
+ CALLBACK_CUSTOM_TYPE2 = ewl_callback_type_add();
+ if (CALLBACK_CUSTOM_TYPE != CALLBACK_CUSTOM_TYPE2)
+ ret = 1;
+ else
+ LOG_FAILURE(buf, len, "callback type not unique");
- return ret;
+ return ret;
}
/*
@@ -772,21 +772,21 @@
static int
custom_callback_test_append(char *buf, int len)
{
- Ewl_Widget *w;
- int ret = 0;
+ Ewl_Widget *w;
+ int ret = 0;
- w = ewl_widget_new();
- ewl_callback_append(w, CALLBACK_CUSTOM_TYPE, base_callback, NULL);
- ewl_callback_call(w, CALLBACK_CUSTOM_TYPE);
+ w = ewl_widget_new();
+ ewl_callback_append(w, CALLBACK_CUSTOM_TYPE, base_callback, NULL);
+ ewl_callback_call(w, CALLBACK_CUSTOM_TYPE);
- if ((long)ewl_widget_data_get(w, w) == 1)
- ret = 1;
- else
- LOG_FAILURE(buf, len, "callback function not called");
+ if ((long)ewl_widget_data_get(w, w) == 1)
+ ret = 1;
+ else
+ LOG_FAILURE(buf, len, "callback function not called");
- ewl_widget_destroy(w);
+ ewl_widget_destroy(w);
- return ret;
+ return ret;
}
/*
@@ -795,21 +795,21 @@
static int
custom_callback_test_prepend(char *buf, int len)
{
- Ewl_Widget *w;
- int ret = 0;
+ Ewl_Widget *w;
+ int ret = 0;
- w = ewl_widget_new();
- ewl_callback_prepend(w, CALLBACK_CUSTOM_TYPE, base_callback, NULL);
- ewl_callback_call(w, CALLBACK_CUSTOM_TYPE);
+ w = ewl_widget_new();
+ ewl_callback_prepend(w, CALLBACK_CUSTOM_TYPE, base_callback, NULL);
+ ewl_callback_call(w, CALLBACK_CUSTOM_TYPE);
- if ((long)ewl_widget_data_get(w, w) == 1)
- ret = 1;
- else
- LOG_FAILURE(buf, len, "callback function not called");
+ if ((long)ewl_widget_data_get(w, w) == 1)
+ ret = 1;
+ else
+ LOG_FAILURE(buf, len, "callback function not called");
- ewl_widget_destroy(w);
+ ewl_widget_destroy(w);
- return ret;
+ return ret;
}
/*
@@ -818,23 +818,23 @@
static int
custom_callback_test_insert_after(char *buf, int len)
{
- Ewl_Widget *w;
- int ret = 0;
+ Ewl_Widget *w;
+ int ret = 0;
- w = ewl_widget_new();
- ewl_callback_prepend(w, CALLBACK_CUSTOM_TYPE, base_callback, NULL);
- ewl_callback_insert_after(w, CALLBACK_CUSTOM_TYPE, differing_callback,
- NULL, base_callback, NULL);
- ewl_callback_call(w, CALLBACK_CUSTOM_TYPE);
-
- if ((long)ewl_widget_data_get(w, w) == 2)
- ret = 1;
- else
- LOG_FAILURE(buf, len, "callback function not called");
+ w = ewl_widget_new();
+ ewl_callback_prepend(w, CALLBACK_CUSTOM_TYPE, base_callback, NULL);
+ ewl_callback_insert_after(w, CALLBACK_CUSTOM_TYPE, differing_callback,
+ NULL, base_callback, NULL);
+ ewl_callback_call(w, CALLBACK_CUSTOM_TYPE);
+
+ if ((long)ewl_widget_data_get(w, w) == 2)
+ ret = 1;
+ else
+ LOG_FAILURE(buf, len, "callback function not called");
- ewl_widget_destroy(w);
+ ewl_widget_destroy(w);
- return ret;
+ return ret;
}
/*
@@ -843,22 +843,22 @@
static int
custom_callback_test_del_single(char *buf, int len)
{
- Ewl_Widget *w;
- int ret = 0;
+ Ewl_Widget *w;
+ int ret = 0;
- w = ewl_widget_new();
- ewl_callback_append(w, CALLBACK_CUSTOM_TYPE, base_callback, NULL);
- ewl_callback_del(w, CALLBACK_CUSTOM_TYPE, base_callback);
- ewl_callback_call(w, CALLBACK_CUSTOM_TYPE);
-
- if ((long)ewl_widget_data_get(w, w) == 0)
- ret = 1;
- else
- LOG_FAILURE(buf, len, "callback function called");
+ w = ewl_widget_new();
+ ewl_callback_append(w, CALLBACK_CUSTOM_TYPE, base_callback, NULL);
+ ewl_callback_del(w, CALLBACK_CUSTOM_TYPE, base_callback);
+ ewl_callback_call(w, CALLBACK_CUSTOM_TYPE);
+
+ if ((long)ewl_widget_data_get(w, w) == 0)
+ ret = 1;
+ else
+ LOG_FAILURE(buf, len, "callback function called");
- ewl_widget_destroy(w);
+ ewl_widget_destroy(w);
- return ret;
+ return ret;
}
/*
@@ -868,32 +868,32 @@
static int
custom_callback_test_del_multiple(char *buf, int len)
{
- Ewl_Widget *w;
- int ret = 0;
+ Ewl_Widget *w;
+ int ret = 0;
- w = ewl_widget_new();
- ewl_callback_append(w, CALLBACK_CUSTOM_TYPE, differing_callback, NULL);
- ewl_callback_append(w, CALLBACK_CUSTOM_TYPE, base_callback, NULL);
- ewl_callback_del(w, CALLBACK_CUSTOM_TYPE, base_callback);
- ewl_callback_call(w, CALLBACK_CUSTOM_TYPE);
-
- if ((long)ewl_widget_data_get(w, w) == 2) {
- ewl_callback_append(w, CALLBACK_CUSTOM_TYPE, base_callback,
- NULL);
- ewl_callback_del(w, CALLBACK_CUSTOM_TYPE, differing_callback);
- ewl_callback_call(w, CALLBACK_CUSTOM_TYPE);
-
- if ((long)ewl_widget_data_get(w, w) == 1)
- ret = 1;
- else
- LOG_FAILURE(buf, len, "first callback function called");
- }
- else
- LOG_FAILURE(buf, len, "second callback function called");
+ w = ewl_widget_new();
+ ewl_callback_append(w, CALLBACK_CUSTOM_TYPE, differing_callback, NULL);
+ ewl_callback_append(w, CALLBACK_CUSTOM_TYPE, base_callback, NULL);
+ ewl_callback_del(w, CALLBACK_CUSTOM_TYPE, base_callback);
+ ewl_callback_call(w, CALLBACK_CUSTOM_TYPE);
+
+ if ((long)ewl_widget_data_get(w, w) == 2) {
+ ewl_callback_append(w, CALLBACK_CUSTOM_TYPE, base_callback,
+ NULL);
+ ewl_callback_del(w, CALLBACK_CUSTOM_TYPE, differing_callback);
+ ewl_callback_call(w, CALLBACK_CUSTOM_TYPE);
+
+ if ((long)ewl_widget_data_get(w, w) == 1)
+ ret = 1;
+ else
+ LOG_FAILURE(buf, len, "first callback function called");
+ }
+ else
+ LOG_FAILURE(buf, len, "second callback function called");
- ewl_widget_destroy(w);
+ ewl_widget_destroy(w);
- return ret;
+ return ret;
}
/*
@@ -902,22 +902,22 @@
static int
custom_callback_test_del_type_single(char *buf, int len)
{
- Ewl_Widget *w;
- int ret = 0;
+ Ewl_Widget *w;
+ int ret = 0;
- w = ewl_widget_new();
- ewl_callback_append(w, CALLBACK_CUSTOM_TYPE, base_callback, NULL);
- ewl_callback_del_type(w, CALLBACK_CUSTOM_TYPE);
- ewl_callback_call(w, CALLBACK_CUSTOM_TYPE);
-
- if ((long)ewl_widget_data_get(w, w) == 0)
- ret = 1;
- else
- LOG_FAILURE(buf, len, "callback function called");
+ w = ewl_widget_new();
+ ewl_callback_append(w, CALLBACK_CUSTOM_TYPE, base_callback, NULL);
+ ewl_callback_del_type(w, CALLBACK_CUSTOM_TYPE);
+ ewl_callback_call(w, CALLBACK_CUSTOM_TYPE);
+
+ if ((long)ewl_widget_data_get(w, w) == 0)
+ ret = 1;
+ else
+ LOG_FAILURE(buf, len, "callback function called");
- ewl_widget_destroy(w);
+ ewl_widget_destroy(w);
- return ret;
+ return ret;
}
/*
@@ -927,28 +927,28 @@
static int
custom_callback_test_del_type_multiple(char *buf, int len)
{
- Ewl_Widget *w;
- int ret = 0;
+ Ewl_Widget *w;
+ int ret = 0;
- w = ewl_widget_new();
- ewl_callback_append(w, CALLBACK_CUSTOM_TYPE, base_callback, NULL);
- ewl_callback_append(w, CALLBACK_CUSTOM_TYPE2, differing_callback, NULL);
- ewl_callback_del_type(w, CALLBACK_CUSTOM_TYPE);
- ewl_callback_call(w, CALLBACK_CUSTOM_TYPE2);
-
- if ((long)ewl_widget_data_get(w, w) == 2) {
- ewl_callback_call(w, CALLBACK_CUSTOM_TYPE);
- if ((long)ewl_widget_data_get(w, w) == 2)
- ret = 1;
- else
- LOG_FAILURE(buf, len, "callback function called");
- }
- else
- LOG_FAILURE(buf, len, "callback function not called");
+ w = ewl_widget_new();
+ ewl_callback_append(w, CALLBACK_CUSTOM_TYPE, base_callback, NULL);
+ ewl_callback_append(w, CALLBACK_CUSTOM_TYPE2, differing_callback,
NULL);
+ ewl_callback_del_type(w, CALLBACK_CUSTOM_TYPE);
+ ewl_callback_call(w, CALLBACK_CUSTOM_TYPE2);
+
+ if ((long)ewl_widget_data_get(w, w) == 2) {
+ ewl_callback_call(w, CALLBACK_CUSTOM_TYPE);
+ if ((long)ewl_widget_data_get(w, w) == 2)
+ ret = 1;
+ else
+ LOG_FAILURE(buf, len, "callback function called");
+ }
+ else
+ LOG_FAILURE(buf, len, "callback function not called");
- ewl_widget_destroy(w);
+ ewl_widget_destroy(w);
- return ret;
+ return ret;
}
/*
@@ -957,82 +957,82 @@
static int
custom_callback_test_clear(char *buf, int len)
{
- Ewl_Widget *w;
- int ret = 0;
+ Ewl_Widget *w;
+ int ret = 0;
- w = ewl_widget_new();
- ewl_callback_append(w, CALLBACK_CUSTOM_TYPE, base_callback, NULL);
- ewl_callback_clear(w);
- ewl_callback_call(w, CALLBACK_CUSTOM_TYPE);
-
- if ((long)ewl_widget_data_get(w, w) == 0)
- ret = 1;
- else
- LOG_FAILURE(buf, len, "callback function called");
+ w = ewl_widget_new();
+ ewl_callback_append(w, CALLBACK_CUSTOM_TYPE, base_callback, NULL);
+ ewl_callback_clear(w);
+ ewl_callback_call(w, CALLBACK_CUSTOM_TYPE);
+
+ if ((long)ewl_widget_data_get(w, w) == 0)
+ ret = 1;
+ else
+ LOG_FAILURE(buf, len, "callback function called");
- ewl_widget_destroy(w);
+ ewl_widget_destroy(w);
- return ret;
+ return ret;
}
static void
base_callback(Ewl_Widget *w, void *event, void *data)
{
- ewl_widget_data_set(w, w, (void *)(long)1);
- event = data = NULL;
- return;
+ ewl_widget_data_set(w, w, (void *)(long)1);
+ event = data = NULL;
+ return;
}
static void
differing_callback(Ewl_Widget *w, void *event, void *data)
{
- ewl_widget_data_set(w, w, (void *)(long)2);
- event = data = NULL;
- return;
+ ewl_widget_data_set(w, w, (void *)(long)2);
+ event = data = NULL;
+ return;
}
static void
append_callback(Ewl_Widget *w, void *event, void *data)
{
- ewl_callback_append(w, EWL_CALLBACK_CONFIGURE, base_callback, NULL);
+ ewl_callback_append(w, EWL_CALLBACK_CONFIGURE, base_callback, NULL);
- event = data = NULL;
- return;
+ event = data = NULL;
+ return;
}
static void
prepend_callback(Ewl_Widget *w, void *event, void *data)
{
- ewl_callback_prepend(w, EWL_CALLBACK_CONFIGURE, base_callback, NULL);
+ ewl_callback_prepend(w, EWL_CALLBACK_CONFIGURE, base_callback, NULL);
- event = data = NULL;
- return;
+ event = data = NULL;
+ return;
}
static void
insert_after_callback(Ewl_Widget *w, void *event, void *data)
{
- ewl_callback_insert_after(w, EWL_CALLBACK_CONFIGURE, base_callback,
- NULL, insert_after_callback, NULL);
+ ewl_callback_insert_after(w, EWL_CALLBACK_CONFIGURE, base_callback,
+ NULL, insert_after_callback, NULL);
- event = data = NULL;
- return;
+ event = data = NULL;
+ return;
}
static void
insert_before_callback(Ewl_Widget *w, void *event, void *data)
{
- ewl_callback_insert_after(w, EWL_CALLBACK_CONFIGURE, base_callback,
- NULL, differing_callback, NULL);
+ ewl_callback_insert_after(w, EWL_CALLBACK_CONFIGURE, base_callback,
+ NULL, differing_callback, NULL);
- event = data = NULL;
- return;
+ event = data = NULL;
+ return;
}
static void
delete_callback(Ewl_Widget *w, void *event, void *data)
{
- ewl_callback_del(w, EWL_CALLBACK_CONFIGURE, base_callback);
- event = data = NULL;
- return;
+ ewl_callback_del(w, EWL_CALLBACK_CONFIGURE, base_callback);
+ event = data = NULL;
+ return;
}
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
