Enlightenment CVS committal
Author : pfritz
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/engines/xcb
Modified Files:
ewl_engine_xcb.c
Log Message:
- remove the first argument of the parameter and type check macros, althoug
they had a different intention they were only used as the parameter name
- don't fail on type checks if the pointer is NULL
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/engines/xcb/ewl_engine_xcb.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ewl_engine_xcb.c 7 Nov 2007 18:01:30 -0000 1.1
+++ ewl_engine_xcb.c 12 Nov 2007 22:42:21 -0000 1.2
@@ -172,7 +172,7 @@
int i;
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR_RET("engine", engine, FALSE);
+ DCHECK_PARAM_PTR_RET(engine, FALSE);
/* If the event handlers are already setup don't do it again */
if (ee_expose_handler)
@@ -303,7 +303,7 @@
ee_shutdown(Ewl_Engine *engine)
{
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("engine", engine);
+ DCHECK_PARAM_PTR(engine);
if (ee_expose_handler)
ecore_event_handler_del(ee_expose_handler);
@@ -390,8 +390,8 @@
Ecore_X_Window xwin;
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("win", win);
- DCHECK_TYPE("win", win, EWL_WINDOW_TYPE);
+ DCHECK_PARAM_PTR(win);
+ DCHECK_TYPE(win, EWL_WINDOW_TYPE);
if (win->flags & EWL_WINDOW_OVERRIDE)
xwin = ecore_x_window_override_new(0,
@@ -419,8 +419,8 @@
ee_window_destroy(Ewl_Window *win)
{
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("win", win);
- DCHECK_TYPE("win", win, EWL_WINDOW_TYPE);
+ DCHECK_PARAM_PTR(win);
+ DCHECK_TYPE(win, EWL_WINDOW_TYPE);
ee_window_hide(win);
ecore_x_window_del((Ecore_X_Window)(EWL_EMBED(win)->canvas_window));
@@ -436,8 +436,8 @@
ee_window_move(Ewl_Window *win)
{
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("win", win);
- DCHECK_TYPE("win", win, EWL_WINDOW_TYPE);
+ DCHECK_PARAM_PTR(win);
+ DCHECK_TYPE(win, EWL_WINDOW_TYPE);
ecore_x_window_move((Ecore_X_Window)win->window,
EWL_EMBED(win)->x,
@@ -452,8 +452,8 @@
int width, height;
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("win", win);
- DCHECK_TYPE("win", win, EWL_WINDOW_TYPE);
+ DCHECK_PARAM_PTR(win);
+ DCHECK_TYPE(win, EWL_WINDOW_TYPE);
width = ewl_object_current_w_get(EWL_OBJECT(win));
height = ewl_object_current_h_get(EWL_OBJECT(win));
@@ -471,8 +471,8 @@
ee_window_min_max_size_set(Ewl_Window *win)
{
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("win", win);
- DCHECK_TYPE("win", win, EWL_WINDOW_TYPE);
+ DCHECK_PARAM_PTR(win);
+ DCHECK_TYPE(win, EWL_WINDOW_TYPE);
ecore_x_icccm_size_pos_hints_get_prefetch((Ecore_X_Window)win->window);
ecore_x_icccm_size_pos_hints_get_fetch();
@@ -493,8 +493,8 @@
ee_window_show(Ewl_Window *win)
{
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("win", win);
- DCHECK_TYPE("win", win, EWL_WINDOW_TYPE);
+ DCHECK_PARAM_PTR(win);
+ DCHECK_TYPE(win, EWL_WINDOW_TYPE);
ecore_x_window_show((Ecore_X_Window)win->window);
ecore_x_window_show((Ecore_X_Window)EWL_EMBED(win)->canvas_window);
@@ -506,8 +506,8 @@
ee_window_hide(Ewl_Window *win)
{
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("win", win);
- DCHECK_TYPE("win", win, EWL_WINDOW_TYPE);
+ DCHECK_PARAM_PTR(win);
+ DCHECK_TYPE(win, EWL_WINDOW_TYPE);
ecore_x_window_hide((Ecore_X_Window)EWL_EMBED(win)->canvas_window);
ecore_x_window_hide((Ecore_X_Window)EWL_WINDOW(win)->window);
@@ -519,8 +519,8 @@
ee_window_title_set(Ewl_Window *win)
{
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("win", win);
- DCHECK_TYPE("win", win, EWL_WINDOW_TYPE);
+ DCHECK_PARAM_PTR(win);
+ DCHECK_TYPE(win, EWL_WINDOW_TYPE);
ecore_x_icccm_title_set((Ecore_X_Window)win->window, win->title);
ecore_x_netwm_name_set((Ecore_X_Window)win->window, win->title);
@@ -532,8 +532,8 @@
ee_window_name_class_set(Ewl_Window *win)
{
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("win", win);
- DCHECK_TYPE("win", win, EWL_WINDOW_TYPE);
+ DCHECK_PARAM_PTR(win);
+ DCHECK_TYPE(win, EWL_WINDOW_TYPE);
ecore_x_icccm_name_class_set((Ecore_X_Window)win->window, win->name,
(win->classname ? win->classname : win->name));
@@ -545,8 +545,8 @@
ee_window_borderless_set(Ewl_Window *win)
{
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("win", win);
- DCHECK_TYPE("win", win, EWL_WINDOW_TYPE);
+ DCHECK_PARAM_PTR(win);
+ DCHECK_TYPE(win, EWL_WINDOW_TYPE);
ecore_x_mwm_borderless_set((Ecore_X_Window)win->window,
(!!(win->flags & EWL_WINDOW_BORDERLESS)));
@@ -558,8 +558,8 @@
ee_window_dialog_set(Ewl_Window *win)
{
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("win", win);
- DCHECK_TYPE("win", win, EWL_WINDOW_TYPE);
+ DCHECK_PARAM_PTR(win);
+ DCHECK_TYPE(win, EWL_WINDOW_TYPE);
ecore_x_netwm_window_type_set((Ecore_X_Window)win->window,
((!!(win->flags & EWL_WINDOW_DIALOG)) ?
@@ -575,8 +575,8 @@
int diff;
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("win", win);
- DCHECK_TYPE("win", win, EWL_WINDOW_TYPE);
+ DCHECK_PARAM_PTR(win);
+ DCHECK_TYPE(win, EWL_WINDOW_TYPE);
diff = win->flags ^ win->old_flags;
if (!diff) DRETURN(DLEVEL_STABLE);
@@ -599,8 +599,8 @@
int state = 0;
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("win", win);
- DCHECK_TYPE("win", win, EWL_WINDOW_TYPE);
+ DCHECK_PARAM_PTR(win);
+ DCHECK_TYPE(win, EWL_WINDOW_TYPE);
if (states & ewl_flag)
{
@@ -616,8 +616,8 @@
ee_window_state_request(Ewl_Window *win, int states)
{
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("win", win);
- DCHECK_TYPE("win", win, EWL_WINDOW_TYPE);
+ DCHECK_PARAM_PTR(win);
+ DCHECK_TYPE(win, EWL_WINDOW_TYPE);
ee_window_state_handle(win, states, EWL_WINDOW_FULLSCREEN,
ECORE_X_WINDOW_STATE_FULLSCREEN);
@@ -642,8 +642,8 @@
int count = 0;
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("win", win);
- DCHECK_TYPE("win", win, EWL_WINDOW_TYPE);
+ DCHECK_PARAM_PTR(win);
+ DCHECK_TYPE(win, EWL_WINDOW_TYPE);
/* Note: We're ignoring the attention demand state in here as it is
* only relevant if the window has been realized */
@@ -675,8 +675,8 @@
int urgent = FALSE;
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("win", win);
- DCHECK_TYPE("win", win, EWL_WINDOW_TYPE);
+ DCHECK_PARAM_PTR(win);
+ DCHECK_TYPE(win, EWL_WINDOW_TYPE);
if (win->flags & EWL_WINDOW_LEADER)
win_group = win->leader.ewl->window;
@@ -704,8 +704,8 @@
ee_window_transient_for(Ewl_Window *win)
{
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("win", win);
- DCHECK_TYPE("win", win, EWL_WINDOW_TYPE);
+ DCHECK_PARAM_PTR(win);
+ DCHECK_TYPE(win, EWL_WINDOW_TYPE);
if (win->flags & EWL_WINDOW_TRANSIENT)
ecore_x_icccm_transient_for_set((Ecore_X_Window)win->window,
@@ -725,8 +725,8 @@
Ewl_Embed_Window *leader;
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("win", win);
- DCHECK_TYPE("win", win, EWL_WINDOW_TYPE);
+ DCHECK_PARAM_PTR(win);
+ DCHECK_TYPE(win, EWL_WINDOW_TYPE);
if (win->flags & EWL_WINDOW_LEADER)
leader = win->leader.ewl->window;
@@ -747,8 +747,8 @@
ee_window_raise(Ewl_Window *win)
{
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("win", win);
- DCHECK_TYPE("win", win, EWL_WINDOW_TYPE);
+ DCHECK_PARAM_PTR(win);
+ DCHECK_TYPE(win, EWL_WINDOW_TYPE);
ecore_x_window_raise((Ecore_X_Window)win->window);
@@ -759,8 +759,8 @@
ee_window_lower(Ewl_Window *win)
{
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("win", win);
- DCHECK_TYPE("win", win, EWL_WINDOW_TYPE);
+ DCHECK_PARAM_PTR(win);
+ DCHECK_TYPE(win, EWL_WINDOW_TYPE);
ecore_x_window_lower((Ecore_X_Window)win->window);
@@ -773,8 +773,8 @@
int ret = FALSE;
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR_RET("win", win, FALSE);
- DCHECK_TYPE_RET("win", win, EWL_WINDOW_TYPE, FALSE);
+ DCHECK_PARAM_PTR_RET(win, FALSE);
+ DCHECK_TYPE_RET(win, EWL_WINDOW_TYPE, FALSE);
if ((!!(win->flags & EWL_WINDOW_GRAB_KEYBOARD)))
{
@@ -794,8 +794,8 @@
ee_keyboard_ungrab(Ewl_Window *win)
{
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("win", win);
- DCHECK_TYPE("win", win, EWL_WINDOW_TYPE);
+ DCHECK_PARAM_PTR(win);
+ DCHECK_TYPE(win, EWL_WINDOW_TYPE);
ecore_x_keyboard_ungrab();
ee_current_key_grab_window = NULL;
@@ -809,8 +809,8 @@
int ret = FALSE;
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR_RET("win", win, FALSE);
- DCHECK_TYPE_RET("win", win, EWL_WINDOW_TYPE, FALSE);
+ DCHECK_PARAM_PTR_RET(win, FALSE);
+ DCHECK_TYPE_RET(win, EWL_WINDOW_TYPE, FALSE);
if ((!!(win->flags & EWL_WINDOW_GRAB_POINTER)))
{
@@ -830,8 +830,8 @@
ee_pointer_ungrab(Ewl_Window *win)
{
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("win", win);
- DCHECK_TYPE("win", win, EWL_WINDOW_TYPE);
+ DCHECK_PARAM_PTR(win);
+ DCHECK_TYPE(win, EWL_WINDOW_TYPE);
ecore_x_pointer_ungrab();
ee_current_pointer_grab_window = NULL;
@@ -843,9 +843,9 @@
ee_window_selection_text_set(Ewl_Window *win, const char *txt)
{
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("win", win);
- DCHECK_PARAM_PTR("txt", txt);
- DCHECK_TYPE("win", win, EWL_WINDOW_TYPE);
+ DCHECK_PARAM_PTR(win);
+ DCHECK_PARAM_PTR(txt);
+ DCHECK_TYPE(win, EWL_WINDOW_TYPE);
ecore_x_selection_primary_prefetch();
ecore_x_selection_primary_fetch();
@@ -876,8 +876,8 @@
ee_dnd_aware_set(Ewl_Embed *embed)
{
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("embed", embed);
- DCHECK_TYPE("embed", embed, EWL_EMBED_TYPE);
+ DCHECK_PARAM_PTR(embed);
+ DCHECK_TYPE(embed, EWL_EMBED_TYPE);
ecore_x_dnd_aware_set((Ecore_X_Window)embed->canvas_window, TRUE);
@@ -888,8 +888,8 @@
ee_desktop_size_get(Ewl_Embed *embed, int *w, int *h)
{
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("embed", embed);
- DCHECK_TYPE("embed", embed, EWL_EMBED_TYPE);
+ DCHECK_PARAM_PTR(embed);
+ DCHECK_TYPE(embed, EWL_EMBED_TYPE);
ecore_x_drawable_geometry_get_prefetch((Ecore_X_Window)0);
ecore_x_drawable_geometry_get_fetch();
@@ -902,8 +902,8 @@
ee_dnd_drag_types_set(Ewl_Embed *embed, const char **types, unsigned int num)
{
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("embed", embed);
- DCHECK_TYPE("embed", embed, EWL_EMBED_TYPE);
+ DCHECK_PARAM_PTR(embed);
+ DCHECK_TYPE(embed, EWL_EMBED_TYPE);
ecore_x_dnd_type_get_prefetch((Ecore_X_Window)embed->canvas_window);
ecore_x_dnd_aware_set((Ecore_X_Window)embed->canvas_window,
@@ -918,8 +918,8 @@
ee_dnd_drag_begin(Ewl_Embed *embed)
{
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("embed", embed);
- DCHECK_TYPE("embed", embed, EWL_EMBED_TYPE);
+ DCHECK_PARAM_PTR(embed);
+ DCHECK_TYPE(embed, EWL_EMBED_TYPE);
ecore_x_dnd_begin_prefetch((Ecore_X_Window)embed->canvas_window);
ecore_x_dnd_begin_fetch();
@@ -932,8 +932,8 @@
ee_dnd_drag_drop(Ewl_Embed *embed)
{
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("embed", embed);
- DCHECK_TYPE("embed", embed, EWL_EMBED_TYPE);
+ DCHECK_PARAM_PTR(embed);
+ DCHECK_TYPE(embed, EWL_EMBED_TYPE);
ecore_x_dnd_drop();
@@ -946,9 +946,9 @@
Ecore_X_Event_Selection_Request *request = handle;
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR_RET("embed", embed, FALSE);
- DCHECK_PARAM_PTR_RET("handle", handle, FALSE);
- DCHECK_TYPE_RET("embed", embed, EWL_EMBED_TYPE, FALSE);
+ DCHECK_PARAM_PTR_RET(embed, FALSE);
+ DCHECK_PARAM_PTR_RET(handle, FALSE);
+ DCHECK_TYPE_RET(embed, EWL_EMBED_TYPE, FALSE);
ecore_x_window_prop_property_set(request->requestor, request->property,
request->target, 8, data, len);
@@ -962,8 +962,8 @@
ee_pointer_data_new(Ewl_Embed *embed, int *data, int w, int h)
{
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR_RET("embed", embed, 0);
- DCHECK_TYPE_RET("embed", embed, EWL_EMBED_TYPE, 0);
+ DCHECK_PARAM_PTR_RET(embed, 0);
+ DCHECK_TYPE_RET(embed, EWL_EMBED_TYPE, 0);
DRETURN_INT(ecore_x_cursor_new((Ecore_X_Window)embed->canvas_window,
data, w, h, 0, 0), DLEVEL_STABLE);
@@ -973,8 +973,8 @@
ee_pointer_free(Ewl_Embed *embed, int pointer)
{
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("embed", embed);
- DCHECK_TYPE("embed", embed, EWL_EMBED_TYPE);
+ DCHECK_PARAM_PTR(embed);
+ DCHECK_TYPE(embed, EWL_EMBED_TYPE);
ecore_x_cursor_free(pointer);
@@ -989,8 +989,8 @@
ee_pointer_get(Ewl_Embed *embed)
{
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR_RET("embed", embed, 0);
- DCHECK_TYPE_RET("embed", embed, EWL_EMBED_TYPE, 0);
+ DCHECK_PARAM_PTR_RET(embed, 0);
+ DCHECK_TYPE_RET(embed, EWL_EMBED_TYPE, 0);
DRETURN_INT(ecore_x_cursor_size_get(), DLEVEL_STABLE);
}
@@ -1001,8 +1001,8 @@
Ecore_X_Cursor cur;
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("embed", embed);
- DCHECK_TYPE("embed", embed, EWL_EMBED_TYPE);
+ DCHECK_PARAM_PTR(embed);
+ DCHECK_TYPE(embed, EWL_EMBED_TYPE);
if (pointer >= EWL_MOUSE_CURSOR_MAX)
cur = pointer;
@@ -1366,7 +1366,7 @@
Ecore_X_Event_Selection_Notify *ev;
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR_RET("e", e, FALSE);
+ DCHECK_PARAM_PTR_RET(e, FALSE);
ev = e;
@@ -1420,7 +1420,7 @@
Ecore_X_Event_Selection_Request *ev;
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR_RET("e", e, FALSE);
+ DCHECK_PARAM_PTR_RET(e, FALSE);
ev = e;
@@ -1467,7 +1467,7 @@
int will_accept = 0;
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR_RET("e", e, FALSE);
+ DCHECK_PARAM_PTR_RET(e, FALSE);
ev = e;
@@ -1518,7 +1518,7 @@
int i = 0;
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR_RET("e", e, FALSE);
+ DCHECK_PARAM_PTR_RET(e, FALSE);
ev = e;
@@ -1541,7 +1541,7 @@
int i;
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR_RET("e", e, FALSE);
+ DCHECK_PARAM_PTR_RET(e, FALSE);
ev = e;
@@ -1568,7 +1568,7 @@
int internal = 0;
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR_RET("e", e, FALSE);
+ DCHECK_PARAM_PTR_RET(e, FALSE);
ev = e;
-------------------------------------------------------------------------
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
