From b4b682cd6a293c8bce1460d5c3726236ffc5b569 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 8 Apr 2016 15:57:21 -0400 Subject: [PATCH] make a number of client functions take const E_Client* --- src/bin/e_client.c | 2 +- src/bin/e_client.h | 2 +- src/bin/e_maximize.c | 24 ++++++++++++------------ src/bin/e_maximize.h | 8 ++++---- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/bin/e_client.c b/src/bin/e_client.c index 33ec5001d..676a664b0 100644 --- a/src/bin/e_client.c +++ b/src/bin/e_client.c @@ -4822,7 +4822,7 @@ e_client_signal_resize_end(E_Client *ec, const char *dir EINA_UNUSED, const char //////////////////////////////////////////// E_API void -e_client_resize_limit(E_Client *ec, int *w, int *h) +e_client_resize_limit(const E_Client *ec, int *w, int *h) { double a; Eina_Bool inc_h; diff --git a/src/bin/e_client.h b/src/bin/e_client.h index f164ba7be..55c9e2f1d 100644 --- a/src/bin/e_client.h +++ b/src/bin/e_client.h @@ -819,7 +819,7 @@ E_API void e_client_signal_move_begin(E_Client *ec, const char *sig, const char E_API void e_client_signal_move_end(E_Client *ec, const char *sig EINA_UNUSED, const char *src EINA_UNUSED); E_API void e_client_signal_resize_begin(E_Client *ec, const char *dir, const char *sig, const char *src EINA_UNUSED); E_API void e_client_signal_resize_end(E_Client *ec, const char *dir EINA_UNUSED, const char *sig EINA_UNUSED, const char *src EINA_UNUSED); -E_API void e_client_resize_limit(E_Client *ec, int *w, int *h); +E_API void e_client_resize_limit(const E_Client *ec, int *w, int *h); E_API E_Client *e_client_under_pointer_get(E_Desk *desk, E_Client *exclude); E_API int e_client_pointer_warp_to_center_now(E_Client *ec); E_API int e_client_pointer_warp_to_center(E_Client *ec); diff --git a/src/bin/e_maximize.c b/src/bin/e_maximize.c index 8399af99a..d6737d42c 100644 --- a/src/bin/e_maximize.c +++ b/src/bin/e_maximize.c @@ -14,19 +14,19 @@ struct _E_Maximize_Rect rects = eina_list_append(rects, r); \ } -static void _e_maximize_client_rects_fill(E_Client *ec, Eina_List *list, int *x1, int *yy1, int *x2, int *y2, E_Maximize dir); -static void _e_maximize_client_rects_fill_both(E_Client *ec, Eina_List *rects, int *x1, int *yy1, int *x2, int *y2); -static void _e_maximize_client_rects_fill_horiz(E_Client *ec, Eina_List *rects, int *x1, int *x2, int *bx, int *by, int *bw, int *bh); -static void _e_maximize_client_rects_fill_vert(E_Client *ec, Eina_List *rects, int *yy1, int *y2, int *bx, int *by, int *bw, int *bh); +static void _e_maximize_client_rects_fill(const E_Client *ec, Eina_List *list, int *x1, int *yy1, int *x2, int *y2, E_Maximize dir); +static void _e_maximize_client_rects_fill_both(const E_Client *ec, Eina_List *rects, int *x1, int *yy1, int *x2, int *y2); +static void _e_maximize_client_rects_fill_horiz(const E_Client *ec, Eina_List *rects, int *x1, int *x2, int *bx, int *by, int *bw, int *bh); +static void _e_maximize_client_rects_fill_vert(const E_Client *ec, Eina_List *rects, int *yy1, int *y2, int *bx, int *by, int *bw, int *bh); E_API void -e_maximize_client_shelf_fit(E_Client *ec, int *x1, int *yy1, int *x2, int *y2, E_Maximize dir) +e_maximize_client_shelf_fit(const E_Client *ec, int *x1, int *yy1, int *x2, int *y2, E_Maximize dir) { e_maximize_client_shelf_fill(ec, x1, yy1, x2, y2, dir); } E_API void -e_maximize_client_dock_fit(E_Client *ec, int *x1, int *yy1, int *x2, int *y2) +e_maximize_client_dock_fit(const E_Client *ec, int *x1, int *yy1, int *x2, int *y2) { E_Client *ec2; int cx1, cx2, cy1, cy2; @@ -124,7 +124,7 @@ e_maximize_client_dock_fit(E_Client *ec, int *x1, int *yy1, int *x2, int *y2) } E_API void -e_maximize_client_shelf_fill(E_Client *ec, int *x1, int *yy1, int *x2, int *y2, E_Maximize dir) +e_maximize_client_shelf_fill(const E_Client *ec, int *x1, int *yy1, int *x2, int *y2, E_Maximize dir) { Eina_List *l, *rects = NULL; E_Shelf *es; @@ -146,7 +146,7 @@ e_maximize_client_shelf_fill(E_Client *ec, int *x1, int *yy1, int *x2, int *y2, } E_API void -e_maximize_client_client_fill(E_Client *ec, int *x1, int *yy1, int *x2, int *y2, E_Maximize dir) +e_maximize_client_client_fill(const E_Client *ec, int *x1, int *yy1, int *x2, int *y2, E_Maximize dir) { Eina_List *rects = NULL; E_Maximize_Rect *r; @@ -166,7 +166,7 @@ e_maximize_client_client_fill(E_Client *ec, int *x1, int *yy1, int *x2, int *y2, } static void -_e_maximize_client_rects_fill(E_Client *ec, Eina_List *rects, int *x1, int *yy1, int *x2, int *y2, E_Maximize dir) +_e_maximize_client_rects_fill(const E_Client *ec, Eina_List *rects, int *x1, int *yy1, int *x2, int *y2, E_Maximize dir) { if ((dir & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_BOTH) { @@ -191,7 +191,7 @@ _e_maximize_client_rects_fill(E_Client *ec, Eina_List *rects, int *x1, int *yy1, } static void -_e_maximize_client_rects_fill_both(E_Client *ec, Eina_List *rects, int *x1, int *yy1, int *x2, int *y2) +_e_maximize_client_rects_fill_both(const E_Client *ec, Eina_List *rects, int *x1, int *yy1, int *x2, int *y2) { int hx1, hy1, hx2, hy2; int vx1, vy1, vx2, vy2; @@ -243,7 +243,7 @@ _e_maximize_client_rects_fill_both(E_Client *ec, Eina_List *rects, int *x1, int } static void -_e_maximize_client_rects_fill_horiz(E_Client *ec, Eina_List *rects, int *x1, int *x2, int *bx, int *by, int *bw, int *bh) +_e_maximize_client_rects_fill_horiz(const E_Client *ec, Eina_List *rects, int *x1, int *x2, int *bx, int *by, int *bw, int *bh) { Eina_List *l; E_Maximize_Rect *rect; @@ -283,7 +283,7 @@ _e_maximize_client_rects_fill_horiz(E_Client *ec, Eina_List *rects, int *x1, int } static void -_e_maximize_client_rects_fill_vert(E_Client *ec, Eina_List *rects, int *yy1, int *y2, int *bx, int *by, int *bw, int *bh) +_e_maximize_client_rects_fill_vert(const E_Client *ec, Eina_List *rects, int *yy1, int *y2, int *bx, int *by, int *bw, int *bh) { Eina_List *l; E_Maximize_Rect *rect; diff --git a/src/bin/e_maximize.h b/src/bin/e_maximize.h index ea0852a80..9a0f2b264 100644 --- a/src/bin/e_maximize.h +++ b/src/bin/e_maximize.h @@ -3,10 +3,10 @@ #ifndef E_MAXIMIZE_H #define E_MAXIMIZE_H -E_API void e_maximize_client_shelf_fit(E_Client *ec, int *x1, int *y1, int *x2, int *y2, E_Maximize dir); -E_API void e_maximize_client_dock_fit(E_Client *ec, int *x1, int *y1, int *x2, int *y2); -E_API void e_maximize_client_shelf_fill(E_Client *ec, int *x1, int *y1, int *x2, int *y2, E_Maximize dir); -E_API void e_maximize_client_client_fill(E_Client *ec, int *x1, int *y1, int *x2, int *y2, E_Maximize dir); +E_API void e_maximize_client_shelf_fit(const E_Client *ec, int *x1, int *y1, int *x2, int *y2, E_Maximize dir); +E_API void e_maximize_client_dock_fit(const E_Client *ec, int *x1, int *y1, int *x2, int *y2); +E_API void e_maximize_client_shelf_fill(const E_Client *ec, int *x1, int *y1, int *x2, int *y2, E_Maximize dir); +E_API void e_maximize_client_client_fill(const E_Client *ec, int *x1, int *y1, int *x2, int *y2, E_Maximize dir); #endif #endif