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.170 by root, Wed Jan 11 00:59:58 2006 UTC vs.
Revision 1.173 by root, Wed Jan 11 19:55:34 2006 UTC

… …
284 if (parent[0]) 284 if (parent[0])
285 XDestroyWindow (disp, parent[0]); 285 XDestroyWindow (disp, parent[0]);
286 } 286 }
287 287
288 // TODO: free pixcolours, colours should become part of rxvt_display 288 // TODO: free pixcolours, colours should become part of rxvt_display
289
290 delete pix_colors_focused; 289 delete pix_colors_focused;
291#if OFF_FOCUS_FADING 290#if OFF_FOCUS_FADING
292 delete pix_colors_unfocused; 291 delete pix_colors_unfocused;
293#endif 292#endif
294 293
… …
479/*----------------------------------------------------------------------*/ 478/*----------------------------------------------------------------------*/
480bool 479bool
481rxvt_term::init (int argc, const char *const *argv) 480rxvt_term::init (int argc, const char *const *argv)
482{ 481{
483 SET_R (this); 482 SET_R (this);
483 TEMP_ENV; // few things in X do not call setlocale :(
484 484
485 set_locale (""); 485 set_locale ("");
486 486
487 if (!init_vars ()) 487 if (!init_vars ())
488 return false; 488 return false;
… …
533 533
534 dDisp; 534 dDisp;
535 535
536 init_xlocale (); 536 init_xlocale ();
537 537
538 scr_reset (); /* initialize screen */ 538 scr_reset (); // initialize screen
539 539
540#if 0 540#if 0
541 XSynchronize (disp, True); 541 XSynchronize (disp, True);
542#endif 542#endif
543 543
… …
703 case IGNORE: 703 case IGNORE:
704 /* 704 /*
705 * change effective uid/gid - not real uid/gid - so we can switch 705 * change effective uid/gid - not real uid/gid - so we can switch
706 * back to root later, as required 706 * back to root later, as required
707 */ 707 */
708 setegid (getgid ());
708 seteuid (getuid ()); 709 seteuid (getuid ());
709 setegid (getgid ());
710 break; 710 break;
711 case SAVE: 711 case SAVE:
712 saved_egid = getegid ();
712 saved_euid = geteuid (); 713 saved_euid = geteuid ();
713 saved_egid = getegid ();
714 break; 714 break;
715 case RESTORE: 715 case RESTORE:
716 setegid (saved_egid);
716 seteuid (saved_euid); 717 seteuid (saved_euid);
717 setegid (saved_egid);
718 break; 718 break;
719 } 719 }
720# else 720# else
721 switch (action) 721 switch (action)
722 { 722 {
723 case IGNORE: 723 case IGNORE:
724 setgid (getgid ());
724 setuid (getuid ()); 725 setuid (getuid ());
725 setgid (getgid ());
726 /* FALLTHROUGH */ 726 /* FALLTHROUGH */
727 case SAVE: 727 case SAVE:
728 /* FALLTHROUGH */ 728 /* FALLTHROUGH */
729 case RESTORE: 729 case RESTORE:
730 break; 730 break;
… …
1446 unsigned long fg, bg; 1446 unsigned long fg, bg;
1447 const char *p; 1447 const char *p;
1448 char **s; 1448 char **s;
1449 XIMStyles *xim_styles; 1449 XIMStyles *xim_styles;
1450 1450
1451 TEMP_ENV;
1452
1451 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1453 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1452 return false; 1454 return false;
1453 1455
1454 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1456 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1455 input_method = display->get_xim (locale, modifiers); 1457 input_method = display->get_xim (locale, modifiers);

Diff Legend

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