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

Diff Legend

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