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.112 by root, Sat Feb 19 01:07:58 2005 UTC vs.
Revision 1.209 by ayin, Sat Sep 8 20:54:50 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: init.C 2 * File: init.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
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>
… …
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 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
15 * 15 *
16 * 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
17 * 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
18 * the Free Software Foundation; either version 2 of the License, or 18 * the Free Software Foundation; either version 2 of the License, or
19 * (at your option) any later version. 19 * (at your option) any later version.
… …
34#include "../config.h" /* NECESSARY */ 34#include "../config.h" /* NECESSARY */
35#include "rxvt.h" /* NECESSARY */ 35#include "rxvt.h" /* NECESSARY */
36#include "rxvtutil.h" 36#include "rxvtutil.h"
37#include "init.h" 37#include "init.h"
38 38
39#include <limits>
40
39#include <csignal> 41#include <csignal>
40 42
41const char *const def_colorName[] = 43const char *const def_colorName[] =
42 { 44 {
43 COLOR_FOREGROUND, 45 COLOR_FOREGROUND,
44 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
45 /* low-intensity colors */ 47 /* low-intensity colors */
46 "Black", /* 0: black (#000000) */ 48 "rgb:00/00/00", // 0: black (Black)
47#ifndef NO_BRIGHTCOLOR 49 "rgb:cd/00/00", // 1: red (Red3)
48 "Red3", /* 1: red (#CD0000) */ 50 "rgb:00/cd/00", // 2: green (Green3)
49 "Green3", /* 2: green (#00CD00) */ 51 "rgb:cd/cd/00", // 3: yellow (Yellow3)
50 "Yellow3", /* 3: yellow (#CDCD00) */ 52 "rgb:00/00/cd", // 4: blue (Blue3)
51 "Blue3", /* 4: blue (#0000CD) */ 53 "rgb:cd/00/cd", // 5: magenta (Magenta3)
52 "Magenta3", /* 5: magenta (#CD00CD) */ 54 "rgb:00/cd/cd", // 6: cyan (Cyan3)
53 "Cyan3", /* 6: cyan (#00CDCD) */ 55# ifdef XTERM_COLORS
54# ifdef XTERM_COLORS 56 "rgb:e5/e5/e5", // 7: white (Grey90)
55 "Grey90", /* 7: white (#E5E5E5) */ 57# else
56# else 58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
57 "AntiqueWhite", /* 7: white (#FAEBD7) */
58# endif 59# endif
59 /* high-intensity colors */ 60 /* high-intensity colors */
60# ifdef XTERM_COLORS 61# ifdef XTERM_COLORS
61 "Grey30", /* 8: bright black (#4D4D4D) */ 62 "rgb:4d/4d/4d", // 8: bright black (Grey30)
62# else 63# else
63 "Grey25", /* 8: bright black (#404040) */ 64 "rgb:40/40/40", // 8: bright black (Grey25)
64# endif 65# endif
65#endif /* NO_BRIGHTCOLOR */ 66 "rgb:ff/00/00", // 1/9: bright red (Reed)
66 "Red", /* 1/9: bright red (#FF0000) */ 67 "rgb:00/ff/00", // 2/10: bright green (Green)
67 "Green", /* 2/10: bright green (#00FF00) */ 68 "rgb:ff/ff/00", // 3/11: bright yellow (Yellow)
68 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 69 "rgb:00/00/ff", // 4/12: bright blue (Blue)
69 "Blue", /* 4/12: bright blue (#0000FF) */ 70 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
70 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 71 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
71 "Cyan", /* 6/14: bright cyan (#00FFFF) */ 72 "rgb:ff/ff/ff", // 7/15: bright white (White)
72 "White", /* 7/15: bright white (#FFFFFF) */
73 73
74 // 88 xterm colours 74 // 88 xterm colours
75 "rgb:00/00/00", 75 "rgb:00/00/00",
76 "rgb:00/00/8b", 76 "rgb:00/00/8b",
77 "rgb:00/00/cd", 77 "rgb:00/00/cd",
… …
166#endif 166#endif
167#ifdef KEEP_SCROLLCOLOR 167#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 168 COLOR_SCROLLBAR,
169 COLOR_SCROLLTROUGH, 169 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 170#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 171#if ENABLE_TRANSPARENCY
172 NULL, 172 NULL,
173#endif 173#endif
174 }; 174#if OFF_FOCUS_FADING
175 175 "rgb:00/00/00",
176const char *const xa_names[] =
177 {
178 "TEXT",
179 "COMPOUND_TEXT",
180 "UTF8_STRING",
181 "MULTIPLE",
182 "TARGETS",
183 "TIMESTAMP",
184 "VT_SELECTION",
185 "INCR",
186 "WM_PROTOCOLS",
187 "WM_DELETE_WINDOW",
188 "CLIPBOARD",
189#if ENABLE_FRILLS
190 "_NET_WM_PID",
191 "_MOTIF_WM_HINTS",
192 "_NET_WM_NAME",
193 "_NET_WM_ICON_NAME",
194#endif
195#if USE_XIM
196 "WM_LOCALE_NAME",
197#endif
198#ifdef TRANSPARENT
199 "_XROOTPMAP_ID",
200 "ESETROOT_PMAP_ID",
201#endif
202#ifdef OFFIX_DND
203 "DndProtocol",
204 "DndSelection",
205#endif
206#if ENABLE_XEMBED
207 "_XEMBED",
208#endif 176#endif
209 }; 177 };
210 178
211bool 179bool
212rxvt_term::init_vars () 180rxvt_term::init_vars ()
213{ 181{
214 sw_term.start (SIGTERM); 182 pix_colors = //
215 sw_int.start (SIGINT);
216
217 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
218#ifdef OFF_FOCUS_FADING 184#ifdef OFF_FOCUS_FADING
219 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
220#endif 186#endif
221 pix_colors = pix_colors_focused;
222 187
223 if (pix_colors == NULL)
224 return false;
225
226#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
227 TermWin.pixmap = None;
228#endif
229 188
230 MEvent.time = CurrentTime; 189 MEvent.time = CurrentTime;
231 MEvent.button = AnyButton; 190 MEvent.button = AnyButton;
232 options = DEFAULT_OPTIONS;
233 want_refresh = 1; 191 want_refresh = 1;
234 priv_modes = SavedModes = PrivMode_Default; 192 priv_modes = SavedModes = PrivMode_Default;
235 TermWin.focus = 0;
236 TermWin.ncol = 80; 193 ncol = 80;
237 TermWin.nrow = 24; 194 nrow = 24;
238 TermWin.int_bwidth = INTERNALBORDERWIDTH; 195 int_bwidth = INTERNALBORDERWIDTH;
239 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 196 ext_bwidth = EXTERNALBORDERWIDTH;
240 TermWin.lineSpace = LINESPACE; 197 lineSpace = LINESPACE;
241 TermWin.saveLines = SAVELINES; 198 saveLines = SAVELINES;
242 numpix_colors = TOTAL_COLORS; 199 numpix_colors = TOTAL_COLORS;
243 200
244 refresh_limit = 1;
245 refresh_type = SLOW_REFRESH; 201 refresh_type = SLOW_REFRESH;
246 prev_nrow = prev_ncol = 0;
247 202
248 oldcursor.row = oldcursor.col = -1; 203 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; */
249#ifdef XPM_BACKGROUND 209#ifdef XPM_BACKGROUND
250 /* bgPixmap.w = bgPixmap.h = 0; */
251 bgPixmap.x = bgPixmap.y = 50; 210 bgPixmap.h_scale = bgPixmap.v_scale = 0;
211 bgPixmap.h_align = bgPixmap.v_align = 0;
212#endif
213 bgPixmap.flags = 0;
252 bgPixmap.pixmap = None; 214 bgPixmap.pixmap = None;
253#endif 215#endif
254
255 last_bot = last_state = -1; 216 last_bot = last_state = -1;
256 217
257#ifdef MENUBAR 218 set_option (Opt_scrollBar);
258 menu_readonly = 1; 219 set_option (Opt_scrollTtyOutput);
259# if ! (MENUBAR_MAX > 1) 220 set_option (Opt_jumpScroll);
260 CurrentBar = &BarList; 221 set_option (Opt_skipScroll);
261# endif /* (MENUBAR_MAX > 1) */ 222 set_option (Opt_secondaryScreen);
262#endif 223 set_option (Opt_secondaryScroll);
224 set_option (Opt_pastableTabs);
225 set_option (Opt_intensityStyles);
226 set_option (Opt_iso14755_52);
263 227
264 return true; 228 return true;
265} 229}
266 230
267void 231void
… …
305 int i, r_argc; 269 int i, r_argc;
306 char *val; 270 char *val;
307 const char **cmd_argv, **r_argv; 271 const char **cmd_argv, **r_argv;
308 272
309 /* 273 /*
310 * Look for -exec option. Find => split and make cmd_argv[] of command args 274 * Look for -e option. Find => split and make cmd_argv[] of command args
311 */ 275 */
312 for (r_argc = 0; r_argc < argc; r_argc++) 276 for (r_argc = 0; r_argc < argc; r_argc++)
313 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 277 if (!strcmp (argv[r_argc], "-e"))
314 break; 278 break;
315 279
316 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 280 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
317 281
318 for (i = 0; i < r_argc; i++) 282 for (i = 0; i < r_argc; i++)
… …
335 rs[Rs_name] = rxvt_r_basename (argv[0]); 299 rs[Rs_name] = rxvt_r_basename (argv[0]);
336 300
337 /* 301 /*
338 * Open display, get options/resources and create the window 302 * Open display, get options/resources and create the window
339 */ 303 */
304
340 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 305 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
341 rs[Rs_display_name] = ":0"; 306 rs[Rs_display_name] = ":0";
342 307
343 get_options (r_argc, r_argv); 308 get_options (r_argc, r_argv);
344 309
345#ifdef LOCAL_X_IS_UNIX
346 if (rs[Rs_display_name][0] == ':')
347 {
348 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
349 strcpy (val, "unix");
350 strcat (val, rs[Rs_display_name]);
351 display = displays.get (val);
352 free (val);
353 }
354#endif
355
356 if (!display
357 && ! (display = displays.get (rs[Rs_display_name]))) 310 if (!(display = displays.get (rs[Rs_display_name])))
358 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 311 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
359 312
313 // using a local pointer decreases code size a lot
314 xa = display->xa;
315
316 set (display);
360 extract_resources (); 317 extract_resources ();
318
319#if XFT
320 if (rs[Rs_depth])
321 select_visual (strtol (rs[Rs_depth], 0, 0));
322#endif
323
324#ifdef HAVE_AFTERIMAGE
325 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
326#endif
361 free (r_argv); 327 free (r_argv);
328
329 for (int i = NUM_RESOURCES; i--; )
330 if (rs [i] == resval_undef)
331 rs [i] = 0;
332
333#if ENABLE_PERL
334 if (!rs[Rs_perl_ext_1])
335 rs[Rs_perl_ext_1] = "default";
336
337 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
338 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
339 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
340 {
341 rxvt_perl.init (this);
342 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
343 }
344#endif
362 345
363 /* 346 /*
364 * set any defaults not already set 347 * set any defaults not already set
365 */ 348 */
366 if (cmd_argv && cmd_argv[0]) 349 if (cmd_argv && cmd_argv[0])
… …
377 if (!rs[Rs_iconName]) 360 if (!rs[Rs_iconName])
378 rs[Rs_iconName] = rs[Rs_name]; 361 rs[Rs_iconName] = rs[Rs_name];
379 } 362 }
380 363
381 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 364 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
382 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 365 saveLines = min (i, MAX_SAVELINES);
383 366
384#if ENABLE_FRILLS 367#if ENABLE_FRILLS
385 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 368 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
386 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 369 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
370
387 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 371 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
388 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 372 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
373
389 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 374 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
390 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 375 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
391#endif 376#endif
392 377
393#ifdef POINTER_BLANK 378#ifdef POINTER_BLANK
394 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 379 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
395 pointerBlankDelay = i; 380 pointerBlankDelay = i;
396 else 381 else
397 pointerBlankDelay = 2; 382 pointerBlankDelay = 2;
398#endif 383#endif
399 384
400 /* no point having a scrollbar without having any scrollback! */ 385 /* no point having a scrollbar without having any scrollback! */
401 if (!TermWin.saveLines) 386 if (!saveLines)
402 options &= ~Opt_scrollBar; 387 set_option (Opt_scrollBar, 0);
403 388
404#ifdef PRINTPIPE 389#ifdef PRINTPIPE
405 if (!rs[Rs_print_pipe]) 390 if (!rs[Rs_print_pipe])
406 rs[Rs_print_pipe] = PRINTPIPE; 391 rs[Rs_print_pipe] = PRINTPIPE;
407#endif 392#endif
… …
417 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 402 key_backspace = "DEC"; /* can toggle between \010 or \177 */
418# endif 403# endif
419 else 404 else
420 { 405 {
421 val = strdup (rs[Rs_backspace_key]); 406 val = strdup (rs[Rs_backspace_key]);
422 rxvt_Str_trim (val);
423 rxvt_Str_escaped (val);
424 key_backspace = val; 407 key_backspace = val;
425 } 408 }
426#endif 409#endif
427 410
428#ifndef NO_DELETE_KEY 411#ifndef NO_DELETE_KEY
… …
433 key_delete = "\033[3~"; 416 key_delete = "\033[3~";
434# endif 417# endif
435 else 418 else
436 { 419 {
437 val = strdup (rs[Rs_delete_key]); 420 val = strdup (rs[Rs_delete_key]);
438 rxvt_Str_trim (val);
439 rxvt_Str_escaped (val);
440 key_delete = val; 421 key_delete = val;
441 } 422 }
442#endif 423#endif
443 if (rs[Rs_answerbackstring])
444 {
445 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
446 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
447 }
448 424
449#ifdef HAVE_SCROLLBARS 425#ifdef HAVE_SCROLLBARS
450 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 426 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
451#endif 427#endif
452 428
453#ifdef XTERM_REVERSE_VIDEO 429#ifdef XTERM_REVERSE_VIDEO
454 /* this is how xterm implements reverseVideo */ 430 /* this is how xterm implements reverseVideo */
455 if (options & Opt_reverseVideo) 431 if (option (Opt_reverseVideo))
456 { 432 {
457 if (!rs[Rs_color + Color_fg]) 433 if (!rs[Rs_color + Color_fg])
458 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 434 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
435
459 if (!rs[Rs_color + Color_bg]) 436 if (!rs[Rs_color + Color_bg])
460 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 437 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
461 } 438 }
462#endif 439#endif
463 440
… …
465 if (!rs[Rs_color + i]) 442 if (!rs[Rs_color + i])
466 rs[Rs_color + i] = def_colorName[i]; 443 rs[Rs_color + i] = def_colorName[i];
467 444
468#ifndef XTERM_REVERSE_VIDEO 445#ifndef XTERM_REVERSE_VIDEO
469 /* this is how we implement reverseVideo */ 446 /* this is how we implement reverseVideo */
470 if (options & Opt_reverseVideo) 447 if (option (Opt_reverseVideo))
471 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 448 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
472#endif 449#endif
473 450
474 /* convenient aliases for setting fg/bg to colors */ 451 /* convenient aliases for setting fg/bg to colors */
475 color_aliases (Color_fg); 452 color_aliases (Color_fg);
476 color_aliases (Color_bg); 453 color_aliases (Color_bg);
… …
496/*----------------------------------------------------------------------*/ 473/*----------------------------------------------------------------------*/
497void 474void
498rxvt_term::init_env () 475rxvt_term::init_env ()
499{ 476{
500 int i; 477 int i;
501 unsigned int u;
502 char *val; 478 char *val;
503 479
504#ifdef DISPLAY_IS_IP 480#ifdef DISPLAY_IS_IP
505 /* Fixup display_name for export over pty to any interested terminal 481 /* Fixup display_name for export over pty to any interested terminal
506 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 482 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
515 val = rxvt_network_display (rs[Rs_display_name]); 491 val = rxvt_network_display (rs[Rs_display_name]);
516 rs[Rs_display_name] = (const char *)val; 492 rs[Rs_display_name] = (const char *)val;
517 493
518 if (val == NULL) 494 if (val == NULL)
519#endif /* DISPLAY_IS_IP */ 495#endif /* DISPLAY_IS_IP */
520 val = XDisplayString (display->display); 496 val = XDisplayString (dpy);
521 497
522 if (rs[Rs_display_name] == NULL) 498 if (rs[Rs_display_name] == NULL)
523 rs[Rs_display_name] = val; /* use broken `:0' value */ 499 rs[Rs_display_name] = val; /* use broken `:0' value */
524 500
525 i = strlen (val); 501 i = strlen (val);
526 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 502 env_display = (char *)rxvt_malloc (i + 9);
527 503
528 sprintf (env_display, "DISPLAY=%s", val); 504 sprintf (env_display, "DISPLAY=%s", val);
529 505
530 /* avoiding the math library: 506 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
531 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */
532 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++)
533 ;
534 MAX_IT (i, 1);
535 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
536
537 sprintf (env_windowid, "WINDOWID=%u",
538 (unsigned int)TermWin.parent[0]);
539 507
540 /* add entries to the environment: 508 /* add entries to the environment:
541 * @ DISPLAY: in case we started with -display 509 * @ DISPLAY: in case we started with -display
542 * @ WINDOWID: X window id number of the window 510 * @ WINDOWID: X window id number of the window
543 * @ COLORTERM: terminal sub-name and also indicates its color 511 * @ COLORTERM: terminal sub-name and also indicates its color
… …
545 * @ TERMINFO: path to terminfo directory 513 * @ TERMINFO: path to terminfo directory
546 * @ COLORFGBG: fg;bg color codes 514 * @ COLORFGBG: fg;bg color codes
547 */ 515 */
548 putenv (env_display); 516 putenv (env_display);
549 putenv (env_windowid); 517 putenv (env_windowid);
518
550 if (env_colorfgbg) 519 if (env_colorfgbg)
551 putenv (env_colorfgbg); 520 putenv (env_colorfgbg);
552 521
553#ifdef RXVT_TERMINFO 522#ifdef RXVT_TERMINFO
554 putenv ("TERMINFO=" RXVT_TERMINFO); 523 putenv ("TERMINFO=" RXVT_TERMINFO);
555#endif 524#endif
556 525
557 if (display->depth <= 2) 526 if (depth <= 2)
558 putenv ("COLORTERM=" COLORTERMENV "-mono"); 527 putenv ("COLORTERM=" COLORTERMENV "-mono");
559 else 528 else
560 putenv ("COLORTERM=" COLORTERMENVFULL); 529 putenv ("COLORTERM=" COLORTERMENVFULL);
561 530
562 if (rs[Rs_term_name] != NULL) 531 if (rs[Rs_term_name] != NULL)
563 { 532 {
564 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 533 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
565 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 534 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
566 putenv (env_term); 535 putenv (env_term);
567 } 536 }
568 else 537 else
569 putenv ("TERM=" TERMENV); 538 putenv ("TERM=" TERMENV);
… …
582 * This should support all European type languages. 551 * This should support all European type languages.
583 */ 552 */
584void 553void
585rxvt_term::set_locale (const char *locale) 554rxvt_term::set_locale (const char *locale)
586{ 555{
556 set_environ (envv);
557
587#if HAVE_XSETLOCALE || HAVE_SETLOCALE 558#if HAVE_XSETLOCALE || HAVE_SETLOCALE
588 free (this->locale); 559 free (this->locale);
589 this->locale = setlocale (LC_CTYPE, locale); 560 this->locale = setlocale (LC_CTYPE, locale);
590 561
591 if (!this->locale) 562 if (!this->locale)
592 { 563 {
593 if (*locale) 564 if (*locale)
594 { 565 {
595 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale); 566 rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
596 setlocale (LC_CTYPE, ""); 567 setlocale (LC_CTYPE, "C");
597 } 568 }
598 else 569 else
599 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); 570 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
600 571
601 this->locale = ""; 572 this->locale = "C";
602 } 573 }
603 574
604 575
605 this->locale = rxvt_strdup (this->locale); 576 this->locale = rxvt_strdup (this->locale);
606 SET_LOCALE (this->locale); 577 SET_LOCALE (this->locale);
… …
621} 592}
622 593
623void 594void
624rxvt_term::init_xlocale () 595rxvt_term::init_xlocale ()
625{ 596{
597 set_environ (envv);
598
626#ifdef USE_XIM 599#ifdef USE_XIM
627 if (!locale) 600 if (!locale)
628 rxvt_warn ("setting locale failed, working without locale support.\n"); 601 rxvt_warn ("setting locale failed, working without locale support.\n");
629 else 602 else
630 { 603 {
… …
652 * Initialize the command connection. 625 * Initialize the command connection.
653 * This should be called after the X server connection is established. 626 * This should be called after the X server connection is established.
654 */ 627 */
655 628
656#ifdef META8_OPTION 629#ifdef META8_OPTION
657 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 630 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
658#endif 631#endif
659 632
660 get_ourmods (); 633 get_ourmods ();
661 634
662 if (!(options & Opt_scrollTtyOutput)) 635 if (!option (Opt_scrollTtyOutput))
663 priv_modes |= PrivMode_TtyOutputInh; 636 priv_modes |= PrivMode_TtyOutputInh;
664 if (options & Opt_scrollTtyKeypress) 637 if (option (Opt_scrollTtyKeypress))
665 priv_modes |= PrivMode_Keypress; 638 priv_modes |= PrivMode_Keypress;
666 if (!(options & Opt_jumpScroll)) 639 if (!option (Opt_jumpScroll))
667 priv_modes |= PrivMode_smoothScroll; 640 priv_modes |= PrivMode_smoothScroll;
668 641
669#ifndef NO_BACKSPACE_KEY 642#ifndef NO_BACKSPACE_KEY
670 if (strcmp (key_backspace, "DEC") == 0) 643 if (strcmp (key_backspace, "DEC") == 0)
671 priv_modes |= PrivMode_HaveBackSpace; 644 priv_modes |= PrivMode_HaveBackSpace;
672#endif 645#endif
673 646
674 /* add value for scrollBar */ 647 /* add value for scrollBar */
675 if (scrollbar_visible ()) 648 if (scrollBar.state)
676 { 649 {
677 priv_modes |= PrivMode_scrollBar; 650 priv_modes |= PrivMode_scrollBar;
678 SavedModes |= PrivMode_scrollBar; 651 SavedModes |= PrivMode_scrollBar;
679 } 652 }
680
681 if (menubar_visible ())
682 {
683 priv_modes |= PrivMode_menuBar;
684 SavedModes |= PrivMode_menuBar;
685 }
686
687#ifdef CURSOR_BLINK
688 if (options & Opt_cursorBlink)
689 (void)gettimeofday (&lastcursorchange, NULL);
690#endif
691 653
692 run_command (argv); 654 run_command (argv);
693} 655}
694 656
695/*----------------------------------------------------------------------*/ 657/*----------------------------------------------------------------------*/
… …
700 662
701#ifdef OFF_FOCUS_FADING 663#ifdef OFF_FOCUS_FADING
702 pix_colors = pix_colors_focused; 664 pix_colors = pix_colors_focused;
703#endif 665#endif
704 666
705 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 667 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
706 { 668 {
669 const char *name = rs[Rs_color + i];
670
671 if (!name)
672 continue;
673
707 rxvt_color xcol; 674 rxvt_color xcol;
708 675
709 if (!rs[Rs_color + i]) 676 if (!set_color (xcol, name))
710 continue;
711
712 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
713 { 677 {
714#ifndef XTERM_REVERSE_VIDEO 678#ifndef XTERM_REVERSE_VIDEO
715 if (i < 2 && (options & Opt_reverseVideo)) 679 if (i < 2 && option (Opt_reverseVideo))
716 rs[Rs_color + i] = def_colorName[!i]; 680 name = def_colorName [1 - i];
717 else 681 else
718#endif 682#endif
719 rs[Rs_color + i] = def_colorName[i]; 683 name = def_colorName [i];
720 684
721 if (!rs[Rs_color + i]) 685 if (!name)
722 continue; 686 continue;
723 687
724 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 688 if (!set_color (xcol, name))
725 { 689 {
726 switch (i) 690 switch (i)
727 { 691 {
728 case Color_fg: 692 case Color_fg:
729 case Color_bg: 693 case Color_bg:
730 /* fatal: need bg/fg color */
731 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 694 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
732 /* NOTREACHED */ 695 name = "";
733 break; 696 break;
734#ifndef NO_CURSORCOLOR 697#ifndef NO_CURSORCOLOR
735 case Color_cursor2: 698 case Color_cursor2:
736 xcol = pix_colors[Color_fg]; 699#endif
737 break;
738#endif /* ! NO_CURSORCOLOR */
739 case Color_pointer_fg: 700 case Color_pointer_fg:
740 xcol = pix_colors[Color_fg]; 701 name = rs[Rs_color + Color_fg];
702 xcol.set (this, name);
741 break; 703 break;
742 default: 704 default:
743 xcol = pix_colors[Color_bg]; /* None */ 705 name = rs[Rs_color + Color_bg];
706 xcol.set (this, name);
744 break; 707 break;
745 } 708 }
746 } 709 }
747 } 710 }
748 711
749 pix_colors[i] = xcol; 712 pix_colors[i] = xcol;
750#ifdef OFF_FOCUS_FADING 713 rs[Rs_color + i] = name;
751 if (rs[Rs_fade])
752 pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade]));
753#endif
754 SET_PIXCOLOR (i);
755 }
756
757 if (display->depth <= 2)
758 { 714 }
715
716 if (depth <= 2)
717 {
759 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 718 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
760 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 719 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
761 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 720 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
762 } 721 }
763 722
764 /* 723 /*
765 * get scrollBar/menuBar shadow colors 724 * get scrollBar shadow colors
766 * 725 *
767 * The calculations of topShadow/bottomShadow values are adapted 726 * The calculations of topShadow/bottomShadow values are adapted
768 * from the fvwm window manager. 727 * from the fvwm window manager.
769 */ 728 */
770#ifdef KEEP_SCROLLCOLOR 729#ifdef KEEP_SCROLLCOLOR
771
772 if (display->depth <= 2) 730 if (depth <= 2)
731 {
773 { /* Monochrome */ 732 /* Monochrome */
774 pix_colors[Color_scroll] = pix_colors[Color_fg]; 733 alias_color (Color_scroll, Color_fg);
775 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 734 alias_color (Color_topShadow, Color_bg);
776 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 735 alias_color (Color_bottomShadow, Color_bg);
777 } 736 }
778 else 737 else
779 { 738 {
780 rxvt_color xcol[2]; 739 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
781 /* xcol[0] == white
782 * xcol[1] == top shadow
783 * xcol[2] == bot shadow */
784 740
785 xcol[1] = pix_colors[Color_scroll]; 741 rgba cscroll;
786 xcol[0].set (display, 65535, 65535, 65535); 742 pix_colors [Color_scroll].get (cscroll);
787
788 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
789
790 xcol[0].get (display, pr0, pg0, pb0);
791 xcol[1].get (display, pr1, pg1, pb1);
792
793 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
794 743
795 /* topShadowColor */ 744 /* topShadowColor */
796 if (!xcol[1].set (display, 745 if (!pix_colors[Color_topShadow].set (this,
797 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 746 rgba (
798 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 747 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
799 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 748 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
800 xcol[1] = pix_colors[Color_White]; 749 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
801 750 cscroll.a)
802 pix_colors[Color_topShadow] = xcol[1]; 751 ))
752 alias_color (Color_topShadow, Color_White);
803 } 753 }
804#endif /* KEEP_SCROLLCOLOR */ 754#endif /* KEEP_SCROLLCOLOR */
755
756#ifdef OFF_FOCUS_FADING
757 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
758 update_fade_color (i);
759#endif
805} 760}
806 761
807/*----------------------------------------------------------------------*/ 762/*----------------------------------------------------------------------*/
808/* color aliases, fg/bg bright-bold */ 763/* color aliases, fg/bg bright-bold */
809void 764void
… …
814 int i = atoi (rs[Rs_color + idx]); 769 int i = atoi (rs[Rs_color + idx]);
815 770
816 if (i >= 8 && i <= 15) 771 if (i >= 8 && i <= 15)
817 { /* bright colors */ 772 { /* bright colors */
818 i -= 8; 773 i -= 8;
819#ifndef NO_BRIGHTCOLOR
820 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 774 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
821 return; 775 return;
822#endif
823 } 776 }
824 777
825 if (i >= 0 && i <= 7) /* normal colors */ 778 if (i >= 0 && i <= 7) /* normal colors */
826 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 779 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
827 } 780 }
… …
850 803
851 if (rsmod 804 if (rsmod
852 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 805 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
853 requestedmeta = rsmod[3] - '0'; 806 requestedmeta = rsmod[3] - '0';
854 807
855 map = XGetModifierMapping (display->display); 808 map = XGetModifierMapping (dpy);
856 kc = map->modifiermap; 809 kc = map->modifiermap;
857 810
858 for (i = 1; i < 6; i++) 811 for (i = 1; i < 6; i++)
859 { 812 {
860 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 813 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
862 for (j = map->max_keypermod; j--; k++) 815 for (j = map->max_keypermod; j--; k++)
863 { 816 {
864 if (kc[k] == 0) 817 if (kc[k] == 0)
865 break; 818 break;
866 819
867 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 820 switch (XKeycodeToKeysym (dpy, kc[k], 0))
868 { 821 {
869 case XK_Num_Lock: 822 case XK_Num_Lock:
870 ModNumLockMask = modmasks[i - 1]; 823 ModNumLockMask = modmasks[i - 1];
871 continue; 824 continue;
872 825
… …
922rxvt_term::create_windows (int argc, const char *const *argv) 875rxvt_term::create_windows (int argc, const char *const *argv)
923{ 876{
924 XClassHint classHint; 877 XClassHint classHint;
925 XWMHints wmHint; 878 XWMHints wmHint;
926#if ENABLE_FRILLS 879#if ENABLE_FRILLS
927 Atom prop = None;
928 MWMHints mwmhints; 880 MWMHints mwmhints = { };
929#endif 881#endif
930 XGCValues gcvalue; 882 XGCValues gcvalue;
931 long vt_emask;
932 XSetWindowAttributes attributes; 883 XSetWindowAttributes attributes;
933 XWindowAttributes gattr;
934 Window top; 884 Window top, parent;
935 dDisp;
936 885
937#ifdef USING_W11LIB 886 dLocal (Display *, dpy);
938 /* enable W11 callbacks */
939 W11AddEventHandler (disp, rxvt_W11_process_x_event);
940#endif
941 887
942 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 888 /* grab colors before netscape does */
943 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 889 Get_Colours ();
944 890
945 if (options & Opt_transparent) 891 if (!set_fonts ())
946 { 892 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
947 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 893
948 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 894 parent = display->root;
949 } 895
896 attributes.override_redirect = !!option (Opt_override_redirect);
950 897
951#if ENABLE_FRILLS 898#if ENABLE_FRILLS
952 if (options & Opt_borderLess) 899 if (option (Opt_borderLess))
953 { 900 {
954 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 901 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
955
956 if (prop == None)
957 { 902 {
958 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 903 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
959#ifdef PREFER_24BIT
960 attributes.override_redirect = TRUE; 904 attributes.override_redirect = true;
961#endif
962 mwmhints.flags = 0;
963 } 905 }
964 else 906 else
965 { 907 {
966 mwmhints.flags = MWM_HINTS_DECORATIONS; 908 mwmhints.flags = MWM_HINTS_DECORATIONS;
967 mwmhints.decorations = 0;
968 } 909 }
969 } 910 }
970 else
971 {
972 mwmhints.flags = 0;
973 }
974#endif 911#endif
975
976 /* grab colors before netscape does */
977 Get_Colours ();
978
979 if (!set_fonts ())
980 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
981 912
982#if ENABLE_XEMBED 913#if ENABLE_XEMBED
983 if (rs[Rs_embed]) 914 if (rs[Rs_embed])
984 { 915 {
985 XWindowAttributes wattr; 916 XWindowAttributes wattr;
986 917
987 top = strtol (rs[Rs_embed], 0, 0); 918 parent = strtol (rs[Rs_embed], 0, 0);
988 919
989 if (!XGetWindowAttributes (disp, top, &wattr)) 920 if (!XGetWindowAttributes (dpy, parent, &wattr))
990 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 921 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
991 922
992 window_calc (wattr.width, wattr.height); 923 window_calc (wattr.width, wattr.height);
993
994#if 0
995 if (wattr.map_state == IsViewable)
996 {
997 TermWin.mapped = 1;
998 refresh_type = FAST_REFRESH;
999 XClearWindow (disp, top);
1000 // TODO: make XMapNotify-event-code a function and call it
1001 // TODO: how can I detetc visibility without unmpa/map?
1002 // TODO: focusin etc.
1003 }
1004#else
1005 // it'S easiets just to unmap/map to get all state correctly set-up
1006 XUnmapWindow (disp, top);
1007#endif
1008 }
1009 else
1010#endif
1011 { 924 }
925#endif
926
1012 window_calc (0, 0); 927 window_calc (0, 0);
1013 928
1014 /* sub-window placement & size in rxvt_resize_subwindows () */ 929 /* sub-window placement & size in rxvt_resize_subwindows () */
1015#ifdef PREFER_24BIT
1016 attributes.background_pixel = pix_colors_focused[Color_border]; 930 attributes.background_pixel = pix_colors_focused [Color_border];
1017 attributes.border_pixel = pix_colors_focused[Color_border]; 931 attributes.border_pixel = pix_colors_focused [Color_border];
1018 attributes.colormap = display->cmap; 932 attributes.colormap = cmap;
1019 top = XCreateWindow (disp, DefaultRootWindow (disp), 933
934 top = XCreateWindow (dpy, parent,
1020 szHint.x, szHint.y, 935 szHint.x, szHint.y,
1021 szHint.width, szHint.height, 936 szHint.width, szHint.height,
1022 TermWin.ext_bwidth, 937 ext_bwidth,
1023 display->depth, InputOutput, 938 depth, InputOutput, visual,
1024 display->visual,
1025 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 939 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1026#else 940 &attributes);
1027 top = XCreateSimpleWindow (disp, DefaultRootWindow (disp),
1028 szHint.x, szHint.y,
1029 szHint.width, szHint.height,
1030 TermWin.ext_bwidth,
1031 pix_colors_focused[Color_border],
1032 pix_colors_focused[Color_border]);
1033#endif
1034 }
1035 941
1036 TermWin.parent[0] = top; 942 this->parent[0] = top;
1037 943
1038 old_width = szHint.width; 944 old_width = szHint.width;
1039 old_height = szHint.height; 945 old_height = szHint.height;
1040 946
1041 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 947 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1042 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 948 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1043 949
1044 classHint.res_name = (char *)rs[Rs_name]; 950 classHint.res_name = (char *)rs[Rs_name];
1045 classHint.res_class = (char *)RESCLASS; 951 classHint.res_class = (char *)RESCLASS;
1046 952
1047 wmHint.flags = InputHint | StateHint | WindowGroupHint; 953 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1048 wmHint.input = True; 954 wmHint.input = True;
1049 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 955 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1050 wmHint.window_group = top; 956 wmHint.window_group = top;
1051 957
1052 XSetWMProperties (disp, top, NULL, NULL, 958 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1053 (char **)argv, argc, &szHint, &wmHint, &classHint); 959 &szHint, &wmHint, &classHint);
1054
1055 /* Enable delete window protocol */
1056 XSetWMProtocols (disp, top, &xa[XA_WM_DELETE_WINDOW], 1);
1057 960
1058#if ENABLE_FRILLS 961#if ENABLE_FRILLS
962 if (mwmhints.flags)
963 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
964 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
965#endif
966
967 Atom protocols[] = {
968 xa[XA_WM_DELETE_WINDOW],
969#if ENABLE_EWMH
970 xa[XA_NET_WM_PING],
971#endif
972 };
973
974 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
975
976#if ENABLE_FRILLS
977 if (rs[Rs_transient_for])
978 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
979#endif
980
981#if ENABLE_EWMH
1059 long pid = getpid (); 982 long pid = getpid ();
1060 983
1061 XChangeProperty (disp, top, 984 XChangeProperty (dpy, top,
1062 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 985 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1063 PropModeReplace, (unsigned char *)&pid, 1); 986 PropModeReplace, (unsigned char *)&pid, 1);
1064#endif
1065 987
988 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
989#endif
990
1066 XSelectInput (disp, top, 991 XSelectInput (dpy, top,
1067 KeyPressMask 992 KeyPressMask
1068#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 993#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1069 | KeyReleaseMask 994 | KeyReleaseMask
1070#endif 995#endif
1071 | FocusChangeMask | VisibilityChangeMask 996 | FocusChangeMask | VisibilityChangeMask
1072 | ExposureMask | StructureNotifyMask); 997 | ExposureMask | StructureNotifyMask);
1073 998
1074 termwin_ev.start (display, top); 999 termwin_ev.start (display, top);
1075 1000
1076#if ENABLE_FRILLS
1077 if (mwmhints.flags)
1078 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1079 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1080#endif
1081
1082 /* vt cursor: Black-on-White is standard, but this is more popular */ 1001 /* vt cursor: Black-on-White is standard, but this is more popular */
1083 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1002 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1084 1003
1085#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1004#ifdef HAVE_SCROLLBARS
1086 /* cursor (menuBar/scrollBar): Black-on-White */ 1005 /* cursor scrollBar: Black-on-White */
1087 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1006 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1088#endif 1007#endif
1089 1008
1090 /* the vt window */ 1009 /* the vt window */
1091 TermWin.vt = XCreateSimpleWindow (disp, top, 1010 vt = XCreateSimpleWindow (dpy, top,
1092 window_vt_x,
1093 window_vt_y, 1011 window_vt_x, window_vt_y,
1094 TermWin_TotalWidth (), 1012 width, height,
1095 TermWin_TotalHeight (),
1096 0, 1013 0,
1097 pix_colors_focused[Color_fg], 1014 pix_colors_focused[Color_fg],
1098 pix_colors_focused[Color_bg]); 1015 pix_colors_focused[Color_bg]);
1099#ifdef DEBUG_X
1100 XStoreName (disp, TermWin.vt, "vt window");
1101#endif
1102 1016
1103 attributes.bit_gravity = NorthWestGravity; 1017 attributes.bit_gravity = NorthWestGravity;
1104 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes); 1018 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1105 1019
1106 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1020 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1107 1021
1108 pointer_unblank ();
1109
1110#ifdef POINTER_BLANK
1111 if (options & Opt_pointerBlank) 1022 if (option (Opt_pointerBlank))
1112 vt_emask |= PointerMotionMask; 1023 vt_emask |= PointerMotionMask;
1113 else 1024 else
1114#endif
1115 vt_emask |= Button1MotionMask | Button3MotionMask; 1025 vt_emask |= Button1MotionMask | Button3MotionMask;
1116 1026
1117 XSelectInput (disp, TermWin.vt, vt_emask); 1027 vt_select_input ();
1028
1118 vt_ev.start (display, TermWin.vt); 1029 vt_ev.start (display, vt);
1119
1120#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1121 if (menuBar_height ())
1122 {
1123 menuBar.win = XCreateSimpleWindow (disp, top,
1124 window_vt_x, 0,
1125 TermWin_TotalWidth (),
1126 menuBar_TotalHeight (),
1127 0,
1128 pix_colors_focused[Color_fg],
1129 pix_colors_focused[Color_scroll]);
1130
1131#ifdef DEBUG_X
1132 XStoreName (disp, menuBar.win, "menubar");
1133#endif
1134
1135 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1136
1137 XDefineCursor (disp, menuBar.win,
1138 XCreateFontCursor (disp, XC_left_ptr));
1139
1140 XSelectInput (disp, menuBar.win,
1141 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1142 menubar_ev.start (display, menuBar.win);
1143 }
1144#endif
1145
1146#ifdef XPM_BACKGROUND
1147 if (rs[Rs_backgroundPixmap] != NULL
1148 && ! (options & Opt_transparent))
1149 {
1150 const char *p = rs[Rs_backgroundPixmap];
1151
1152 if ((p = strchr (p, ';')) != NULL)
1153 {
1154 p++;
1155 scale_pixmap (p);
1156 }
1157
1158 set_bgPixmap (rs[Rs_backgroundPixmap]);
1159 scr_touch (true);
1160 }
1161#endif
1162 1030
1163 /* graphics context for the vt window */ 1031 /* graphics context for the vt window */
1164 gcvalue.foreground = pix_colors[Color_fg]; 1032 gcvalue.foreground = pix_colors[Color_fg];
1165 gcvalue.background = pix_colors[Color_bg]; 1033 gcvalue.background = pix_colors[Color_bg];
1166 gcvalue.graphics_exposures = 1; 1034 gcvalue.graphics_exposures = 0;
1167 TermWin.gc = XCreateGC (disp, TermWin.vt, 1035
1036 gc = XCreateGC (dpy, vt,
1168 GCForeground | GCBackground | GCGraphicsExposures, 1037 GCForeground | GCBackground | GCGraphicsExposures,
1169 &gcvalue); 1038 &gcvalue);
1170 1039
1171 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1040 drawable = new rxvt_drawable (this, vt);
1172 1041
1173#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1042#ifdef RXVT_SCROLLBAR
1174 gcvalue.foreground = pix_colors[Color_topShadow]; 1043 gcvalue.foreground = pix_colors[Color_topShadow];
1175 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1044 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1176 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1045 gcvalue.foreground = pix_colors[Color_bottomShadow];
1177 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1046 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1178 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1047 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1179 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1048 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1180#endif 1049#endif
1181 1050
1182#ifdef OFF_FOCUS_FADING 1051#ifdef OFF_FOCUS_FADING
1183 // initially we are in unfocused state 1052 // initially we are in unfocused state
1184 if (rs[Rs_fade]) 1053 if (rs[Rs_fade])
1185 pix_colors = pix_colors_unfocused; 1054 pix_colors = pix_colors_unfocused;
1186#endif 1055#endif
1187 1056
1057 pointer_unblank ();
1188 scr_recolour (); 1058 scr_recolour ();
1189} 1059}
1190 1060
1191/* ------------------------------------------------------------------------- * 1061/* ------------------------------------------------------------------------- *
1192 * GET TTY CURRENT STATE * 1062 * GET TTY CURRENT STATE *
1193 * ------------------------------------------------------------------------- */ 1063 * ------------------------------------------------------------------------- */
1194void 1064void
1195rxvt_get_ttymode (ttymode_t *tio, int erase) 1065rxvt_get_ttymode (ttymode_t *tio, int erase)
1196{ 1066{
1197#ifdef HAVE_TERMIOS_H
1198 /* 1067 /*
1199 * standard System V termios interface 1068 * standard System V termios interface
1200 */ 1069 */
1201 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1070 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1202 { 1071 {
1203 /* return error - use system defaults */ 1072 // return error - use system defaults,
1073 // where possible, and zero elsewhere
1074 memset (tio, 0, sizeof (ttymode_t));
1075
1204 tio->c_cc[VINTR] = CINTR; 1076 tio->c_cc[VINTR] = CINTR;
1205 tio->c_cc[VQUIT] = CQUIT; 1077 tio->c_cc[VQUIT] = CQUIT;
1206 tio->c_cc[VERASE] = CERASE; 1078 tio->c_cc[VERASE] = CERASE;
1079#ifdef VERASE2
1080 tio->c_cc[VERASE2] = CERASE2;
1081#endif
1207 tio->c_cc[VKILL] = CKILL; 1082 tio->c_cc[VKILL] = CKILL;
1208 tio->c_cc[VSTART] = CSTART; 1083 tio->c_cc[VSTART] = CSTART;
1209 tio->c_cc[VSTOP] = CSTOP; 1084 tio->c_cc[VSTOP] = CSTOP;
1210 tio->c_cc[VSUSP] = CSUSP; 1085 tio->c_cc[VSUSP] = CSUSP;
1211# ifdef VDSUSP 1086# ifdef VDSUSP
1212
1213 tio->c_cc[VDSUSP] = CDSUSP; 1087 tio->c_cc[VDSUSP] = CDSUSP;
1214# endif 1088# endif
1215# ifdef VREPRINT 1089# ifdef VREPRINT
1216
1217 tio->c_cc[VREPRINT] = CRPRNT; 1090 tio->c_cc[VREPRINT] = CRPRNT;
1218# endif 1091# endif
1219# ifdef VDISCRD 1092# ifdef VDISCRD
1220
1221 tio->c_cc[VDISCRD] = CFLUSH; 1093 tio->c_cc[VDISCRD] = CFLUSH;
1222# endif 1094# endif
1223# ifdef VWERSE 1095# ifdef VWERSE
1224
1225 tio->c_cc[VWERSE] = CWERASE; 1096 tio->c_cc[VWERSE] = CWERASE;
1226# endif 1097# endif
1227# ifdef VLNEXT 1098# ifdef VLNEXT
1228
1229 tio->c_cc[VLNEXT] = CLNEXT; 1099 tio->c_cc[VLNEXT] = CLNEXT;
1230# endif 1100# endif
1231
1232 } 1101 }
1102
1233 tio->c_cc[VEOF] = CEOF; 1103 tio->c_cc[VEOF] = CEOF;
1234 tio->c_cc[VEOL] = VDISABLE; 1104 tio->c_cc[VEOL] = VDISABLE;
1235# ifdef VEOL2 1105# ifdef VEOL2
1236
1237 tio->c_cc[VEOL2] = VDISABLE; 1106 tio->c_cc[VEOL2] = VDISABLE;
1238# endif 1107# endif
1239# ifdef VSWTC 1108# ifdef VSWTC
1240
1241 tio->c_cc[VSWTC] = VDISABLE; 1109 tio->c_cc[VSWTC] = VDISABLE;
1242# endif 1110# endif
1243# ifdef VSWTCH 1111# ifdef VSWTCH
1244
1245 tio->c_cc[VSWTCH] = VDISABLE; 1112 tio->c_cc[VSWTCH] = VDISABLE;
1246# endif 1113# endif
1247# if VMIN != VEOF 1114# if VMIN != VEOF
1248
1249 tio->c_cc[VMIN] = 1; 1115 tio->c_cc[VMIN] = 1;
1250# endif 1116# endif
1251# if VTIME != VEOL 1117# if VTIME != VEOL
1252
1253 tio->c_cc[VTIME] = 0; 1118 tio->c_cc[VTIME] = 0;
1254# endif 1119# endif
1255 1120
1256 if (erase != -1) 1121 if (erase != -1)
1257 tio->c_cc[VERASE] = (char)erase; 1122 tio->c_cc[VERASE] = (char)erase;
… …
1273 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1138 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1274# if defined (ECHOCTL) && defined (ECHOKE) 1139# if defined (ECHOCTL) && defined (ECHOKE)
1275 | ECHOCTL | ECHOKE 1140 | ECHOCTL | ECHOKE
1276# endif 1141# endif
1277 | ECHOE | ECHOK); 1142 | ECHOE | ECHOK);
1278# else /* HAVE_TERMIOS_H */
1279
1280 /*
1281 * sgtty interface
1282 */
1283
1284 /* get parameters -- gtty */
1285 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1286 {
1287 tio->sg.sg_erase = CERASE; /* ^H */
1288 tio->sg.sg_kill = CKILL; /* ^U */
1289 }
1290 if (erase != -1)
1291 tio->sg.sg_erase = (char)erase;
1292
1293 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1294
1295 /* get special characters */
1296 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1297 {
1298 tio->tc.t_intrc = CINTR; /* ^C */
1299 tio->tc.t_quitc = CQUIT; /* ^\ */
1300 tio->tc.t_startc = CSTART; /* ^Q */
1301 tio->tc.t_stopc = CSTOP; /* ^S */
1302 tio->tc.t_eofc = CEOF; /* ^D */
1303 tio->tc.t_brkc = -1;
1304 }
1305 /* get local special chars */
1306 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1307 {
1308 tio->lc.t_suspc = CSUSP; /* ^Z */
1309 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1310 tio->lc.t_rprntc = CRPRNT; /* ^R */
1311 tio->lc.t_flushc = CFLUSH; /* ^O */
1312 tio->lc.t_werasc = CWERASE; /* ^W */
1313 tio->lc.t_lnextc = CLNEXT; /* ^V */
1314 }
1315 /* get line discipline */
1316 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1317# ifdef NTTYDISC
1318
1319 tio->line = NTTYDISC;
1320# endif /* NTTYDISC */
1321
1322 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1323#endif /* HAVE_TERMIOS_H */
1324 1143
1325 /* 1144 /*
1326 * Debugging 1145 * Debugging
1327 */ 1146 */
1328#ifdef DEBUG_TTYMODE 1147#ifdef DEBUG_TTYMODE
… …
1346 FOO (IGNCR, "IGNCR"); 1165 FOO (IGNCR, "IGNCR");
1347 FOO (ICRNL, "ICRNL"); 1166 FOO (ICRNL, "ICRNL");
1348 FOO (IXON, "IXON"); 1167 FOO (IXON, "IXON");
1349 FOO (IXOFF, "IXOFF"); 1168 FOO (IXOFF, "IXOFF");
1350# ifdef IUCLC 1169# ifdef IUCLC
1351
1352 FOO (IUCLC, "IUCLC"); 1170 FOO (IUCLC, "IUCLC");
1353# endif 1171# endif
1354# ifdef IXANY 1172# ifdef IXANY
1355
1356 FOO (IXANY, "IXANY"); 1173 FOO (IXANY, "IXANY");
1357# endif 1174# endif
1358# ifdef IMAXBEL 1175# ifdef IMAXBEL
1359
1360 FOO (IMAXBEL, "IMAXBEL"); 1176 FOO (IMAXBEL, "IMAXBEL");
1361# endif 1177# endif
1362 1178
1363 fprintf (stderr, "\n"); 1179 fprintf (stderr, "\n");
1364 1180
… …
1371 FOO (VERASE, "VERASE"); 1187 FOO (VERASE, "VERASE");
1372 FOO (VKILL, "VKILL"); 1188 FOO (VKILL, "VKILL");
1373 FOO (VEOF, "VEOF"); 1189 FOO (VEOF, "VEOF");
1374 FOO (VEOL, "VEOL"); 1190 FOO (VEOL, "VEOL");
1375# ifdef VEOL2 1191# ifdef VEOL2
1376
1377 FOO (VEOL2, "VEOL2"); 1192 FOO (VEOL2, "VEOL2");
1378# endif 1193# endif
1379# ifdef VSWTC 1194# ifdef VSWTC
1380
1381 FOO (VSWTC, "VSWTC"); 1195 FOO (VSWTC, "VSWTC");
1382# endif 1196# endif
1383# ifdef VSWTCH 1197# ifdef VSWTCH
1384
1385 FOO (VSWTCH, "VSWTCH"); 1198 FOO (VSWTCH, "VSWTCH");
1386# endif 1199# endif
1387
1388 FOO (VSTART, "VSTART"); 1200 FOO (VSTART, "VSTART");
1389 FOO (VSTOP, "VSTOP"); 1201 FOO (VSTOP, "VSTOP");
1390 FOO (VSUSP, "VSUSP"); 1202 FOO (VSUSP, "VSUSP");
1391# ifdef VDSUSP 1203# ifdef VDSUSP
1392
1393 FOO (VDSUSP, "VDSUSP"); 1204 FOO (VDSUSP, "VDSUSP");
1394# endif 1205# endif
1395# ifdef VREPRINT 1206# ifdef VREPRINT
1396
1397 FOO (VREPRINT, "VREPRINT"); 1207 FOO (VREPRINT, "VREPRINT");
1398# endif 1208# endif
1399# ifdef VDISCRD 1209# ifdef VDISCRD
1400
1401 FOO (VDISCRD, "VDISCRD"); 1210 FOO (VDISCRD, "VDISCRD");
1402# endif 1211# endif
1403# ifdef VWERSE 1212# ifdef VWERSE
1404
1405 FOO (VWERSE, "VWERSE"); 1213 FOO (VWERSE, "VWERSE");
1406# endif 1214# endif
1407# ifdef VLNEXT 1215# ifdef VLNEXT
1408
1409 FOO (VLNEXT, "VLNEXT"); 1216 FOO (VLNEXT, "VLNEXT");
1410# endif 1217# endif
1411 1218
1412 fprintf (stderr, "\n"); 1219 fprintf (stderr, "\n");
1413# undef FOO 1220# undef FOO
… …
1425rxvt_term::run_command (const char *const *argv) 1232rxvt_term::run_command (const char *const *argv)
1426{ 1233{
1427#if ENABLE_FRILLS 1234#if ENABLE_FRILLS
1428 if (rs[Rs_pty_fd]) 1235 if (rs[Rs_pty_fd])
1429 { 1236 {
1430 pty.pty = atoi (rs[Rs_pty_fd]); 1237 pty->pty = atoi (rs[Rs_pty_fd]);
1431 fcntl (pty.pty, F_SETFL, O_NONBLOCK); 1238
1239 if (pty->pty >= 0)
1240 {
1241 if (getfd_hook)
1242 pty->pty = (*getfd_hook) (pty->pty);
1243
1244 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1245 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1246 }
1432 } 1247 }
1433 else 1248 else
1434#endif 1249#endif
1435 if (!pty.get ()) 1250 if (!pty->get ())
1436 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1251 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1437
1438 pty.set_utf8_mode (enc_utf8);
1439
1440 /* set initial window size */
1441 tt_winch ();
1442 1252
1443 int er; 1253 int er;
1444 1254
1445#ifndef NO_BACKSPACE_KEY 1255#ifndef NO_BACKSPACE_KEY
1446 if (key_backspace[0] && !key_backspace[1]) 1256 if (key_backspace[0] && !key_backspace[1])
… …
1450 else 1260 else
1451#endif 1261#endif
1452 er = -1; 1262 er = -1;
1453 1263
1454 rxvt_get_ttymode (&tio, er); 1264 rxvt_get_ttymode (&tio, er);
1265 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1266 pty->set_utf8_mode (enc_utf8);
1267
1268 /* set initial window size */
1269 tt_winch ();
1455 1270
1456#if ENABLE_FRILLS 1271#if ENABLE_FRILLS
1457 if (rs[Rs_pty_fd]) 1272 if (rs[Rs_pty_fd])
1458 return; 1273 return;
1459#endif 1274#endif
1460 1275
1461 sw_chld.start (SIGCHLD);
1462
1463#ifndef __QNX__
1464 /* spin off the command interpreter */ 1276 /* spin off the command interpreter */
1465 switch (cmd_pid = fork ()) 1277 switch (cmd_pid = fork ())
1466 { 1278 {
1467 case -1: 1279 case -1:
1468 { 1280 {
… …
1470 rxvt_fatal ("can't fork, aborting.\n"); 1282 rxvt_fatal ("can't fork, aborting.\n");
1471 } 1283 }
1472 case 0: 1284 case 0:
1473 init_env (); 1285 init_env ();
1474 1286
1475 if (!pty.make_controlling_tty ()) 1287 if (!pty->make_controlling_tty ())
1476 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1288 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1477 else 1289 else
1478 { 1290 {
1479 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1291 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1480 dup2 (pty.tty, STDIN_FILENO); 1292 dup2 (pty->tty, STDIN_FILENO);
1481 dup2 (pty.tty, STDOUT_FILENO); 1293 dup2 (pty->tty, STDOUT_FILENO);
1482 dup2 (pty.tty, STDERR_FILENO); 1294 dup2 (pty->tty, STDERR_FILENO);
1483 1295
1484 // close all our file handles that we do no longer need 1296 // close all our file handles that we do no longer need
1485 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1297 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1486 { 1298 {
1487 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1299 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1488 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1300 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1489 } 1301 }
1490 1302
1491 run_child (argv); 1303 run_child (argv);
1492 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1304 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1493 } 1305 }
1494 1306
1495 _exit (EXIT_FAILURE); 1307 _exit (EXIT_FAILURE);
1496 1308
1497 default: 1309 default:
1498 { 1310 if (!option (Opt_utmpInhibit))
1499#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1311 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1500 int fdstdin;
1501 1312
1502 fdstdin = dup (STDIN_FILENO); 1313 pty->close_tty ();
1503 dup2 (pty.tty, STDIN_FILENO);
1504#endif
1505 1314
1506#ifdef UTMP_SUPPORT 1315 child_ev.start (cmd_pid);
1507 privileged_utmp (SAVE);
1508#endif
1509 1316
1510#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1317 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1511
1512 dup2 (fdstdin, STDIN_FILENO);
1513 close (fdstdin);
1514#endif
1515 }
1516
1517 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1518 break; 1318 break;
1519 } 1319 }
1520#else /* __QNX__ uses qnxspawn () */
1521 fchmod (pty.tty, 0622);
1522 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1523 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1524
1525 if (run_child (argv) == -1)
1526 exit (EXIT_FAILURE);
1527#endif
1528} 1320}
1529 1321
1530/* ------------------------------------------------------------------------- * 1322/* ------------------------------------------------------------------------- *
1531 * CHILD PROCESS OPERATIONS * 1323 * CHILD PROCESS OPERATIONS *
1532 * ------------------------------------------------------------------------- */ 1324 * ------------------------------------------------------------------------- */
… …
1537int 1329int
1538rxvt_term::run_child (const char *const *argv) 1330rxvt_term::run_child (const char *const *argv)
1539{ 1331{
1540 char *login; 1332 char *login;
1541 1333
1542 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1543
1544 if (options & Opt_console) 1334 if (option (Opt_console))
1545 { /* be virtual console, fail silently */ 1335 { /* be virtual console, fail silently */
1546#ifdef TIOCCONS 1336#ifdef TIOCCONS
1547 unsigned int on = 1; 1337 unsigned int on = 1;
1548 1338
1549 ioctl (STDIN_FILENO, TIOCCONS, &on); 1339 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1576 // unblock signals (signals are blocked by iom.C 1366 // unblock signals (signals are blocked by iom.C
1577 sigset_t ss; 1367 sigset_t ss;
1578 sigemptyset (&ss); 1368 sigemptyset (&ss);
1579 sigprocmask (SIG_SETMASK, &ss, 0); 1369 sigprocmask (SIG_SETMASK, &ss, 0);
1580 1370
1581#ifndef __QNX__
1582 /* command interpreter path */ 1371 /* command interpreter path */
1583 if (argv != NULL) 1372 if (argv != NULL)
1584 { 1373 {
1585# ifdef DEBUG_CMD 1374# ifdef DEBUG_CMD
1586 int i; 1375 int i;
… …
1592 execvp (argv[0], (char *const *)argv); 1381 execvp (argv[0], (char *const *)argv);
1593 /* no error message: STDERR is closed! */ 1382 /* no error message: STDERR is closed! */
1594 } 1383 }
1595 else 1384 else
1596 { 1385 {
1597 const char *argv0, *shell; 1386 const char *argv0, *shell;
1598 1387
1599 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1388 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1600 shell = "/bin/sh"; 1389 shell = "/bin/sh";
1601 1390
1602 argv0 = (const char *)rxvt_r_basename (shell); 1391 argv0 = (const char *)rxvt_r_basename (shell);
1603 1392
1604 if (options & Opt_loginShell) 1393 if (option (Opt_loginShell))
1605 { 1394 {
1606 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1395 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1607 1396
1608 login[0] = '-'; 1397 login[0] = '-';
1609 strcpy (&login[1], argv0); 1398 strcpy (&login[1], argv0);
1610 argv0 = login; 1399 argv0 = login;
1611 } 1400 }
1401
1612 execlp (shell, argv0, NULL); 1402 execlp (shell, argv0, NULL);
1613 /* no error message: STDERR is closed! */ 1403 /* no error message: STDERR is closed! */
1614 } 1404 }
1615 1405
1616#else /* __QNX__ uses qnxspawn () */
1617
1618 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1619 char *command = NULL, fullcommand[_MAX_PATH];
1620 char **arg_v, *arg_a[2] = { NULL, NULL };
1621
1622 if (argv != NULL)
1623 {
1624 if (access (argv[0], X_OK) == -1)
1625 {
1626 if (strchr (argv[0], '/') == NULL)
1627 {
1628 searchenv (argv[0], "PATH", fullcommand);
1629
1630 if (fullcommand[0] != '\0')
1631 command = fullcommand;
1632 }
1633
1634 if (access (command, X_OK) == -1)
1635 return -1;
1636 }
1637 else
1638 command = argv[0];
1639
1640 arg_v = argv;
1641 }
1642 else
1643 {
1644 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1645 command = "/bin/sh";
1646
1647 arg_a[0] = my_basename (command);
1648
1649 if (options & Opt_loginShell)
1650 {
1651 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1652
1653 login[0] = '-';
1654 strcpy (&login[1], arg_a[0]);
1655 arg_a[0] = login;
1656 }
1657
1658 arg_v = arg_a;
1659 }
1660
1661 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1662 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1663 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1664 command, arg_v, environ, iov_a, 0);
1665 if (login)
1666 free (login);
1667
1668 pty.close_tty ();
1669 return pty.pty;
1670#endif
1671
1672 return -1; 1406 return -1;
1673} 1407}
1674 1408
1675/*----------------------- end-of-file (C source) -----------------------*/ 1409/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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