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

Diff Legend

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