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.214 by ayin, Fri Sep 14 17:10:34 2007 UTC vs.
Revision 1.243 by root, Fri Jan 25 16:04:57 2008 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-2008 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.
… …
36 34
37#include "../config.h" /* NECESSARY */ 35#include "../config.h" /* NECESSARY */
38#include "rxvt.h" /* NECESSARY */ 36#include "rxvt.h" /* NECESSARY */
39#include "rxvtutil.h" 37#include "rxvtutil.h"
40#include "init.h" 38#include "init.h"
39#include "keyboard.h"
41 40
42#include <limits> 41#include <limits>
43 42
44#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
45 59
46#ifdef DISPLAY_IS_IP 60#ifdef DISPLAY_IS_IP
47/* On Solaris link with -lsocket and -lnsl */ 61/* On Solaris link with -lsocket and -lnsl */
48#include <sys/types.h> 62#include <sys/types.h>
49#include <sys/socket.h> 63#include <sys/socket.h>
… …
141 "rgb:00/cd/00", // 2: green (Green3) 155 "rgb:00/cd/00", // 2: green (Green3)
142 "rgb:cd/cd/00", // 3: yellow (Yellow3) 156 "rgb:cd/cd/00", // 3: yellow (Yellow3)
143 "rgb:00/00/cd", // 4: blue (Blue3) 157 "rgb:00/00/cd", // 4: blue (Blue3)
144 "rgb:cd/00/cd", // 5: magenta (Magenta3) 158 "rgb:cd/00/cd", // 5: magenta (Magenta3)
145 "rgb:00/cd/cd", // 6: cyan (Cyan3) 159 "rgb:00/cd/cd", // 6: cyan (Cyan3)
146# ifdef XTERM_COLORS 160# ifdef XTERM_COLORS
147 "rgb:e5/e5/e5", // 7: white (Grey90) 161 "rgb:e5/e5/e5", // 7: white (Grey90)
148# else 162# else
149 "rgb:fa/eb/d7", // 7: white (AntiqueWhite) 163 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
150# endif 164# endif
151 /* high-intensity colors */ 165 /* high-intensity colors */
152# ifdef XTERM_COLORS 166# ifdef XTERM_COLORS
153 "rgb:4d/4d/4d", // 8: bright black (Grey30) 167 "rgb:4d/4d/4d", // 8: bright black (Grey30)
… …
237 "rgb:e7/e7/e7", 251 "rgb:e7/e7/e7",
238 252
239#ifndef NO_CURSORCOLOR 253#ifndef NO_CURSORCOLOR
240 COLOR_CURSOR_BACKGROUND, 254 COLOR_CURSOR_BACKGROUND,
241 COLOR_CURSOR_FOREGROUND, 255 COLOR_CURSOR_FOREGROUND,
242#endif /* ! NO_CURSORCOLOR */ 256#endif /* ! NO_CURSORCOLOR */
243 NULL, /* Color_pointer_fg */ 257 NULL, /* Color_pointer_fg */
244 NULL, /* Color_pointer_bg */ 258 NULL, /* Color_pointer_bg */
245 NULL, /* Color_border */ 259 NULL, /* Color_border */
246#ifndef NO_BOLD_UNDERLINE_REVERSE 260#ifndef NO_BOLD_UNDERLINE_REVERSE
247 NULL, /* Color_BD */ 261 NULL, /* Color_BD */
248 NULL, /* Color_IT */ 262 NULL, /* Color_IT */
249 NULL, /* Color_UL */ 263 NULL, /* Color_UL */
250 NULL, /* Color_RV */ 264 NULL, /* Color_RV */
251#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 265#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
252#if ENABLE_FRILLS 266#if ENABLE_FRILLS
253 NULL, // Color_underline 267 NULL, // Color_underline
254#endif 268#endif
255#ifdef OPTION_HC 269#ifdef OPTION_HC
256 NULL, 270 NULL,
257#endif 271#endif
258#ifdef KEEP_SCROLLCOLOR 272#ifdef KEEP_SCROLLCOLOR
259 COLOR_SCROLLBAR, 273 COLOR_SCROLLBAR,
260 COLOR_SCROLLTROUGH, 274 COLOR_SCROLLTROUGH,
261#endif /* KEEP_SCROLLCOLOR */ 275#endif /* KEEP_SCROLLCOLOR */
262#if ENABLE_TRANSPARENCY 276#if ENABLE_TRANSPARENCY
263 NULL, 277 NULL,
264#endif 278#endif
265#if OFF_FOCUS_FADING 279#if OFF_FOCUS_FADING
266 "rgb:00/00/00", 280 "rgb:00/00/00",
267#endif 281#endif
268 }; 282 };
269 283
270bool 284void
271rxvt_term::init_vars () 285rxvt_term::init_vars ()
272{ 286{
273 pix_colors = // 287 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 288
280 MEvent.time = CurrentTime; 289 MEvent.time = CurrentTime;
281 MEvent.button = AnyButton; 290 MEvent.button = AnyButton;
282 want_refresh = 1; 291 want_refresh = 1;
283 priv_modes = SavedModes = PrivMode_Default; 292 priv_modes = SavedModes = PrivMode_Default;
… …
285 nrow = 24; 294 nrow = 24;
286 int_bwidth = INTERNALBORDERWIDTH; 295 int_bwidth = INTERNALBORDERWIDTH;
287 ext_bwidth = EXTERNALBORDERWIDTH; 296 ext_bwidth = EXTERNALBORDERWIDTH;
288 lineSpace = LINESPACE; 297 lineSpace = LINESPACE;
289 saveLines = SAVELINES; 298 saveLines = SAVELINES;
290 numpix_colors = TOTAL_COLORS;
291 299
292 refresh_type = SLOW_REFRESH; 300 refresh_type = SLOW_REFRESH;
293 301
294 oldcursor.row = oldcursor.col = -1; 302 oldcursor.row = oldcursor.col = -1;
295 last_bot = last_state = -1;
296 303
297 set_option (Opt_scrollBar); 304 set_option (Opt_scrollBar);
298 set_option (Opt_scrollTtyOutput); 305 set_option (Opt_scrollTtyOutput);
299 set_option (Opt_jumpScroll); 306 set_option (Opt_jumpScroll);
300 set_option (Opt_skipScroll); 307 set_option (Opt_skipScroll);
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 315static void
311rxvt_term::init_secondary () 316init_secondary ()
312{ 317{
313 int i; 318 int i;
314 319
315 /*
316 * Close all unused file descriptors
317 * We don't want them, we don't need them.
318 */
319 if ((i = open ("/dev/null", O_RDONLY)) < 0) 320 if ((i = open ("/dev/null", O_RDONLY)) < 0)
320 { 321 {
321 /* TODO: BOO HISS */
322 dup2 (STDERR_FILENO, STDIN_FILENO); 322 dup2 (STDERR_FILENO, STDIN_FILENO);
323 } 323 }
324 else if (i > STDIN_FILENO) 324 else if (i != STDIN_FILENO)
325 { 325 {
326 dup2 (i, STDIN_FILENO); 326 dup2 (i, STDIN_FILENO);
327 close (i); 327 close (i);
328 } 328 }
329 329
330 dup2 (STDERR_FILENO, STDOUT_FILENO); 330 dup2 (STDERR_FILENO, STDOUT_FILENO);
331
332#if 0 // schmorp sayz closing filies is murder
333 for (i = STDERR_FILENO + 1; i < num_fds; i++)
334 {
335#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
336 if (i == 4 || i == 7)
337 continue;
338#endif
339 close (i);
340 }
341#endif
342} 331}
343 332
344/*----------------------------------------------------------------------*/ 333/*----------------------------------------------------------------------*/
345const char ** 334const char **
346rxvt_term::init_resources (int argc, const char *const *argv) 335rxvt_term::init_resources (int argc, const char *const *argv)
… …
353 */ 342 */
354 for (r_argc = 0; r_argc < argc; r_argc++) 343 for (r_argc = 0; r_argc < argc; r_argc++)
355 if (!strcmp (argv[r_argc], "-e")) 344 if (!strcmp (argv[r_argc], "-e"))
356 break; 345 break;
357 346
347 if (r_argc == argc)
348 cmd_argv = NULL;
349 else if (!argv[r_argc + 1])
350 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
351 else
352 {
353 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
354
355 for (i = 0; i < argc - r_argc - 1; i++)
356 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
357
358 cmd_argv[i] = NULL;
359 }
360
358 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 361 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
359 362
360 for (i = 0; i < r_argc; i++) 363 for (i = 0; i < r_argc; i++)
361 r_argv[i] = (const char *)argv[i]; 364 r_argv[i] = (const char *)argv[i];
362 365
363 r_argv[i] = NULL; 366 r_argv[i] = NULL;
364
365 if (r_argc == argc)
366 cmd_argv = NULL;
367 else
368 {
369 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
370
371 for (i = 0; i < argc - r_argc - 1; i++)
372 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
373
374 cmd_argv[i] = NULL;
375 }
376 367
377 rs[Rs_name] = rxvt_basename (argv[0]); 368 rs[Rs_name] = rxvt_basename (argv[0]);
378 369
379 /* 370 /*
380 * Open display, get options/resources and create the window 371 * Open display, get options/resources and create the window
… …
384 rs[Rs_display_name] = ":0"; 375 rs[Rs_display_name] = ":0";
385 376
386 get_options (r_argc, r_argv); 377 get_options (r_argc, r_argv);
387 378
388 if (!(display = displays.get (rs[Rs_display_name]))) 379 if (!(display = displays.get (rs[Rs_display_name])))
380 {
381 free (r_argv);
389 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 382 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
383 }
390 384
391 // using a local pointer decreases code size a lot 385 // using a local pointer decreases code size a lot
392 xa = display->xa; 386 xa = display->xa;
393 387
394 set (display); 388 set (display);
… …
398 if (rs[Rs_depth]) 392 if (rs[Rs_depth])
399 select_visual (strtol (rs[Rs_depth], 0, 0)); 393 select_visual (strtol (rs[Rs_depth], 0, 0));
400#endif 394#endif
401 395
402#ifdef HAVE_AFTERIMAGE 396#ifdef HAVE_AFTERIMAGE
397 set_application_name ((char*)rs[Rs_name]);
398 set_output_threshold (OUTPUT_LEVEL_WARNING);
403 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL); 399 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
404#endif 400#endif
405 free (r_argv); 401 free (r_argv);
406 402
407 for (int i = NUM_RESOURCES; i--; ) 403 for (int i = NUM_RESOURCES; i--; )
… …
520 color_aliases (Color_fg); 516 color_aliases (Color_fg);
521 color_aliases (Color_bg); 517 color_aliases (Color_bg);
522#ifndef NO_CURSORCOLOR 518#ifndef NO_CURSORCOLOR
523 color_aliases (Color_cursor); 519 color_aliases (Color_cursor);
524 color_aliases (Color_cursor2); 520 color_aliases (Color_cursor2);
525#endif /* NO_CURSORCOLOR */ 521#endif /* NO_CURSORCOLOR */
526 color_aliases (Color_pointer_fg); 522 color_aliases (Color_pointer_fg);
527 color_aliases (Color_pointer_bg); 523 color_aliases (Color_pointer_bg);
528 color_aliases (Color_border); 524 color_aliases (Color_border);
529#ifndef NO_BOLD_UNDERLINE_REVERSE 525#ifndef NO_BOLD_UNDERLINE_REVERSE
530 color_aliases (Color_BD); 526 color_aliases (Color_BD);
531 color_aliases (Color_UL); 527 color_aliases (Color_UL);
532 color_aliases (Color_RV); 528 color_aliases (Color_RV);
533#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 529#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
534 530
535 if (!rs[Rs_color + Color_border]) 531 if (!rs[Rs_color + Color_border])
536 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 532 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
537 533
538 return cmd_argv; 534 return cmd_argv;
535}
536
537/*----------------------------------------------------------------------*/
538void
539rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
540{
541 this->envv = envv;
542
543 SET_R (this);
544 set_locale ("");
545 set_environ (envv); // few things in X do not call setlocale :(
546
547 init_vars ();
548
549 init_secondary ();
550
551 const char **cmd_argv = init_resources (argc, argv);
552
553#ifdef KEYSYM_RESOURCE
554 keyboard->register_done ();
555#endif
556
557#ifdef HAVE_SCROLLBARS
558 if (option (Opt_scrollBar))
559 scrollBar.setIdle (); /* set existence for size calculations */
560#endif
561
562 pty = ptytty::create ();
563
564 create_windows (argc, argv);
565
566 init_xlocale ();
567
568 scr_reset (); // initialize screen
569
570#if 0
571 XSynchronize (dpy, True);
572#endif
573
574#ifdef HAVE_SCROLLBARS
575 if (option (Opt_scrollBar))
576 resize_scrollbar (); /* create and map scrollbar */
577#endif
578#ifdef HAVE_BG_PIXMAP
579 {
580 bgPixmap.set_target (this);
581 bgPixmap.invalidate ();
582
583#ifdef ENABLE_TRANSPARENCY
584 if (option (Opt_transparent))
585 {
586 bgPixmap.set_transparent ();
587
588#ifdef HAVE_AFTERIMAGE
589 if (rs [Rs_blurradius])
590 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
591#endif
592 if (ISSET_PIXCOLOR (Color_tint))
593 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
594
595 if (rs [Rs_shade])
596 bgPixmap.set_shade (rs [Rs_shade]);
597
598 bgPixmap.set_root_pixmap ();
599 XSelectInput (dpy, display->root, PropertyChangeMask);
600 rootwin_ev.start (display, display->root);
601 }
602#endif
603
604#ifdef BG_IMAGE_FROM_FILE
605 if (rs[Rs_backgroundPixmap])
606 {
607 const char *p = rs[Rs_backgroundPixmap];
608
609 if ((p = strchr (p, ';')) != 0)
610 {
611 p++;
612 bgPixmap.set_geometry (p);
613 }
614 else
615 bgPixmap.set_defaultGeometry ();
616
617 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
618 if (!bgPixmap.window_position_sensitive ())
619 update_background ();
620 }
621#endif
622 }
623#endif
624
625#if ENABLE_PERL
626 rootwin_ev.start (display, display->root);
627#endif
628
629 set_colorfgbg ();
630
631 init_command (cmd_argv);
632
633 free (cmd_argv);
634
635 if (pty->pty >= 0)
636 pty_ev.start (pty->pty, ev::READ);
637
638 HOOK_INVOKE ((this, HOOK_START, DT_END));
639
640#if ENABLE_XEMBED
641 if (rs[Rs_embed])
642 {
643 long info[2] = { 0, XEMBED_MAPPED };
644
645 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
646 32, PropModeReplace, (unsigned char *)&info, 2);
647 }
648#endif
649
650 XMapWindow (dpy, vt);
651 XMapWindow (dpy, parent[0]);
652
653 refresh_check ();
539} 654}
540 655
541/*----------------------------------------------------------------------*/ 656/*----------------------------------------------------------------------*/
542void 657void
543rxvt_term::init_env () 658rxvt_term::init_env ()
… …
558 */ 673 */
559 val = rxvt_network_display (rs[Rs_display_name]); 674 val = rxvt_network_display (rs[Rs_display_name]);
560 rs[Rs_display_name] = (const char *)val; 675 rs[Rs_display_name] = (const char *)val;
561 676
562 if (val == NULL) 677 if (val == NULL)
563#endif /* DISPLAY_IS_IP */ 678#endif /* DISPLAY_IS_IP */
564 val = XDisplayString (dpy); 679 val = XDisplayString (dpy);
565 680
566 if (rs[Rs_display_name] == NULL) 681 if (rs[Rs_display_name] == NULL)
567 rs[Rs_display_name] = val; /* use broken `:0' value */ 682 rs[Rs_display_name] = val; /* use broken `:0' value */
568 683
… …
608#ifdef HAVE_UNSETENV 723#ifdef HAVE_UNSETENV
609 /* avoid passing old settings and confusing term size */ 724 /* avoid passing old settings and confusing term size */
610 unsetenv ("LINES"); 725 unsetenv ("LINES");
611 unsetenv ("COLUMNS"); 726 unsetenv ("COLUMNS");
612 unsetenv ("TERMCAP"); /* terminfo should be okay */ 727 unsetenv ("TERMCAP"); /* terminfo should be okay */
613#endif /* HAVE_UNSETENV */ 728#endif /* HAVE_UNSETENV */
614} 729}
615 730
616/*----------------------------------------------------------------------*/ 731/*----------------------------------------------------------------------*/
617/* 732/*
618 * This is more or less stolen straight from XFree86 xterm. 733 * This is more or less stolen straight from XFree86 xterm.
… …
639 754
640 this->locale = "C"; 755 this->locale = "C";
641 } 756 }
642 757
643 758
644 this->locale = rxvt_strdup (this->locale); 759 this->locale = strdup (this->locale);
645 SET_LOCALE (this->locale); 760 SET_LOCALE (this->locale);
646 mbstate.reset (); 761 mbstate.reset ();
647#endif 762#endif
648 763
649#if HAVE_NL_LANGINFO 764#if HAVE_NL_LANGINFO
… …
729 int i; 844 int i;
730 845
731#ifdef OFF_FOCUS_FADING 846#ifdef OFF_FOCUS_FADING
732 pix_colors = pix_colors_focused; 847 pix_colors = pix_colors_focused;
733#endif 848#endif
734 849
735 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 850 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
736 { 851 {
737 const char *name = rs[Rs_color + i]; 852 const char *name = rs[Rs_color + i];
738 853
739 if (!name) 854 if (!name)
… …
817 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 932 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
818 cscroll.a) 933 cscroll.a)
819 )) 934 ))
820 alias_color (Color_topShadow, Color_White); 935 alias_color (Color_topShadow, Color_White);
821 } 936 }
822#endif /* KEEP_SCROLLCOLOR */ 937#endif /* KEEP_SCROLLCOLOR */
823 938
824#ifdef OFF_FOCUS_FADING 939#ifdef OFF_FOCUS_FADING
825 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 940 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
826 update_fade_color (i); 941 update_fade_color (i);
827#endif 942#endif
… …
835 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 950 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
836 { 951 {
837 int i = atoi (rs[Rs_color + idx]); 952 int i = atoi (rs[Rs_color + idx]);
838 953
839 if (i >= 8 && i <= 15) 954 if (i >= 8 && i <= 15)
840 { /* bright colors */ 955 /* bright colors */
841 i -= 8;
842 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 956 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
843 return; 957 else if (i >= 0 && i <= 7)
844 } 958 /* normal colors */
845
846 if (i >= 0 && i <= 7) /* normal colors */
847 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 959 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
848 } 960 }
849} 961}
850 962
851/*----------------------------------------------------------------------*/ 963/*----------------------------------------------------------------------*/
… …
1067 termwin_ev.start (display, top); 1179 termwin_ev.start (display, top);
1068 1180
1069 /* vt cursor: Black-on-White is standard, but this is more popular */ 1181 /* vt cursor: Black-on-White is standard, but this is more popular */
1070 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1182 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1071 1183
1072#ifdef HAVE_SCROLLBARS
1073 /* cursor scrollBar: Black-on-White */
1074 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1075#endif
1076
1077 /* the vt window */ 1184 /* the vt window */
1078 vt = XCreateSimpleWindow (dpy, top, 1185 vt = XCreateSimpleWindow (dpy, top,
1079 window_vt_x, window_vt_y, 1186 window_vt_x, window_vt_y,
1080 width, height, 1187 width, height,
1081 0, 1188 0,
… …
1105 GCForeground | GCBackground | GCGraphicsExposures, 1212 GCForeground | GCBackground | GCGraphicsExposures,
1106 &gcvalue); 1213 &gcvalue);
1107 1214
1108 drawable = new rxvt_drawable (this, vt); 1215 drawable = new rxvt_drawable (this, vt);
1109 1216
1110#ifdef RXVT_SCROLLBAR
1111 gcvalue.foreground = pix_colors[Color_topShadow];
1112 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1113 gcvalue.foreground = pix_colors[Color_bottomShadow];
1114 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1115 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1116 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1117#endif
1118
1119#ifdef OFF_FOCUS_FADING 1217#ifdef OFF_FOCUS_FADING
1120 // initially we are in unfocused state 1218 // initially we are in unfocused state
1121 if (rs[Rs_fade]) 1219 if (rs[Rs_fade])
1122 pix_colors = pix_colors_unfocused; 1220 pix_colors = pix_colors_unfocused;
1123#endif 1221#endif
… …
1128 1226
1129/* ------------------------------------------------------------------------- * 1227/* ------------------------------------------------------------------------- *
1130 * GET TTY CURRENT STATE * 1228 * GET TTY CURRENT STATE *
1131 * ------------------------------------------------------------------------- */ 1229 * ------------------------------------------------------------------------- */
1132void 1230void
1133rxvt_get_ttymode (ttymode_t *tio, int erase) 1231rxvt_get_ttymode (struct termios *tio, int erase)
1134{ 1232{
1135 /* 1233 /*
1136 * standard System V termios interface 1234 * standard System V termios interface
1137 */ 1235 */
1138 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1236 if (tcgetattr (STDIN_FILENO, tio) < 0)
1139 { 1237 {
1140 // return error - use system defaults, 1238 // return error - use system defaults,
1141 // where possible, and zero elsewhere 1239 // where possible, and zero elsewhere
1142 memset (tio, 0, sizeof (ttymode_t)); 1240 memset (tio, 0, sizeof (struct termios));
1143 1241
1144 tio->c_cc[VINTR] = CINTR; 1242 tio->c_cc[VINTR] = CINTR;
1145 tio->c_cc[VQUIT] = CQUIT; 1243 tio->c_cc[VQUIT] = CQUIT;
1146 tio->c_cc[VERASE] = CERASE; 1244 tio->c_cc[VERASE] = CERASE;
1147#ifdef VERASE2 1245#ifdef VERASE2
… …
1211 1309
1212 /* 1310 /*
1213 * Debugging 1311 * Debugging
1214 */ 1312 */
1215#ifdef DEBUG_TTYMODE 1313#ifdef DEBUG_TTYMODE
1216#ifdef HAVE_TERMIOS_H
1217 /* c_iflag bits */ 1314 /* c_iflag bits */
1218 fprintf (stderr, "Input flags\n"); 1315 fprintf (stderr, "Input flags\n");
1219 1316
1220 /* cpp token stringize doesn't work on all machines <sigh> */ 1317 /* cpp token stringize doesn't work on all machines <sigh> */
1221# define FOO(flag,name) \ 1318# define FOO(flag,name) \
… …
1284 FOO (VLNEXT, "VLNEXT"); 1381 FOO (VLNEXT, "VLNEXT");
1285# endif 1382# endif
1286 1383
1287 fprintf (stderr, "\n"); 1384 fprintf (stderr, "\n");
1288# undef FOO 1385# undef FOO
1289# endif /* HAVE_TERMIOS_H */ 1386#endif /* DEBUG_TTYMODE */
1290#endif /* DEBUG_TTYMODE */
1291} 1387}
1292 1388
1293/*----------------------------------------------------------------------*/ 1389/*----------------------------------------------------------------------*/
1294/* 1390/*
1295 * Run the command in a subprocess and return a file descriptor for the 1391 * Run the command in a subprocess and return a file descriptor for the
… …
1328 else 1424 else
1329#endif 1425#endif
1330 er = -1; 1426 er = -1;
1331 1427
1332 rxvt_get_ttymode (&tio, er); 1428 rxvt_get_ttymode (&tio, er);
1333 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1429 /* init terminal attributes */
1430 cfsetospeed (&tio, BAUDRATE);
1431 cfsetispeed (&tio, BAUDRATE);
1432 tcsetattr (pty->tty, TCSANOW, &tio);
1334 pty->set_utf8_mode (enc_utf8); 1433 pty->set_utf8_mode (enc_utf8);
1335 1434
1336 /* set initial window size */ 1435 /* set initial window size */
1337 tt_winch (); 1436 tt_winch ();
1338 1437
… …
1398rxvt_term::run_child (const char *const *argv) 1497rxvt_term::run_child (const char *const *argv)
1399{ 1498{
1400 char *login; 1499 char *login;
1401 1500
1402 if (option (Opt_console)) 1501 if (option (Opt_console))
1502 {
1403 { /* be virtual console, fail silently */ 1503 /* be virtual console, fail silently */
1404#ifdef TIOCCONS 1504#ifdef TIOCCONS
1405 unsigned int on = 1; 1505 unsigned int on = 1;
1406 1506
1407 ioctl (STDIN_FILENO, TIOCCONS, &on); 1507 ioctl (STDIN_FILENO, TIOCCONS, &on);
1408#elif defined (SRIOCSREDIR) 1508#elif defined (SRIOCSREDIR)
… …
1410 1510
1411 fd = open (CONSOLE, O_WRONLY, 0); 1511 fd = open (CONSOLE, O_WRONLY, 0);
1412 if (fd >= 0) 1512 if (fd >= 0)
1413 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1513 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1414 close (fd); 1514 close (fd);
1415#endif /* SRIOCSREDIR */ 1515#endif /* SRIOCSREDIR */
1416 } 1516 }
1417 1517
1418 /* reset signals and spin off the command interpreter */ 1518 /* reset signals and spin off the command interpreter */
1419 signal (SIGINT, SIG_DFL); 1519 signal (SIGINT, SIG_DFL);
1420 signal (SIGQUIT, SIG_DFL); 1520 signal (SIGQUIT, SIG_DFL);
… …
1427 */ 1527 */
1428#ifdef SIGTSTP 1528#ifdef SIGTSTP
1429 signal (SIGTSTP, SIG_IGN); 1529 signal (SIGTSTP, SIG_IGN);
1430 signal (SIGTTIN, SIG_IGN); 1530 signal (SIGTTIN, SIG_IGN);
1431 signal (SIGTTOU, SIG_IGN); 1531 signal (SIGTTOU, SIG_IGN);
1432#endif /* SIGTSTP */ 1532#endif /* SIGTSTP */
1433 1533
1434 // unblock signals (signals are blocked by iom.C 1534 // unblock signals (signals are blocked by iom.C
1435 sigset_t ss; 1535 sigset_t ss;
1436 sigemptyset (&ss); 1536 sigemptyset (&ss);
1437 sigprocmask (SIG_SETMASK, &ss, 0); 1537 sigprocmask (SIG_SETMASK, &ss, 0);

Diff Legend

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