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.34 by pcg, Tue Feb 24 00:02:44 2004 UTC vs.
Revision 1.45 by pcg, Mon Mar 22 17:18:25 2004 UTC

… …
384 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 384 TermWin.ext_bwidth = EXTERNALBORDERWIDTH;
385 TermWin.lineSpace = LINESPACE; 385 TermWin.lineSpace = LINESPACE;
386 TermWin.saveLines = SAVELINES; 386 TermWin.saveLines = SAVELINES;
387 numPixColors = TOTAL_COLORS; 387 numPixColors = TOTAL_COLORS;
388 388
389#ifndef NO_NEW_SELECTION
390 selection_style = NEW_SELECT;
391#else
392 selection_style = OLD_SELECT;
393#endif
394
395#ifndef NO_BRIGHTCOLOR 389#ifndef NO_BRIGHTCOLOR
396 colorfgbg = DEFAULT_RSTYLE; 390 colorfgbg = DEFAULT_RSTYLE;
397#endif
398
399#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
400 ks_bigfont = XK_greater;
401 ks_smallfont = XK_less;
402#endif 391#endif
403 392
404 refresh_limit = 1; 393 refresh_limit = 1;
405 refresh_type = SLOW_REFRESH; 394 refresh_type = SLOW_REFRESH;
406 prev_nrow = prev_ncol = 0; 395 prev_nrow = prev_ncol = 0;
… …
505 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 494 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
506 495
507 cmd_argv[i] = NULL; 496 cmd_argv[i] = NULL;
508 } 497 }
509 498
510 /* clear all resources */
511 for (i = 0; i < NUM_RESOURCES;)
512 rs[i++] = NULL;
513
514 rs[Rs_name] = rxvt_r_basename (argv[0]); 499 rs[Rs_name] = rxvt_r_basename (argv[0]);
515 500
516 /* 501 /*
517 * Open display, get options/resources and create the window 502 * Open display, get options/resources and create the window
518 */ 503 */
… …
533 } 518 }
534#endif 519#endif
535 520
536 if (!display 521 if (!display
537 && ! (display = displays.get (rs[Rs_display_name]))) 522 && ! (display = displays.get (rs[Rs_display_name])))
538 {
539 rxvt_print_error ("can't open display %s", rs[Rs_display_name]); 523 rxvt_fatal ("can't open display %s", rs[Rs_display_name]);
540 exit (EXIT_FAILURE);
541 }
542 524
543 extract_resources (display->display, rs[Rs_name]); 525 extract_resources (display->display, rs[Rs_name]);
544 526
545 /* 527 /*
546 * set any defaults not already set 528 * set any defaults not already set
… …
591 rs[Rs_print_pipe] = PRINTPIPE; 573 rs[Rs_print_pipe] = PRINTPIPE;
592#endif 574#endif
593 575
594 if (!rs[Rs_cutchars]) 576 if (!rs[Rs_cutchars])
595 rs[Rs_cutchars] = CUTCHARS; 577 rs[Rs_cutchars] = CUTCHARS;
596
597#ifdef ACS_ASCII
598 if (!rs[Rs_acs_chars])
599 rs[Rs_acs_chars] = ACS_CHARS;
600 if ((i = STRLEN (rs[Rs_acs_chars])) < 0x20)
601 {
602 val = rxvt_realloc ((void *)rs[Rs_acs_chars], 0x20);
603 for (; i < 0x20; )
604 val[i] = ' ';
605 rs[Rs_acs_chars] = val;
606 }
607#endif
608 578
609#ifndef NO_BACKSPACE_KEY 579#ifndef NO_BACKSPACE_KEY
610 if (!rs[Rs_backspace_key]) 580 if (!rs[Rs_backspace_key])
611# ifdef DEFAULT_BACKSPACE 581# ifdef DEFAULT_BACKSPACE
612 key_backspace = DEFAULT_BACKSPACE; 582 key_backspace = DEFAULT_BACKSPACE;
… …
639#endif 609#endif
640 if (rs[Rs_answerbackstring]) 610 if (rs[Rs_answerbackstring])
641 { 611 {
642 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]); 612 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
643 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]); 613 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
644 }
645
646 if (rs[Rs_selectstyle])
647 {
648 if (STRNCASECMP (rs[Rs_selectstyle], "oldword", 7) == 0)
649 selection_style = OLD_WORD_SELECT;
650#ifndef NO_OLD_SELECTION
651
652 else if (STRNCASECMP (rs[Rs_selectstyle], "old", 3) == 0)
653 selection_style = OLD_SELECT;
654#endif
655
656 } 614 }
657 615
658#ifdef HAVE_SCROLLBARS 616#ifdef HAVE_SCROLLBARS
659 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], 617 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle],
660 rs[Rs_scrollBar_thickness]); 618 rs[Rs_scrollBar_thickness]);
… …
794 free (this->locale); 752 free (this->locale);
795 this->locale = rxvt_strdup (setlocale (LC_CTYPE, locale)); 753 this->locale = rxvt_strdup (setlocale (LC_CTYPE, locale));
796 SET_LOCALE (this->locale); 754 SET_LOCALE (this->locale);
797 mbstate.reset (); 755 mbstate.reset ();
798#endif 756#endif
757#if 0
799#if HAVE_NL_LANGINFO 758#if HAVE_NL_LANGINFO
800 free (codeset); 759 free (codeset);
801 codeset = strdup (nl_langinfo (CODESET)); 760 codeset = strdup (nl_langinfo (CODESET));
802 enc_utf8 = !STRCASECMP (codeset, "UTF-8") 761 enc_utf8 = !STRCASECMP (codeset, "UTF-8")
803 || !STRCASECMP (codeset, "UTF8"); 762 || !STRCASECMP (codeset, "UTF8");
804#else 763#else
805 enc_utf8 = 1; 764 enc_utf8 = 1;
806#endif 765#endif
766#endif
807} 767}
808 768
809void 769void
810rxvt_term::init_xlocale () 770rxvt_term::init_xlocale ()
811{ 771{
812#ifdef USE_XIM 772#ifdef USE_XIM
813 if (!locale) 773 if (!locale)
814 rxvt_print_error ("Setting locale failed."); 774 rxvt_warn ("setting locale failed, working without locale support.\n");
815 else 775 else
816 { 776 {
817 Atom wmlocale; 777 Atom wmlocale;
818 778
819 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False); 779 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
… …
821 XA_STRING, 8, PropModeReplace, 781 XA_STRING, 8, PropModeReplace,
822 (unsigned char *)locale, STRLEN (locale)); 782 (unsigned char *)locale, STRLEN (locale));
823 783
824 if (!XSupportsLocale ()) 784 if (!XSupportsLocale ())
825 { 785 {
826 rxvt_print_error ("The locale is not supported by Xlib"); 786 rxvt_warn ("the locale is not supported by Xlib, working withotu locale support.\n");
827 return; 787 return;
828 } 788 }
829 789
830 im_ev.start (display); 790 im_ev.start (display);
831 791
… …
891 if (Options & Opt_cursorBlink) 851 if (Options & Opt_cursorBlink)
892 (void)gettimeofday (&lastcursorchange, NULL); 852 (void)gettimeofday (&lastcursorchange, NULL);
893#endif 853#endif
894 854
895 if ((cmd_fd = run_command (argv)) < 0) 855 if ((cmd_fd = run_command (argv)) < 0)
896 { 856 rxvt_fatal ("failure while running command, aborting");
897 rxvt_print_error ("aborting");
898 exit (EXIT_FAILURE);
899 }
900} 857}
901 858
902/*----------------------------------------------------------------------*/ 859/*----------------------------------------------------------------------*/
903void 860void
904rxvt_term::Get_Colours () 861rxvt_term::Get_Colours ()
… …
929 switch (i) 886 switch (i)
930 { 887 {
931 case Color_fg: 888 case Color_fg:
932 case Color_bg: 889 case Color_bg:
933 /* fatal: need bg/fg color */ 890 /* fatal: need bg/fg color */
934 rxvt_print_error ("aborting"); 891 rxvt_fatal ("unable to get foreground/background colour, aborting");
935 exit (EXIT_FAILURE);
936 /* NOTREACHED */ 892 /* NOTREACHED */
937 break; 893 break;
938#ifndef NO_CURSORCOLOR 894#ifndef NO_CURSORCOLOR
939 case Color_cursor2: 895 case Color_cursor2:
940 xcol = PixColors[Color_fg]; 896 xcol = PixColors[Color_fg];
… …
1167 1123
1168 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1124 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1169 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1125 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1170 1126
1171 classHint.res_name = (char *)rs[Rs_name]; 1127 classHint.res_name = (char *)rs[Rs_name];
1172 classHint.res_class = (char *)APL_CLASS; 1128 classHint.res_class = (char *)RESCLASS;
1173 1129
1174 wmHint.flags = (InputHint | StateHint | WindowGroupHint); 1130 wmHint.flags = (InputHint | StateHint | WindowGroupHint);
1175 wmHint.input = True; 1131 wmHint.input = True;
1176 wmHint.initial_state = (Options & Opt_iconic ? IconicState 1132 wmHint.initial_state = (Options & Opt_iconic ? IconicState
1177 : NormalState); 1133 : NormalState);
… …
1240 1196
1241#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1197#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1242 if (menuBar_height ()) 1198 if (menuBar_height ())
1243 { 1199 {
1244 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1200 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1245 window_vt_x, 0, 1201 window_vt_x, 0,
1246 TermWin_TotalWidth (), 1202 TermWin_TotalWidth (),
1247 menuBar_TotalHeight (), 1203 menuBar_TotalHeight (),
1248 0, 1204 0,
1249 PixColors[Color_fg], 1205 PixColors[Color_fg],
1250 PixColors[Color_scroll]); 1206 PixColors[Color_scroll]);
1207
1251#ifdef DEBUG_X 1208#ifdef DEBUG_X
1252 XStoreName (display->display, menuBar.win, "menubar"); 1209 XStoreName (display->display, menuBar.win, "menubar");
1253#endif 1210#endif
1211
1212 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1254 1213
1255 XDefineCursor (display->display, menuBar.win, 1214 XDefineCursor (display->display, menuBar.win,
1256 XCreateFontCursor (display->display, XC_left_ptr)); 1215 XCreateFontCursor (display->display, XC_left_ptr));
1257 1216
1258 XSelectInput (display->display, menuBar.win, 1217 XSelectInput (display->display, menuBar.win,
… …
1281 /* graphics context for the vt window */ 1240 /* graphics context for the vt window */
1282 gcvalue.foreground = PixColors[Color_fg]; 1241 gcvalue.foreground = PixColors[Color_fg];
1283 gcvalue.background = PixColors[Color_bg]; 1242 gcvalue.background = PixColors[Color_bg];
1284 gcvalue.graphics_exposures = 1; 1243 gcvalue.graphics_exposures = 1;
1285 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1244 TermWin.gc = XCreateGC (display->display, TermWin.vt,
1286 GCForeground | GCBackground 1245 GCForeground | GCBackground | GCGraphicsExposures,
1287 | GCGraphicsExposures, &gcvalue); 1246 &gcvalue);
1247
1248 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1288 1249
1289#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1250#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1290 gcvalue.foreground = PixColors[Color_topShadow]; 1251 gcvalue.foreground = PixColors[Color_topShadow];
1291 topShadowGC = XCreateGC (display->display, TermWin.vt, 1252 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1292 GCForeground, &gcvalue);
1293 gcvalue.foreground = PixColors[Color_bottomShadow]; 1253 gcvalue.foreground = PixColors[Color_bottomShadow];
1294 botShadowGC = XCreateGC (display->display, TermWin.vt, 1254 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1295 GCForeground, &gcvalue);
1296 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg 1255 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg : Color_scroll)];
1297 : Color_scroll)];
1298 scrollbarGC = XCreateGC (display->display, TermWin.vt, 1256 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1299 GCForeground, &gcvalue);
1300#endif 1257#endif
1301} 1258}
1302 1259
1303/*----------------------------------------------------------------------*/ 1260/*----------------------------------------------------------------------*/
1304/* 1261/*
… …
1311{ 1268{
1312 int cfd, er; 1269 int cfd, er;
1313 1270
1314 /* get master (pty) */ 1271 /* get master (pty) */
1315 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0) 1272 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0)
1316 {
1317 rxvt_print_error ("can't open pseudo-tty"); 1273 rxvt_fatal ("can't open pseudo-tty");
1318 return -1;
1319 }
1320 1274
1321 fcntl (cfd, F_SETFL, O_NONBLOCK); 1275 fcntl (cfd, F_SETFL, O_NONBLOCK);
1322 1276
1323 /* get slave (tty) */ 1277 /* get slave (tty) */
1324 if (tty_fd < 0) 1278 if (tty_fd < 0)
… …
1328#endif 1282#endif
1329 1283
1330 if ((tty_fd = rxvt_get_tty (ttydev)) < 0) 1284 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1331 { 1285 {
1332 close (cfd); 1286 close (cfd);
1333 rxvt_print_error ("can't open slave tty %s", ttydev); 1287 rxvt_fatal ("can't open slave tty %s", ttydev);
1334 return -1;
1335 } 1288 }
1336 } 1289 }
1337#ifndef NO_BACKSPACE_KEY 1290#ifndef NO_BACKSPACE_KEY
1338 if (key_backspace[0] && !key_backspace[1]) 1291 if (key_backspace[0] && !key_backspace[1])
1339 er = key_backspace[0]; 1292 er = key_backspace[0];
… …
1349#ifndef __QNX__ 1302#ifndef __QNX__
1350 /* spin off the command interpreter */ 1303 /* spin off the command interpreter */
1351 switch (cmd_pid = fork ()) 1304 switch (cmd_pid = fork ())
1352 { 1305 {
1353 case -1: 1306 case -1:
1354 rxvt_print_error ("can't fork"); 1307 rxvt_fatal ("can't fork");
1355 return -1;
1356 case 0: 1308 case 0:
1357 close (cfd); /* only keep tty_fd and STDERR open */ 1309 close (cfd); /* only keep tty_fd and STDERR open */
1358 1310
1359 init_env (); 1311 init_env ();
1360 1312
1361 if (rxvt_control_tty (tty_fd, ttydev) < 0) 1313 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1362 rxvt_print_error ("could not obtain control of tty"); 1314 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1363 else 1315 else
1364 { 1316 {
1365 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1317 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1366 dup2 (tty_fd, STDIN_FILENO); 1318 dup2 (tty_fd, STDIN_FILENO);
1367 dup2 (tty_fd, STDOUT_FILENO); 1319 dup2 (tty_fd, STDOUT_FILENO);
… …
1369 1321
1370 if (tty_fd > 2) 1322 if (tty_fd > 2)
1371 close (tty_fd); 1323 close (tty_fd);
1372 1324
1373 run_child (argv); 1325 run_child (argv);
1326 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1374 } 1327 }
1328
1375 exit (EXIT_FAILURE); 1329 _exit (EXIT_FAILURE);
1376 /* NOTREACHED */ 1330
1377 default: 1331 default:
1378 { 1332 {
1379#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1333#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1380 int fdstdin; 1334 int fdstdin;
1381 1335
… …
1390#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1344#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1391 1345
1392 dup2 (fdstdin, STDIN_FILENO); 1346 dup2 (fdstdin, STDIN_FILENO);
1393 close (fdstdin); 1347 close (fdstdin);
1394#endif 1348#endif
1395
1396 } 1349 }
1350
1397 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */ 1351 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */
1398 break; 1352 break;
1399 } 1353 }
1400#else /* __QNX__ uses qnxspawn () */ 1354#else /* __QNX__ uses qnxspawn () */
1401 fchmod (tty_fd, 0622); 1355 fchmod (tty_fd, 0622);

Diff Legend

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