"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/main.C" between
rxvt-unicode-9.26.tar.bz2 and rxvt-unicode-9.29.tar.bz2

About: rxvt-unicode is a clone of the terminal emulator rxvt.

main.C  (rxvt-unicode-9.26.tar.bz2):main.C  (rxvt-unicode-9.29.tar.bz2)
skipping to change at line 129 skipping to change at line 129
rxvt_warn ("too many unrepresentable composite characters, try --enable- unicode3\n"); rxvt_warn ("too many unrepresentable composite characters, try --enable- unicode3\n");
return REPLACEMENT_CHAR; return REPLACEMENT_CHAR;
} }
v.push_back (compose_char (c1, c2)); v.push_back (compose_char (c1, c2));
return v.size () - 1 + COMPOSE_LO; return v.size () - 1 + COMPOSE_LO;
} }
int rxvt_composite_vec::expand (unicode_t c, wchar_t *r) template<typename T>
int rxvt_composite_vec::expand (unicode_t c, T *r)
{ {
compose_char *cc = (*this)[c]; compose_char *cc = (*this)[c];
if (!cc) if (!cc)
{ {
if (r) *r = c; if (r) *r = c;
return 1; return 1;
} }
int len = expand (cc->c1, r); int len = expand (cc->c1, r);
if (r) r += len; if (r) r += len;
if (cc->c2 != NOCHAR) if (cc->c2 != NOCHAR)
{ {
len++; len++;
if (r) *r++ = cc->c2; if (r) *r++ = cc->c2;
} }
return len; return len;
} }
template int rxvt_composite_vec::expand<text_t> (unicode_t c, text_t *);
template int rxvt_composite_vec::expand<wchar_t> (unicode_t c, wchar_t *);
#endif #endif
rxvt_term::rxvt_term () rxvt_term::rxvt_term ()
{ {
#ifdef CURSOR_BLINK #ifdef CURSOR_BLINK
cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); curso r_blink_ev.set (0., CURSOR_BLINK_INTERVAL); cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); curso r_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
#endif #endif
#ifdef TEXT_BLINK #ifdef TEXT_BLINK
text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_ blink_ev.set (0., TEXT_BLINK_INTERVAL); text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_ blink_ev.set (0., TEXT_BLINK_INTERVAL);
#endif #endif
skipping to change at line 636 skipping to change at line 639
sig_handlers.sw_term.start (SIGTERM); ev_unref (); sig_handlers.sw_term.start (SIGTERM); ev_unref ();
sig_handlers.sw_int.start (SIGINT); ev_unref (); sig_handlers.sw_int.start (SIGINT); ev_unref ();
old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
// TODO: handle this with exceptions and tolerate the memory loss // TODO: handle this with exceptions and tolerate the memory loss
XSetIOErrorHandler (rxvt_xioerror_handler); XSetIOErrorHandler (rxvt_xioerror_handler);
XrmInitialize (); XrmInitialize ();
#if HAVE_PIXBUF #if HAVE_PIXBUF
#if !GLIB_CHECK_VERSION(2,36,0)
g_type_init (); g_type_init ();
#endif
#endif #endif
} }
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/
/* /*
* window size/position calculations for XSizeHint and other storage. * window size/position calculations for XSizeHint and other storage.
* if width/height are non-zero then override calculated width/height * if width/height are non-zero then override calculated width/height
*/ */
void void
rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
 End of changes. 5 change blocks. 
2 lines changed or deleted 7 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)