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.198 by sasha, Fri Aug 3 05:33:04 2007 UTC vs.
Revision 1.210 by ayin, Sat Sep 8 21:25:56 2007 UTC

… …
166#endif 166#endif
167#ifdef KEEP_SCROLLCOLOR 167#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 168 COLOR_SCROLLBAR,
169 COLOR_SCROLLTROUGH, 169 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 170#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 171#if ENABLE_TRANSPARENCY
172 NULL, 172 NULL,
173#endif 173#endif
174#if OFF_FOCUS_FADING 174#if OFF_FOCUS_FADING
175 "rgb:00/00/00", 175 "rgb:00/00/00",
176#endif 176#endif
… …
199 numpix_colors = TOTAL_COLORS; 199 numpix_colors = TOTAL_COLORS;
200 200
201 refresh_type = SLOW_REFRESH; 201 refresh_type = SLOW_REFRESH;
202 202
203 oldcursor.row = oldcursor.col = -1; 203 oldcursor.row = oldcursor.col = -1;
204#if defined(XPM_BACKGROUND) || defined(ENABLE_TRANSPARENCY) 204#ifdef HAVE_BG_PIXMAP
205#ifdef HAVE_AFTERIMAGE
206 bgPixmap.original_asim = NULL;
207#endif
208 /* bgPixmap.w = bgPixmap.h = 0; */
205#ifdef XPM_BACKGROUND 209#ifdef XPM_BACKGROUND
206 bgPixmap.original_asim = NULL;
207#endif
208 /* bgPixmap.w = bgPixmap.h = 0; */
209 bgPixmap.x = bgPixmap.y = 0; 210 bgPixmap.h_scale = bgPixmap.v_scale = 0;
211 bgPixmap.h_align = bgPixmap.v_align = 0;
212#endif
213 bgPixmap.flags = 0;
210 bgPixmap.pixmap = None; 214 bgPixmap.pixmap = None;
211#endif 215#endif
212
213 last_bot = last_state = -1; 216 last_bot = last_state = -1;
214 217
215 set_option (Opt_scrollBar); 218 set_option (Opt_scrollBar);
216 set_option (Opt_scrollTtyOutput); 219 set_option (Opt_scrollTtyOutput);
217 set_option (Opt_jumpScroll); 220 set_option (Opt_jumpScroll);
… …
291 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 294 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
292 295
293 cmd_argv[i] = NULL; 296 cmd_argv[i] = NULL;
294 } 297 }
295 298
296 rs[Rs_name] = rxvt_r_basename (argv[0]); 299 rs[Rs_name] = rxvt_basename (argv[0]);
297 300
298 /* 301 /*
299 * Open display, get options/resources and create the window 302 * Open display, get options/resources and create the window
300 */ 303 */
301 304
… …
344 * set any defaults not already set 347 * set any defaults not already set
345 */ 348 */
346 if (cmd_argv && cmd_argv[0]) 349 if (cmd_argv && cmd_argv[0])
347 { 350 {
348 if (!rs[Rs_title]) 351 if (!rs[Rs_title])
349 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 352 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
350 if (!rs[Rs_iconName]) 353 if (!rs[Rs_iconName])
351 rs[Rs_iconName] = rs[Rs_title]; 354 rs[Rs_iconName] = rs[Rs_title];
352 } 355 }
353 else 356 else
354 { 357 {
… …
399 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 402 key_backspace = "DEC"; /* can toggle between \010 or \177 */
400# endif 403# endif
401 else 404 else
402 { 405 {
403 val = strdup (rs[Rs_backspace_key]); 406 val = strdup (rs[Rs_backspace_key]);
404 rxvt_Str_trim (val);
405 rxvt_Str_escaped (val);
406 key_backspace = val; 407 key_backspace = val;
407 } 408 }
408#endif 409#endif
409 410
410#ifndef NO_DELETE_KEY 411#ifndef NO_DELETE_KEY
… …
415 key_delete = "\033[3~"; 416 key_delete = "\033[3~";
416# endif 417# endif
417 else 418 else
418 { 419 {
419 val = strdup (rs[Rs_delete_key]); 420 val = strdup (rs[Rs_delete_key]);
420 rxvt_Str_trim (val);
421 rxvt_Str_escaped (val);
422 key_delete = val; 421 key_delete = val;
423 } 422 }
424#endif 423#endif
425 if (rs[Rs_answerbackstring])
426 {
427 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
428 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
429 }
430 424
431#ifdef HAVE_SCROLLBARS 425#ifdef HAVE_SCROLLBARS
432 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]);
433#endif 427#endif
434 428
… …
479/*----------------------------------------------------------------------*/ 473/*----------------------------------------------------------------------*/
480void 474void
481rxvt_term::init_env () 475rxvt_term::init_env ()
482{ 476{
483 int i; 477 int i;
484 unsigned int u;
485 char *val; 478 char *val;
486 479
487#ifdef DISPLAY_IS_IP 480#ifdef DISPLAY_IS_IP
488 /* Fixup display_name for export over pty to any interested terminal 481 /* Fixup display_name for export over pty to any interested terminal
489 * 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
… …
504 497
505 if (rs[Rs_display_name] == NULL) 498 if (rs[Rs_display_name] == NULL)
506 rs[Rs_display_name] = val; /* use broken `:0' value */ 499 rs[Rs_display_name] = val; /* use broken `:0' value */
507 500
508 i = strlen (val); 501 i = strlen (val);
509 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 502 env_display = (char *)rxvt_malloc (i + 9);
510 503
511 sprintf (env_display, "DISPLAY=%s", val); 504 sprintf (env_display, "DISPLAY=%s", val);
512 505
513 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 506 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
514 507
… …
535 else 528 else
536 putenv ("COLORTERM=" COLORTERMENVFULL); 529 putenv ("COLORTERM=" COLORTERMENVFULL);
537 530
538 if (rs[Rs_term_name] != NULL) 531 if (rs[Rs_term_name] != NULL)
539 { 532 {
540 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);
541 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 534 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
542 putenv (env_term); 535 putenv (env_term);
543 } 536 }
544 else 537 else
545 putenv ("TERM=" TERMENV); 538 putenv ("TERM=" TERMENV);
… …
905#if ENABLE_FRILLS 898#if ENABLE_FRILLS
906 if (option (Opt_borderLess)) 899 if (option (Opt_borderLess))
907 { 900 {
908 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 901 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
909 { 902 {
910 /* 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");
911 attributes.override_redirect = true; 904 attributes.override_redirect = true;
912 mwmhints.flags = 0;
913 } 905 }
914 else 906 else
915 { 907 {
916 mwmhints.flags = MWM_HINTS_DECORATIONS; 908 mwmhints.flags = MWM_HINTS_DECORATIONS;
917 mwmhints.decorations = 0;
918 } 909 }
919 } 910 }
920 else
921 mwmhints.flags = 0;
922#endif 911#endif
923 912
924#if ENABLE_XEMBED 913#if ENABLE_XEMBED
925 if (rs[Rs_embed]) 914 if (rs[Rs_embed])
926 { 915 {
… …
1036 vt_emask |= Button1MotionMask | Button3MotionMask; 1025 vt_emask |= Button1MotionMask | Button3MotionMask;
1037 1026
1038 vt_select_input (); 1027 vt_select_input ();
1039 1028
1040 vt_ev.start (display, vt); 1029 vt_ev.start (display, vt);
1041
1042#ifdef XPM_BACKGROUND
1043 if (rs[Rs_backgroundPixmap] != NULL)
1044 {
1045 const char *p = rs[Rs_backgroundPixmap];
1046
1047 if ((p = strchr (p, ';')) != NULL)
1048 {
1049 p++;
1050 scale_pixmap (p);
1051 }
1052
1053 set_bgPixmap (rs[Rs_backgroundPixmap]);
1054 scr_touch (true);
1055 }
1056#endif
1057 1030
1058 /* graphics context for the vt window */ 1031 /* graphics context for the vt window */
1059 gcvalue.foreground = pix_colors[Color_fg]; 1032 gcvalue.foreground = pix_colors[Color_fg];
1060 gcvalue.background = pix_colors[Color_bg]; 1033 gcvalue.background = pix_colors[Color_bg];
1061 gcvalue.graphics_exposures = 0; 1034 gcvalue.graphics_exposures = 0;
… …
1413 const char *argv0, *shell; 1386 const char *argv0, *shell;
1414 1387
1415 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1388 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1416 shell = "/bin/sh"; 1389 shell = "/bin/sh";
1417 1390
1418 argv0 = (const char *)rxvt_r_basename (shell); 1391 argv0 = (const char *)rxvt_basename (shell);
1419 1392
1420 if (option (Opt_loginShell)) 1393 if (option (Opt_loginShell))
1421 { 1394 {
1422 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1395 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1423 1396
1424 login[0] = '-'; 1397 login[0] = '-';
1425 strcpy (&login[1], argv0); 1398 strcpy (&login[1], argv0);
1426 argv0 = login; 1399 argv0 = login;
1427 } 1400 }

Diff Legend

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