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.27 by pcg, Fri Feb 13 13:28:17 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 {
… …
805void 748void
806rxvt_term::set_locale (const char *locale) 749rxvt_term::set_locale (const char *locale)
807{ 750{
808#if HAVE_XSETLOCALE || HAVE_SETLOCALE 751#if HAVE_XSETLOCALE || HAVE_SETLOCALE
809 free (this->locale); 752 free (this->locale);
810 this->locale = rxvt_strdup (setlocale (LC_CTYPE, "")); 753 this->locale = rxvt_strdup (setlocale (LC_CTYPE, locale));
754 SET_LOCALE (this->locale);
755 mbstate.reset ();
811#endif 756#endif
757#if 0
812#if HAVE_NL_LANGINFO 758#if HAVE_NL_LANGINFO
813 free (codeset); 759 free (codeset);
814 codeset = strdup (nl_langinfo (CODESET)); 760 codeset = strdup (nl_langinfo (CODESET));
815 enc_utf8 = !STRCASECMP (codeset, "UTF-8") 761 enc_utf8 = !STRCASECMP (codeset, "UTF-8")
816 || !STRCASECMP (codeset, "UTF8"); 762 || !STRCASECMP (codeset, "UTF8");
817#else 763#else
818 enc_utf8 = 1; 764 enc_utf8 = 1;
819#endif 765#endif
766#endif
820} 767}
821 768
822void 769void
823rxvt_term::init_xlocale () 770rxvt_term::init_xlocale ()
824{ 771{
825#ifdef USE_XIM 772#ifdef USE_XIM
826 if (!locale) 773 if (!locale)
827 rxvt_print_error ("Setting locale failed."); 774 rxvt_warn ("setting locale failed, working without locale support.\n");
828 else 775 else
829 { 776 {
830 Atom wmlocale; 777 Atom wmlocale;
831 778
832 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False); 779 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
… …
834 XA_STRING, 8, PropModeReplace, 781 XA_STRING, 8, PropModeReplace,
835 (unsigned char *)locale, STRLEN (locale)); 782 (unsigned char *)locale, STRLEN (locale));
836 783
837 if (!XSupportsLocale ()) 784 if (!XSupportsLocale ())
838 { 785 {
839 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");
840 return; 787 return;
841 } 788 }
842 789
843 im_ev.start (display); 790 im_ev.start (display);
844 791
… …
898 { 845 {
899 PrivateModes |= PrivMode_menuBar; 846 PrivateModes |= PrivMode_menuBar;
900 SavedModes |= PrivMode_menuBar; 847 SavedModes |= PrivMode_menuBar;
901 } 848 }
902 849
903#ifdef GREEK_SUPPORT
904 greek_init ();
905#endif
906
907#ifdef CURSOR_BLINK 850#ifdef CURSOR_BLINK
908 if (Options & Opt_cursorBlink) 851 if (Options & Opt_cursorBlink)
909 (void)gettimeofday (&lastcursorchange, NULL); 852 (void)gettimeofday (&lastcursorchange, NULL);
910#endif 853#endif
911 854
912 if ((cmd_fd = run_command (argv)) < 0) 855 if ((cmd_fd = run_command (argv)) < 0)
913 { 856 rxvt_fatal ("failure while running command, aborting");
914 rxvt_print_error ("aborting");
915 exit (EXIT_FAILURE);
916 }
917} 857}
918 858
919/*----------------------------------------------------------------------*/ 859/*----------------------------------------------------------------------*/
920void 860void
921rxvt_term::Get_Colours () 861rxvt_term::Get_Colours ()
… …
946 switch (i) 886 switch (i)
947 { 887 {
948 case Color_fg: 888 case Color_fg:
949 case Color_bg: 889 case Color_bg:
950 /* fatal: need bg/fg color */ 890 /* fatal: need bg/fg color */
951 rxvt_print_error ("aborting"); 891 rxvt_fatal ("unable to get foreground/background colour, aborting");
952 exit (EXIT_FAILURE);
953 /* NOTREACHED */ 892 /* NOTREACHED */
954 break; 893 break;
955#ifndef NO_CURSORCOLOR 894#ifndef NO_CURSORCOLOR
956 case Color_cursor2: 895 case Color_cursor2:
957 xcol = PixColors[Color_fg]; 896 xcol = PixColors[Color_fg];
… …
1142 } 1081 }
1143 1082
1144 /* grab colors before netscape does */ 1083 /* grab colors before netscape does */
1145 Get_Colours (); 1084 Get_Colours ();
1146 1085
1147 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
1148 window_calc (0, 0); 1093 window_calc (0, 0);
1149 old_width = szHint.width; 1094 old_width = szHint.width;
1150 old_height = szHint.height; 1095 old_height = szHint.height;
1151 1096
1152 /* parent window - reverse video so we can see placement errors 1097 /* parent window - reverse video so we can see placement errors
… …
1178 1123
1179 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1124 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1180 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1125 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1181 1126
1182 classHint.res_name = (char *)rs[Rs_name]; 1127 classHint.res_name = (char *)rs[Rs_name];
1183 classHint.res_class = (char *)APL_CLASS; 1128 classHint.res_class = (char *)RESCLASS;
1184 1129
1185 wmHint.flags = (InputHint | StateHint | WindowGroupHint); 1130 wmHint.flags = (InputHint | StateHint | WindowGroupHint);
1186 wmHint.input = True; 1131 wmHint.input = True;
1187 wmHint.initial_state = (Options & Opt_iconic ? IconicState 1132 wmHint.initial_state = (Options & Opt_iconic ? IconicState
1188 : NormalState); 1133 : NormalState);
… …
1251 1196
1252#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1197#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1253 if (menuBar_height ()) 1198 if (menuBar_height ())
1254 { 1199 {
1255 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1200 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1256 window_vt_x, 0, 1201 window_vt_x, 0,
1257 TermWin_TotalWidth (), 1202 TermWin_TotalWidth (),
1258 menuBar_TotalHeight (), 1203 menuBar_TotalHeight (),
1259 0, 1204 0,
1260 PixColors[Color_fg], 1205 PixColors[Color_fg],
1261 PixColors[Color_scroll]); 1206 PixColors[Color_scroll]);
1207
1262#ifdef DEBUG_X 1208#ifdef DEBUG_X
1263 XStoreName (display->display, menuBar.win, "menubar"); 1209 XStoreName (display->display, menuBar.win, "menubar");
1264#endif 1210#endif
1265 1211
1212 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1213
1266 XDefineCursor (display->display, menuBar.win, pointer_leftptr); 1214 XDefineCursor (display->display, menuBar.win,
1215 XCreateFontCursor (display->display, XC_left_ptr));
1267 1216
1268 XSelectInput (display->display, menuBar.win, 1217 XSelectInput (display->display, menuBar.win,
1269 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1218 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1270 | Button1MotionMask)); 1219 | Button1MotionMask));
1271 menubar_ev.start (display, menuBar.win); 1220 menubar_ev.start (display, menuBar.win);
… …
1291 /* graphics context for the vt window */ 1240 /* graphics context for the vt window */
1292 gcvalue.foreground = PixColors[Color_fg]; 1241 gcvalue.foreground = PixColors[Color_fg];
1293 gcvalue.background = PixColors[Color_bg]; 1242 gcvalue.background = PixColors[Color_bg];
1294 gcvalue.graphics_exposures = 1; 1243 gcvalue.graphics_exposures = 1;
1295 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1244 TermWin.gc = XCreateGC (display->display, TermWin.vt,
1296 GCForeground | GCBackground 1245 GCForeground | GCBackground | GCGraphicsExposures,
1297 | GCGraphicsExposures, &gcvalue); 1246 &gcvalue);
1247
1248 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1298 1249
1299#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1250#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1300 gcvalue.foreground = PixColors[Color_topShadow]; 1251 gcvalue.foreground = PixColors[Color_topShadow];
1301 topShadowGC = XCreateGC (display->display, TermWin.vt, 1252 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1302 GCForeground, &gcvalue);
1303 gcvalue.foreground = PixColors[Color_bottomShadow]; 1253 gcvalue.foreground = PixColors[Color_bottomShadow];
1304 botShadowGC = XCreateGC (display->display, TermWin.vt, 1254 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1305 GCForeground, &gcvalue);
1306 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg 1255 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg : Color_scroll)];
1307 : Color_scroll)];
1308 scrollbarGC = XCreateGC (display->display, TermWin.vt, 1256 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1309 GCForeground, &gcvalue);
1310#endif 1257#endif
1311} 1258}
1312 1259
1313/*----------------------------------------------------------------------*/ 1260/*----------------------------------------------------------------------*/
1314/* 1261/*
… …
1321{ 1268{
1322 int cfd, er; 1269 int cfd, er;
1323 1270
1324 /* get master (pty) */ 1271 /* get master (pty) */
1325 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0) 1272 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0)
1326 {
1327 rxvt_print_error ("can't open pseudo-tty"); 1273 rxvt_fatal ("can't open pseudo-tty");
1328 return -1;
1329 }
1330 1274
1331 fcntl (cfd, F_SETFL, O_NONBLOCK); 1275 fcntl (cfd, F_SETFL, O_NONBLOCK);
1332 1276
1333 /* get slave (tty) */ 1277 /* get slave (tty) */
1334 if (tty_fd < 0) 1278 if (tty_fd < 0)
… …
1338#endif 1282#endif
1339 1283
1340 if ((tty_fd = rxvt_get_tty (ttydev)) < 0) 1284 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1341 { 1285 {
1342 close (cfd); 1286 close (cfd);
1343 rxvt_print_error ("can't open slave tty %s", ttydev); 1287 rxvt_fatal ("can't open slave tty %s", ttydev);
1344 return -1;
1345 } 1288 }
1346 } 1289 }
1347#ifndef NO_BACKSPACE_KEY 1290#ifndef NO_BACKSPACE_KEY
1348 if (key_backspace[0] && !key_backspace[1]) 1291 if (key_backspace[0] && !key_backspace[1])
1349 er = key_backspace[0]; 1292 er = key_backspace[0];
… …
1359#ifndef __QNX__ 1302#ifndef __QNX__
1360 /* spin off the command interpreter */ 1303 /* spin off the command interpreter */
1361 switch (cmd_pid = fork ()) 1304 switch (cmd_pid = fork ())
1362 { 1305 {
1363 case -1: 1306 case -1:
1364 rxvt_print_error ("can't fork"); 1307 rxvt_fatal ("can't fork");
1365 return -1;
1366 case 0: 1308 case 0:
1367 close (cfd); /* only keep tty_fd and STDERR open */ 1309 close (cfd); /* only keep tty_fd and STDERR open */
1368 1310
1369 init_env (); 1311 init_env ();
1370 1312
1371 if (rxvt_control_tty (tty_fd, ttydev) < 0) 1313 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1372 rxvt_print_error ("could not obtain control of tty"); 1314 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1373 else 1315 else
1374 { 1316 {
1375 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1317 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1376 dup2 (tty_fd, STDIN_FILENO); 1318 dup2 (tty_fd, STDIN_FILENO);
1377 dup2 (tty_fd, STDOUT_FILENO); 1319 dup2 (tty_fd, STDOUT_FILENO);
… …
1379 1321
1380 if (tty_fd > 2) 1322 if (tty_fd > 2)
1381 close (tty_fd); 1323 close (tty_fd);
1382 1324
1383 run_child (argv); 1325 run_child (argv);
1326 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1384 } 1327 }
1328
1385 exit (EXIT_FAILURE); 1329 _exit (EXIT_FAILURE);
1386 /* NOTREACHED */ 1330
1387 default: 1331 default:
1388 { 1332 {
1389#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1333#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1390 int fdstdin; 1334 int fdstdin;
1391 1335
… …
1400#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1344#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1401 1345
1402 dup2 (fdstdin, STDIN_FILENO); 1346 dup2 (fdstdin, STDIN_FILENO);
1403 close (fdstdin); 1347 close (fdstdin);
1404#endif 1348#endif
1405
1406 } 1349 }
1350
1407 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */ 1351 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */
1408 break; 1352 break;
1409 } 1353 }
1410#else /* __QNX__ uses qnxspawn () */ 1354#else /* __QNX__ uses qnxspawn () */
1411 fchmod (tty_fd, 0622); 1355 fchmod (tty_fd, 0622);

Diff Legend

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