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.116 by root, Sun Feb 20 19:45:30 2005 UTC vs.
Revision 1.211 by ayin, Sun Sep 9 10:14:40 2007 UTC

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

Diff Legend

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