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.204 by sasha, Thu Aug 9 22:08:21 2007 UTC vs.
Revision 1.210 by ayin, Sat Sep 8 21:25:56 2007 UTC

… …
294 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 294 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
295 295
296 cmd_argv[i] = NULL; 296 cmd_argv[i] = NULL;
297 } 297 }
298 298
299 rs[Rs_name] = rxvt_r_basename (argv[0]); 299 rs[Rs_name] = rxvt_basename (argv[0]);
300 300
301 /* 301 /*
302 * Open display, get options/resources and create the window 302 * Open display, get options/resources and create the window
303 */ 303 */
304 304
… …
323 323
324#ifdef HAVE_AFTERIMAGE 324#ifdef HAVE_AFTERIMAGE
325 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL); 325 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
326#endif 326#endif
327 free (r_argv); 327 free (r_argv);
328
329 bgPixmap.set_target (this);
330 328
331 for (int i = NUM_RESOURCES; i--; ) 329 for (int i = NUM_RESOURCES; i--; )
332 if (rs [i] == resval_undef) 330 if (rs [i] == resval_undef)
333 rs [i] = 0; 331 rs [i] = 0;
334 332
… …
349 * set any defaults not already set 347 * set any defaults not already set
350 */ 348 */
351 if (cmd_argv && cmd_argv[0]) 349 if (cmd_argv && cmd_argv[0])
352 { 350 {
353 if (!rs[Rs_title]) 351 if (!rs[Rs_title])
354 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 352 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
355 if (!rs[Rs_iconName]) 353 if (!rs[Rs_iconName])
356 rs[Rs_iconName] = rs[Rs_title]; 354 rs[Rs_iconName] = rs[Rs_title];
357 } 355 }
358 else 356 else
359 { 357 {
… …
404 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 402 key_backspace = "DEC"; /* can toggle between \010 or \177 */
405# endif 403# endif
406 else 404 else
407 { 405 {
408 val = strdup (rs[Rs_backspace_key]); 406 val = strdup (rs[Rs_backspace_key]);
409 rxvt_Str_trim (val);
410 rxvt_Str_escaped (val);
411 key_backspace = val; 407 key_backspace = val;
412 } 408 }
413#endif 409#endif
414 410
415#ifndef NO_DELETE_KEY 411#ifndef NO_DELETE_KEY
… …
420 key_delete = "\033[3~"; 416 key_delete = "\033[3~";
421# endif 417# endif
422 else 418 else
423 { 419 {
424 val = strdup (rs[Rs_delete_key]); 420 val = strdup (rs[Rs_delete_key]);
425 rxvt_Str_trim (val);
426 rxvt_Str_escaped (val);
427 key_delete = val; 421 key_delete = val;
428 } 422 }
429#endif 423#endif
430 if (rs[Rs_answerbackstring])
431 {
432 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
433 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
434 }
435 424
436#ifdef HAVE_SCROLLBARS 425#ifdef HAVE_SCROLLBARS
437 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]);
438#endif 427#endif
439 428
… …
484/*----------------------------------------------------------------------*/ 473/*----------------------------------------------------------------------*/
485void 474void
486rxvt_term::init_env () 475rxvt_term::init_env ()
487{ 476{
488 int i; 477 int i;
489 unsigned int u;
490 char *val; 478 char *val;
491 479
492#ifdef DISPLAY_IS_IP 480#ifdef DISPLAY_IS_IP
493 /* Fixup display_name for export over pty to any interested terminal 481 /* Fixup display_name for export over pty to any interested terminal
494 * 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
… …
509 497
510 if (rs[Rs_display_name] == NULL) 498 if (rs[Rs_display_name] == NULL)
511 rs[Rs_display_name] = val; /* use broken `:0' value */ 499 rs[Rs_display_name] = val; /* use broken `:0' value */
512 500
513 i = strlen (val); 501 i = strlen (val);
514 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 502 env_display = (char *)rxvt_malloc (i + 9);
515 503
516 sprintf (env_display, "DISPLAY=%s", val); 504 sprintf (env_display, "DISPLAY=%s", val);
517 505
518 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 506 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
519 507
… …
540 else 528 else
541 putenv ("COLORTERM=" COLORTERMENVFULL); 529 putenv ("COLORTERM=" COLORTERMENVFULL);
542 530
543 if (rs[Rs_term_name] != NULL) 531 if (rs[Rs_term_name] != NULL)
544 { 532 {
545 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);
546 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 534 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
547 putenv (env_term); 535 putenv (env_term);
548 } 536 }
549 else 537 else
550 putenv ("TERM=" TERMENV); 538 putenv ("TERM=" TERMENV);
… …
910#if ENABLE_FRILLS 898#if ENABLE_FRILLS
911 if (option (Opt_borderLess)) 899 if (option (Opt_borderLess))
912 { 900 {
913 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 901 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
914 { 902 {
915 /* 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");
916 attributes.override_redirect = true; 904 attributes.override_redirect = true;
917 mwmhints.flags = 0;
918 } 905 }
919 else 906 else
920 { 907 {
921 mwmhints.flags = MWM_HINTS_DECORATIONS; 908 mwmhints.flags = MWM_HINTS_DECORATIONS;
922 mwmhints.decorations = 0;
923 } 909 }
924 } 910 }
925 else
926 mwmhints.flags = 0;
927#endif 911#endif
928 912
929#if ENABLE_XEMBED 913#if ENABLE_XEMBED
930 if (rs[Rs_embed]) 914 if (rs[Rs_embed])
931 { 915 {
… …
1041 vt_emask |= Button1MotionMask | Button3MotionMask; 1025 vt_emask |= Button1MotionMask | Button3MotionMask;
1042 1026
1043 vt_select_input (); 1027 vt_select_input ();
1044 1028
1045 vt_ev.start (display, vt); 1029 vt_ev.start (display, vt);
1046
1047#ifdef XPM_BACKGROUND
1048 if (rs[Rs_backgroundPixmap] != NULL)
1049 {
1050 const char *p = rs[Rs_backgroundPixmap];
1051
1052 if ((p = strchr (p, ';')) != NULL)
1053 {
1054 p++;
1055 bgPixmap.handle_geometry (p);
1056 }
1057 else
1058 bgPixmap.set_defaultGeometry ();
1059
1060 set_bgPixmap (rs[Rs_backgroundPixmap]);
1061 scr_touch (true);
1062 }
1063#endif
1064 1030
1065 /* graphics context for the vt window */ 1031 /* graphics context for the vt window */
1066 gcvalue.foreground = pix_colors[Color_fg]; 1032 gcvalue.foreground = pix_colors[Color_fg];
1067 gcvalue.background = pix_colors[Color_bg]; 1033 gcvalue.background = pix_colors[Color_bg];
1068 gcvalue.graphics_exposures = 0; 1034 gcvalue.graphics_exposures = 0;
… …
1420 const char *argv0, *shell; 1386 const char *argv0, *shell;
1421 1387
1422 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1388 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1423 shell = "/bin/sh"; 1389 shell = "/bin/sh";
1424 1390
1425 argv0 = (const char *)rxvt_r_basename (shell); 1391 argv0 = (const char *)rxvt_basename (shell);
1426 1392
1427 if (option (Opt_loginShell)) 1393 if (option (Opt_loginShell))
1428 { 1394 {
1429 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1395 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1430 1396
1431 login[0] = '-'; 1397 login[0] = '-';
1432 strcpy (&login[1], argv0); 1398 strcpy (&login[1], argv0);
1433 argv0 = login; 1399 argv0 = login;
1434 } 1400 }

Diff Legend

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