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.119 by root, Thu Aug 11 02:05:07 2005 UTC vs.
Revision 1.213 by root, Fri Sep 14 10:15:41 2007 UTC

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

Diff Legend

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