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.32 by pcg, Sun Feb 22 08:28:36 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;
407#ifdef MULTICHAR_SET
408# ifdef MULTICHAR_ENCODING
409 encoding_method = MULTICHAR_ENCODING;
410# endif
411 multichar_decode = rxvt_euc2jis;
412#endif
413 396
414 oldcursor.row = oldcursor.col = -1; 397 oldcursor.row = oldcursor.col = -1;
415#ifdef XPM_BACKGROUND 398#ifdef XPM_BACKGROUND
416 /* bgPixmap.w = bgPixmap.h = 0; */ 399 /* bgPixmap.w = bgPixmap.h = 0; */
417 bgPixmap.x = bgPixmap.y = 50; 400 bgPixmap.x = bgPixmap.y = 50;
… …
511 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 494 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
512 495
513 cmd_argv[i] = NULL; 496 cmd_argv[i] = NULL;
514 } 497 }
515 498
516 /* clear all resources */
517 for (i = 0; i < NUM_RESOURCES;)
518 rs[i++] = NULL;
519
520 rs[Rs_name] = rxvt_r_basename (argv[0]); 499 rs[Rs_name] = rxvt_r_basename (argv[0]);
521 500
522 /* 501 /*
523 * Open display, get options/resources and create the window 502 * Open display, get options/resources and create the window
524 */ 503 */
… …
539 } 518 }
540#endif 519#endif
541 520
542 if (!display 521 if (!display
543 && ! (display = displays.get (rs[Rs_display_name]))) 522 && ! (display = displays.get (rs[Rs_display_name])))
544 {
545 rxvt_print_error ("can't open display %s", rs[Rs_display_name]); 523 rxvt_fatal ("can't open display %s", rs[Rs_display_name]);
546 exit (EXIT_FAILURE);
547 }
548 524
549 extract_resources (display->display, rs[Rs_name]); 525 extract_resources (display->display, rs[Rs_name]);
550 526
551 /* 527 /*
552 * set any defaults not already set 528 * set any defaults not already set
… …
597 rs[Rs_print_pipe] = PRINTPIPE; 573 rs[Rs_print_pipe] = PRINTPIPE;
598#endif 574#endif
599 575
600 if (!rs[Rs_cutchars]) 576 if (!rs[Rs_cutchars])
601 rs[Rs_cutchars] = CUTCHARS; 577 rs[Rs_cutchars] = CUTCHARS;
602
603#ifdef ACS_ASCII
604 if (!rs[Rs_acs_chars])
605 rs[Rs_acs_chars] = ACS_CHARS;
606 if ((i = STRLEN (rs[Rs_acs_chars])) < 0x20)
607 {
608 val = rxvt_realloc ((void *)rs[Rs_acs_chars], 0x20);
609 for (; i < 0x20; )
610 val[i] = ' ';
611 rs[Rs_acs_chars] = val;
612 }
613#endif
614 578
615#ifndef NO_BACKSPACE_KEY 579#ifndef NO_BACKSPACE_KEY
616 if (!rs[Rs_backspace_key]) 580 if (!rs[Rs_backspace_key])
617# ifdef DEFAULT_BACKSPACE 581# ifdef DEFAULT_BACKSPACE
618 key_backspace = DEFAULT_BACKSPACE; 582 key_backspace = DEFAULT_BACKSPACE;
… …
645#endif 609#endif
646 if (rs[Rs_answerbackstring]) 610 if (rs[Rs_answerbackstring])
647 { 611 {
648 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]); 612 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
649 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]); 613 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
650 }
651
652 if (rs[Rs_selectstyle])
653 {
654 if (STRNCASECMP (rs[Rs_selectstyle], "oldword", 7) == 0)
655 selection_style = OLD_WORD_SELECT;
656#ifndef NO_OLD_SELECTION
657
658 else if (STRNCASECMP (rs[Rs_selectstyle], "old", 3) == 0)
659 selection_style = OLD_SELECT;
660#endif
661
662 } 614 }
663 615
664#ifdef HAVE_SCROLLBARS 616#ifdef HAVE_SCROLLBARS
665 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], 617 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle],
666 rs[Rs_scrollBar_thickness]); 618 rs[Rs_scrollBar_thickness]);
… …
796void 748void
797rxvt_term::set_locale (const char *locale) 749rxvt_term::set_locale (const char *locale)
798{ 750{
799#if HAVE_XSETLOCALE || HAVE_SETLOCALE 751#if HAVE_XSETLOCALE || HAVE_SETLOCALE
800 free (this->locale); 752 free (this->locale);
801 this->locale = rxvt_strdup (setlocale (LC_CTYPE, "")); 753 this->locale = rxvt_strdup (setlocale (LC_CTYPE, locale));
802 SET_LOCALE (this->locale); 754 SET_LOCALE (this->locale);
803 mbstate.reset (); 755 mbstate.reset ();
804#endif 756#endif
757#if 0
805#if HAVE_NL_LANGINFO 758#if HAVE_NL_LANGINFO
806 free (codeset); 759 free (codeset);
807 codeset = strdup (nl_langinfo (CODESET)); 760 codeset = strdup (nl_langinfo (CODESET));
808 enc_utf8 = !STRCASECMP (codeset, "UTF-8") 761 enc_utf8 = !STRCASECMP (codeset, "UTF-8")
809 || !STRCASECMP (codeset, "UTF8"); 762 || !STRCASECMP (codeset, "UTF8");
810#else 763#else
811 enc_utf8 = 1; 764 enc_utf8 = 1;
812#endif 765#endif
766#endif
813} 767}
814 768
815void 769void
816rxvt_term::init_xlocale () 770rxvt_term::init_xlocale ()
817{ 771{
818#ifdef USE_XIM 772#ifdef USE_XIM
819 if (!locale) 773 if (!locale)
820 rxvt_print_error ("Setting locale failed."); 774 rxvt_warn ("setting locale failed, working without locale support.\n");
821 else 775 else
822 { 776 {
823 Atom wmlocale; 777 Atom wmlocale;
824 778
825 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False); 779 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
… …
827 XA_STRING, 8, PropModeReplace, 781 XA_STRING, 8, PropModeReplace,
828 (unsigned char *)locale, STRLEN (locale)); 782 (unsigned char *)locale, STRLEN (locale));
829 783
830 if (!XSupportsLocale ()) 784 if (!XSupportsLocale ())
831 { 785 {
832 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");
833 return; 787 return;
834 } 788 }
835 789
836 im_ev.start (display); 790 im_ev.start (display);
837 791
… …
897 if (Options & Opt_cursorBlink) 851 if (Options & Opt_cursorBlink)
898 (void)gettimeofday (&lastcursorchange, NULL); 852 (void)gettimeofday (&lastcursorchange, NULL);
899#endif 853#endif
900 854
901 if ((cmd_fd = run_command (argv)) < 0) 855 if ((cmd_fd = run_command (argv)) < 0)
902 { 856 rxvt_fatal ("failure while running command, aborting");
903 rxvt_print_error ("aborting");
904 exit (EXIT_FAILURE);
905 }
906} 857}
907 858
908/*----------------------------------------------------------------------*/ 859/*----------------------------------------------------------------------*/
909void 860void
910rxvt_term::Get_Colours () 861rxvt_term::Get_Colours ()
… …
935 switch (i) 886 switch (i)
936 { 887 {
937 case Color_fg: 888 case Color_fg:
938 case Color_bg: 889 case Color_bg:
939 /* fatal: need bg/fg color */ 890 /* fatal: need bg/fg color */
940 rxvt_print_error ("aborting"); 891 rxvt_fatal ("unable to get foreground/background colour, aborting");
941 exit (EXIT_FAILURE);
942 /* NOTREACHED */ 892 /* NOTREACHED */
943 break; 893 break;
944#ifndef NO_CURSORCOLOR 894#ifndef NO_CURSORCOLOR
945 case Color_cursor2: 895 case Color_cursor2:
946 xcol = PixColors[Color_fg]; 896 xcol = PixColors[Color_fg];
… …
1173 1123
1174 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1124 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1175 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1125 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1176 1126
1177 classHint.res_name = (char *)rs[Rs_name]; 1127 classHint.res_name = (char *)rs[Rs_name];
1178 classHint.res_class = (char *)APL_CLASS; 1128 classHint.res_class = (char *)RESCLASS;
1179 1129
1180 wmHint.flags = (InputHint | StateHint | WindowGroupHint); 1130 wmHint.flags = (InputHint | StateHint | WindowGroupHint);
1181 wmHint.input = True; 1131 wmHint.input = True;
1182 wmHint.initial_state = (Options & Opt_iconic ? IconicState 1132 wmHint.initial_state = (Options & Opt_iconic ? IconicState
1183 : NormalState); 1133 : NormalState);
… …
1246 1196
1247#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1197#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1248 if (menuBar_height ()) 1198 if (menuBar_height ())
1249 { 1199 {
1250 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1200 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1251 window_vt_x, 0, 1201 window_vt_x, 0,
1252 TermWin_TotalWidth (), 1202 TermWin_TotalWidth (),
1253 menuBar_TotalHeight (), 1203 menuBar_TotalHeight (),
1254 0, 1204 0,
1255 PixColors[Color_fg], 1205 PixColors[Color_fg],
1256 PixColors[Color_scroll]); 1206 PixColors[Color_scroll]);
1207
1257#ifdef DEBUG_X 1208#ifdef DEBUG_X
1258 XStoreName (display->display, menuBar.win, "menubar"); 1209 XStoreName (display->display, menuBar.win, "menubar");
1259#endif 1210#endif
1260 1211
1212 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1213
1261 XDefineCursor (display->display, menuBar.win, pointer_leftptr); 1214 XDefineCursor (display->display, menuBar.win,
1215 XCreateFontCursor (display->display, XC_left_ptr));
1262 1216
1263 XSelectInput (display->display, menuBar.win, 1217 XSelectInput (display->display, menuBar.win,
1264 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1218 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1265 | Button1MotionMask)); 1219 | Button1MotionMask));
1266 menubar_ev.start (display, menuBar.win); 1220 menubar_ev.start (display, menuBar.win);
… …
1286 /* graphics context for the vt window */ 1240 /* graphics context for the vt window */
1287 gcvalue.foreground = PixColors[Color_fg]; 1241 gcvalue.foreground = PixColors[Color_fg];
1288 gcvalue.background = PixColors[Color_bg]; 1242 gcvalue.background = PixColors[Color_bg];
1289 gcvalue.graphics_exposures = 1; 1243 gcvalue.graphics_exposures = 1;
1290 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1244 TermWin.gc = XCreateGC (display->display, TermWin.vt,
1291 GCForeground | GCBackground 1245 GCForeground | GCBackground | GCGraphicsExposures,
1292 | GCGraphicsExposures, &gcvalue); 1246 &gcvalue);
1247
1248 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1293 1249
1294#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1250#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1295 gcvalue.foreground = PixColors[Color_topShadow]; 1251 gcvalue.foreground = PixColors[Color_topShadow];
1296 topShadowGC = XCreateGC (display->display, TermWin.vt, 1252 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1297 GCForeground, &gcvalue);
1298 gcvalue.foreground = PixColors[Color_bottomShadow]; 1253 gcvalue.foreground = PixColors[Color_bottomShadow];
1299 botShadowGC = XCreateGC (display->display, TermWin.vt, 1254 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1300 GCForeground, &gcvalue);
1301 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg 1255 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg : Color_scroll)];
1302 : Color_scroll)];
1303 scrollbarGC = XCreateGC (display->display, TermWin.vt, 1256 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1304 GCForeground, &gcvalue);
1305#endif 1257#endif
1306} 1258}
1307 1259
1308/*----------------------------------------------------------------------*/ 1260/*----------------------------------------------------------------------*/
1309/* 1261/*
… …
1316{ 1268{
1317 int cfd, er; 1269 int cfd, er;
1318 1270
1319 /* get master (pty) */ 1271 /* get master (pty) */
1320 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0) 1272 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0)
1321 {
1322 rxvt_print_error ("can't open pseudo-tty"); 1273 rxvt_fatal ("can't open pseudo-tty");
1323 return -1;
1324 }
1325 1274
1326 fcntl (cfd, F_SETFL, O_NONBLOCK); 1275 fcntl (cfd, F_SETFL, O_NONBLOCK);
1327 1276
1328 /* get slave (tty) */ 1277 /* get slave (tty) */
1329 if (tty_fd < 0) 1278 if (tty_fd < 0)
… …
1333#endif 1282#endif
1334 1283
1335 if ((tty_fd = rxvt_get_tty (ttydev)) < 0) 1284 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1336 { 1285 {
1337 close (cfd); 1286 close (cfd);
1338 rxvt_print_error ("can't open slave tty %s", ttydev); 1287 rxvt_fatal ("can't open slave tty %s", ttydev);
1339 return -1;
1340 } 1288 }
1341 } 1289 }
1342#ifndef NO_BACKSPACE_KEY 1290#ifndef NO_BACKSPACE_KEY
1343 if (key_backspace[0] && !key_backspace[1]) 1291 if (key_backspace[0] && !key_backspace[1])
1344 er = key_backspace[0]; 1292 er = key_backspace[0];
… …
1354#ifndef __QNX__ 1302#ifndef __QNX__
1355 /* spin off the command interpreter */ 1303 /* spin off the command interpreter */
1356 switch (cmd_pid = fork ()) 1304 switch (cmd_pid = fork ())
1357 { 1305 {
1358 case -1: 1306 case -1:
1359 rxvt_print_error ("can't fork"); 1307 rxvt_fatal ("can't fork");
1360 return -1;
1361 case 0: 1308 case 0:
1362 close (cfd); /* only keep tty_fd and STDERR open */ 1309 close (cfd); /* only keep tty_fd and STDERR open */
1363 1310
1364 init_env (); 1311 init_env ();
1365 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