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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.375 by sf-exg, Sun Jun 3 17:48:28 2012 UTC vs.
Revision 1.376 by root, Mon Jun 4 15:18:52 2012 UTC

172#endif 172#endif
173#if ENABLE_TRANSPARENCY || ENABLE_PERL 173#if ENABLE_TRANSPARENCY || ENABLE_PERL
174 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 174 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
175#endif 175#endif
176 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 176 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
177#ifdef USE_XIM 177#if USE_XIM
178 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 178 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
179#endif 179#endif
180#ifdef POINTER_BLANK 180#ifdef POINTER_BLANK
181 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 181 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
182#endif 182#endif
231 if (display) 231 if (display)
232 { 232 {
233 selection_clear (); 233 selection_clear ();
234 selection_clear (true); 234 selection_clear (true);
235 235
236#ifdef USE_XIM 236#if USE_XIM
237 im_destroy (); 237 im_destroy ();
238#endif 238#endif
239 scrollBar.destroy (); 239 scrollBar.destroy ();
240 if (gc) XFreeGC (dpy, gc); 240 if (gc) XFreeGC (dpy, gc);
241 241
572 // TODO: handle this with exceptions and tolerate the memory loss 572 // TODO: handle this with exceptions and tolerate the memory loss
573 XSetIOErrorHandler (rxvt_xioerror_handler); 573 XSetIOErrorHandler (rxvt_xioerror_handler);
574 574
575 XrmInitialize (); 575 XrmInitialize ();
576 576
577#ifdef HAVE_PIXBUF 577#if HAVE_PIXBUF
578 g_type_init (); 578 g_type_init ();
579#endif 579#endif
580} 580}
581 581
582/*----------------------------------------------------------------------*/ 582/*----------------------------------------------------------------------*/
965 965
966 for (i = Color_Black; i <= Color_White; i++) 966 for (i = Color_Black; i <= Color_White; i++)
967 if (pix_colors[Color_bg] == pix_colors[i]) 967 if (pix_colors[Color_bg] == pix_colors[i])
968 { 968 {
969 sprintf (bstr, "%d", i - Color_Black); 969 sprintf (bstr, "%d", i - Color_Black);
970#ifdef BG_IMAGE_FROM_FILE 970#if BG_IMAGE_FROM_FILE
971 xpmb = "default;"; 971 xpmb = "default;";
972#endif 972#endif
973 break; 973 break;
974 } 974 }
975 975
1087 } 1087 }
1088 1088
1089 if (fix_screen || old_height == 0) 1089 if (fix_screen || old_height == 0)
1090 scr_reset (); 1090 scr_reset ();
1091 1091
1092#ifdef USE_XIM 1092#if USE_XIM
1093 im_set_position (); 1093 im_set_position ();
1094#endif 1094#endif
1095} 1095}
1096 1096
1097/* 1097/*
1122} 1122}
1123 1123
1124/* -------------------------------------------------------------------- * 1124/* -------------------------------------------------------------------- *
1125 * - X INPUT METHOD ROUTINES - * 1125 * - X INPUT METHOD ROUTINES - *
1126 * -------------------------------------------------------------------- */ 1126 * -------------------------------------------------------------------- */
1127#ifdef USE_XIM 1127#if USE_XIM
1128 1128
1129void 1129void
1130rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1130rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1131{ 1131{
1132 fg = pix_colors [Color_fg]; 1132 fg = pix_colors [Color_fg];

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines