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

Diff Legend

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