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.30 by pcg, Sat Feb 21 22:14:00 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
403
404#ifdef GREEK_SUPPORT
405 ks_greekmodeswith = GREEK_KEYBOARD_MODESWITCH;
406#endif 391#endif
407 392
408 refresh_limit = 1; 393 refresh_limit = 1;
409 refresh_type = SLOW_REFRESH; 394 refresh_type = SLOW_REFRESH;
410 prev_nrow = prev_ncol = 0; 395 prev_nrow = prev_ncol = 0;
411#ifdef MULTICHAR_SET
412# ifdef MULTICHAR_ENCODING
413 encoding_method = MULTICHAR_ENCODING;
414# endif
415 multichar_decode = rxvt_euc2jis;
416#endif
417 396
418 oldcursor.row = oldcursor.col = -1; 397 oldcursor.row = oldcursor.col = -1;
419#ifdef XPM_BACKGROUND 398#ifdef XPM_BACKGROUND
420 /* bgPixmap.w = bgPixmap.h = 0; */ 399 /* bgPixmap.w = bgPixmap.h = 0; */
421 bgPixmap.x = bgPixmap.y = 50; 400 bgPixmap.x = bgPixmap.y = 50;
… …
515 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 494 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
516 495
517 cmd_argv[i] = NULL; 496 cmd_argv[i] = NULL;
518 } 497 }
519 498
520 /* clear all resources */
521 for (i = 0; i < NUM_RESOURCES;)
522 rs[i++] = NULL;
523
524 rs[Rs_name] = rxvt_r_basename (argv[0]); 499 rs[Rs_name] = rxvt_r_basename (argv[0]);
525 500
526 /* 501 /*
527 * Open display, get options/resources and create the window 502 * Open display, get options/resources and create the window
528 */ 503 */
… …
543 } 518 }
544#endif 519#endif
545 520
546 if (!display 521 if (!display
547 && ! (display = displays.get (rs[Rs_display_name]))) 522 && ! (display = displays.get (rs[Rs_display_name])))
548 {
549 rxvt_print_error ("can't open display %s", rs[Rs_display_name]); 523 rxvt_fatal ("can't open display %s", rs[Rs_display_name]);
550 exit (EXIT_FAILURE);
551 }
552 524
553 extract_resources (display->display, rs[Rs_name]); 525 extract_resources (display->display, rs[Rs_name]);
554 526
555 /* 527 /*
556 * set any defaults not already set 528 * set any defaults not already set
… …
601 rs[Rs_print_pipe] = PRINTPIPE; 573 rs[Rs_print_pipe] = PRINTPIPE;
602#endif 574#endif
603 575
604 if (!rs[Rs_cutchars]) 576 if (!rs[Rs_cutchars])
605 rs[Rs_cutchars] = CUTCHARS; 577 rs[Rs_cutchars] = CUTCHARS;
606
607#ifdef ACS_ASCII
608 if (!rs[Rs_acs_chars])
609 rs[Rs_acs_chars] = ACS_CHARS;
610 if ((i = STRLEN (rs[Rs_acs_chars])) < 0x20)
611 {
612 val = rxvt_realloc ((void *)rs[Rs_acs_chars], 0x20);
613 for (; i < 0x20; )
614 val[i] = ' ';
615 rs[Rs_acs_chars] = val;
616 }
617#endif
618 578
619#ifndef NO_BACKSPACE_KEY 579#ifndef NO_BACKSPACE_KEY
620 if (!rs[Rs_backspace_key]) 580 if (!rs[Rs_backspace_key])
621# ifdef DEFAULT_BACKSPACE 581# ifdef DEFAULT_BACKSPACE
622 key_backspace = DEFAULT_BACKSPACE; 582 key_backspace = DEFAULT_BACKSPACE;
… …
651 { 611 {
652 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]); 612 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
653 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]); 613 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
654 } 614 }
655 615
656 if (rs[Rs_selectstyle])
657 {
658 if (STRNCASECMP (rs[Rs_selectstyle], "oldword", 7) == 0)
659 selection_style = OLD_WORD_SELECT;
660#ifndef NO_OLD_SELECTION
661
662 else if (STRNCASECMP (rs[Rs_selectstyle], "old", 3) == 0)
663 selection_style = OLD_SELECT;
664#endif
665
666 }
667
668#ifdef HAVE_SCROLLBARS 616#ifdef HAVE_SCROLLBARS
669 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], 617 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle],
670 rs[Rs_scrollBar_thickness]); 618 rs[Rs_scrollBar_thickness]);
671#endif 619#endif
672
673 TermWin.fontset = new rxvt_fontset (this);
674 TermWin.fontset->populate (rs[Rs_font]);
675 TermWin.fwidth = TermWin.fontset->base_font ()->width;
676 TermWin.fheight = TermWin.fontset->base_font ()->height;
677 TermWin.fbase = TermWin.fontset->base_font ()->ascent;
678 620
679#ifdef XTERM_REVERSE_VIDEO 621#ifdef XTERM_REVERSE_VIDEO
680 /* this is how xterm implements reverseVideo */ 622 /* this is how xterm implements reverseVideo */
681 if (Options & Opt_reverseVideo) 623 if (Options & Opt_reverseVideo)
682 { 624 {
… …
806void 748void
807rxvt_term::set_locale (const char *locale) 749rxvt_term::set_locale (const char *locale)
808{ 750{
809#if HAVE_XSETLOCALE || HAVE_SETLOCALE 751#if HAVE_XSETLOCALE || HAVE_SETLOCALE
810 free (this->locale); 752 free (this->locale);
811 this->locale = rxvt_strdup (setlocale (LC_CTYPE, "")); 753 this->locale = rxvt_strdup (setlocale (LC_CTYPE, locale));
812 SET_LOCALE (this->locale); 754 SET_LOCALE (this->locale);
813 mbstate.reset (); 755 mbstate.reset ();
814#endif 756#endif
757#if 0
815#if HAVE_NL_LANGINFO 758#if HAVE_NL_LANGINFO
816 free (codeset); 759 free (codeset);
817 codeset = strdup (nl_langinfo (CODESET)); 760 codeset = strdup (nl_langinfo (CODESET));
818 enc_utf8 = !STRCASECMP (codeset, "UTF-8") 761 enc_utf8 = !STRCASECMP (codeset, "UTF-8")
819 || !STRCASECMP (codeset, "UTF8"); 762 || !STRCASECMP (codeset, "UTF8");
820#else 763#else
821 enc_utf8 = 1; 764 enc_utf8 = 1;
822#endif 765#endif
766#endif
823} 767}
824 768
825void 769void
826rxvt_term::init_xlocale () 770rxvt_term::init_xlocale ()
827{ 771{
828#ifdef USE_XIM 772#ifdef USE_XIM
829 if (!locale) 773 if (!locale)
830 rxvt_print_error ("Setting locale failed."); 774 rxvt_warn ("setting locale failed, working without locale support.\n");
831 else 775 else
832 { 776 {
833 Atom wmlocale; 777 Atom wmlocale;
834 778
835 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False); 779 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
… …
837 XA_STRING, 8, PropModeReplace, 781 XA_STRING, 8, PropModeReplace,
838 (unsigned char *)locale, STRLEN (locale)); 782 (unsigned char *)locale, STRLEN (locale));
839 783
840 if (!XSupportsLocale ()) 784 if (!XSupportsLocale ())
841 { 785 {
842 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");
843 return; 787 return;
844 } 788 }
845 789
846 im_ev.start (display); 790 im_ev.start (display);
847 791
… …
901 { 845 {
902 PrivateModes |= PrivMode_menuBar; 846 PrivateModes |= PrivMode_menuBar;
903 SavedModes |= PrivMode_menuBar; 847 SavedModes |= PrivMode_menuBar;
904 } 848 }
905 849
906#ifdef GREEK_SUPPORT
907 greek_init ();
908#endif
909
910#ifdef CURSOR_BLINK 850#ifdef CURSOR_BLINK
911 if (Options & Opt_cursorBlink) 851 if (Options & Opt_cursorBlink)
912 (void)gettimeofday (&lastcursorchange, NULL); 852 (void)gettimeofday (&lastcursorchange, NULL);
913#endif 853#endif
914 854
915 if ((cmd_fd = run_command (argv)) < 0) 855 if ((cmd_fd = run_command (argv)) < 0)
916 { 856 rxvt_fatal ("failure while running command, aborting");
917 rxvt_print_error ("aborting");
918 exit (EXIT_FAILURE);
919 }
920} 857}
921 858
922/*----------------------------------------------------------------------*/ 859/*----------------------------------------------------------------------*/
923void 860void
924rxvt_term::Get_Colours () 861rxvt_term::Get_Colours ()
… …
949 switch (i) 886 switch (i)
950 { 887 {
951 case Color_fg: 888 case Color_fg:
952 case Color_bg: 889 case Color_bg:
953 /* fatal: need bg/fg color */ 890 /* fatal: need bg/fg color */
954 rxvt_print_error ("aborting"); 891 rxvt_fatal ("unable to get foreground/background colour, aborting");
955 exit (EXIT_FAILURE);
956 /* NOTREACHED */ 892 /* NOTREACHED */
957 break; 893 break;
958#ifndef NO_CURSORCOLOR 894#ifndef NO_CURSORCOLOR
959 case Color_cursor2: 895 case Color_cursor2:
960 xcol = PixColors[Color_fg]; 896 xcol = PixColors[Color_fg];
… …
1145 } 1081 }
1146 1082
1147 /* grab colors before netscape does */ 1083 /* grab colors before netscape does */
1148 Get_Colours (); 1084 Get_Colours ();
1149 1085
1150 change_font (1, NULL); 1086 if (!change_font (rs[Rs_font]))
1087 {
1088 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1089 destroy ();
1090 return;
1091 }
1092
1151 window_calc (0, 0); 1093 window_calc (0, 0);
1152 old_width = szHint.width; 1094 old_width = szHint.width;
1153 old_height = szHint.height; 1095 old_height = szHint.height;
1154 1096
1155 /* parent window - reverse video so we can see placement errors 1097 /* parent window - reverse video so we can see placement errors
… …
1181 1123
1182 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1124 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1183 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1125 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1184 1126
1185 classHint.res_name = (char *)rs[Rs_name]; 1127 classHint.res_name = (char *)rs[Rs_name];
1186 classHint.res_class = (char *)APL_CLASS; 1128 classHint.res_class = (char *)RESCLASS;
1187 1129
1188 wmHint.flags = (InputHint | StateHint | WindowGroupHint); 1130 wmHint.flags = (InputHint | StateHint | WindowGroupHint);
1189 wmHint.input = True; 1131 wmHint.input = True;
1190 wmHint.initial_state = (Options & Opt_iconic ? IconicState 1132 wmHint.initial_state = (Options & Opt_iconic ? IconicState
1191 : NormalState); 1133 : NormalState);
… …
1254 1196
1255#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1197#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1256 if (menuBar_height ()) 1198 if (menuBar_height ())
1257 { 1199 {
1258 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1200 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1259 window_vt_x, 0, 1201 window_vt_x, 0,
1260 TermWin_TotalWidth (), 1202 TermWin_TotalWidth (),
1261 menuBar_TotalHeight (), 1203 menuBar_TotalHeight (),
1262 0, 1204 0,
1263 PixColors[Color_fg], 1205 PixColors[Color_fg],
1264 PixColors[Color_scroll]); 1206 PixColors[Color_scroll]);
1207
1265#ifdef DEBUG_X 1208#ifdef DEBUG_X
1266 XStoreName (display->display, menuBar.win, "menubar"); 1209 XStoreName (display->display, menuBar.win, "menubar");
1267#endif 1210#endif
1268 1211
1212 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1213
1269 XDefineCursor (display->display, menuBar.win, pointer_leftptr); 1214 XDefineCursor (display->display, menuBar.win,
1215 XCreateFontCursor (display->display, XC_left_ptr));
1270 1216
1271 XSelectInput (display->display, menuBar.win, 1217 XSelectInput (display->display, menuBar.win,
1272 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1218 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1273 | Button1MotionMask)); 1219 | Button1MotionMask));
1274 menubar_ev.start (display, menuBar.win); 1220 menubar_ev.start (display, menuBar.win);
… …
1294 /* graphics context for the vt window */ 1240 /* graphics context for the vt window */
1295 gcvalue.foreground = PixColors[Color_fg]; 1241 gcvalue.foreground = PixColors[Color_fg];
1296 gcvalue.background = PixColors[Color_bg]; 1242 gcvalue.background = PixColors[Color_bg];
1297 gcvalue.graphics_exposures = 1; 1243 gcvalue.graphics_exposures = 1;
1298 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1244 TermWin.gc = XCreateGC (display->display, TermWin.vt,
1299 GCForeground | GCBackground 1245 GCForeground | GCBackground | GCGraphicsExposures,
1300 | GCGraphicsExposures, &gcvalue); 1246 &gcvalue);
1247
1248 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1301 1249
1302#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1250#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1303 gcvalue.foreground = PixColors[Color_topShadow]; 1251 gcvalue.foreground = PixColors[Color_topShadow];
1304 topShadowGC = XCreateGC (display->display, TermWin.vt, 1252 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1305 GCForeground, &gcvalue);
1306 gcvalue.foreground = PixColors[Color_bottomShadow]; 1253 gcvalue.foreground = PixColors[Color_bottomShadow];
1307 botShadowGC = XCreateGC (display->display, TermWin.vt, 1254 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1308 GCForeground, &gcvalue);
1309 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg 1255 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg : Color_scroll)];
1310 : Color_scroll)];
1311 scrollbarGC = XCreateGC (display->display, TermWin.vt, 1256 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1312 GCForeground, &gcvalue);
1313#endif 1257#endif
1314} 1258}
1315 1259
1316/*----------------------------------------------------------------------*/ 1260/*----------------------------------------------------------------------*/
1317/* 1261/*
… …
1324{ 1268{
1325 int cfd, er; 1269 int cfd, er;
1326 1270
1327 /* get master (pty) */ 1271 /* get master (pty) */
1328 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0) 1272 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0)
1329 {
1330 rxvt_print_error ("can't open pseudo-tty"); 1273 rxvt_fatal ("can't open pseudo-tty");
1331 return -1;
1332 }
1333 1274
1334 fcntl (cfd, F_SETFL, O_NONBLOCK); 1275 fcntl (cfd, F_SETFL, O_NONBLOCK);
1335 1276
1336 /* get slave (tty) */ 1277 /* get slave (tty) */
1337 if (tty_fd < 0) 1278 if (tty_fd < 0)
… …
1341#endif 1282#endif
1342 1283
1343 if ((tty_fd = rxvt_get_tty (ttydev)) < 0) 1284 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1344 { 1285 {
1345 close (cfd); 1286 close (cfd);
1346 rxvt_print_error ("can't open slave tty %s", ttydev); 1287 rxvt_fatal ("can't open slave tty %s", ttydev);
1347 return -1;
1348 } 1288 }
1349 } 1289 }
1350#ifndef NO_BACKSPACE_KEY 1290#ifndef NO_BACKSPACE_KEY
1351 if (key_backspace[0] && !key_backspace[1]) 1291 if (key_backspace[0] && !key_backspace[1])
1352 er = key_backspace[0]; 1292 er = key_backspace[0];
… …
1362#ifndef __QNX__ 1302#ifndef __QNX__
1363 /* spin off the command interpreter */ 1303 /* spin off the command interpreter */
1364 switch (cmd_pid = fork ()) 1304 switch (cmd_pid = fork ())
1365 { 1305 {
1366 case -1: 1306 case -1:
1367 rxvt_print_error ("can't fork"); 1307 rxvt_fatal ("can't fork");
1368 return -1;
1369 case 0: 1308 case 0:
1370 close (cfd); /* only keep tty_fd and STDERR open */ 1309 close (cfd); /* only keep tty_fd and STDERR open */
1371 1310
1372 init_env (); 1311 init_env ();
1373 1312
1374 if (rxvt_control_tty (tty_fd, ttydev) < 0) 1313 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1375 rxvt_print_error ("could not obtain control of tty"); 1314 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1376 else 1315 else
1377 { 1316 {
1378 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1317 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1379 dup2 (tty_fd, STDIN_FILENO); 1318 dup2 (tty_fd, STDIN_FILENO);
1380 dup2 (tty_fd, STDOUT_FILENO); 1319 dup2 (tty_fd, STDOUT_FILENO);
… …
1382 1321
1383 if (tty_fd > 2) 1322 if (tty_fd > 2)
1384 close (tty_fd); 1323 close (tty_fd);
1385 1324
1386 run_child (argv); 1325 run_child (argv);
1326 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1387 } 1327 }
1328
1388 exit (EXIT_FAILURE); 1329 _exit (EXIT_FAILURE);
1389 /* NOTREACHED */ 1330
1390 default: 1331 default:
1391 { 1332 {
1392#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1333#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1393 int fdstdin; 1334 int fdstdin;
1394 1335
… …
1403#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1344#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1404 1345
1405 dup2 (fdstdin, STDIN_FILENO); 1346 dup2 (fdstdin, STDIN_FILENO);
1406 close (fdstdin); 1347 close (fdstdin);
1407#endif 1348#endif
1408
1409 } 1349 }
1350
1410 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */ 1351 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */
1411 break; 1352 break;
1412 } 1353 }
1413#else /* __QNX__ uses qnxspawn () */ 1354#else /* __QNX__ uses qnxspawn () */
1414 fchmod (tty_fd, 0622); 1355 fchmod (tty_fd, 0622);

Diff Legend

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