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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.201 by ayin, Fri Aug 3 23:32:14 2007 UTC vs.
Revision 1.209 by ayin, Sat Sep 8 20:54:50 2007 UTC

… …
211 bgPixmap.h_align = bgPixmap.v_align = 0; 211 bgPixmap.h_align = bgPixmap.v_align = 0;
212#endif 212#endif
213 bgPixmap.flags = 0; 213 bgPixmap.flags = 0;
214 bgPixmap.pixmap = None; 214 bgPixmap.pixmap = None;
215#endif 215#endif
216
217 last_bot = last_state = -1; 216 last_bot = last_state = -1;
218 217
219 set_option (Opt_scrollBar); 218 set_option (Opt_scrollBar);
220 set_option (Opt_scrollTtyOutput); 219 set_option (Opt_scrollTtyOutput);
221 set_option (Opt_jumpScroll); 220 set_option (Opt_jumpScroll);
… …
403 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 402 key_backspace = "DEC"; /* can toggle between \010 or \177 */
404# endif 403# endif
405 else 404 else
406 { 405 {
407 val = strdup (rs[Rs_backspace_key]); 406 val = strdup (rs[Rs_backspace_key]);
408 rxvt_Str_trim (val);
409 rxvt_Str_escaped (val);
410 key_backspace = val; 407 key_backspace = val;
411 } 408 }
412#endif 409#endif
413 410
414#ifndef NO_DELETE_KEY 411#ifndef NO_DELETE_KEY
… …
419 key_delete = "\033[3~"; 416 key_delete = "\033[3~";
420# endif 417# endif
421 else 418 else
422 { 419 {
423 val = strdup (rs[Rs_delete_key]); 420 val = strdup (rs[Rs_delete_key]);
424 rxvt_Str_trim (val);
425 rxvt_Str_escaped (val);
426 key_delete = val; 421 key_delete = val;
427 } 422 }
428#endif 423#endif
429 if (rs[Rs_answerbackstring])
430 {
431 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
432 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
433 }
434 424
435#ifdef HAVE_SCROLLBARS 425#ifdef HAVE_SCROLLBARS
436 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 426 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
437#endif 427#endif
438 428
… …
483/*----------------------------------------------------------------------*/ 473/*----------------------------------------------------------------------*/
484void 474void
485rxvt_term::init_env () 475rxvt_term::init_env ()
486{ 476{
487 int i; 477 int i;
488 unsigned int u;
489 char *val; 478 char *val;
490 479
491#ifdef DISPLAY_IS_IP 480#ifdef DISPLAY_IS_IP
492 /* Fixup display_name for export over pty to any interested terminal 481 /* Fixup display_name for export over pty to any interested terminal
493 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 482 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
508 497
509 if (rs[Rs_display_name] == NULL) 498 if (rs[Rs_display_name] == NULL)
510 rs[Rs_display_name] = val; /* use broken `:0' value */ 499 rs[Rs_display_name] = val; /* use broken `:0' value */
511 500
512 i = strlen (val); 501 i = strlen (val);
513 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 502 env_display = (char *)rxvt_malloc (i + 9);
514 503
515 sprintf (env_display, "DISPLAY=%s", val); 504 sprintf (env_display, "DISPLAY=%s", val);
516 505
517 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 506 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
518 507
… …
539 else 528 else
540 putenv ("COLORTERM=" COLORTERMENVFULL); 529 putenv ("COLORTERM=" COLORTERMENVFULL);
541 530
542 if (rs[Rs_term_name] != NULL) 531 if (rs[Rs_term_name] != NULL)
543 { 532 {
544 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 533 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
545 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 534 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
546 putenv (env_term); 535 putenv (env_term);
547 } 536 }
548 else 537 else
549 putenv ("TERM=" TERMENV); 538 putenv ("TERM=" TERMENV);
… …
909#if ENABLE_FRILLS 898#if ENABLE_FRILLS
910 if (option (Opt_borderLess)) 899 if (option (Opt_borderLess))
911 { 900 {
912 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 901 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
913 { 902 {
914 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 903 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
915 attributes.override_redirect = true; 904 attributes.override_redirect = true;
916 mwmhints.flags = 0;
917 } 905 }
918 else 906 else
919 { 907 {
920 mwmhints.flags = MWM_HINTS_DECORATIONS; 908 mwmhints.flags = MWM_HINTS_DECORATIONS;
921 mwmhints.decorations = 0;
922 } 909 }
923 } 910 }
924 else
925 mwmhints.flags = 0;
926#endif 911#endif
927 912
928#if ENABLE_XEMBED 913#if ENABLE_XEMBED
929 if (rs[Rs_embed]) 914 if (rs[Rs_embed])
930 { 915 {
… …
1040 vt_emask |= Button1MotionMask | Button3MotionMask; 1025 vt_emask |= Button1MotionMask | Button3MotionMask;
1041 1026
1042 vt_select_input (); 1027 vt_select_input ();
1043 1028
1044 vt_ev.start (display, vt); 1029 vt_ev.start (display, vt);
1045
1046#ifdef XPM_BACKGROUND
1047 if (rs[Rs_backgroundPixmap] != NULL)
1048 {
1049 const char *p = rs[Rs_backgroundPixmap];
1050
1051 if ((p = strchr (p, ';')) != NULL)
1052 {
1053 p++;
1054 bgPixmap.handle_geometry (p);
1055 }
1056
1057 set_bgPixmap (rs[Rs_backgroundPixmap]);
1058 scr_touch (true);
1059 }
1060#endif
1061 1030
1062 /* graphics context for the vt window */ 1031 /* graphics context for the vt window */
1063 gcvalue.foreground = pix_colors[Color_fg]; 1032 gcvalue.foreground = pix_colors[Color_fg];
1064 gcvalue.background = pix_colors[Color_bg]; 1033 gcvalue.background = pix_colors[Color_bg];
1065 gcvalue.graphics_exposures = 0; 1034 gcvalue.graphics_exposures = 0;
… …
1421 1390
1422 argv0 = (const char *)rxvt_r_basename (shell); 1391 argv0 = (const char *)rxvt_r_basename (shell);
1423 1392
1424 if (option (Opt_loginShell)) 1393 if (option (Opt_loginShell))
1425 { 1394 {
1426 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1395 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1427 1396
1428 login[0] = '-'; 1397 login[0] = '-';
1429 strcpy (&login[1], argv0); 1398 strcpy (&login[1], argv0);
1430 argv0 = login; 1399 argv0 = login;
1431 } 1400 }

Diff Legend

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