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.206 by ayin, Mon Aug 13 07:17:48 2007 UTC vs.
Revision 1.213 by root, Fri Sep 14 10:15:41 2007 UTC

… …
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#ifdef HAVE_BG_PIXMAP
205#ifdef HAVE_AFTERIMAGE
206 bgPixmap.original_asim = NULL;
207#endif
208 /* bgPixmap.w = bgPixmap.h = 0; */
209#ifdef XPM_BACKGROUND
210 bgPixmap.h_scale = bgPixmap.v_scale = 0;
211 bgPixmap.h_align = bgPixmap.v_align = 0;
212#endif
213 bgPixmap.flags = 0;
214 bgPixmap.pixmap = None;
215#endif
216 last_bot = last_state = -1; 204 last_bot = last_state = -1;
217 205
218 set_option (Opt_scrollBar); 206 set_option (Opt_scrollBar);
219 set_option (Opt_scrollTtyOutput); 207 set_option (Opt_scrollTtyOutput);
220 set_option (Opt_jumpScroll); 208 set_option (Opt_jumpScroll);
… …
265/*----------------------------------------------------------------------*/ 253/*----------------------------------------------------------------------*/
266const char ** 254const char **
267rxvt_term::init_resources (int argc, const char *const *argv) 255rxvt_term::init_resources (int argc, const char *const *argv)
268{ 256{
269 int i, r_argc; 257 int i, r_argc;
270 char *val;
271 const char **cmd_argv, **r_argv; 258 const char **cmd_argv, **r_argv;
272 259
273 /* 260 /*
274 * Look for -e option. Find => split and make cmd_argv[] of command args 261 * Look for -e option. Find => split and make cmd_argv[] of command args
275 */ 262 */
… …
294 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 281 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
295 282
296 cmd_argv[i] = NULL; 283 cmd_argv[i] = NULL;
297 } 284 }
298 285
299 rs[Rs_name] = rxvt_r_basename (argv[0]); 286 rs[Rs_name] = rxvt_basename (argv[0]);
300 287
301 /* 288 /*
302 * Open display, get options/resources and create the window 289 * Open display, get options/resources and create the window
303 */ 290 */
304 291
… …
347 * set any defaults not already set 334 * set any defaults not already set
348 */ 335 */
349 if (cmd_argv && cmd_argv[0]) 336 if (cmd_argv && cmd_argv[0])
350 { 337 {
351 if (!rs[Rs_title]) 338 if (!rs[Rs_title])
352 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 339 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
353 if (!rs[Rs_iconName]) 340 if (!rs[Rs_iconName])
354 rs[Rs_iconName] = rs[Rs_title]; 341 rs[Rs_iconName] = rs[Rs_title];
355 } 342 }
356 else 343 else
357 { 344 {
… …
395 rs[Rs_cutchars] = CUTCHARS; 382 rs[Rs_cutchars] = CUTCHARS;
396 383
397#ifndef NO_BACKSPACE_KEY 384#ifndef NO_BACKSPACE_KEY
398 if (!rs[Rs_backspace_key]) 385 if (!rs[Rs_backspace_key])
399# ifdef DEFAULT_BACKSPACE 386# ifdef DEFAULT_BACKSPACE
400 key_backspace = DEFAULT_BACKSPACE; 387 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
401# else 388# else
402 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 389 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
403# endif 390# endif
404 else
405 {
406 val = strdup (rs[Rs_backspace_key]);
407 rxvt_Str_trim (val);
408 rxvt_Str_escaped (val);
409 key_backspace = val;
410 }
411#endif 391#endif
412 392
413#ifndef NO_DELETE_KEY 393#ifndef NO_DELETE_KEY
414 if (!rs[Rs_delete_key]) 394 if (!rs[Rs_delete_key])
415# ifdef DEFAULT_DELETE 395# ifdef DEFAULT_DELETE
416 key_delete = DEFAULT_DELETE; 396 rs[Rs_delete_key] = DEFAULT_DELETE;
417# else 397# else
418 key_delete = "\033[3~"; 398 rs[Rs_delete_key] = "\033[3~";
419# endif
420 else
421 {
422 val = strdup (rs[Rs_delete_key]);
423 rxvt_Str_trim (val);
424 rxvt_Str_escaped (val);
425 key_delete = val;
426 }
427#endif 399# endif
428 if (rs[Rs_answerbackstring]) 400#endif
429 {
430 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
431 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
432 }
433 401
434#ifdef HAVE_SCROLLBARS 402#ifdef HAVE_SCROLLBARS
435 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 403 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
436#endif 404#endif
437 405
… …
482/*----------------------------------------------------------------------*/ 450/*----------------------------------------------------------------------*/
483void 451void
484rxvt_term::init_env () 452rxvt_term::init_env ()
485{ 453{
486 int i; 454 int i;
487 unsigned int u;
488 char *val; 455 char *val;
489 456
490#ifdef DISPLAY_IS_IP 457#ifdef DISPLAY_IS_IP
491 /* Fixup display_name for export over pty to any interested terminal 458 /* Fixup display_name for export over pty to any interested terminal
492 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 459 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
507 474
508 if (rs[Rs_display_name] == NULL) 475 if (rs[Rs_display_name] == NULL)
509 rs[Rs_display_name] = val; /* use broken `:0' value */ 476 rs[Rs_display_name] = val; /* use broken `:0' value */
510 477
511 i = strlen (val); 478 i = strlen (val);
512 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 479 env_display = (char *)rxvt_malloc (i + 9);
513 480
514 sprintf (env_display, "DISPLAY=%s", val); 481 sprintf (env_display, "DISPLAY=%s", val);
515 482
516 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 483 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
517 484
… …
538 else 505 else
539 putenv ("COLORTERM=" COLORTERMENVFULL); 506 putenv ("COLORTERM=" COLORTERMENVFULL);
540 507
541 if (rs[Rs_term_name] != NULL) 508 if (rs[Rs_term_name] != NULL)
542 { 509 {
543 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 510 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
544 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 511 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
545 putenv (env_term); 512 putenv (env_term);
546 } 513 }
547 else 514 else
548 putenv ("TERM=" TERMENV); 515 putenv ("TERM=" TERMENV);
… …
648 priv_modes |= PrivMode_Keypress; 615 priv_modes |= PrivMode_Keypress;
649 if (!option (Opt_jumpScroll)) 616 if (!option (Opt_jumpScroll))
650 priv_modes |= PrivMode_smoothScroll; 617 priv_modes |= PrivMode_smoothScroll;
651 618
652#ifndef NO_BACKSPACE_KEY 619#ifndef NO_BACKSPACE_KEY
653 if (strcmp (key_backspace, "DEC") == 0) 620 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
654 priv_modes |= PrivMode_HaveBackSpace; 621 priv_modes |= PrivMode_HaveBackSpace;
655#endif 622#endif
656 623
657 /* add value for scrollBar */ 624 /* add value for scrollBar */
658 if (scrollBar.state) 625 if (scrollBar.state)
… …
1261 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1228 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1262 1229
1263 int er; 1230 int er;
1264 1231
1265#ifndef NO_BACKSPACE_KEY 1232#ifndef NO_BACKSPACE_KEY
1266 if (key_backspace[0] && !key_backspace[1]) 1233 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1267 er = key_backspace[0]; 1234 er = rs[Rs_backspace_key][0];
1268 else if (strcmp (key_backspace, "DEC") == 0) 1235 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1269 er = '\177'; /* the initial state anyway */ 1236 er = '\177'; /* the initial state anyway */
1270 else 1237 else
1271#endif 1238#endif
1272 er = -1; 1239 er = -1;
1273 1240
… …
1377 sigset_t ss; 1344 sigset_t ss;
1378 sigemptyset (&ss); 1345 sigemptyset (&ss);
1379 sigprocmask (SIG_SETMASK, &ss, 0); 1346 sigprocmask (SIG_SETMASK, &ss, 0);
1380 1347
1381 /* command interpreter path */ 1348 /* command interpreter path */
1382 if (argv != NULL) 1349 if (argv)
1383 { 1350 {
1384# ifdef DEBUG_CMD 1351# ifdef DEBUG_CMD
1385 int i; 1352 int i;
1386 1353
1387 for (i = 0; argv[i]; i++) 1354 for (i = 0; argv[i]; i++)
… …
1396 const char *argv0, *shell; 1363 const char *argv0, *shell;
1397 1364
1398 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1365 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1399 shell = "/bin/sh"; 1366 shell = "/bin/sh";
1400 1367
1401 argv0 = (const char *)rxvt_r_basename (shell); 1368 argv0 = (const char *)rxvt_basename (shell);
1402 1369
1403 if (option (Opt_loginShell)) 1370 if (option (Opt_loginShell))
1404 { 1371 {
1405 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1372 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1406 1373
1407 login[0] = '-'; 1374 login[0] = '-';
1408 strcpy (&login[1], argv0); 1375 strcpy (&login[1], argv0);
1409 argv0 = login; 1376 argv0 = login;
1410 } 1377 }
1411 1378
1412 execlp (shell, argv0, NULL); 1379 execlp (shell, argv0, (char *)0);
1413 /* no error message: STDERR is closed! */ 1380 /* no error message: STDERR is closed! */
1414 } 1381 }
1415 1382
1416 return -1; 1383 return -1;
1417} 1384}

Diff Legend

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