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.217 by root, Tue Oct 9 13:36:10 2007 UTC vs.
Revision 1.235 by ayin, Sat Dec 29 12:36:56 2007 UTC

… …
10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM> 10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca> 11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
14 * - extensive modifications 14 * - extensive modifications
15 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
16 * - QNX support
17 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 15 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
18 * 16 *
19 * This program is free software; you can redistribute it and/or modify 17 * This program is free software; you can redistribute it and/or modify
20 * it under the terms of the GNU General Public License as published by 18 * it under the terms of the GNU General Public License as published by
21 * the Free Software Foundation; either version 2 of the License, or 19 * the Free Software Foundation; either version 2 of the License, or
22 * (at your option) any later version. 20 * (at your option) any later version.
… …
41 39
42#include <limits> 40#include <limits>
43 41
44#include <csignal> 42#include <csignal>
45 43
44#include <fcntl.h>
45
46#ifdef HAVE_XSETLOCALE
47# define X_LOCALE
48# include <X11/Xlocale.h>
49#else
50# ifdef HAVE_SETLOCALE
51# include <clocale>
52# endif
53#endif
54
55#ifdef HAVE_NL_LANGINFO
56# include <langinfo.h>
57#endif
58
46#ifdef DISPLAY_IS_IP 59#ifdef DISPLAY_IS_IP
47/* On Solaris link with -lsocket and -lnsl */ 60/* On Solaris link with -lsocket and -lnsl */
48#include <sys/types.h> 61#include <sys/types.h>
49#include <sys/socket.h> 62#include <sys/socket.h>
50 63
… …
141 "rgb:00/cd/00", // 2: green (Green3) 154 "rgb:00/cd/00", // 2: green (Green3)
142 "rgb:cd/cd/00", // 3: yellow (Yellow3) 155 "rgb:cd/cd/00", // 3: yellow (Yellow3)
143 "rgb:00/00/cd", // 4: blue (Blue3) 156 "rgb:00/00/cd", // 4: blue (Blue3)
144 "rgb:cd/00/cd", // 5: magenta (Magenta3) 157 "rgb:cd/00/cd", // 5: magenta (Magenta3)
145 "rgb:00/cd/cd", // 6: cyan (Cyan3) 158 "rgb:00/cd/cd", // 6: cyan (Cyan3)
146# ifdef XTERM_COLORS 159# ifdef XTERM_COLORS
147 "rgb:e5/e5/e5", // 7: white (Grey90) 160 "rgb:e5/e5/e5", // 7: white (Grey90)
148# else 161# else
149 "rgb:fa/eb/d7", // 7: white (AntiqueWhite) 162 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
150# endif 163# endif
151 /* high-intensity colors */ 164 /* high-intensity colors */
152# ifdef XTERM_COLORS 165# ifdef XTERM_COLORS
153 "rgb:4d/4d/4d", // 8: bright black (Grey30) 166 "rgb:4d/4d/4d", // 8: bright black (Grey30)
… …
237 "rgb:e7/e7/e7", 250 "rgb:e7/e7/e7",
238 251
239#ifndef NO_CURSORCOLOR 252#ifndef NO_CURSORCOLOR
240 COLOR_CURSOR_BACKGROUND, 253 COLOR_CURSOR_BACKGROUND,
241 COLOR_CURSOR_FOREGROUND, 254 COLOR_CURSOR_FOREGROUND,
242#endif /* ! NO_CURSORCOLOR */ 255#endif /* ! NO_CURSORCOLOR */
243 NULL, /* Color_pointer_fg */ 256 NULL, /* Color_pointer_fg */
244 NULL, /* Color_pointer_bg */ 257 NULL, /* Color_pointer_bg */
245 NULL, /* Color_border */ 258 NULL, /* Color_border */
246#ifndef NO_BOLD_UNDERLINE_REVERSE 259#ifndef NO_BOLD_UNDERLINE_REVERSE
247 NULL, /* Color_BD */ 260 NULL, /* Color_BD */
248 NULL, /* Color_IT */ 261 NULL, /* Color_IT */
249 NULL, /* Color_UL */ 262 NULL, /* Color_UL */
250 NULL, /* Color_RV */ 263 NULL, /* Color_RV */
251#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 264#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
252#if ENABLE_FRILLS 265#if ENABLE_FRILLS
253 NULL, // Color_underline 266 NULL, // Color_underline
254#endif 267#endif
255#ifdef OPTION_HC 268#ifdef OPTION_HC
256 NULL, 269 NULL,
257#endif 270#endif
258#ifdef KEEP_SCROLLCOLOR 271#ifdef KEEP_SCROLLCOLOR
259 COLOR_SCROLLBAR, 272 COLOR_SCROLLBAR,
260 COLOR_SCROLLTROUGH, 273 COLOR_SCROLLTROUGH,
261#endif /* KEEP_SCROLLCOLOR */ 274#endif /* KEEP_SCROLLCOLOR */
262#if ENABLE_TRANSPARENCY 275#if ENABLE_TRANSPARENCY
263 NULL, 276 NULL,
264#endif 277#endif
265#if OFF_FOCUS_FADING 278#if OFF_FOCUS_FADING
266 "rgb:00/00/00", 279 "rgb:00/00/00",
267#endif 280#endif
268 }; 281 };
269 282
270bool 283void
271rxvt_term::init_vars () 284rxvt_term::init_vars ()
272{ 285{
273 pix_colors = // 286 pix_colors = pix_colors_focused;
274 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
275#ifdef OFF_FOCUS_FADING
276 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
277#endif
278
279 287
280 MEvent.time = CurrentTime; 288 MEvent.time = CurrentTime;
281 MEvent.button = AnyButton; 289 MEvent.button = AnyButton;
282 want_refresh = 1; 290 want_refresh = 1;
283 priv_modes = SavedModes = PrivMode_Default; 291 priv_modes = SavedModes = PrivMode_Default;
… …
285 nrow = 24; 293 nrow = 24;
286 int_bwidth = INTERNALBORDERWIDTH; 294 int_bwidth = INTERNALBORDERWIDTH;
287 ext_bwidth = EXTERNALBORDERWIDTH; 295 ext_bwidth = EXTERNALBORDERWIDTH;
288 lineSpace = LINESPACE; 296 lineSpace = LINESPACE;
289 saveLines = SAVELINES; 297 saveLines = SAVELINES;
290 numpix_colors = TOTAL_COLORS;
291 298
292 refresh_type = SLOW_REFRESH; 299 refresh_type = SLOW_REFRESH;
293 300
294 oldcursor.row = oldcursor.col = -1; 301 oldcursor.row = oldcursor.col = -1;
295 last_bot = last_state = -1; 302 last_bot = last_state = -1;
… …
301 set_option (Opt_secondaryScreen); 308 set_option (Opt_secondaryScreen);
302 set_option (Opt_secondaryScroll); 309 set_option (Opt_secondaryScroll);
303 set_option (Opt_pastableTabs); 310 set_option (Opt_pastableTabs);
304 set_option (Opt_intensityStyles); 311 set_option (Opt_intensityStyles);
305 set_option (Opt_iso14755_52); 312 set_option (Opt_iso14755_52);
306
307 return true;
308} 313}
309 314
310void 315void
311rxvt_term::init_secondary () 316rxvt_term::init_secondary ()
312{ 317{
… …
356 break; 361 break;
357 362
358 if (r_argc == argc) 363 if (r_argc == argc)
359 cmd_argv = NULL; 364 cmd_argv = NULL;
360 else if (!argv[r_argc + 1]) 365 else if (!argv[r_argc + 1])
361 rxvt_fatal ("-e requires an argument\n"); 366 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
362 else 367 else
363 { 368 {
364 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc)); 369 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
365 370
366 for (i = 0; i < argc - r_argc - 1; i++) 371 for (i = 0; i < argc - r_argc - 1; i++)
… …
403 if (rs[Rs_depth]) 408 if (rs[Rs_depth])
404 select_visual (strtol (rs[Rs_depth], 0, 0)); 409 select_visual (strtol (rs[Rs_depth], 0, 0));
405#endif 410#endif
406 411
407#ifdef HAVE_AFTERIMAGE 412#ifdef HAVE_AFTERIMAGE
413 set_application_name ((char*)rs[Rs_name]);
414 set_output_threshold (OUTPUT_LEVEL_WARNING);
408 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL); 415 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
409#endif 416#endif
410 free (r_argv); 417 free (r_argv);
411 418
412 for (int i = NUM_RESOURCES; i--; ) 419 for (int i = NUM_RESOURCES; i--; )
… …
525 color_aliases (Color_fg); 532 color_aliases (Color_fg);
526 color_aliases (Color_bg); 533 color_aliases (Color_bg);
527#ifndef NO_CURSORCOLOR 534#ifndef NO_CURSORCOLOR
528 color_aliases (Color_cursor); 535 color_aliases (Color_cursor);
529 color_aliases (Color_cursor2); 536 color_aliases (Color_cursor2);
530#endif /* NO_CURSORCOLOR */ 537#endif /* NO_CURSORCOLOR */
531 color_aliases (Color_pointer_fg); 538 color_aliases (Color_pointer_fg);
532 color_aliases (Color_pointer_bg); 539 color_aliases (Color_pointer_bg);
533 color_aliases (Color_border); 540 color_aliases (Color_border);
534#ifndef NO_BOLD_UNDERLINE_REVERSE 541#ifndef NO_BOLD_UNDERLINE_REVERSE
535 color_aliases (Color_BD); 542 color_aliases (Color_BD);
536 color_aliases (Color_UL); 543 color_aliases (Color_UL);
537 color_aliases (Color_RV); 544 color_aliases (Color_RV);
538#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 545#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
539 546
540 if (!rs[Rs_color + Color_border]) 547 if (!rs[Rs_color + Color_border])
541 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 548 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
542 549
543 return cmd_argv; 550 return cmd_argv;
… …
563 */ 570 */
564 val = rxvt_network_display (rs[Rs_display_name]); 571 val = rxvt_network_display (rs[Rs_display_name]);
565 rs[Rs_display_name] = (const char *)val; 572 rs[Rs_display_name] = (const char *)val;
566 573
567 if (val == NULL) 574 if (val == NULL)
568#endif /* DISPLAY_IS_IP */ 575#endif /* DISPLAY_IS_IP */
569 val = XDisplayString (dpy); 576 val = XDisplayString (dpy);
570 577
571 if (rs[Rs_display_name] == NULL) 578 if (rs[Rs_display_name] == NULL)
572 rs[Rs_display_name] = val; /* use broken `:0' value */ 579 rs[Rs_display_name] = val; /* use broken `:0' value */
573 580
… …
613#ifdef HAVE_UNSETENV 620#ifdef HAVE_UNSETENV
614 /* avoid passing old settings and confusing term size */ 621 /* avoid passing old settings and confusing term size */
615 unsetenv ("LINES"); 622 unsetenv ("LINES");
616 unsetenv ("COLUMNS"); 623 unsetenv ("COLUMNS");
617 unsetenv ("TERMCAP"); /* terminfo should be okay */ 624 unsetenv ("TERMCAP"); /* terminfo should be okay */
618#endif /* HAVE_UNSETENV */ 625#endif /* HAVE_UNSETENV */
619} 626}
620 627
621/*----------------------------------------------------------------------*/ 628/*----------------------------------------------------------------------*/
622/* 629/*
623 * This is more or less stolen straight from XFree86 xterm. 630 * This is more or less stolen straight from XFree86 xterm.
… …
644 651
645 this->locale = "C"; 652 this->locale = "C";
646 } 653 }
647 654
648 655
649 this->locale = rxvt_strdup (this->locale); 656 this->locale = strdup (this->locale);
650 SET_LOCALE (this->locale); 657 SET_LOCALE (this->locale);
651 mbstate.reset (); 658 mbstate.reset ();
652#endif 659#endif
653 660
654#if HAVE_NL_LANGINFO 661#if HAVE_NL_LANGINFO
… …
734 int i; 741 int i;
735 742
736#ifdef OFF_FOCUS_FADING 743#ifdef OFF_FOCUS_FADING
737 pix_colors = pix_colors_focused; 744 pix_colors = pix_colors_focused;
738#endif 745#endif
739 746
740 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 747 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
741 { 748 {
742 const char *name = rs[Rs_color + i]; 749 const char *name = rs[Rs_color + i];
743 750
744 if (!name) 751 if (!name)
… …
822 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 829 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
823 cscroll.a) 830 cscroll.a)
824 )) 831 ))
825 alias_color (Color_topShadow, Color_White); 832 alias_color (Color_topShadow, Color_White);
826 } 833 }
827#endif /* KEEP_SCROLLCOLOR */ 834#endif /* KEEP_SCROLLCOLOR */
828 835
829#ifdef OFF_FOCUS_FADING 836#ifdef OFF_FOCUS_FADING
830 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 837 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
831 update_fade_color (i); 838 update_fade_color (i);
832#endif 839#endif
… …
840 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 847 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
841 { 848 {
842 int i = atoi (rs[Rs_color + idx]); 849 int i = atoi (rs[Rs_color + idx]);
843 850
844 if (i >= 8 && i <= 15) 851 if (i >= 8 && i <= 15)
845 { /* bright colors */ 852 /* bright colors */
846 i -= 8;
847 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 853 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
848 return; 854 else if (i >= 0 && i <= 7)
849 } 855 /* normal colors */
850
851 if (i >= 0 && i <= 7) /* normal colors */
852 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 856 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
853 } 857 }
854} 858}
855 859
856/*----------------------------------------------------------------------*/ 860/*----------------------------------------------------------------------*/
… …
1133 1137
1134/* ------------------------------------------------------------------------- * 1138/* ------------------------------------------------------------------------- *
1135 * GET TTY CURRENT STATE * 1139 * GET TTY CURRENT STATE *
1136 * ------------------------------------------------------------------------- */ 1140 * ------------------------------------------------------------------------- */
1137void 1141void
1138rxvt_get_ttymode (ttymode_t *tio, int erase) 1142rxvt_get_ttymode (struct termios *tio, int erase)
1139{ 1143{
1140 /* 1144 /*
1141 * standard System V termios interface 1145 * standard System V termios interface
1142 */ 1146 */
1143 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1147 if (tcgetattr (STDIN_FILENO, tio) < 0)
1144 { 1148 {
1145 // return error - use system defaults, 1149 // return error - use system defaults,
1146 // where possible, and zero elsewhere 1150 // where possible, and zero elsewhere
1147 memset (tio, 0, sizeof (ttymode_t)); 1151 memset (tio, 0, sizeof (struct termios));
1148 1152
1149 tio->c_cc[VINTR] = CINTR; 1153 tio->c_cc[VINTR] = CINTR;
1150 tio->c_cc[VQUIT] = CQUIT; 1154 tio->c_cc[VQUIT] = CQUIT;
1151 tio->c_cc[VERASE] = CERASE; 1155 tio->c_cc[VERASE] = CERASE;
1152#ifdef VERASE2 1156#ifdef VERASE2
… …
1216 1220
1217 /* 1221 /*
1218 * Debugging 1222 * Debugging
1219 */ 1223 */
1220#ifdef DEBUG_TTYMODE 1224#ifdef DEBUG_TTYMODE
1221#ifdef HAVE_TERMIOS_H
1222 /* c_iflag bits */ 1225 /* c_iflag bits */
1223 fprintf (stderr, "Input flags\n"); 1226 fprintf (stderr, "Input flags\n");
1224 1227
1225 /* cpp token stringize doesn't work on all machines <sigh> */ 1228 /* cpp token stringize doesn't work on all machines <sigh> */
1226# define FOO(flag,name) \ 1229# define FOO(flag,name) \
… …
1289 FOO (VLNEXT, "VLNEXT"); 1292 FOO (VLNEXT, "VLNEXT");
1290# endif 1293# endif
1291 1294
1292 fprintf (stderr, "\n"); 1295 fprintf (stderr, "\n");
1293# undef FOO 1296# undef FOO
1294# endif /* HAVE_TERMIOS_H */ 1297#endif /* DEBUG_TTYMODE */
1295#endif /* DEBUG_TTYMODE */
1296} 1298}
1297 1299
1298/*----------------------------------------------------------------------*/ 1300/*----------------------------------------------------------------------*/
1299/* 1301/*
1300 * Run the command in a subprocess and return a file descriptor for the 1302 * Run the command in a subprocess and return a file descriptor for the
… …
1333 else 1335 else
1334#endif 1336#endif
1335 er = -1; 1337 er = -1;
1336 1338
1337 rxvt_get_ttymode (&tio, er); 1339 rxvt_get_ttymode (&tio, er);
1338 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1340 /* init terminal attributes */
1341 cfsetospeed (&tio, BAUDRATE);
1342 cfsetispeed (&tio, BAUDRATE);
1343 tcsetattr (pty->tty, TCSANOW, &tio);
1339 pty->set_utf8_mode (enc_utf8); 1344 pty->set_utf8_mode (enc_utf8);
1340 1345
1341 /* set initial window size */ 1346 /* set initial window size */
1342 tt_winch (); 1347 tt_winch ();
1343 1348
… …
1403rxvt_term::run_child (const char *const *argv) 1408rxvt_term::run_child (const char *const *argv)
1404{ 1409{
1405 char *login; 1410 char *login;
1406 1411
1407 if (option (Opt_console)) 1412 if (option (Opt_console))
1413 {
1408 { /* be virtual console, fail silently */ 1414 /* be virtual console, fail silently */
1409#ifdef TIOCCONS 1415#ifdef TIOCCONS
1410 unsigned int on = 1; 1416 unsigned int on = 1;
1411 1417
1412 ioctl (STDIN_FILENO, TIOCCONS, &on); 1418 ioctl (STDIN_FILENO, TIOCCONS, &on);
1413#elif defined (SRIOCSREDIR) 1419#elif defined (SRIOCSREDIR)
… …
1415 1421
1416 fd = open (CONSOLE, O_WRONLY, 0); 1422 fd = open (CONSOLE, O_WRONLY, 0);
1417 if (fd >= 0) 1423 if (fd >= 0)
1418 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1424 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1419 close (fd); 1425 close (fd);
1420#endif /* SRIOCSREDIR */ 1426#endif /* SRIOCSREDIR */
1421 } 1427 }
1422 1428
1423 /* reset signals and spin off the command interpreter */ 1429 /* reset signals and spin off the command interpreter */
1424 signal (SIGINT, SIG_DFL); 1430 signal (SIGINT, SIG_DFL);
1425 signal (SIGQUIT, SIG_DFL); 1431 signal (SIGQUIT, SIG_DFL);
… …
1432 */ 1438 */
1433#ifdef SIGTSTP 1439#ifdef SIGTSTP
1434 signal (SIGTSTP, SIG_IGN); 1440 signal (SIGTSTP, SIG_IGN);
1435 signal (SIGTTIN, SIG_IGN); 1441 signal (SIGTTIN, SIG_IGN);
1436 signal (SIGTTOU, SIG_IGN); 1442 signal (SIGTTOU, SIG_IGN);
1437#endif /* SIGTSTP */ 1443#endif /* SIGTSTP */
1438 1444
1439 // unblock signals (signals are blocked by iom.C 1445 // unblock signals (signals are blocked by iom.C
1440 sigset_t ss; 1446 sigset_t ss;
1441 sigemptyset (&ss); 1447 sigemptyset (&ss);
1442 sigprocmask (SIG_SETMASK, &ss, 0); 1448 sigprocmask (SIG_SETMASK, &ss, 0);

Diff Legend

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