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.199 by sasha, Fri Aug 3 22:40:10 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
… …
204#ifdef HAVE_BG_PIXMAP 204#ifdef HAVE_BG_PIXMAP
205#ifdef HAVE_AFTERIMAGE 205#ifdef HAVE_AFTERIMAGE
206 bgPixmap.original_asim = NULL; 206 bgPixmap.original_asim = NULL;
207#endif 207#endif
208 /* bgPixmap.w = bgPixmap.h = 0; */ 208 /* bgPixmap.w = bgPixmap.h = 0; */
209#ifdef XPM_BACKGROUND
209 bgPixmap.h_scale = bgPixmap.v_scale = 0; 210 bgPixmap.h_scale = bgPixmap.v_scale = 0;
210 bgPixmap.h_align = bgPixmap.v_align = 0; 211 bgPixmap.h_align = bgPixmap.v_align = 0;
212#endif
211 bgPixmap.flags = 0; 213 bgPixmap.flags = 0;
212 bgPixmap.pixmap = None; 214 bgPixmap.pixmap = None;
213#endif 215#endif
214
215 last_bot = last_state = -1; 216 last_bot = last_state = -1;
216 217
217 set_option (Opt_scrollBar); 218 set_option (Opt_scrollBar);
218 set_option (Opt_scrollTtyOutput); 219 set_option (Opt_scrollTtyOutput);
219 set_option (Opt_jumpScroll); 220 set_option (Opt_jumpScroll);
… …
264/*----------------------------------------------------------------------*/ 265/*----------------------------------------------------------------------*/
265const char ** 266const char **
266rxvt_term::init_resources (int argc, const char *const *argv) 267rxvt_term::init_resources (int argc, const char *const *argv)
267{ 268{
268 int i, r_argc; 269 int i, r_argc;
269 char *val;
270 const char **cmd_argv, **r_argv; 270 const char **cmd_argv, **r_argv;
271 271
272 /* 272 /*
273 * 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
274 */ 274 */
… …
293 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 293 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
294 294
295 cmd_argv[i] = NULL; 295 cmd_argv[i] = NULL;
296 } 296 }
297 297
298 rs[Rs_name] = rxvt_r_basename (argv[0]); 298 rs[Rs_name] = rxvt_basename (argv[0]);
299 299
300 /* 300 /*
301 * Open display, get options/resources and create the window 301 * Open display, get options/resources and create the window
302 */ 302 */
303 303
… …
346 * set any defaults not already set 346 * set any defaults not already set
347 */ 347 */
348 if (cmd_argv && cmd_argv[0]) 348 if (cmd_argv && cmd_argv[0])
349 { 349 {
350 if (!rs[Rs_title]) 350 if (!rs[Rs_title])
351 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 351 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
352 if (!rs[Rs_iconName]) 352 if (!rs[Rs_iconName])
353 rs[Rs_iconName] = rs[Rs_title]; 353 rs[Rs_iconName] = rs[Rs_title];
354 } 354 }
355 else 355 else
356 { 356 {
… …
394 rs[Rs_cutchars] = CUTCHARS; 394 rs[Rs_cutchars] = CUTCHARS;
395 395
396#ifndef NO_BACKSPACE_KEY 396#ifndef NO_BACKSPACE_KEY
397 if (!rs[Rs_backspace_key]) 397 if (!rs[Rs_backspace_key])
398# ifdef DEFAULT_BACKSPACE 398# ifdef DEFAULT_BACKSPACE
399 key_backspace = DEFAULT_BACKSPACE; 399 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
400# else 400# else
401 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 401 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
402# endif 402# endif
403 else
404 {
405 val = strdup (rs[Rs_backspace_key]);
406 rxvt_Str_trim (val);
407 rxvt_Str_escaped (val);
408 key_backspace = val;
409 }
410#endif 403#endif
411 404
412#ifndef NO_DELETE_KEY 405#ifndef NO_DELETE_KEY
413 if (!rs[Rs_delete_key]) 406 if (!rs[Rs_delete_key])
414# ifdef DEFAULT_DELETE 407# ifdef DEFAULT_DELETE
415 key_delete = DEFAULT_DELETE; 408 rs[Rs_delete_key] = DEFAULT_DELETE;
416# else 409# else
417 key_delete = "\033[3~"; 410 rs[Rs_delete_key] = "\033[3~";
418# endif
419 else
420 {
421 val = strdup (rs[Rs_delete_key]);
422 rxvt_Str_trim (val);
423 rxvt_Str_escaped (val);
424 key_delete = val;
425 }
426#endif 411# endif
427 if (rs[Rs_answerbackstring]) 412#endif
428 {
429 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
430 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
431 }
432 413
433#ifdef HAVE_SCROLLBARS 414#ifdef HAVE_SCROLLBARS
434 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]);
435#endif 416#endif
436 417
… …
481/*----------------------------------------------------------------------*/ 462/*----------------------------------------------------------------------*/
482void 463void
483rxvt_term::init_env () 464rxvt_term::init_env ()
484{ 465{
485 int i; 466 int i;
486 unsigned int u;
487 char *val; 467 char *val;
488 468
489#ifdef DISPLAY_IS_IP 469#ifdef DISPLAY_IS_IP
490 /* Fixup display_name for export over pty to any interested terminal 470 /* Fixup display_name for export over pty to any interested terminal
491 * 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
… …
506 486
507 if (rs[Rs_display_name] == NULL) 487 if (rs[Rs_display_name] == NULL)
508 rs[Rs_display_name] = val; /* use broken `:0' value */ 488 rs[Rs_display_name] = val; /* use broken `:0' value */
509 489
510 i = strlen (val); 490 i = strlen (val);
511 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 491 env_display = (char *)rxvt_malloc (i + 9);
512 492
513 sprintf (env_display, "DISPLAY=%s", val); 493 sprintf (env_display, "DISPLAY=%s", val);
514 494
515 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 495 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
516 496
… …
537 else 517 else
538 putenv ("COLORTERM=" COLORTERMENVFULL); 518 putenv ("COLORTERM=" COLORTERMENVFULL);
539 519
540 if (rs[Rs_term_name] != NULL) 520 if (rs[Rs_term_name] != NULL)
541 { 521 {
542 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);
543 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 523 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
544 putenv (env_term); 524 putenv (env_term);
545 } 525 }
546 else 526 else
547 putenv ("TERM=" TERMENV); 527 putenv ("TERM=" TERMENV);
… …
647 priv_modes |= PrivMode_Keypress; 627 priv_modes |= PrivMode_Keypress;
648 if (!option (Opt_jumpScroll)) 628 if (!option (Opt_jumpScroll))
649 priv_modes |= PrivMode_smoothScroll; 629 priv_modes |= PrivMode_smoothScroll;
650 630
651#ifndef NO_BACKSPACE_KEY 631#ifndef NO_BACKSPACE_KEY
652 if (strcmp (key_backspace, "DEC") == 0) 632 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
653 priv_modes |= PrivMode_HaveBackSpace; 633 priv_modes |= PrivMode_HaveBackSpace;
654#endif 634#endif
655 635
656 /* add value for scrollBar */ 636 /* add value for scrollBar */
657 if (scrollBar.state) 637 if (scrollBar.state)
… …
907#if ENABLE_FRILLS 887#if ENABLE_FRILLS
908 if (option (Opt_borderLess)) 888 if (option (Opt_borderLess))
909 { 889 {
910 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 890 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
911 { 891 {
912 /* 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");
913 attributes.override_redirect = true; 893 attributes.override_redirect = true;
914 mwmhints.flags = 0;
915 } 894 }
916 else 895 else
917 { 896 {
918 mwmhints.flags = MWM_HINTS_DECORATIONS; 897 mwmhints.flags = MWM_HINTS_DECORATIONS;
919 mwmhints.decorations = 0;
920 } 898 }
921 } 899 }
922 else
923 mwmhints.flags = 0;
924#endif 900#endif
925 901
926#if ENABLE_XEMBED 902#if ENABLE_XEMBED
927 if (rs[Rs_embed]) 903 if (rs[Rs_embed])
928 { 904 {
… …
1038 vt_emask |= Button1MotionMask | Button3MotionMask; 1014 vt_emask |= Button1MotionMask | Button3MotionMask;
1039 1015
1040 vt_select_input (); 1016 vt_select_input ();
1041 1017
1042 vt_ev.start (display, vt); 1018 vt_ev.start (display, vt);
1043
1044#ifdef XPM_BACKGROUND
1045 if (rs[Rs_backgroundPixmap] != NULL)
1046 {
1047 const char *p = rs[Rs_backgroundPixmap];
1048
1049 if ((p = strchr (p, ';')) != NULL)
1050 {
1051 p++;
1052 bgPixmap.handle_geometry (p);
1053 }
1054
1055 set_bgPixmap (rs[Rs_backgroundPixmap]);
1056 scr_touch (true);
1057 }
1058#endif
1059 1019
1060 /* graphics context for the vt window */ 1020 /* graphics context for the vt window */
1061 gcvalue.foreground = pix_colors[Color_fg]; 1021 gcvalue.foreground = pix_colors[Color_fg];
1062 gcvalue.background = pix_colors[Color_bg]; 1022 gcvalue.background = pix_colors[Color_bg];
1063 gcvalue.graphics_exposures = 0; 1023 gcvalue.graphics_exposures = 0;
… …
1280 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1240 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1281 1241
1282 int er; 1242 int er;
1283 1243
1284#ifndef NO_BACKSPACE_KEY 1244#ifndef NO_BACKSPACE_KEY
1285 if (key_backspace[0] && !key_backspace[1]) 1245 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1286 er = key_backspace[0]; 1246 er = rs[Rs_backspace_key][0];
1287 else if (strcmp (key_backspace, "DEC") == 0) 1247 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1288 er = '\177'; /* the initial state anyway */ 1248 er = '\177'; /* the initial state anyway */
1289 else 1249 else
1290#endif 1250#endif
1291 er = -1; 1251 er = -1;
1292 1252
… …
1415 const char *argv0, *shell; 1375 const char *argv0, *shell;
1416 1376
1417 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1377 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1418 shell = "/bin/sh"; 1378 shell = "/bin/sh";
1419 1379
1420 argv0 = (const char *)rxvt_r_basename (shell); 1380 argv0 = (const char *)rxvt_basename (shell);
1421 1381
1422 if (option (Opt_loginShell)) 1382 if (option (Opt_loginShell))
1423 { 1383 {
1424 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1384 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1425 1385
1426 login[0] = '-'; 1386 login[0] = '-';
1427 strcpy (&login[1], argv0); 1387 strcpy (&login[1], argv0);
1428 argv0 = login; 1388 argv0 = login;
1429 } 1389 }

Diff Legend

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