ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvt.h
(Generate patch)

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.234 by root, Sun Jan 22 00:48:13 2006 UTC vs.
Revision 1.236 by root, Sun Jan 22 17:10:01 2006 UTC

… …
169extern char **environ; 169extern char **environ;
170extern char **rxvt_environ; // the original environ pointer 170extern char **rxvt_environ; // the original environ pointer
171 171
172inline void set_environ (stringvec *envv) 172inline void set_environ (stringvec *envv)
173{ 173{
174#if ENABLE_PERL
175 assert (envv);
176#else
174 if (envv) 177 if (envv)
178#endif
175 environ = (char **)envv->begin (); 179 environ = (char **)envv->begin ();
176} 180}
177 181
178inline void set_environ (char **envv) 182inline void set_environ (char **envv)
179{ 183{
184#if ENABLE_PERL
185 assert (envv);
186#else
180 if (envv) 187 if (envv)
188#endif
181 environ = envv; 189 environ = envv;
182} 190}
183 191
184/* 192/*
185 ***************************************************************************** 193 *****************************************************************************
… …
1249 void create_windows (int argc, const char *const *argv); 1257 void create_windows (int argc, const char *const *argv);
1250 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1258 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1251 void window_calc (unsigned int newwidth, unsigned int newheight); 1259 void window_calc (unsigned int newwidth, unsigned int newheight);
1252 1260
1253#if USE_XIM 1261#if USE_XIM
1254 rxvt_xim *input_method; 1262 rxvt_xim *input_method;
1255 XIC Input_Context; 1263 XIC Input_Context;
1256 XIMStyle input_style; 1264 XIMStyle input_style;
1257 XPoint spot; // most recently sent spot position 1265 XPoint spot; // most recently sent spot position
1258 1266
1259 void im_destroy (); 1267 void im_destroy ();
1260 void im_cb (); im_watcher im_ev; 1268 void im_cb (); im_watcher im_ev;
1261 void im_set_size (XRectangle &size); 1269 void im_set_size (XRectangle &size);
1262 void im_set_position (XPoint &pos) NOTHROW; 1270 void im_set_position (XPoint &pos) NOTHROW;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines