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

Diff Legend

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