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.200 by ayin, Fri Aug 3 23:15:34 2007 UTC vs.
Revision 1.211 by ayin, Sun Sep 9 10:14:40 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
… …
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);
… …
266/*----------------------------------------------------------------------*/ 265/*----------------------------------------------------------------------*/
267const char ** 266const char **
268rxvt_term::init_resources (int argc, const char *const *argv) 267rxvt_term::init_resources (int argc, const char *const *argv)
269{ 268{
270 int i, r_argc; 269 int i, r_argc;
271 char *val;
272 const char **cmd_argv, **r_argv; 270 const char **cmd_argv, **r_argv;
273 271
274 /* 272 /*
275 * Look for -e option. Find => split and make cmd_argv[] of command args 273 * Look for -e option. Find => split and make cmd_argv[] of command args
276 */ 274 */
… …
295 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 293 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
296 294
297 cmd_argv[i] = NULL; 295 cmd_argv[i] = NULL;
298 } 296 }
299 297
300 rs[Rs_name] = rxvt_r_basename (argv[0]); 298 rs[Rs_name] = rxvt_basename (argv[0]);
301 299
302 /* 300 /*
303 * Open display, get options/resources and create the window 301 * Open display, get options/resources and create the window
304 */ 302 */
305 303
… …
348 * set any defaults not already set 346 * set any defaults not already set
349 */ 347 */
350 if (cmd_argv && cmd_argv[0]) 348 if (cmd_argv && cmd_argv[0])
351 { 349 {
352 if (!rs[Rs_title]) 350 if (!rs[Rs_title])
353 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 351 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
354 if (!rs[Rs_iconName]) 352 if (!rs[Rs_iconName])
355 rs[Rs_iconName] = rs[Rs_title]; 353 rs[Rs_iconName] = rs[Rs_title];
356 } 354 }
357 else 355 else
358 { 356 {
… …
396 rs[Rs_cutchars] = CUTCHARS; 394 rs[Rs_cutchars] = CUTCHARS;
397 395
398#ifndef NO_BACKSPACE_KEY 396#ifndef NO_BACKSPACE_KEY
399 if (!rs[Rs_backspace_key]) 397 if (!rs[Rs_backspace_key])
400# ifdef DEFAULT_BACKSPACE 398# ifdef DEFAULT_BACKSPACE
401 key_backspace = DEFAULT_BACKSPACE; 399 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
402# else 400# else
403 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 401 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
404# endif 402# endif
405 else
406 {
407 val = strdup (rs[Rs_backspace_key]);
408 rxvt_Str_trim (val);
409 rxvt_Str_escaped (val);
410 key_backspace = val;
411 }
412#endif 403#endif
413 404
414#ifndef NO_DELETE_KEY 405#ifndef NO_DELETE_KEY
415 if (!rs[Rs_delete_key]) 406 if (!rs[Rs_delete_key])
416# ifdef DEFAULT_DELETE 407# ifdef DEFAULT_DELETE
417 key_delete = DEFAULT_DELETE; 408 rs[Rs_delete_key] = DEFAULT_DELETE;
418# else 409# else
419 key_delete = "\033[3~"; 410 rs[Rs_delete_key] = "\033[3~";
420# endif
421 else
422 {
423 val = strdup (rs[Rs_delete_key]);
424 rxvt_Str_trim (val);
425 rxvt_Str_escaped (val);
426 key_delete = val;
427 }
428#endif 411# endif
429 if (rs[Rs_answerbackstring]) 412#endif
430 {
431 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
432 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
433 }
434 413
435#ifdef HAVE_SCROLLBARS 414#ifdef HAVE_SCROLLBARS
436 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 415 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
437#endif 416#endif
438 417
… …
483/*----------------------------------------------------------------------*/ 462/*----------------------------------------------------------------------*/
484void 463void
485rxvt_term::init_env () 464rxvt_term::init_env ()
486{ 465{
487 int i; 466 int i;
488 unsigned int u;
489 char *val; 467 char *val;
490 468
491#ifdef DISPLAY_IS_IP 469#ifdef DISPLAY_IS_IP
492 /* Fixup display_name for export over pty to any interested terminal 470 /* 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 471 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
508 486
509 if (rs[Rs_display_name] == NULL) 487 if (rs[Rs_display_name] == NULL)
510 rs[Rs_display_name] = val; /* use broken `:0' value */ 488 rs[Rs_display_name] = val; /* use broken `:0' value */
511 489
512 i = strlen (val); 490 i = strlen (val);
513 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 491 env_display = (char *)rxvt_malloc (i + 9);
514 492
515 sprintf (env_display, "DISPLAY=%s", val); 493 sprintf (env_display, "DISPLAY=%s", val);
516 494
517 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 495 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
518 496
… …
539 else 517 else
540 putenv ("COLORTERM=" COLORTERMENVFULL); 518 putenv ("COLORTERM=" COLORTERMENVFULL);
541 519
542 if (rs[Rs_term_name] != NULL) 520 if (rs[Rs_term_name] != NULL)
543 { 521 {
544 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 522 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
545 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 523 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
546 putenv (env_term); 524 putenv (env_term);
547 } 525 }
548 else 526 else
549 putenv ("TERM=" TERMENV); 527 putenv ("TERM=" TERMENV);
… …
649 priv_modes |= PrivMode_Keypress; 627 priv_modes |= PrivMode_Keypress;
650 if (!option (Opt_jumpScroll)) 628 if (!option (Opt_jumpScroll))
651 priv_modes |= PrivMode_smoothScroll; 629 priv_modes |= PrivMode_smoothScroll;
652 630
653#ifndef NO_BACKSPACE_KEY 631#ifndef NO_BACKSPACE_KEY
654 if (strcmp (key_backspace, "DEC") == 0) 632 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
655 priv_modes |= PrivMode_HaveBackSpace; 633 priv_modes |= PrivMode_HaveBackSpace;
656#endif 634#endif
657 635
658 /* add value for scrollBar */ 636 /* add value for scrollBar */
659 if (scrollBar.state) 637 if (scrollBar.state)
… …
909#if ENABLE_FRILLS 887#if ENABLE_FRILLS
910 if (option (Opt_borderLess)) 888 if (option (Opt_borderLess))
911 { 889 {
912 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 890 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
913 { 891 {
914 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 892 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
915 attributes.override_redirect = true; 893 attributes.override_redirect = true;
916 mwmhints.flags = 0;
917 } 894 }
918 else 895 else
919 { 896 {
920 mwmhints.flags = MWM_HINTS_DECORATIONS; 897 mwmhints.flags = MWM_HINTS_DECORATIONS;
921 mwmhints.decorations = 0;
922 } 898 }
923 } 899 }
924 else
925 mwmhints.flags = 0;
926#endif 900#endif
927 901
928#if ENABLE_XEMBED 902#if ENABLE_XEMBED
929 if (rs[Rs_embed]) 903 if (rs[Rs_embed])
930 { 904 {
… …
1040 vt_emask |= Button1MotionMask | Button3MotionMask; 1014 vt_emask |= Button1MotionMask | Button3MotionMask;
1041 1015
1042 vt_select_input (); 1016 vt_select_input ();
1043 1017
1044 vt_ev.start (display, vt); 1018 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 1019
1062 /* graphics context for the vt window */ 1020 /* graphics context for the vt window */
1063 gcvalue.foreground = pix_colors[Color_fg]; 1021 gcvalue.foreground = pix_colors[Color_fg];
1064 gcvalue.background = pix_colors[Color_bg]; 1022 gcvalue.background = pix_colors[Color_bg];
1065 gcvalue.graphics_exposures = 0; 1023 gcvalue.graphics_exposures = 0;
… …
1282 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1240 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1283 1241
1284 int er; 1242 int er;
1285 1243
1286#ifndef NO_BACKSPACE_KEY 1244#ifndef NO_BACKSPACE_KEY
1287 if (key_backspace[0] && !key_backspace[1]) 1245 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1288 er = key_backspace[0]; 1246 er = rs[Rs_backspace_key][0];
1289 else if (strcmp (key_backspace, "DEC") == 0) 1247 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1290 er = '\177'; /* the initial state anyway */ 1248 er = '\177'; /* the initial state anyway */
1291 else 1249 else
1292#endif 1250#endif
1293 er = -1; 1251 er = -1;
1294 1252
… …
1417 const char *argv0, *shell; 1375 const char *argv0, *shell;
1418 1376
1419 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1377 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1420 shell = "/bin/sh"; 1378 shell = "/bin/sh";
1421 1379
1422 argv0 = (const char *)rxvt_r_basename (shell); 1380 argv0 = (const char *)rxvt_basename (shell);
1423 1381
1424 if (option (Opt_loginShell)) 1382 if (option (Opt_loginShell))
1425 { 1383 {
1426 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1384 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1427 1385
1428 login[0] = '-'; 1386 login[0] = '-';
1429 strcpy (&login[1], argv0); 1387 strcpy (&login[1], argv0);
1430 argv0 = login; 1388 argv0 = login;
1431 } 1389 }

Diff Legend

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