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

Diff Legend

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