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.211 by ayin, Sun Sep 9 10:14:40 2007 UTC

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

Diff Legend

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