# HG changeset patch
# User Thinker K.F. Li <thinker@codemud.net>
# Date 1282800948 -28800
# Node ID 86f2c0fbadfc490a16704962ff667fbbd82cab6d
# Parent  cedfe4966fd6307f674062cf6090ef52b1ee4209# Parent  ffbf9910213c2d0af1457f20acee4b30aa7d21cd
Merge from head

diff -r ffbf9910213c -r 86f2c0fbadfc include/mb_types.h
--- 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)			\
diff -r ffbf9910213c -r 86f2c0fbadfc nodejs/X_supp_njs.c
--- 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);
 
     /*