Mercurial > MadButterfly
changeset 754:86f2c0fbadfc
Merge from head
| author | Thinker K.F. Li <thinker@codemud.net> |
|---|---|
| date | Thu, 26 Aug 2010 13:35:48 +0800 |
| parents | cedfe4966fd6 (diff) ffbf9910213c (current diff) |
| children | 82836f1290b6 |
| files | |
| diffstat | 2 files changed, 2 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/include/mb_types.h Thu Aug 26 09:53:15 2010 +0800 +++ b/include/mb_types.h Thu Aug 26 13:35:48 2010 +0800 @@ -312,6 +312,8 @@ #define coord_clear_flags(co, _flags) \ do { (co)->flags &= ~(_flags); } while(0) #define coord_get_mouse_event(coord) ((coord)->mouse_event) +#define coord_get_opacity(coord) ((coord)->opacity) +#define coord_set_opacity(coord, v) do { (coord)->opacity = v; } while(0) #define coord_get_aggr_matrix(coord) ((coord)->aggr_matrix) #define coord_get_matrix(coord) ((coord)->matrix) #define FOR_COORDS_POSTORDER(coord, cur) \
--- a/nodejs/X_supp_njs.c Thu Aug 26 09:53:15 2010 +0800 +++ b/nodejs/X_supp_njs.c Thu Aug 26 13:35:48 2010 +0800 @@ -81,11 +81,7 @@ void X_njs_MB_init_handle_connection(njs_runtime_t *rt) { void *xrt = rt->xrt; - mb_tman_t *tman; - mb_timeval_t now, tmo; - ev_tstamp tout; int fd; - int r; extern int _X_MB_get_x_conn_for_nodejs(void *rt); /*