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.26 by pcg, Fri Feb 13 12:16:21 2004 UTC vs.
Revision 1.45 by pcg, Mon Mar 22 17:18:25 2004 UTC

… …
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
11 * - extensive modifications 11 * - extensive modifications
12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com> 12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13 * - QNX support 13 * - QNX support
14 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
14 * 15 *
15 * This program is free software; you can redistribute it and/or modify 16 * This program is free software; you can redistribute it and/or modify
16 * it under the terms of the GNU General Public License as published by 17 * it under the terms of the GNU General Public License as published by
17 * the Free Software Foundation; either version 2 of the License, or 18 * the Free Software Foundation; either version 2 of the License, or
18 * (at your option) any later version. 19 * (at your option) any later version.
… …
383 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 384 TermWin.ext_bwidth = EXTERNALBORDERWIDTH;
384 TermWin.lineSpace = LINESPACE; 385 TermWin.lineSpace = LINESPACE;
385 TermWin.saveLines = SAVELINES; 386 TermWin.saveLines = SAVELINES;
386 numPixColors = TOTAL_COLORS; 387 numPixColors = TOTAL_COLORS;
387 388
388#ifndef NO_NEW_SELECTION
389 selection_style = NEW_SELECT;
390#else
391 selection_style = OLD_SELECT;
392#endif
393
394#ifndef NO_BRIGHTCOLOR 389#ifndef NO_BRIGHTCOLOR
395 colorfgbg = DEFAULT_RSTYLE; 390 colorfgbg = DEFAULT_RSTYLE;
396#endif
397
398#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
399 ks_bigfont = XK_greater;
400 ks_smallfont = XK_less;
401#endif
402
403#ifdef GREEK_SUPPORT
404 ks_greekmodeswith = GREEK_KEYBOARD_MODESWITCH;
405#endif 391#endif
406 392
407 refresh_limit = 1; 393 refresh_limit = 1;
408 refresh_type = SLOW_REFRESH; 394 refresh_type = SLOW_REFRESH;
409 prev_nrow = prev_ncol = 0; 395 prev_nrow = prev_ncol = 0;
410#ifdef MULTICHAR_SET
411# ifdef MULTICHAR_ENCODING
412 encoding_method = MULTICHAR_ENCODING;
413# endif
414 multichar_decode = rxvt_euc2jis;
415#endif
416 396
417 oldcursor.row = oldcursor.col = -1; 397 oldcursor.row = oldcursor.col = -1;
418#ifdef XPM_BACKGROUND 398#ifdef XPM_BACKGROUND
419 /* bgPixmap.w = bgPixmap.h = 0; */ 399 /* bgPixmap.w = bgPixmap.h = 0; */
420 bgPixmap.x = bgPixmap.y = 50; 400 bgPixmap.x = bgPixmap.y = 50;
… …
514 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 494 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
515 495
516 cmd_argv[i] = NULL; 496 cmd_argv[i] = NULL;
517 } 497 }
518 498
519 /* clear all resources */
520 for (i = 0; i < NUM_RESOURCES;)
521 rs[i++] = NULL;
522
523 rs[Rs_name] = rxvt_r_basename (argv[0]); 499 rs[Rs_name] = rxvt_r_basename (argv[0]);
524 500
525 /* 501 /*
526 * Open display, get options/resources and create the window 502 * Open display, get options/resources and create the window
527 */ 503 */
… …
542 } 518 }
543#endif 519#endif
544 520
545 if (!display 521 if (!display
546 && ! (display = displays.get (rs[Rs_display_name]))) 522 && ! (display = displays.get (rs[Rs_display_name])))
547 {
548 rxvt_print_error ("can't open display %s", rs[Rs_display_name]); 523 rxvt_fatal ("can't open display %s", rs[Rs_display_name]);
549 exit (EXIT_FAILURE);
550 }
551 524
552 extract_resources (display->display, rs[Rs_name]); 525 extract_resources (display->display, rs[Rs_name]);
553 526
554 /* 527 /*
555 * set any defaults not already set 528 * set any defaults not already set
… …
600 rs[Rs_print_pipe] = PRINTPIPE; 573 rs[Rs_print_pipe] = PRINTPIPE;
601#endif 574#endif
602 575
603 if (!rs[Rs_cutchars]) 576 if (!rs[Rs_cutchars])
604 rs[Rs_cutchars] = CUTCHARS; 577 rs[Rs_cutchars] = CUTCHARS;
605
606#ifdef ACS_ASCII
607 if (!rs[Rs_acs_chars])
608 rs[Rs_acs_chars] = ACS_CHARS;
609 if ((i = STRLEN (rs[Rs_acs_chars])) < 0x20)
610 {
611 val = rxvt_realloc ((void *)rs[Rs_acs_chars], 0x20);
612 for (; i < 0x20; )
613 val[i] = ' ';
614 rs[Rs_acs_chars] = val;
615 }
616#endif
617 578
618#ifndef NO_BACKSPACE_KEY 579#ifndef NO_BACKSPACE_KEY
619 if (!rs[Rs_backspace_key]) 580 if (!rs[Rs_backspace_key])
620# ifdef DEFAULT_BACKSPACE 581# ifdef DEFAULT_BACKSPACE
621 key_backspace = DEFAULT_BACKSPACE; 582 key_backspace = DEFAULT_BACKSPACE;
… …
650 { 611 {
651 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]); 612 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
652 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]); 613 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
653 } 614 }
654 615
655 if (rs[Rs_selectstyle])
656 {
657 if (STRNCASECMP (rs[Rs_selectstyle], "oldword", 7) == 0)
658 selection_style = OLD_WORD_SELECT;
659#ifndef NO_OLD_SELECTION
660
661 else if (STRNCASECMP (rs[Rs_selectstyle], "old", 3) == 0)
662 selection_style = OLD_SELECT;
663#endif
664
665 }
666
667#ifdef HAVE_SCROLLBARS 616#ifdef HAVE_SCROLLBARS
668 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], 617 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle],
669 rs[Rs_scrollBar_thickness]); 618 rs[Rs_scrollBar_thickness]);
670#endif 619#endif
671
672 TermWin.fontset = new rxvt_fontset (this);
673 TermWin.fontset->populate (rs[Rs_font]);
674 TermWin.fwidth = TermWin.fontset->base_font ()->width;
675 TermWin.fheight = TermWin.fontset->base_font ()->height;
676 TermWin.fbase = TermWin.fontset->base_font ()->ascent;
677 620
678#ifdef XTERM_REVERSE_VIDEO 621#ifdef XTERM_REVERSE_VIDEO
679 /* this is how xterm implements reverseVideo */ 622 /* this is how xterm implements reverseVideo */
680 if (Options & Opt_reverseVideo) 623 if (Options & Opt_reverseVideo)
681 { 624 {
… …
762 * @ DISPLAY: in case we started with -display 705 * @ DISPLAY: in case we started with -display
763 * @ WINDOWID: X window id number of the window 706 * @ WINDOWID: X window id number of the window
764 * @ COLORTERM: terminal sub-name and also indicates its color 707 * @ COLORTERM: terminal sub-name and also indicates its color
765 * @ TERM: terminal name 708 * @ TERM: terminal name
766 * @ TERMINFO: path to terminfo directory 709 * @ TERMINFO: path to terminfo directory
710 * @ COLORFGBG: fg;bg color codes
767 */ 711 */
768 putenv (env_display); 712 putenv (env_display);
769 putenv (env_windowid); 713 putenv (env_windowid);
714 if (env_colorfgbg)
715 putenv (env_colorfgbg);
770 716
771#ifdef RXVT_TERMINFO 717#ifdef RXVT_TERMINFO
772 putenv ("TERMINFO=" RXVT_TERMINFO); 718 putenv ("TERMINFO=" RXVT_TERMINFO);
773#endif 719#endif
774 720
… …
802void 748void
803rxvt_term::set_locale (const char *locale) 749rxvt_term::set_locale (const char *locale)
804{ 750{
805#if HAVE_XSETLOCALE || HAVE_SETLOCALE 751#if HAVE_XSETLOCALE || HAVE_SETLOCALE
806 free (this->locale); 752 free (this->locale);
807 this->locale = rxvt_strdup (setlocale (LC_CTYPE, "")); 753 this->locale = rxvt_strdup (setlocale (LC_CTYPE, locale));
754 SET_LOCALE (this->locale);
755 mbstate.reset ();
808#endif 756#endif
757#if 0
809#if HAVE_NL_LANGINFO 758#if HAVE_NL_LANGINFO
810 free (codeset); 759 free (codeset);
811 codeset = strdup (nl_langinfo (CODESET)); 760 codeset = strdup (nl_langinfo (CODESET));
812 enc_utf8 = !STRCASECMP (codeset, "UTF-8") 761 enc_utf8 = !STRCASECMP (codeset, "UTF-8")
813 || !STRCASECMP (codeset, "UTF8"); 762 || !STRCASECMP (codeset, "UTF8");
814#else 763#else
815 enc_utf8 = 1; 764 enc_utf8 = 1;
816#endif 765#endif
766#endif
817} 767}
818 768
819void 769void
820rxvt_term::init_xlocale () 770rxvt_term::init_xlocale ()
821{ 771{
822#ifdef USE_XIM 772#ifdef USE_XIM
823 if (!locale) 773 if (!locale)
824 rxvt_print_error ("Setting locale failed."); 774 rxvt_warn ("setting locale failed, working without locale support.\n");
825 else 775 else
826 { 776 {
827 Atom wmlocale; 777 Atom wmlocale;
828 778
829 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False); 779 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
… …
831 XA_STRING, 8, PropModeReplace, 781 XA_STRING, 8, PropModeReplace,
832 (unsigned char *)locale, STRLEN (locale)); 782 (unsigned char *)locale, STRLEN (locale));
833 783
834 if (!XSupportsLocale ()) 784 if (!XSupportsLocale ())
835 { 785 {
836 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");
837 return; 787 return;
838 } 788 }
839 789
840 im_ev.start (display); 790 im_ev.start (display);
841 791
… …
895 { 845 {
896 PrivateModes |= PrivMode_menuBar; 846 PrivateModes |= PrivMode_menuBar;
897 SavedModes |= PrivMode_menuBar; 847 SavedModes |= PrivMode_menuBar;
898 } 848 }
899 849
900#ifdef GREEK_SUPPORT
901 greek_init ();
902#endif
903
904#ifdef CURSOR_BLINK 850#ifdef CURSOR_BLINK
905 if (Options & Opt_cursorBlink) 851 if (Options & Opt_cursorBlink)
906 (void)gettimeofday (&lastcursorchange, NULL); 852 (void)gettimeofday (&lastcursorchange, NULL);
907#endif 853#endif
908 854
909 if ((cmd_fd = run_command (argv)) < 0) 855 if ((cmd_fd = run_command (argv)) < 0)
910 { 856 rxvt_fatal ("failure while running command, aborting");
911 rxvt_print_error ("aborting");
912 exit (EXIT_FAILURE);
913 }
914} 857}
915 858
916/*----------------------------------------------------------------------*/ 859/*----------------------------------------------------------------------*/
917void 860void
918rxvt_term::Get_Colours () 861rxvt_term::Get_Colours ()
… …
943 switch (i) 886 switch (i)
944 { 887 {
945 case Color_fg: 888 case Color_fg:
946 case Color_bg: 889 case Color_bg:
947 /* fatal: need bg/fg color */ 890 /* fatal: need bg/fg color */
948 rxvt_print_error ("aborting"); 891 rxvt_fatal ("unable to get foreground/background colour, aborting");
949 exit (EXIT_FAILURE);
950 /* NOTREACHED */ 892 /* NOTREACHED */
951 break; 893 break;
952#ifndef NO_CURSORCOLOR 894#ifndef NO_CURSORCOLOR
953 case Color_cursor2: 895 case Color_cursor2:
954 xcol = PixColors[Color_fg]; 896 xcol = PixColors[Color_fg];
… …
1139 } 1081 }
1140 1082
1141 /* grab colors before netscape does */ 1083 /* grab colors before netscape does */
1142 Get_Colours (); 1084 Get_Colours ();
1143 1085
1144 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
1145 window_calc (0, 0); 1093 window_calc (0, 0);
1146 old_width = szHint.width; 1094 old_width = szHint.width;
1147 old_height = szHint.height; 1095 old_height = szHint.height;
1148 1096
1149 /* parent window - reverse video so we can see placement errors 1097 /* parent window - reverse video so we can see placement errors
… …
1175 1123
1176 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1124 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1177 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1125 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1178 1126
1179 classHint.res_name = (char *)rs[Rs_name]; 1127 classHint.res_name = (char *)rs[Rs_name];
1180 classHint.res_class = (char *)APL_CLASS; 1128 classHint.res_class = (char *)RESCLASS;
1181 1129
1182 wmHint.flags = (InputHint | StateHint | WindowGroupHint); 1130 wmHint.flags = (InputHint | StateHint | WindowGroupHint);
1183 wmHint.input = True; 1131 wmHint.input = True;
1184 wmHint.initial_state = (Options & Opt_iconic ? IconicState 1132 wmHint.initial_state = (Options & Opt_iconic ? IconicState
1185 : NormalState); 1133 : NormalState);
… …
1248 1196
1249#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1197#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1250 if (menuBar_height ()) 1198 if (menuBar_height ())
1251 { 1199 {
1252 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1200 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1253 window_vt_x, 0, 1201 window_vt_x, 0,
1254 TermWin_TotalWidth (), 1202 TermWin_TotalWidth (),
1255 menuBar_TotalHeight (), 1203 menuBar_TotalHeight (),
1256 0, 1204 0,
1257 PixColors[Color_fg], 1205 PixColors[Color_fg],
1258 PixColors[Color_scroll]); 1206 PixColors[Color_scroll]);
1207
1259#ifdef DEBUG_X 1208#ifdef DEBUG_X
1260 XStoreName (display->display, menuBar.win, "menubar"); 1209 XStoreName (display->display, menuBar.win, "menubar");
1261#endif 1210#endif
1262 1211
1212 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1213
1263 XDefineCursor (display->display, menuBar.win, pointer_leftptr); 1214 XDefineCursor (display->display, menuBar.win,
1215 XCreateFontCursor (display->display, XC_left_ptr));
1264 1216
1265 XSelectInput (display->display, menuBar.win, 1217 XSelectInput (display->display, menuBar.win,
1266 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1218 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1267 | Button1MotionMask)); 1219 | Button1MotionMask));
1268 menubar_ev.start (display, menuBar.win); 1220 menubar_ev.start (display, menuBar.win);
… …
1288 /* graphics context for the vt window */ 1240 /* graphics context for the vt window */
1289 gcvalue.foreground = PixColors[Color_fg]; 1241 gcvalue.foreground = PixColors[Color_fg];
1290 gcvalue.background = PixColors[Color_bg]; 1242 gcvalue.background = PixColors[Color_bg];
1291 gcvalue.graphics_exposures = 1; 1243 gcvalue.graphics_exposures = 1;
1292 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1244 TermWin.gc = XCreateGC (display->display, TermWin.vt,
1293 GCForeground | GCBackground 1245 GCForeground | GCBackground | GCGraphicsExposures,
1294 | GCGraphicsExposures, &gcvalue); 1246 &gcvalue);
1247
1248 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1295 1249
1296#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1250#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1297 gcvalue.foreground = PixColors[Color_topShadow]; 1251 gcvalue.foreground = PixColors[Color_topShadow];
1298 topShadowGC = XCreateGC (display->display, TermWin.vt, 1252 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1299 GCForeground, &gcvalue);
1300 gcvalue.foreground = PixColors[Color_bottomShadow]; 1253 gcvalue.foreground = PixColors[Color_bottomShadow];
1301 botShadowGC = XCreateGC (display->display, TermWin.vt, 1254 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1302 GCForeground, &gcvalue);
1303 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg 1255 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg : Color_scroll)];
1304 : Color_scroll)];
1305 scrollbarGC = XCreateGC (display->display, TermWin.vt, 1256 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1306 GCForeground, &gcvalue);
1307#endif 1257#endif
1308} 1258}
1309 1259
1310/*----------------------------------------------------------------------*/ 1260/*----------------------------------------------------------------------*/
1311/* 1261/*
… …
1318{ 1268{
1319 int cfd, er; 1269 int cfd, er;
1320 1270
1321 /* get master (pty) */ 1271 /* get master (pty) */
1322 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0) 1272 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0)
1323 {
1324 rxvt_print_error ("can't open pseudo-tty"); 1273 rxvt_fatal ("can't open pseudo-tty");
1325 return -1;
1326 }
1327 1274
1328 fcntl (cfd, F_SETFL, O_NONBLOCK); 1275 fcntl (cfd, F_SETFL, O_NONBLOCK);
1329 1276
1330 /* get slave (tty) */ 1277 /* get slave (tty) */
1331 if (tty_fd < 0) 1278 if (tty_fd < 0)
… …
1335#endif 1282#endif
1336 1283
1337 if ((tty_fd = rxvt_get_tty (ttydev)) < 0) 1284 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1338 { 1285 {
1339 close (cfd); 1286 close (cfd);
1340 rxvt_print_error ("can't open slave tty %s", ttydev); 1287 rxvt_fatal ("can't open slave tty %s", ttydev);
1341 return -1;
1342 } 1288 }
1343 } 1289 }
1344#ifndef NO_BACKSPACE_KEY 1290#ifndef NO_BACKSPACE_KEY
1345 if (key_backspace[0] && !key_backspace[1]) 1291 if (key_backspace[0] && !key_backspace[1])
1346 er = key_backspace[0]; 1292 er = key_backspace[0];
… …
1356#ifndef __QNX__ 1302#ifndef __QNX__
1357 /* spin off the command interpreter */ 1303 /* spin off the command interpreter */
1358 switch (cmd_pid = fork ()) 1304 switch (cmd_pid = fork ())
1359 { 1305 {
1360 case -1: 1306 case -1:
1361 rxvt_print_error ("can't fork"); 1307 rxvt_fatal ("can't fork");
1362 return -1;
1363 case 0: 1308 case 0:
1364 close (cfd); /* only keep tty_fd and STDERR open */ 1309 close (cfd); /* only keep tty_fd and STDERR open */
1365 1310
1311 init_env ();
1312
1366 if (rxvt_control_tty (tty_fd, ttydev) < 0) 1313 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1367 rxvt_print_error ("could not obtain control of tty"); 1314 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1368 else 1315 else
1369 { 1316 {
1370 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1317 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1371 dup2 (tty_fd, STDIN_FILENO); 1318 dup2 (tty_fd, STDIN_FILENO);
1372 dup2 (tty_fd, STDOUT_FILENO); 1319 dup2 (tty_fd, STDOUT_FILENO);
… …
1374 1321
1375 if (tty_fd > 2) 1322 if (tty_fd > 2)
1376 close (tty_fd); 1323 close (tty_fd);
1377 1324
1378 run_child (argv); 1325 run_child (argv);
1326 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1379 } 1327 }
1328
1380 exit (EXIT_FAILURE); 1329 _exit (EXIT_FAILURE);
1381 /* NOTREACHED */ 1330
1382 default: 1331 default:
1383 { 1332 {
1384#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1333#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1385 int fdstdin; 1334 int fdstdin;
1386 1335
… …
1395#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1344#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1396 1345
1397 dup2 (fdstdin, STDIN_FILENO); 1346 dup2 (fdstdin, STDIN_FILENO);
1398 close (fdstdin); 1347 close (fdstdin);
1399#endif 1348#endif
1400
1401 } 1349 }
1350
1402 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */ 1351 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */
1403 break; 1352 break;
1404 } 1353 }
1405#else /* __QNX__ uses qnxspawn () */ 1354#else /* __QNX__ uses qnxspawn () */
1406 fchmod (tty_fd, 0622); 1355 fchmod (tty_fd, 0622);

Diff Legend

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