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.144 by root, Tue Jan 17 11:02:10 2006 UTC vs.
Revision 1.148 by root, Wed Jan 18 19:43:51 2006 UTC

… …
928 { 928 {
929 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 929 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
930 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 930 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
931 } 931 }
932 932
933 /* grab colors before netscape does */
934 Get_Colours ();
935
936 if (!set_fonts ())
937 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
938
939 parent = DefaultRootWindow (disp);
940
941 attributes.override_redirect = !!OPTION (Opt_override_redirect);
942
933#if ENABLE_FRILLS 943#if ENABLE_FRILLS
934 if (OPTION (Opt_borderLess)) 944 if (OPTION (Opt_borderLess))
935 { 945 {
936 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 946 prop = XInternAtom (disp, "_MOTIF_WM_INFO", True);
937 947
938 if (prop == None) 948 if (prop == None)
939 { 949 {
940 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 950 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
941#ifdef PREFER_24BIT
942 attributes.override_redirect = TRUE; 951 attributes.override_redirect = TRUE;
943#endif
944 mwmhints.flags = 0; 952 mwmhints.flags = 0;
945 } 953 }
946 else 954 else
947 { 955 {
948 mwmhints.flags = MWM_HINTS_DECORATIONS; 956 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
951 } 959 }
952 else 960 else
953 mwmhints.flags = 0; 961 mwmhints.flags = 0;
954#endif 962#endif
955 963
956 /* grab colors before netscape does */
957 Get_Colours ();
958
959 if (!set_fonts ())
960 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
961
962 parent = DefaultRootWindow (disp);
963
964#if ENABLE_XEMBED 964#if ENABLE_XEMBED
965 if (rs[Rs_embed]) 965 if (rs[Rs_embed])
966 { 966 {
967 XWindowAttributes wattr; 967 XWindowAttributes wattr;
968 968
… …
976#endif 976#endif
977 977
978 window_calc (0, 0); 978 window_calc (0, 0);
979 979
980 /* sub-window placement & size in rxvt_resize_subwindows () */ 980 /* sub-window placement & size in rxvt_resize_subwindows () */
981#ifdef PREFER_24BIT
982 attributes.background_pixel = pix_colors_focused[Color_border]; 981 attributes.background_pixel = pix_colors_focused[Color_border];
983 attributes.border_pixel = pix_colors_focused[Color_border]; 982 attributes.border_pixel = pix_colors_focused[Color_border];
984 attributes.colormap = display->cmap; 983 attributes.colormap = display->cmap;
985 top = XCreateWindow (disp, parent, 984 top = XCreateWindow (disp, parent,
986 szHint.x, szHint.y, 985 szHint.x, szHint.y,
987 szHint.width, szHint.height, 986 szHint.width, szHint.height,
988 ext_bwidth, 987 ext_bwidth,
989 display->depth, InputOutput, 988 display->depth, InputOutput,
990 display->visual, 989 display->visual,
991 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 990 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
992#else 991 &attributes);
993 top = XCreateSimpleWindow (disp, parent,
994 szHint.x, szHint.y,
995 szHint.width, szHint.height,
996 ext_bwidth,
997 pix_colors_focused[Color_border],
998 pix_colors_focused[Color_border]);
999#endif
1000 992
1001 this->parent[0] = top; 993 this->parent[0] = top;
1002 994
1003 old_width = szHint.width; 995 old_width = szHint.width;
1004 old_height = szHint.height; 996 old_height = szHint.height;
… …
1370rxvt_term::run_command (const char *const *argv) 1362rxvt_term::run_command (const char *const *argv)
1371{ 1363{
1372#if ENABLE_FRILLS 1364#if ENABLE_FRILLS
1373 if (rs[Rs_pty_fd]) 1365 if (rs[Rs_pty_fd])
1374 { 1366 {
1375 pty.pty = atoi (rs[Rs_pty_fd]); 1367 pty->pty = atoi (rs[Rs_pty_fd]);
1376 1368
1377 if (pty.pty >= 0) 1369 if (pty->pty >= 0)
1378 { 1370 {
1379 if (getfd_hook) 1371 if (getfd_hook)
1380 pty.pty = (*getfd_hook) (pty.pty); 1372 pty->pty = (*getfd_hook) (pty->pty);
1381 1373
1382 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK)) 1374 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1383 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1375 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1384 } 1376 }
1385 } 1377 }
1386 else 1378 else
1387#endif 1379#endif
1388 if (!pty.get ()) 1380 if (!pty->get ())
1389 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1381 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1390 1382
1391 pty.set_utf8_mode (enc_utf8); 1383 pty->set_utf8_mode (enc_utf8);
1392 1384
1393 /* set initial window size */ 1385 /* set initial window size */
1394 tt_winch (); 1386 tt_winch ();
1395 1387
1396 int er; 1388 int er;
… …
1420 rxvt_fatal ("can't fork, aborting.\n"); 1412 rxvt_fatal ("can't fork, aborting.\n");
1421 } 1413 }
1422 case 0: 1414 case 0:
1423 init_env (); 1415 init_env ();
1424 1416
1425 if (!pty.make_controlling_tty ()) 1417 if (!pty->make_controlling_tty ())
1426 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1418 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1427 else 1419 else
1428 { 1420 {
1429 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1421 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1430 dup2 (pty.tty, STDIN_FILENO); 1422 dup2 (pty->tty, STDIN_FILENO);
1431 dup2 (pty.tty, STDOUT_FILENO); 1423 dup2 (pty->tty, STDOUT_FILENO);
1432 dup2 (pty.tty, STDERR_FILENO); 1424 dup2 (pty->tty, STDERR_FILENO);
1433 1425
1434 // close all our file handles that we do no longer need 1426 // close all our file handles that we do no longer need
1435 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1427 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1436 { 1428 {
1437 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1429 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1438 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1430 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1439 } 1431 }
1440 1432
1441 run_child (argv); 1433 run_child (argv);
1442 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1434 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1443 } 1435 }
1444 1436
1445 _exit (EXIT_FAILURE); 1437 _exit (EXIT_FAILURE);
1446 1438
1447 default: 1439 default:
1448 {
1449#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1450 int fdstdin;
1451
1452 fdstdin = dup (STDIN_FILENO);
1453 dup2 (pty.tty, STDIN_FILENO);
1454#endif
1455
1456#ifdef UTMP_SUPPORT 1440#if UTMP_SUPPORT
1457 privileged_utmp (SAVE); 1441 if (!OPTION (Opt_utmpInhibit))
1442 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1458#endif 1443#endif
1459 1444
1460#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1445 pty->close_tty ();
1461
1462 dup2 (fdstdin, STDIN_FILENO);
1463 close (fdstdin);
1464#endif
1465 }
1466
1467 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1468 break; 1446 break;
1469 } 1447 }
1470} 1448}
1471 1449
1472/* ------------------------------------------------------------------------- * 1450/* ------------------------------------------------------------------------- *

Diff Legend

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