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.211 by ayin, Sun Sep 9 10:14:40 2007 UTC vs.
Revision 1.251 by ayin, Tue Feb 19 18:15:26 2008 UTC

… …
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
11 * - extensive modifications 14 * - extensive modifications
12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13 * - QNX support
14 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 15 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
15 * 16 *
16 * 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
17 * 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
18 * the Free Software Foundation; either version 2 of the License, or 19 * the Free Software Foundation; either version 2 of the License, or
19 * (at your option) any later version. 20 * (at your option) any later version.
… …
33 34
34#include "../config.h" /* NECESSARY */ 35#include "../config.h" /* NECESSARY */
35#include "rxvt.h" /* NECESSARY */ 36#include "rxvt.h" /* NECESSARY */
36#include "rxvtutil.h" 37#include "rxvtutil.h"
37#include "init.h" 38#include "init.h"
39#include "keyboard.h"
38 40
39#include <limits> 41#include <limits>
40 42
41#include <csignal> 43#include <csignal>
44
45#include <fcntl.h>
46
47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE
49# include <X11/Xlocale.h>
50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale>
53# endif
54#endif
55
56#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h>
58#endif
59
60#ifdef DISPLAY_IS_IP
61/* On Solaris link with -lsocket and -lnsl */
62#include <sys/types.h>
63#include <sys/socket.h>
64
65/* these next two are probably only on Sun (not Solaris) */
66#ifdef HAVE_SYS_SOCKIO_H
67#include <sys/sockio.h>
68#endif
69#ifdef HAVE_SYS_BYTEORDER_H
70#include <sys/byteorder.h>
71#endif
72
73#include <netinet/in.h>
74#include <arpa/inet.h>
75#include <net/if.h>
76#include <net/if_arp.h>
77
78static char *
79rxvt_network_display (const char *display)
80{
81 char buffer[1024], *rval = NULL;
82 struct ifconf ifc;
83 struct ifreq *ifr;
84 int i, skfd;
85
86 if (display[0] != ':' && strncmp (display, "unix:", 5))
87 return (char *) display; /* nothing to do */
88
89 ifc.ifc_len = sizeof (buffer); /* Get names of all ifaces */
90 ifc.ifc_buf = buffer;
91
92 if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
93 {
94 perror ("socket");
95 return NULL;
96 }
97
98 if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0)
99 {
100 perror ("SIOCGIFCONF");
101 close (skfd);
102 return NULL;
103 }
104
105 for (i = 0, ifr = ifc.ifc_req;
106 i < (ifc.ifc_len / sizeof (struct ifreq));
107 i++, ifr++)
108 {
109 struct ifreq ifr2;
110
111 strcpy (ifr2.ifr_name, ifr->ifr_name);
112
113 if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0)
114 {
115 unsigned long addr;
116 struct sockaddr_in *p_addr;
117
118 p_addr = (struct sockaddr_in *) &ifr2.ifr_addr;
119 addr = htonl ((unsigned long)p_addr->sin_addr.s_addr);
120
121 /*
122 * not "0.0.0.0" or "127.0.0.1" - so format the address
123 */
124 if (addr && addr != 0x7F000001)
125 {
126 char *colon = strchr (display, ':');
127
128 if (colon == NULL)
129 colon = ":0.0";
130
131 rval = rxvt_malloc (strlen (colon) + 16);
132 sprintf (rval, "%d.%d.%d.%d%s",
133 (int) ((addr >> 030) & 0xFF),
134 (int) ((addr >> 020) & 0xFF),
135 (int) ((addr >> 010) & 0xFF),
136 (int) (addr & 0xFF), colon);
137 break;
138 }
139 }
140 }
141
142 close (skfd);
143
144 return rval;
145}
146#endif
42 147
43const char *const def_colorName[] = 148const char *const def_colorName[] =
44 { 149 {
45 COLOR_FOREGROUND, 150 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 151 COLOR_BACKGROUND,
… …
50 "rgb:00/cd/00", // 2: green (Green3) 155 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: yellow (Yellow3) 156 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "rgb:00/00/cd", // 4: blue (Blue3) 157 "rgb:00/00/cd", // 4: blue (Blue3)
53 "rgb:cd/00/cd", // 5: magenta (Magenta3) 158 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "rgb:00/cd/cd", // 6: cyan (Cyan3) 159 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 160# ifdef XTERM_COLORS
56 "rgb:e5/e5/e5", // 7: white (Grey90) 161 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 162# else
58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite) 163 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59# endif 164# endif
60 /* high-intensity colors */ 165 /* high-intensity colors */
61# ifdef XTERM_COLORS 166# ifdef XTERM_COLORS
62 "rgb:4d/4d/4d", // 8: bright black (Grey30) 167 "rgb:4d/4d/4d", // 8: bright black (Grey30)
… …
146 "rgb:e7/e7/e7", 251 "rgb:e7/e7/e7",
147 252
148#ifndef NO_CURSORCOLOR 253#ifndef NO_CURSORCOLOR
149 COLOR_CURSOR_BACKGROUND, 254 COLOR_CURSOR_BACKGROUND,
150 COLOR_CURSOR_FOREGROUND, 255 COLOR_CURSOR_FOREGROUND,
151#endif /* ! NO_CURSORCOLOR */ 256#endif /* ! NO_CURSORCOLOR */
152 NULL, /* Color_pointer_fg */ 257 NULL, /* Color_pointer_fg */
153 NULL, /* Color_pointer_bg */ 258 NULL, /* Color_pointer_bg */
154 NULL, /* Color_border */ 259 NULL, /* Color_border */
155#ifndef NO_BOLD_UNDERLINE_REVERSE 260#ifndef NO_BOLD_UNDERLINE_REVERSE
156 NULL, /* Color_BD */ 261 NULL, /* Color_BD */
157 NULL, /* Color_IT */ 262 NULL, /* Color_IT */
158 NULL, /* Color_UL */ 263 NULL, /* Color_UL */
159 NULL, /* Color_RV */ 264 NULL, /* Color_RV */
160#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 265#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
161#if ENABLE_FRILLS 266#if ENABLE_FRILLS
162 NULL, // Color_underline 267 NULL, // Color_underline
163#endif 268#endif
164#ifdef OPTION_HC 269#ifdef OPTION_HC
165 NULL, 270 NULL,
166#endif 271#endif
167#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 272 COLOR_SCROLLBAR,
273#ifdef RXVT_SCROLLBAR
169 COLOR_SCROLLTROUGH, 274 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 275#endif
171#if ENABLE_TRANSPARENCY 276#if ENABLE_TRANSPARENCY
172 NULL, 277 NULL,
173#endif 278#endif
174#if OFF_FOCUS_FADING 279#if OFF_FOCUS_FADING
175 "rgb:00/00/00", 280 "rgb:00/00/00",
176#endif 281#endif
177 }; 282 };
178 283
179bool 284void
180rxvt_term::init_vars () 285rxvt_term::init_vars ()
181{ 286{
182 pix_colors = // 287 pix_colors = pix_colors_focused;
183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
184#ifdef OFF_FOCUS_FADING
185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
186#endif
187
188 288
189 MEvent.time = CurrentTime; 289 MEvent.time = CurrentTime;
190 MEvent.button = AnyButton; 290 MEvent.button = AnyButton;
191 want_refresh = 1; 291 want_refresh = 1;
192 priv_modes = SavedModes = PrivMode_Default; 292 priv_modes = SavedModes = PrivMode_Default;
… …
194 nrow = 24; 294 nrow = 24;
195 int_bwidth = INTERNALBORDERWIDTH; 295 int_bwidth = INTERNALBORDERWIDTH;
196 ext_bwidth = EXTERNALBORDERWIDTH; 296 ext_bwidth = EXTERNALBORDERWIDTH;
197 lineSpace = LINESPACE; 297 lineSpace = LINESPACE;
198 saveLines = SAVELINES; 298 saveLines = SAVELINES;
199 numpix_colors = TOTAL_COLORS;
200 299
201 refresh_type = SLOW_REFRESH; 300 refresh_type = SLOW_REFRESH;
202 301
203 oldcursor.row = oldcursor.col = -1; 302 oldcursor.row = oldcursor.col = -1;
204#ifdef HAVE_BG_PIXMAP
205#ifdef HAVE_AFTERIMAGE
206 bgPixmap.original_asim = NULL;
207#endif
208 /* bgPixmap.w = bgPixmap.h = 0; */
209#ifdef XPM_BACKGROUND
210 bgPixmap.h_scale = bgPixmap.v_scale = 0;
211 bgPixmap.h_align = bgPixmap.v_align = 0;
212#endif
213 bgPixmap.flags = 0;
214 bgPixmap.pixmap = None;
215#endif
216 last_bot = last_state = -1;
217 303
218 set_option (Opt_scrollBar); 304 set_option (Opt_scrollBar);
219 set_option (Opt_scrollTtyOutput); 305 set_option (Opt_scrollTtyOutput);
220 set_option (Opt_jumpScroll); 306 set_option (Opt_jumpScroll);
221 set_option (Opt_skipScroll); 307 set_option (Opt_skipScroll);
222 set_option (Opt_secondaryScreen); 308 set_option (Opt_secondaryScreen);
223 set_option (Opt_secondaryScroll); 309 set_option (Opt_secondaryScroll);
224 set_option (Opt_pastableTabs); 310 set_option (Opt_pastableTabs);
225 set_option (Opt_intensityStyles); 311 set_option (Opt_intensityStyles);
226 set_option (Opt_iso14755_52); 312 set_option (Opt_iso14755_52);
227 313 set_option (Opt_buffered);
228 return true;
229} 314}
230 315
231void 316static void
232rxvt_term::init_secondary () 317init_secondary ()
233{ 318{
234 int i; 319 int i;
235 320
236 /*
237 * Close all unused file descriptors
238 * We don't want them, we don't need them.
239 */
240 if ((i = open ("/dev/null", O_RDONLY)) < 0) 321 if ((i = open ("/dev/null", O_RDONLY)) < 0)
241 { 322 {
242 /* TODO: BOO HISS */
243 dup2 (STDERR_FILENO, STDIN_FILENO); 323 dup2 (STDERR_FILENO, STDIN_FILENO);
244 } 324 }
245 else if (i > STDIN_FILENO) 325 else if (i != STDIN_FILENO)
246 { 326 {
247 dup2 (i, STDIN_FILENO); 327 dup2 (i, STDIN_FILENO);
248 close (i); 328 close (i);
249 } 329 }
250 330
251 dup2 (STDERR_FILENO, STDOUT_FILENO); 331 dup2 (STDERR_FILENO, STDOUT_FILENO);
252
253#if 0 // schmorp sayz closing filies is murder
254 for (i = STDERR_FILENO + 1; i < num_fds; i++)
255 {
256#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
257 if (i == 4 || i == 7)
258 continue;
259#endif
260 close (i);
261 }
262#endif
263} 332}
264 333
265/*----------------------------------------------------------------------*/ 334/*----------------------------------------------------------------------*/
266const char ** 335const char **
267rxvt_term::init_resources (int argc, const char *const *argv) 336rxvt_term::init_resources (int argc, const char *const *argv)
… …
274 */ 343 */
275 for (r_argc = 0; r_argc < argc; r_argc++) 344 for (r_argc = 0; r_argc < argc; r_argc++)
276 if (!strcmp (argv[r_argc], "-e")) 345 if (!strcmp (argv[r_argc], "-e"))
277 break; 346 break;
278 347
348 if (r_argc == argc)
349 cmd_argv = NULL;
350 else if (!argv[r_argc + 1])
351 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
352 else
353 {
354 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
355
356 for (i = 0; i < argc - r_argc - 1; i++)
357 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
358
359 cmd_argv[i] = NULL;
360 }
361
279 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 362 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
280 363
281 for (i = 0; i < r_argc; i++) 364 for (i = 0; i < r_argc; i++)
282 r_argv[i] = (const char *)argv[i]; 365 r_argv[i] = (const char *)argv[i];
283 366
284 r_argv[i] = NULL; 367 r_argv[i] = NULL;
285
286 if (r_argc == argc)
287 cmd_argv = NULL;
288 else
289 {
290 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
291
292 for (i = 0; i < argc - r_argc - 1; i++)
293 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
294
295 cmd_argv[i] = NULL;
296 }
297 368
298 rs[Rs_name] = rxvt_basename (argv[0]); 369 rs[Rs_name] = rxvt_basename (argv[0]);
299 370
300 /* 371 /*
301 * Open display, get options/resources and create the window 372 * Open display, get options/resources and create the window
… …
305 rs[Rs_display_name] = ":0"; 376 rs[Rs_display_name] = ":0";
306 377
307 get_options (r_argc, r_argv); 378 get_options (r_argc, r_argv);
308 379
309 if (!(display = displays.get (rs[Rs_display_name]))) 380 if (!(display = displays.get (rs[Rs_display_name])))
381 {
382 free (r_argv);
310 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 383 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
384 }
311 385
312 // using a local pointer decreases code size a lot 386 // using a local pointer decreases code size a lot
313 xa = display->xa; 387 xa = display->xa;
314 388
315 set (display); 389 set (display);
… …
319 if (rs[Rs_depth]) 393 if (rs[Rs_depth])
320 select_visual (strtol (rs[Rs_depth], 0, 0)); 394 select_visual (strtol (rs[Rs_depth], 0, 0));
321#endif 395#endif
322 396
323#ifdef HAVE_AFTERIMAGE 397#ifdef HAVE_AFTERIMAGE
398 set_application_name ((char*)rs[Rs_name]);
399 set_output_threshold (OUTPUT_LEVEL_WARNING);
324 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL); 400 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
325#endif 401#endif
326 free (r_argv); 402 free (r_argv);
327 403
328 for (int i = NUM_RESOURCES; i--; ) 404 for (int i = NUM_RESOURCES; i--; )
… …
409# else 485# else
410 rs[Rs_delete_key] = "\033[3~"; 486 rs[Rs_delete_key] = "\033[3~";
411# endif 487# endif
412#endif 488#endif
413 489
414#ifdef HAVE_SCROLLBARS 490 scrollBar.setup (this);
415 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
416#endif
417 491
418#ifdef XTERM_REVERSE_VIDEO 492#ifdef XTERM_REVERSE_VIDEO
419 /* this is how xterm implements reverseVideo */ 493 /* this is how xterm implements reverseVideo */
420 if (option (Opt_reverseVideo)) 494 if (option (Opt_reverseVideo))
421 { 495 {
… …
441 color_aliases (Color_fg); 515 color_aliases (Color_fg);
442 color_aliases (Color_bg); 516 color_aliases (Color_bg);
443#ifndef NO_CURSORCOLOR 517#ifndef NO_CURSORCOLOR
444 color_aliases (Color_cursor); 518 color_aliases (Color_cursor);
445 color_aliases (Color_cursor2); 519 color_aliases (Color_cursor2);
446#endif /* NO_CURSORCOLOR */ 520#endif /* NO_CURSORCOLOR */
447 color_aliases (Color_pointer_fg); 521 color_aliases (Color_pointer_fg);
448 color_aliases (Color_pointer_bg); 522 color_aliases (Color_pointer_bg);
449 color_aliases (Color_border); 523 color_aliases (Color_border);
450#ifndef NO_BOLD_UNDERLINE_REVERSE 524#ifndef NO_BOLD_UNDERLINE_REVERSE
451 color_aliases (Color_BD); 525 color_aliases (Color_BD);
452 color_aliases (Color_UL); 526 color_aliases (Color_UL);
453 color_aliases (Color_RV); 527 color_aliases (Color_RV);
454#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 528#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
455 529
456 if (!rs[Rs_color + Color_border]) 530 if (!rs[Rs_color + Color_border])
457 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 531 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
458 532
459 return cmd_argv; 533 return cmd_argv;
534}
535
536/*----------------------------------------------------------------------*/
537void
538rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
539{
540 this->envv = envv;
541
542 SET_R (this);
543 set_locale ("");
544 set_environ (envv); // few things in X do not call setlocale :(
545
546 init_vars ();
547
548 init_secondary ();
549
550 const char **cmd_argv = init_resources (argc, argv);
551
552#ifdef KEYSYM_RESOURCE
553 keyboard->register_done ();
554#endif
555
556 if (option (Opt_scrollBar))
557 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
558
559 pty = ptytty::create ();
560
561 create_windows (argc, argv);
562
563 init_xlocale ();
564
565 scr_reset (); // initialize screen
566
567#if 0
568 XSynchronize (dpy, True);
569#endif
570
571 if (option (Opt_scrollBar))
572 scrollBar.resize (); /* create and map scrollbar */
573#ifdef HAVE_BG_PIXMAP
574 {
575 bgPixmap.set_target (this);
576 bgPixmap.invalidate ();
577
578#ifdef ENABLE_TRANSPARENCY
579 if (option (Opt_transparent))
580 {
581 bgPixmap.set_transparent ();
582
583#ifdef HAVE_AFTERIMAGE
584 if (rs [Rs_blurradius])
585 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
586#endif
587 if (ISSET_PIXCOLOR (Color_tint))
588 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
589
590 if (rs [Rs_shade])
591 bgPixmap.set_shade (rs [Rs_shade]);
592
593 bgPixmap.set_root_pixmap ();
594 XSelectInput (dpy, display->root, PropertyChangeMask);
595 rootwin_ev.start (display, display->root);
596 }
597#endif
598
599#ifdef BG_IMAGE_FROM_FILE
600 if (rs[Rs_backgroundPixmap])
601 {
602 const char *p = rs[Rs_backgroundPixmap];
603
604 if ((p = strchr (p, ';')) != 0)
605 {
606 p++;
607 bgPixmap.set_geometry (p);
608 }
609 else
610 bgPixmap.set_defaultGeometry ();
611
612 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
613 if (!bgPixmap.window_position_sensitive ())
614 update_background ();
615 }
616#endif
617 }
618#endif
619
620#if ENABLE_PERL
621 rootwin_ev.start (display, display->root);
622#endif
623
624 set_colorfgbg ();
625
626 init_command (cmd_argv);
627
628 free (cmd_argv);
629
630 if (pty->pty >= 0)
631 pty_ev.start (pty->pty, ev::READ);
632
633 HOOK_INVOKE ((this, HOOK_START, DT_END));
634
635#if ENABLE_XEMBED
636 if (rs[Rs_embed])
637 {
638 long info[2] = { 0, XEMBED_MAPPED };
639
640 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
641 32, PropModeReplace, (unsigned char *)&info, 2);
642 }
643#endif
644
645 XMapWindow (dpy, vt);
646 XMapWindow (dpy, parent[0]);
647
648 refresh_check ();
460} 649}
461 650
462/*----------------------------------------------------------------------*/ 651/*----------------------------------------------------------------------*/
463void 652void
464rxvt_term::init_env () 653rxvt_term::init_env ()
… …
479 */ 668 */
480 val = rxvt_network_display (rs[Rs_display_name]); 669 val = rxvt_network_display (rs[Rs_display_name]);
481 rs[Rs_display_name] = (const char *)val; 670 rs[Rs_display_name] = (const char *)val;
482 671
483 if (val == NULL) 672 if (val == NULL)
484#endif /* DISPLAY_IS_IP */ 673#endif /* DISPLAY_IS_IP */
485 val = XDisplayString (dpy); 674 val = XDisplayString (dpy);
486 675
487 if (rs[Rs_display_name] == NULL) 676 if (rs[Rs_display_name] == NULL)
488 rs[Rs_display_name] = val; /* use broken `:0' value */ 677 rs[Rs_display_name] = val; /* use broken `:0' value */
489 678
… …
529#ifdef HAVE_UNSETENV 718#ifdef HAVE_UNSETENV
530 /* avoid passing old settings and confusing term size */ 719 /* avoid passing old settings and confusing term size */
531 unsetenv ("LINES"); 720 unsetenv ("LINES");
532 unsetenv ("COLUMNS"); 721 unsetenv ("COLUMNS");
533 unsetenv ("TERMCAP"); /* terminfo should be okay */ 722 unsetenv ("TERMCAP"); /* terminfo should be okay */
534#endif /* HAVE_UNSETENV */ 723#endif /* HAVE_UNSETENV */
535} 724}
536 725
537/*----------------------------------------------------------------------*/ 726/*----------------------------------------------------------------------*/
538/* 727/*
539 * This is more or less stolen straight from XFree86 xterm. 728 * This is more or less stolen straight from XFree86 xterm.
… …
560 749
561 this->locale = "C"; 750 this->locale = "C";
562 } 751 }
563 752
564 753
565 this->locale = rxvt_strdup (this->locale); 754 this->locale = strdup (this->locale);
566 SET_LOCALE (this->locale); 755 SET_LOCALE (this->locale);
567 mbstate.reset (); 756 mbstate.reset ();
568#endif 757#endif
569 758
570#if HAVE_NL_LANGINFO 759#if HAVE_NL_LANGINFO
… …
643 run_command (argv); 832 run_command (argv);
644} 833}
645 834
646/*----------------------------------------------------------------------*/ 835/*----------------------------------------------------------------------*/
647void 836void
648rxvt_term::Get_Colours () 837rxvt_term::get_colours ()
649{ 838{
650 int i; 839 int i;
651 840
652#ifdef OFF_FOCUS_FADING 841#ifdef OFF_FOCUS_FADING
653 pix_colors = pix_colors_focused; 842 pix_colors = pix_colors_focused;
654#endif 843#endif
655 844
656 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 845 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
657 { 846 {
658 const char *name = rs[Rs_color + i]; 847 const char *name = rs[Rs_color + i];
659 848
660 if (!name) 849 if (!name)
… …
713 * get scrollBar shadow colors 902 * get scrollBar shadow colors
714 * 903 *
715 * The calculations of topShadow/bottomShadow values are adapted 904 * The calculations of topShadow/bottomShadow values are adapted
716 * from the fvwm window manager. 905 * from the fvwm window manager.
717 */ 906 */
718#ifdef KEEP_SCROLLCOLOR 907#ifdef RXVT_SCROLLBAR
719 if (depth <= 2) 908 if (depth <= 2)
720 { 909 {
721 /* Monochrome */ 910 /* Monochrome */
722 alias_color (Color_scroll, Color_fg); 911 alias_color (Color_scroll, Color_fg);
723 alias_color (Color_topShadow, Color_bg); 912 alias_color (Color_topShadow, Color_bg);
… …
738 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 927 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
739 cscroll.a) 928 cscroll.a)
740 )) 929 ))
741 alias_color (Color_topShadow, Color_White); 930 alias_color (Color_topShadow, Color_White);
742 } 931 }
743#endif /* KEEP_SCROLLCOLOR */ 932#endif
744 933
745#ifdef OFF_FOCUS_FADING 934#ifdef OFF_FOCUS_FADING
746 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 935 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
747 update_fade_color (i); 936 update_fade_color (i);
748#endif 937#endif
… …
756 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 945 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
757 { 946 {
758 int i = atoi (rs[Rs_color + idx]); 947 int i = atoi (rs[Rs_color + idx]);
759 948
760 if (i >= 8 && i <= 15) 949 if (i >= 8 && i <= 15)
761 { /* bright colors */ 950 /* bright colors */
762 i -= 8;
763 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 951 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
764 return; 952 else if (i >= 0 && i <= 7)
765 } 953 /* normal colors */
766
767 if (i >= 0 && i <= 7) /* normal colors */
768 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 954 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
769 } 955 }
770} 956}
771 957
772/*----------------------------------------------------------------------*/ 958/*----------------------------------------------------------------------*/
… …
873 Window top, parent; 1059 Window top, parent;
874 1060
875 dLocal (Display *, dpy); 1061 dLocal (Display *, dpy);
876 1062
877 /* grab colors before netscape does */ 1063 /* grab colors before netscape does */
878 Get_Colours (); 1064 get_colours ();
879 1065
880 if (!set_fonts ()) 1066 if (!set_fonts ())
881 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1067 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
882 1068
883 parent = display->root; 1069 parent = display->root;
… …
988 termwin_ev.start (display, top); 1174 termwin_ev.start (display, top);
989 1175
990 /* vt cursor: Black-on-White is standard, but this is more popular */ 1176 /* vt cursor: Black-on-White is standard, but this is more popular */
991 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1177 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
992 1178
993#ifdef HAVE_SCROLLBARS
994 /* cursor scrollBar: Black-on-White */
995 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
996#endif
997
998 /* the vt window */ 1179 /* the vt window */
999 vt = XCreateSimpleWindow (dpy, top, 1180 vt = XCreateSimpleWindow (dpy, top,
1000 window_vt_x, window_vt_y, 1181 window_vt_x, window_vt_y,
1001 width, height, 1182 width, height,
1002 0, 1183 0,
… …
1026 GCForeground | GCBackground | GCGraphicsExposures, 1207 GCForeground | GCBackground | GCGraphicsExposures,
1027 &gcvalue); 1208 &gcvalue);
1028 1209
1029 drawable = new rxvt_drawable (this, vt); 1210 drawable = new rxvt_drawable (this, vt);
1030 1211
1031#ifdef RXVT_SCROLLBAR
1032 gcvalue.foreground = pix_colors[Color_topShadow];
1033 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1034 gcvalue.foreground = pix_colors[Color_bottomShadow];
1035 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1036 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1037 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1038#endif
1039
1040#ifdef OFF_FOCUS_FADING 1212#ifdef OFF_FOCUS_FADING
1041 // initially we are in unfocused state 1213 // initially we are in unfocused state
1042 if (rs[Rs_fade]) 1214 if (rs[Rs_fade])
1043 pix_colors = pix_colors_unfocused; 1215 pix_colors = pix_colors_unfocused;
1044#endif 1216#endif
… …
1049 1221
1050/* ------------------------------------------------------------------------- * 1222/* ------------------------------------------------------------------------- *
1051 * GET TTY CURRENT STATE * 1223 * GET TTY CURRENT STATE *
1052 * ------------------------------------------------------------------------- */ 1224 * ------------------------------------------------------------------------- */
1053void 1225void
1054rxvt_get_ttymode (ttymode_t *tio, int erase) 1226rxvt_get_ttymode (struct termios *tio, int erase)
1055{ 1227{
1056 /* 1228 /*
1057 * standard System V termios interface 1229 * standard System V termios interface
1058 */ 1230 */
1059 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1231 if (tcgetattr (STDIN_FILENO, tio) < 0)
1060 { 1232 {
1061 // return error - use system defaults, 1233 // return error - use system defaults,
1062 // where possible, and zero elsewhere 1234 // where possible, and zero elsewhere
1063 memset (tio, 0, sizeof (ttymode_t)); 1235 memset (tio, 0, sizeof (struct termios));
1064 1236
1065 tio->c_cc[VINTR] = CINTR; 1237 tio->c_cc[VINTR] = CINTR;
1066 tio->c_cc[VQUIT] = CQUIT; 1238 tio->c_cc[VQUIT] = CQUIT;
1067 tio->c_cc[VERASE] = CERASE; 1239 tio->c_cc[VERASE] = CERASE;
1068#ifdef VERASE2 1240#ifdef VERASE2
… …
1132 1304
1133 /* 1305 /*
1134 * Debugging 1306 * Debugging
1135 */ 1307 */
1136#ifdef DEBUG_TTYMODE 1308#ifdef DEBUG_TTYMODE
1137#ifdef HAVE_TERMIOS_H
1138 /* c_iflag bits */ 1309 /* c_iflag bits */
1139 fprintf (stderr, "Input flags\n"); 1310 fprintf (stderr, "Input flags\n");
1140 1311
1141 /* cpp token stringize doesn't work on all machines <sigh> */ 1312 /* cpp token stringize doesn't work on all machines <sigh> */
1142# define FOO(flag,name) \ 1313# define FOO(flag,name) \
… …
1205 FOO (VLNEXT, "VLNEXT"); 1376 FOO (VLNEXT, "VLNEXT");
1206# endif 1377# endif
1207 1378
1208 fprintf (stderr, "\n"); 1379 fprintf (stderr, "\n");
1209# undef FOO 1380# undef FOO
1210# endif /* HAVE_TERMIOS_H */ 1381#endif /* DEBUG_TTYMODE */
1211#endif /* DEBUG_TTYMODE */
1212} 1382}
1213 1383
1214/*----------------------------------------------------------------------*/ 1384/*----------------------------------------------------------------------*/
1215/* 1385/*
1216 * Run the command in a subprocess and return a file descriptor for the 1386 * Run the command in a subprocess and return a file descriptor for the
… …
1249 else 1419 else
1250#endif 1420#endif
1251 er = -1; 1421 er = -1;
1252 1422
1253 rxvt_get_ttymode (&tio, er); 1423 rxvt_get_ttymode (&tio, er);
1254 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1424 /* init terminal attributes */
1425 cfsetospeed (&tio, BAUDRATE);
1426 cfsetispeed (&tio, BAUDRATE);
1427 tcsetattr (pty->tty, TCSANOW, &tio);
1255 pty->set_utf8_mode (enc_utf8); 1428 pty->set_utf8_mode (enc_utf8);
1256 1429
1257 /* set initial window size */ 1430 /* set initial window size */
1258 tt_winch (); 1431 tt_winch ();
1259 1432
… …
1319rxvt_term::run_child (const char *const *argv) 1492rxvt_term::run_child (const char *const *argv)
1320{ 1493{
1321 char *login; 1494 char *login;
1322 1495
1323 if (option (Opt_console)) 1496 if (option (Opt_console))
1497 {
1324 { /* be virtual console, fail silently */ 1498 /* be virtual console, fail silently */
1325#ifdef TIOCCONS 1499#ifdef TIOCCONS
1326 unsigned int on = 1; 1500 unsigned int on = 1;
1327 1501
1328 ioctl (STDIN_FILENO, TIOCCONS, &on); 1502 ioctl (STDIN_FILENO, TIOCCONS, &on);
1329#elif defined (SRIOCSREDIR) 1503#elif defined (SRIOCSREDIR)
… …
1331 1505
1332 fd = open (CONSOLE, O_WRONLY, 0); 1506 fd = open (CONSOLE, O_WRONLY, 0);
1333 if (fd >= 0) 1507 if (fd >= 0)
1334 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1508 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1335 close (fd); 1509 close (fd);
1336#endif /* SRIOCSREDIR */ 1510#endif /* SRIOCSREDIR */
1337 } 1511 }
1338 1512
1339 /* reset signals and spin off the command interpreter */ 1513 /* reset signals and spin off the command interpreter */
1340 signal (SIGINT, SIG_DFL); 1514 signal (SIGINT, SIG_DFL);
1341 signal (SIGQUIT, SIG_DFL); 1515 signal (SIGQUIT, SIG_DFL);
… …
1348 */ 1522 */
1349#ifdef SIGTSTP 1523#ifdef SIGTSTP
1350 signal (SIGTSTP, SIG_IGN); 1524 signal (SIGTSTP, SIG_IGN);
1351 signal (SIGTTIN, SIG_IGN); 1525 signal (SIGTTIN, SIG_IGN);
1352 signal (SIGTTOU, SIG_IGN); 1526 signal (SIGTTOU, SIG_IGN);
1353#endif /* SIGTSTP */ 1527#endif /* SIGTSTP */
1354
1355 // unblock signals (signals are blocked by iom.C
1356 sigset_t ss;
1357 sigemptyset (&ss);
1358 sigprocmask (SIG_SETMASK, &ss, 0);
1359 1528
1360 /* command interpreter path */ 1529 /* command interpreter path */
1361 if (argv != NULL) 1530 if (argv)
1362 { 1531 {
1363# ifdef DEBUG_CMD 1532# ifdef DEBUG_CMD
1364 int i; 1533 int i;
1365 1534
1366 for (i = 0; argv[i]; i++) 1535 for (i = 0; argv[i]; i++)
… …
1386 login[0] = '-'; 1555 login[0] = '-';
1387 strcpy (&login[1], argv0); 1556 strcpy (&login[1], argv0);
1388 argv0 = login; 1557 argv0 = login;
1389 } 1558 }
1390 1559
1391 execlp (shell, argv0, NULL); 1560 execlp (shell, argv0, (char *)0);
1392 /* no error message: STDERR is closed! */ 1561 /* no error message: STDERR is closed! */
1393 } 1562 }
1394 1563
1395 return -1; 1564 return -1;
1396} 1565}

Diff Legend

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