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.203 by sasha, Wed Aug 8 22:39:49 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 bgPixmap.set_target (this);
217
218 last_bot = last_state = -1; 204 last_bot = last_state = -1;
219 205
220 set_option (Opt_scrollBar); 206 set_option (Opt_scrollBar);
221 set_option (Opt_scrollTtyOutput); 207 set_option (Opt_scrollTtyOutput);
222 set_option (Opt_jumpScroll); 208 set_option (Opt_jumpScroll);
… …
267/*----------------------------------------------------------------------*/ 253/*----------------------------------------------------------------------*/
268const char ** 254const char **
269rxvt_term::init_resources (int argc, const char *const *argv) 255rxvt_term::init_resources (int argc, const char *const *argv)
270{ 256{
271 int i, r_argc; 257 int i, r_argc;
272 char *val;
273 const char **cmd_argv, **r_argv; 258 const char **cmd_argv, **r_argv;
274 259
275 /* 260 /*
276 * 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
277 */ 262 */
… …
296 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 281 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
297 282
298 cmd_argv[i] = NULL; 283 cmd_argv[i] = NULL;
299 } 284 }
300 285
301 rs[Rs_name] = rxvt_r_basename (argv[0]); 286 rs[Rs_name] = rxvt_basename (argv[0]);
302 287
303 /* 288 /*
304 * Open display, get options/resources and create the window 289 * Open display, get options/resources and create the window
305 */ 290 */
306 291
… …
349 * set any defaults not already set 334 * set any defaults not already set
350 */ 335 */
351 if (cmd_argv && cmd_argv[0]) 336 if (cmd_argv && cmd_argv[0])
352 { 337 {
353 if (!rs[Rs_title]) 338 if (!rs[Rs_title])
354 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 339 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
355 if (!rs[Rs_iconName]) 340 if (!rs[Rs_iconName])
356 rs[Rs_iconName] = rs[Rs_title]; 341 rs[Rs_iconName] = rs[Rs_title];
357 } 342 }
358 else 343 else
359 { 344 {
… …
397 rs[Rs_cutchars] = CUTCHARS; 382 rs[Rs_cutchars] = CUTCHARS;
398 383
399#ifndef NO_BACKSPACE_KEY 384#ifndef NO_BACKSPACE_KEY
400 if (!rs[Rs_backspace_key]) 385 if (!rs[Rs_backspace_key])
401# ifdef DEFAULT_BACKSPACE 386# ifdef DEFAULT_BACKSPACE
402 key_backspace = DEFAULT_BACKSPACE; 387 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
403# else 388# else
404 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 389 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
405# endif 390# 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 391#endif
414 392
415#ifndef NO_DELETE_KEY 393#ifndef NO_DELETE_KEY
416 if (!rs[Rs_delete_key]) 394 if (!rs[Rs_delete_key])
417# ifdef DEFAULT_DELETE 395# ifdef DEFAULT_DELETE
418 key_delete = DEFAULT_DELETE; 396 rs[Rs_delete_key] = DEFAULT_DELETE;
419# else 397# else
420 key_delete = "\033[3~"; 398 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 399# endif
430 if (rs[Rs_answerbackstring]) 400#endif
431 {
432 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
433 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
434 }
435 401
436#ifdef HAVE_SCROLLBARS 402#ifdef HAVE_SCROLLBARS
437 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]);
438#endif 404#endif
439 405
… …
484/*----------------------------------------------------------------------*/ 450/*----------------------------------------------------------------------*/
485void 451void
486rxvt_term::init_env () 452rxvt_term::init_env ()
487{ 453{
488 int i; 454 int i;
489 unsigned int u;
490 char *val; 455 char *val;
491 456
492#ifdef DISPLAY_IS_IP 457#ifdef DISPLAY_IS_IP
493 /* Fixup display_name for export over pty to any interested terminal 458 /* 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 459 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
509 474
510 if (rs[Rs_display_name] == NULL) 475 if (rs[Rs_display_name] == NULL)
511 rs[Rs_display_name] = val; /* use broken `:0' value */ 476 rs[Rs_display_name] = val; /* use broken `:0' value */
512 477
513 i = strlen (val); 478 i = strlen (val);
514 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 479 env_display = (char *)rxvt_malloc (i + 9);
515 480
516 sprintf (env_display, "DISPLAY=%s", val); 481 sprintf (env_display, "DISPLAY=%s", val);
517 482
518 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 483 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
519 484
… …
540 else 505 else
541 putenv ("COLORTERM=" COLORTERMENVFULL); 506 putenv ("COLORTERM=" COLORTERMENVFULL);
542 507
543 if (rs[Rs_term_name] != NULL) 508 if (rs[Rs_term_name] != NULL)
544 { 509 {
545 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);
546 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 511 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
547 putenv (env_term); 512 putenv (env_term);
548 } 513 }
549 else 514 else
550 putenv ("TERM=" TERMENV); 515 putenv ("TERM=" TERMENV);
… …
650 priv_modes |= PrivMode_Keypress; 615 priv_modes |= PrivMode_Keypress;
651 if (!option (Opt_jumpScroll)) 616 if (!option (Opt_jumpScroll))
652 priv_modes |= PrivMode_smoothScroll; 617 priv_modes |= PrivMode_smoothScroll;
653 618
654#ifndef NO_BACKSPACE_KEY 619#ifndef NO_BACKSPACE_KEY
655 if (strcmp (key_backspace, "DEC") == 0) 620 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
656 priv_modes |= PrivMode_HaveBackSpace; 621 priv_modes |= PrivMode_HaveBackSpace;
657#endif 622#endif
658 623
659 /* add value for scrollBar */ 624 /* add value for scrollBar */
660 if (scrollBar.state) 625 if (scrollBar.state)
… …
910#if ENABLE_FRILLS 875#if ENABLE_FRILLS
911 if (option (Opt_borderLess)) 876 if (option (Opt_borderLess))
912 { 877 {
913 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 878 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
914 { 879 {
915 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 880 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
916 attributes.override_redirect = true; 881 attributes.override_redirect = true;
917 mwmhints.flags = 0;
918 } 882 }
919 else 883 else
920 { 884 {
921 mwmhints.flags = MWM_HINTS_DECORATIONS; 885 mwmhints.flags = MWM_HINTS_DECORATIONS;
922 mwmhints.decorations = 0;
923 } 886 }
924 } 887 }
925 else
926 mwmhints.flags = 0;
927#endif 888#endif
928 889
929#if ENABLE_XEMBED 890#if ENABLE_XEMBED
930 if (rs[Rs_embed]) 891 if (rs[Rs_embed])
931 { 892 {
… …
1041 vt_emask |= Button1MotionMask | Button3MotionMask; 1002 vt_emask |= Button1MotionMask | Button3MotionMask;
1042 1003
1043 vt_select_input (); 1004 vt_select_input ();
1044 1005
1045 vt_ev.start (display, vt); 1006 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 1007
1065 /* graphics context for the vt window */ 1008 /* graphics context for the vt window */
1066 gcvalue.foreground = pix_colors[Color_fg]; 1009 gcvalue.foreground = pix_colors[Color_fg];
1067 gcvalue.background = pix_colors[Color_bg]; 1010 gcvalue.background = pix_colors[Color_bg];
1068 gcvalue.graphics_exposures = 0; 1011 gcvalue.graphics_exposures = 0;
… …
1285 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1228 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1286 1229
1287 int er; 1230 int er;
1288 1231
1289#ifndef NO_BACKSPACE_KEY 1232#ifndef NO_BACKSPACE_KEY
1290 if (key_backspace[0] && !key_backspace[1]) 1233 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1291 er = key_backspace[0]; 1234 er = rs[Rs_backspace_key][0];
1292 else if (strcmp (key_backspace, "DEC") == 0) 1235 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1293 er = '\177'; /* the initial state anyway */ 1236 er = '\177'; /* the initial state anyway */
1294 else 1237 else
1295#endif 1238#endif
1296 er = -1; 1239 er = -1;
1297 1240
… …
1401 sigset_t ss; 1344 sigset_t ss;
1402 sigemptyset (&ss); 1345 sigemptyset (&ss);
1403 sigprocmask (SIG_SETMASK, &ss, 0); 1346 sigprocmask (SIG_SETMASK, &ss, 0);
1404 1347
1405 /* command interpreter path */ 1348 /* command interpreter path */
1406 if (argv != NULL) 1349 if (argv)
1407 { 1350 {
1408# ifdef DEBUG_CMD 1351# ifdef DEBUG_CMD
1409 int i; 1352 int i;
1410 1353
1411 for (i = 0; argv[i]; i++) 1354 for (i = 0; argv[i]; i++)
… …
1420 const char *argv0, *shell; 1363 const char *argv0, *shell;
1421 1364
1422 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1365 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1423 shell = "/bin/sh"; 1366 shell = "/bin/sh";
1424 1367
1425 argv0 = (const char *)rxvt_r_basename (shell); 1368 argv0 = (const char *)rxvt_basename (shell);
1426 1369
1427 if (option (Opt_loginShell)) 1370 if (option (Opt_loginShell))
1428 { 1371 {
1429 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1372 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1430 1373
1431 login[0] = '-'; 1374 login[0] = '-';
1432 strcpy (&login[1], argv0); 1375 strcpy (&login[1], argv0);
1433 argv0 = login; 1376 argv0 = login;
1434 } 1377 }
1435 1378
1436 execlp (shell, argv0, NULL); 1379 execlp (shell, argv0, (char *)0);
1437 /* no error message: STDERR is closed! */ 1380 /* no error message: STDERR is closed! */
1438 } 1381 }
1439 1382
1440 return -1; 1383 return -1;
1441} 1384}

Diff Legend

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