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.113 by root, Sat Feb 19 04:16:49 2005 UTC vs.
Revision 1.213 by root, Fri Sep 14 10:15:41 2007 UTC

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

Diff Legend

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