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

Diff Legend

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