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.137 by root, Wed Jan 11 00:59:58 2006 UTC vs.
Revision 1.234 by ayin, Fri Dec 28 14:57:04 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{
221 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
222#ifdef OFF_FOCUS_FADING
223 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
224#endif
225 pix_colors = pix_colors_focused; 286 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 287
234 MEvent.time = CurrentTime; 288 MEvent.time = CurrentTime;
235 MEvent.button = AnyButton; 289 MEvent.button = AnyButton;
236 options = DEFAULT_OPTIONS;
237 want_refresh = 1; 290 want_refresh = 1;
238 priv_modes = SavedModes = PrivMode_Default; 291 priv_modes = SavedModes = PrivMode_Default;
239 focus = 0;
240 ncol = 80; 292 ncol = 80;
241 nrow = 24; 293 nrow = 24;
242 int_bwidth = INTERNALBORDERWIDTH; 294 int_bwidth = INTERNALBORDERWIDTH;
243 ext_bwidth = EXTERNALBORDERWIDTH; 295 ext_bwidth = EXTERNALBORDERWIDTH;
244 lineSpace = LINESPACE; 296 lineSpace = LINESPACE;
245 saveLines = SAVELINES; 297 saveLines = SAVELINES;
246 numpix_colors = TOTAL_COLORS;
247 298
248 refresh_limit = 1;
249 refresh_type = SLOW_REFRESH; 299 refresh_type = SLOW_REFRESH;
250 prev_nrow = prev_ncol = 0;
251 300
252 oldcursor.row = oldcursor.col = -1; 301 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; 302 last_bot = last_state = -1;
260 303
261#ifdef MENUBAR 304 set_option (Opt_scrollBar);
262 menu_readonly = 1; 305 set_option (Opt_scrollTtyOutput);
263# if ! (MENUBAR_MAX > 1) 306 set_option (Opt_jumpScroll);
264 CurrentBar = &BarList; 307 set_option (Opt_skipScroll);
265# endif /* (MENUBAR_MAX > 1) */ 308 set_option (Opt_secondaryScreen);
266#endif 309 set_option (Opt_secondaryScroll);
267 310 set_option (Opt_pastableTabs);
268 return true; 311 set_option (Opt_intensityStyles);
312 set_option (Opt_iso14755_52);
269} 313}
270 314
271void 315void
272rxvt_term::init_secondary () 316rxvt_term::init_secondary ()
273{ 317{
… …
280 if ((i = open ("/dev/null", O_RDONLY)) < 0) 324 if ((i = open ("/dev/null", O_RDONLY)) < 0)
281 { 325 {
282 /* TODO: BOO HISS */ 326 /* TODO: BOO HISS */
283 dup2 (STDERR_FILENO, STDIN_FILENO); 327 dup2 (STDERR_FILENO, STDIN_FILENO);
284 } 328 }
285 else if (i > STDIN_FILENO) 329 else if (i != STDIN_FILENO)
286 { 330 {
287 dup2 (i, STDIN_FILENO); 331 dup2 (i, STDIN_FILENO);
288 close (i); 332 close (i);
289 } 333 }
290 334
… …
305/*----------------------------------------------------------------------*/ 349/*----------------------------------------------------------------------*/
306const char ** 350const char **
307rxvt_term::init_resources (int argc, const char *const *argv) 351rxvt_term::init_resources (int argc, const char *const *argv)
308{ 352{
309 int i, r_argc; 353 int i, r_argc;
310 char *val;
311 const char **cmd_argv, **r_argv; 354 const char **cmd_argv, **r_argv;
312 355
313 /* 356 /*
314 * Look for -exec option. Find => split and make cmd_argv[] of command args 357 * Look for -e option. Find => split and make cmd_argv[] of command args
315 */ 358 */
316 for (r_argc = 0; r_argc < argc; r_argc++) 359 for (r_argc = 0; r_argc < argc; r_argc++)
317 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 360 if (!strcmp (argv[r_argc], "-e"))
318 break; 361 break;
362
363 if (r_argc == argc)
364 cmd_argv = NULL;
365 else if (!argv[r_argc + 1])
366 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
367 else
368 {
369 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
370
371 for (i = 0; i < argc - r_argc - 1; i++)
372 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
373
374 cmd_argv[i] = NULL;
375 }
319 376
320 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 377 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
321 378
322 for (i = 0; i < r_argc; i++) 379 for (i = 0; i < r_argc; i++)
323 r_argv[i] = (const char *)argv[i]; 380 r_argv[i] = (const char *)argv[i];
324 381
325 r_argv[i] = NULL; 382 r_argv[i] = NULL;
326 383
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]); 384 rs[Rs_name] = rxvt_basename (argv[0]);
340 385
341 /* 386 /*
342 * Open display, get options/resources and create the window 387 * Open display, get options/resources and create the window
343 */ 388 */
344 {
345 TEMP_ENV;
346 389
347 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 390 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
348 rs[Rs_display_name] = ":0"; 391 rs[Rs_display_name] = ":0";
349 392
350 get_options (r_argc, r_argv); 393 get_options (r_argc, r_argv);
351 394
352 if (!(display = displays.get (rs[Rs_display_name]))) 395 if (!(display = displays.get (rs[Rs_display_name])))
396 {
397 free (r_argv);
353 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 398 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
354 } 399 }
355 400
401 // using a local pointer decreases code size a lot
402 xa = display->xa;
403
404 set (display);
356 extract_resources (); 405 extract_resources ();
406
407#if XFT
408 if (rs[Rs_depth])
409 select_visual (strtol (rs[Rs_depth], 0, 0));
410#endif
411
412#ifdef HAVE_AFTERIMAGE
413 set_application_name ((char*)rs[Rs_name]);
414 set_output_threshold (OUTPUT_LEVEL_WARNING);
415 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
416#endif
357 free (r_argv); 417 free (r_argv);
418
419 for (int i = NUM_RESOURCES; i--; )
420 if (rs [i] == resval_undef)
421 rs [i] = 0;
422
423#if ENABLE_PERL
424 if (!rs[Rs_perl_ext_1])
425 rs[Rs_perl_ext_1] = "default";
426
427 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
428 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
429 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
430 {
431 rxvt_perl.init (this);
432 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
433 }
434#endif
358 435
359 /* 436 /*
360 * set any defaults not already set 437 * set any defaults not already set
361 */ 438 */
362 if (cmd_argv && cmd_argv[0]) 439 if (cmd_argv && cmd_argv[0])
363 { 440 {
364 if (!rs[Rs_title]) 441 if (!rs[Rs_title])
365 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 442 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
366 if (!rs[Rs_iconName]) 443 if (!rs[Rs_iconName])
367 rs[Rs_iconName] = rs[Rs_title]; 444 rs[Rs_iconName] = rs[Rs_title];
368 } 445 }
369 else 446 else
370 { 447 {
… …
408 rs[Rs_cutchars] = CUTCHARS; 485 rs[Rs_cutchars] = CUTCHARS;
409 486
410#ifndef NO_BACKSPACE_KEY 487#ifndef NO_BACKSPACE_KEY
411 if (!rs[Rs_backspace_key]) 488 if (!rs[Rs_backspace_key])
412# ifdef DEFAULT_BACKSPACE 489# ifdef DEFAULT_BACKSPACE
413 key_backspace = DEFAULT_BACKSPACE; 490 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
414# else 491# else
415 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 492 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
416# endif 493# 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 494#endif
425 495
426#ifndef NO_DELETE_KEY 496#ifndef NO_DELETE_KEY
427 if (!rs[Rs_delete_key]) 497 if (!rs[Rs_delete_key])
428# ifdef DEFAULT_DELETE 498# ifdef DEFAULT_DELETE
429 key_delete = DEFAULT_DELETE; 499 rs[Rs_delete_key] = DEFAULT_DELETE;
430# else 500# else
431 key_delete = "\033[3~"; 501 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 502# endif
441 if (rs[Rs_answerbackstring]) 503#endif
442 {
443 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
444 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
445 }
446 504
447#ifdef HAVE_SCROLLBARS 505#ifdef HAVE_SCROLLBARS
448 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 506 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
449#endif 507#endif
450 508
451#ifdef XTERM_REVERSE_VIDEO 509#ifdef XTERM_REVERSE_VIDEO
452 /* this is how xterm implements reverseVideo */ 510 /* this is how xterm implements reverseVideo */
453 if (OPTION (Opt_reverseVideo)) 511 if (option (Opt_reverseVideo))
454 { 512 {
455 if (!rs[Rs_color + Color_fg]) 513 if (!rs[Rs_color + Color_fg])
456 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 514 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
515
457 if (!rs[Rs_color + Color_bg]) 516 if (!rs[Rs_color + Color_bg])
458 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 517 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
459 } 518 }
460#endif 519#endif
461 520
… …
463 if (!rs[Rs_color + i]) 522 if (!rs[Rs_color + i])
464 rs[Rs_color + i] = def_colorName[i]; 523 rs[Rs_color + i] = def_colorName[i];
465 524
466#ifndef XTERM_REVERSE_VIDEO 525#ifndef XTERM_REVERSE_VIDEO
467 /* this is how we implement reverseVideo */ 526 /* this is how we implement reverseVideo */
468 if (OPTION (Opt_reverseVideo)) 527 if (option (Opt_reverseVideo))
469 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 528 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
470#endif 529#endif
471 530
472 /* convenient aliases for setting fg/bg to colors */ 531 /* convenient aliases for setting fg/bg to colors */
473 color_aliases (Color_fg); 532 color_aliases (Color_fg);
474 color_aliases (Color_bg); 533 color_aliases (Color_bg);
475#ifndef NO_CURSORCOLOR 534#ifndef NO_CURSORCOLOR
476 color_aliases (Color_cursor); 535 color_aliases (Color_cursor);
477 color_aliases (Color_cursor2); 536 color_aliases (Color_cursor2);
478#endif /* NO_CURSORCOLOR */ 537#endif /* NO_CURSORCOLOR */
479 color_aliases (Color_pointer_fg); 538 color_aliases (Color_pointer_fg);
480 color_aliases (Color_pointer_bg); 539 color_aliases (Color_pointer_bg);
481 color_aliases (Color_border); 540 color_aliases (Color_border);
482#ifndef NO_BOLD_UNDERLINE_REVERSE 541#ifndef NO_BOLD_UNDERLINE_REVERSE
483 color_aliases (Color_BD); 542 color_aliases (Color_BD);
484 color_aliases (Color_UL); 543 color_aliases (Color_UL);
485 color_aliases (Color_RV); 544 color_aliases (Color_RV);
486#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 545#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
487 546
488 if (!rs[Rs_color + Color_border]) 547 if (!rs[Rs_color + Color_border])
489 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 548 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
490 549
491 return cmd_argv; 550 return cmd_argv;
… …
494/*----------------------------------------------------------------------*/ 553/*----------------------------------------------------------------------*/
495void 554void
496rxvt_term::init_env () 555rxvt_term::init_env ()
497{ 556{
498 int i; 557 int i;
499 unsigned int u;
500 char *val; 558 char *val;
501 559
502#ifdef DISPLAY_IS_IP 560#ifdef DISPLAY_IS_IP
503 /* Fixup display_name for export over pty to any interested terminal 561 /* 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 562 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
512 */ 570 */
513 val = rxvt_network_display (rs[Rs_display_name]); 571 val = rxvt_network_display (rs[Rs_display_name]);
514 rs[Rs_display_name] = (const char *)val; 572 rs[Rs_display_name] = (const char *)val;
515 573
516 if (val == NULL) 574 if (val == NULL)
517#endif /* DISPLAY_IS_IP */ 575#endif /* DISPLAY_IS_IP */
518 val = XDisplayString (display->display); 576 val = XDisplayString (dpy);
519 577
520 if (rs[Rs_display_name] == NULL) 578 if (rs[Rs_display_name] == NULL)
521 rs[Rs_display_name] = val; /* use broken `:0' value */ 579 rs[Rs_display_name] = val; /* use broken `:0' value */
522 580
523 i = strlen (val); 581 i = strlen (val);
524 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 582 env_display = (char *)rxvt_malloc (i + 9);
525 583
526 sprintf (env_display, "DISPLAY=%s", val); 584 sprintf (env_display, "DISPLAY=%s", val);
527 585
528 /* avoiding the math library: 586 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 587
538 /* add entries to the environment: 588 /* add entries to the environment:
539 * @ DISPLAY: in case we started with -display 589 * @ DISPLAY: in case we started with -display
540 * @ WINDOWID: X window id number of the window 590 * @ WINDOWID: X window id number of the window
541 * @ COLORTERM: terminal sub-name and also indicates its color 591 * @ COLORTERM: terminal sub-name and also indicates its color
… …
543 * @ TERMINFO: path to terminfo directory 593 * @ TERMINFO: path to terminfo directory
544 * @ COLORFGBG: fg;bg color codes 594 * @ COLORFGBG: fg;bg color codes
545 */ 595 */
546 putenv (env_display); 596 putenv (env_display);
547 putenv (env_windowid); 597 putenv (env_windowid);
598
548 if (env_colorfgbg) 599 if (env_colorfgbg)
549 putenv (env_colorfgbg); 600 putenv (env_colorfgbg);
550 601
551#ifdef RXVT_TERMINFO 602#ifdef RXVT_TERMINFO
552 putenv ("TERMINFO=" RXVT_TERMINFO); 603 putenv ("TERMINFO=" RXVT_TERMINFO);
553#endif 604#endif
554 605
555 if (display->depth <= 2) 606 if (depth <= 2)
556 putenv ("COLORTERM=" COLORTERMENV "-mono"); 607 putenv ("COLORTERM=" COLORTERMENV "-mono");
557 else 608 else
558 putenv ("COLORTERM=" COLORTERMENVFULL); 609 putenv ("COLORTERM=" COLORTERMENVFULL);
559 610
560 if (rs[Rs_term_name] != NULL) 611 if (rs[Rs_term_name] != NULL)
561 { 612 {
562 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 613 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
563 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 614 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
564 putenv (env_term); 615 putenv (env_term);
565 } 616 }
566 else 617 else
567 putenv ("TERM=" TERMENV); 618 putenv ("TERM=" TERMENV);
… …
569#ifdef HAVE_UNSETENV 620#ifdef HAVE_UNSETENV
570 /* avoid passing old settings and confusing term size */ 621 /* avoid passing old settings and confusing term size */
571 unsetenv ("LINES"); 622 unsetenv ("LINES");
572 unsetenv ("COLUMNS"); 623 unsetenv ("COLUMNS");
573 unsetenv ("TERMCAP"); /* terminfo should be okay */ 624 unsetenv ("TERMCAP"); /* terminfo should be okay */
574#endif /* HAVE_UNSETENV */ 625#endif /* HAVE_UNSETENV */
575} 626}
576 627
577/*----------------------------------------------------------------------*/ 628/*----------------------------------------------------------------------*/
578/* 629/*
579 * This is more or less stolen straight from XFree86 xterm. 630 * This is more or less stolen straight from XFree86 xterm.
580 * This should support all European type languages. 631 * This should support all European type languages.
581 */ 632 */
582void 633void
583rxvt_term::set_locale (const char *locale) 634rxvt_term::set_locale (const char *locale)
584{ 635{
585 TEMP_ENV; 636 set_environ (envv);
586 637
587#if HAVE_XSETLOCALE || HAVE_SETLOCALE 638#if HAVE_XSETLOCALE || HAVE_SETLOCALE
588 free (this->locale); 639 free (this->locale);
589 this->locale = setlocale (LC_CTYPE, locale); 640 this->locale = setlocale (LC_CTYPE, locale);
590 641
… …
600 651
601 this->locale = "C"; 652 this->locale = "C";
602 } 653 }
603 654
604 655
605 this->locale = rxvt_strdup (this->locale); 656 this->locale = strdup (this->locale);
606 SET_LOCALE (this->locale); 657 SET_LOCALE (this->locale);
607 mbstate.reset (); 658 mbstate.reset ();
608#endif 659#endif
609 660
610#if HAVE_NL_LANGINFO 661#if HAVE_NL_LANGINFO
… …
621} 672}
622 673
623void 674void
624rxvt_term::init_xlocale () 675rxvt_term::init_xlocale ()
625{ 676{
626 TEMP_ENV; 677 set_environ (envv);
627 678
628#ifdef USE_XIM 679#ifdef USE_XIM
629 if (!locale) 680 if (!locale)
630 rxvt_warn ("setting locale failed, working without locale support.\n"); 681 rxvt_warn ("setting locale failed, working without locale support.\n");
631 else 682 else
… …
654 * Initialize the command connection. 705 * Initialize the command connection.
655 * This should be called after the X server connection is established. 706 * This should be called after the X server connection is established.
656 */ 707 */
657 708
658#ifdef META8_OPTION 709#ifdef META8_OPTION
659 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 710 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
660#endif 711#endif
661 712
662 get_ourmods (); 713 get_ourmods ();
663 714
664 if (!OPTION (Opt_scrollTtyOutput)) 715 if (!option (Opt_scrollTtyOutput))
665 priv_modes |= PrivMode_TtyOutputInh; 716 priv_modes |= PrivMode_TtyOutputInh;
666 if (OPTION (Opt_scrollTtyKeypress)) 717 if (option (Opt_scrollTtyKeypress))
667 priv_modes |= PrivMode_Keypress; 718 priv_modes |= PrivMode_Keypress;
668 if (!OPTION (Opt_jumpScroll)) 719 if (!option (Opt_jumpScroll))
669 priv_modes |= PrivMode_smoothScroll; 720 priv_modes |= PrivMode_smoothScroll;
670 721
671#ifndef NO_BACKSPACE_KEY 722#ifndef NO_BACKSPACE_KEY
672 if (strcmp (key_backspace, "DEC") == 0) 723 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
673 priv_modes |= PrivMode_HaveBackSpace; 724 priv_modes |= PrivMode_HaveBackSpace;
674#endif 725#endif
675 726
676 /* add value for scrollBar */ 727 /* add value for scrollBar */
677 if (scrollbar_visible ()) 728 if (scrollBar.state)
678 { 729 {
679 priv_modes |= PrivMode_scrollBar; 730 priv_modes |= PrivMode_scrollBar;
680 SavedModes |= PrivMode_scrollBar; 731 SavedModes |= PrivMode_scrollBar;
681 }
682
683 if (menubar_visible ())
684 {
685 priv_modes |= PrivMode_menuBar;
686 SavedModes |= PrivMode_menuBar;
687 } 732 }
688 733
689 run_command (argv); 734 run_command (argv);
690} 735}
691 736
… …
696 int i; 741 int i;
697 742
698#ifdef OFF_FOCUS_FADING 743#ifdef OFF_FOCUS_FADING
699 pix_colors = pix_colors_focused; 744 pix_colors = pix_colors_focused;
700#endif 745#endif
701 746
702 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 747 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
703 { 748 {
749 const char *name = rs[Rs_color + i];
750
751 if (!name)
752 continue;
753
704 rxvt_color xcol; 754 rxvt_color xcol;
705 755
706 if (!rs[Rs_color + i]) 756 if (!set_color (xcol, name))
707 continue;
708
709 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
710 { 757 {
711#ifndef XTERM_REVERSE_VIDEO 758#ifndef XTERM_REVERSE_VIDEO
712 if (i < 2 && OPTION (Opt_reverseVideo)) 759 if (i < 2 && option (Opt_reverseVideo))
713 rs[Rs_color + i] = def_colorName[!i]; 760 name = def_colorName [1 - i];
714 else 761 else
715#endif 762#endif
716 rs[Rs_color + i] = def_colorName[i]; 763 name = def_colorName [i];
717 764
718 if (!rs[Rs_color + i]) 765 if (!name)
719 continue; 766 continue;
720 767
721 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 768 if (!set_color (xcol, name))
722 { 769 {
723 switch (i) 770 switch (i)
724 { 771 {
725 case Color_fg: 772 case Color_fg:
726 case Color_bg: 773 case Color_bg:
727 /* fatal: need bg/fg color */
728 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 774 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
729 /* NOTREACHED */ 775 name = "";
730 break; 776 break;
731#ifndef NO_CURSORCOLOR 777#ifndef NO_CURSORCOLOR
732 case Color_cursor2: 778 case Color_cursor2:
733 xcol = pix_colors[Color_fg]; 779#endif
734 break;
735#endif /* ! NO_CURSORCOLOR */
736 case Color_pointer_fg: 780 case Color_pointer_fg:
737 xcol = pix_colors[Color_fg]; 781 name = rs[Rs_color + Color_fg];
782 xcol.set (this, name);
738 break; 783 break;
739 default: 784 default:
740 xcol = pix_colors[Color_bg]; /* None */ 785 name = rs[Rs_color + Color_bg];
786 xcol.set (this, name);
741 break; 787 break;
742 } 788 }
743 } 789 }
744 } 790 }
745 791
746 pix_colors[i] = xcol; 792 pix_colors[i] = xcol;
747 SET_PIXCOLOR (i); 793 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 { 794 }
795
796 if (depth <= 2)
797 {
758 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 798 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]; 799 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]; 800 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
761 } 801 }
762 802
763 /* 803 /*
764 * get scrollBar/menuBar shadow colors 804 * get scrollBar shadow colors
765 * 805 *
766 * The calculations of topShadow/bottomShadow values are adapted 806 * The calculations of topShadow/bottomShadow values are adapted
767 * from the fvwm window manager. 807 * from the fvwm window manager.
768 */ 808 */
769#ifdef KEEP_SCROLLCOLOR 809#ifdef KEEP_SCROLLCOLOR
770
771 if (display->depth <= 2) 810 if (depth <= 2)
772 { 811 {
773 /* Monochrome */ 812 /* Monochrome */
774 pix_colors[Color_scroll] = pix_colors[Color_fg]; 813 alias_color (Color_scroll, Color_fg);
775 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 814 alias_color (Color_topShadow, Color_bg);
776 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 815 alias_color (Color_bottomShadow, Color_bg);
777 } 816 }
778 else 817 else
779 { 818 {
780 rxvt_color xcol[2]; 819 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 820
785 xcol[1] = pix_colors[Color_scroll]; 821 rgba cscroll;
786 xcol[0].set (display, 65535, 65535, 65535); 822 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 823
795 /* topShadowColor */ 824 /* topShadowColor */
796 if (!xcol[1].set (display, 825 if (!pix_colors[Color_topShadow].set (this,
797 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 826 rgba (
798 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 827 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
799 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 828 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
800 xcol[1] = pix_colors[Color_White]; 829 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
801 830 cscroll.a)
802 pix_colors[Color_topShadow] = xcol[1]; 831 ))
832 alias_color (Color_topShadow, Color_White);
803 } 833 }
804#endif /* KEEP_SCROLLCOLOR */ 834#endif /* KEEP_SCROLLCOLOR */
835
836#ifdef OFF_FOCUS_FADING
837 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
838 update_fade_color (i);
839#endif
805} 840}
806 841
807/*----------------------------------------------------------------------*/ 842/*----------------------------------------------------------------------*/
808/* color aliases, fg/bg bright-bold */ 843/* color aliases, fg/bg bright-bold */
809void 844void
… …
812 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 847 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
813 { 848 {
814 int i = atoi (rs[Rs_color + idx]); 849 int i = atoi (rs[Rs_color + idx]);
815 850
816 if (i >= 8 && i <= 15) 851 if (i >= 8 && i <= 15)
817 { /* bright colors */ 852 /* bright colors */
818 i -= 8;
819 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 853 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
820 return; 854 else if (i >= 0 && i <= 7)
821 } 855 /* normal colors */
822
823 if (i >= 0 && i <= 7) /* normal colors */
824 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 856 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
825 } 857 }
826} 858}
827 859
828/*----------------------------------------------------------------------*/ 860/*----------------------------------------------------------------------*/
… …
848 880
849 if (rsmod 881 if (rsmod
850 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 882 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
851 requestedmeta = rsmod[3] - '0'; 883 requestedmeta = rsmod[3] - '0';
852 884
853 map = XGetModifierMapping (display->display); 885 map = XGetModifierMapping (dpy);
854 kc = map->modifiermap; 886 kc = map->modifiermap;
855 887
856 for (i = 1; i < 6; i++) 888 for (i = 1; i < 6; i++)
857 { 889 {
858 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 890 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
860 for (j = map->max_keypermod; j--; k++) 892 for (j = map->max_keypermod; j--; k++)
861 { 893 {
862 if (kc[k] == 0) 894 if (kc[k] == 0)
863 break; 895 break;
864 896
865 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 897 switch (XKeycodeToKeysym (dpy, kc[k], 0))
866 { 898 {
867 case XK_Num_Lock: 899 case XK_Num_Lock:
868 ModNumLockMask = modmasks[i - 1]; 900 ModNumLockMask = modmasks[i - 1];
869 continue; 901 continue;
870 902
… …
920rxvt_term::create_windows (int argc, const char *const *argv) 952rxvt_term::create_windows (int argc, const char *const *argv)
921{ 953{
922 XClassHint classHint; 954 XClassHint classHint;
923 XWMHints wmHint; 955 XWMHints wmHint;
924#if ENABLE_FRILLS 956#if ENABLE_FRILLS
925 Atom prop = None;
926 MWMHints mwmhints; 957 MWMHints mwmhints = { };
927#endif 958#endif
928 XGCValues gcvalue; 959 XGCValues gcvalue;
929 long vt_emask;
930 XSetWindowAttributes attributes; 960 XSetWindowAttributes attributes;
931 XWindowAttributes gattr;
932 Window top, parent; 961 Window top, parent;
933 dDisp;
934 962
935#ifdef USING_W11LIB 963 dLocal (Display *, dpy);
936 /* enable W11 callbacks */
937 W11AddEventHandler (disp, rxvt_W11_process_x_event);
938#endif
939 964
940 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 965 /* grab colors before netscape does */
941 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 966 Get_Colours ();
942 967
943 if (OPTION (Opt_transparent)) 968 if (!set_fonts ())
944 { 969 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
945 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 970
946 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 971 parent = display->root;
947 } 972
973 attributes.override_redirect = !!option (Opt_override_redirect);
948 974
949#if ENABLE_FRILLS 975#if ENABLE_FRILLS
950 if (OPTION (Opt_borderLess)) 976 if (option (Opt_borderLess))
951 { 977 {
952 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 978 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
953
954 if (prop == None)
955 { 979 {
956 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 980 // 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; 981 attributes.override_redirect = true;
959#endif
960 mwmhints.flags = 0;
961 } 982 }
962 else 983 else
963 { 984 {
964 mwmhints.flags = MWM_HINTS_DECORATIONS; 985 mwmhints.flags = MWM_HINTS_DECORATIONS;
965 mwmhints.decorations = 0;
966 } 986 }
967 } 987 }
968 else
969 mwmhints.flags = 0;
970#endif 988#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 989
980#if ENABLE_XEMBED 990#if ENABLE_XEMBED
981 if (rs[Rs_embed]) 991 if (rs[Rs_embed])
982 { 992 {
983 XWindowAttributes wattr; 993 XWindowAttributes wattr;
984 994
985 parent = strtol (rs[Rs_embed], 0, 0); 995 parent = strtol (rs[Rs_embed], 0, 0);
986 996
987 if (!XGetWindowAttributes (disp, parent, &wattr)) 997 if (!XGetWindowAttributes (dpy, parent, &wattr))
988 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 998 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
989 999
990 window_calc (wattr.width, wattr.height); 1000 window_calc (wattr.width, wattr.height);
991 } 1001 }
992#endif 1002#endif
993 1003
994 window_calc (0, 0); 1004 window_calc (0, 0);
995 1005
996 /* sub-window placement & size in rxvt_resize_subwindows () */ 1006 /* sub-window placement & size in rxvt_resize_subwindows () */
997#ifdef PREFER_24BIT
998 attributes.background_pixel = pix_colors_focused[Color_border]; 1007 attributes.background_pixel = pix_colors_focused [Color_border];
999 attributes.border_pixel = pix_colors_focused[Color_border]; 1008 attributes.border_pixel = pix_colors_focused [Color_border];
1000 attributes.colormap = display->cmap; 1009 attributes.colormap = cmap;
1010
1001 top = XCreateWindow (disp, parent, 1011 top = XCreateWindow (dpy, parent,
1002 szHint.x, szHint.y, 1012 szHint.x, szHint.y,
1003 szHint.width, szHint.height, 1013 szHint.width, szHint.height,
1004 ext_bwidth, 1014 ext_bwidth,
1005 display->depth, InputOutput, 1015 depth, InputOutput, visual,
1006 display->visual,
1007 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 1016 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1008#else 1017 &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 1018
1017 this->parent[0] = top; 1019 this->parent[0] = top;
1018 1020
1019 old_width = szHint.width; 1021 old_width = szHint.width;
1020 old_height = szHint.height; 1022 old_height = szHint.height;
1021 1023
1022 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1024 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1023 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1025 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1024 1026
1025 classHint.res_name = (char *)rs[Rs_name]; 1027 classHint.res_name = (char *)rs[Rs_name];
1026 classHint.res_class = (char *)RESCLASS; 1028 classHint.res_class = (char *)RESCLASS;
1027 1029
1028 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1030 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1029 wmHint.input = True; 1031 wmHint.input = True;
1030 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1032 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1031 wmHint.window_group = top; 1033 wmHint.window_group = top;
1032 1034
1033 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 1035 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1034 &szHint, &wmHint, &classHint); 1036 &szHint, &wmHint, &classHint);
1037
1038#if ENABLE_FRILLS
1039 if (mwmhints.flags)
1040 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1041 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1042#endif
1035 1043
1036 Atom protocols[] = { 1044 Atom protocols[] = {
1037 xa[XA_WM_DELETE_WINDOW], 1045 xa[XA_WM_DELETE_WINDOW],
1038#if ENABLE_EWMH 1046#if ENABLE_EWMH
1039 xa[XA_NET_WM_PING], 1047 xa[XA_NET_WM_PING],
1040#endif 1048#endif
1041 }; 1049 };
1042 1050
1043 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1051 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1044 1052
1045#if ENABLE_FRILLS 1053#if ENABLE_FRILLS
1046 if (rs[Rs_transient_for]) 1054 if (rs[Rs_transient_for])
1047 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1055 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1048#endif 1056#endif
1049 1057
1050#if ENABLE_EWMH 1058#if ENABLE_EWMH
1051 long pid = getpid (); 1059 long pid = getpid ();
1052 1060
1053 XChangeProperty (disp, top, 1061 XChangeProperty (dpy, top,
1054 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1062 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1055 PropModeReplace, (unsigned char *)&pid, 1); 1063 PropModeReplace, (unsigned char *)&pid, 1);
1056 1064
1057 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1065 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1058#endif 1066#endif
1059 1067
1060 XSelectInput (disp, top, 1068 XSelectInput (dpy, top,
1061 KeyPressMask 1069 KeyPressMask
1062#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1070#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1063 | KeyReleaseMask 1071 | KeyReleaseMask
1064#endif 1072#endif
1065 | FocusChangeMask | VisibilityChangeMask 1073 | FocusChangeMask | VisibilityChangeMask
1066 | ExposureMask | StructureNotifyMask); 1074 | ExposureMask | StructureNotifyMask);
1067 1075
1068 termwin_ev.start (display, top); 1076 termwin_ev.start (display, top);
1069 1077
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 */ 1078 /* vt cursor: Black-on-White is standard, but this is more popular */
1077 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1079 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1078 1080
1079#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1081#ifdef HAVE_SCROLLBARS
1080 /* cursor (menuBar/scrollBar): Black-on-White */ 1082 /* cursor scrollBar: Black-on-White */
1081 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1083 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1082#endif 1084#endif
1083 1085
1084 /* the vt window */ 1086 /* the vt window */
1085 vt = XCreateSimpleWindow (disp, top, 1087 vt = XCreateSimpleWindow (dpy, top,
1086 window_vt_x,
1087 window_vt_y, 1088 window_vt_x, window_vt_y,
1088 width,
1089 height, 1089 width, height,
1090 0, 1090 0,
1091 pix_colors_focused[Color_fg], 1091 pix_colors_focused[Color_fg],
1092 pix_colors_focused[Color_bg]); 1092 pix_colors_focused[Color_bg]);
1093#ifdef DEBUG_X
1094 XStoreName (disp, vt, "vt window");
1095#endif
1096 1093
1097 attributes.bit_gravity = NorthWestGravity; 1094 attributes.bit_gravity = NorthWestGravity;
1098 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1095 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1099 1096
1100 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1097 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1101 1098
1102 if (OPTION (Opt_pointerBlank) 1099 if (option (Opt_pointerBlank))
1103#ifdef ENABLE_PERL
1104 || perl.self
1105#endif
1106 )
1107 vt_emask |= PointerMotionMask; 1100 vt_emask |= PointerMotionMask;
1108 else 1101 else
1109 vt_emask |= Button1MotionMask | Button3MotionMask; 1102 vt_emask |= Button1MotionMask | Button3MotionMask;
1110 1103
1111 XSelectInput (disp, vt, vt_emask); 1104 vt_select_input ();
1105
1112 vt_ev.start (display, vt); 1106 vt_ev.start (display, vt);
1113 1107
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 */ 1108 /* graphics context for the vt window */
1158 gcvalue.foreground = pix_colors[Color_fg]; 1109 gcvalue.foreground = pix_colors[Color_fg];
1159 gcvalue.background = pix_colors[Color_bg]; 1110 gcvalue.background = pix_colors[Color_bg];
1160 gcvalue.graphics_exposures = 1; 1111 gcvalue.graphics_exposures = 0;
1112
1161 gc = XCreateGC (disp, vt, 1113 gc = XCreateGC (dpy, vt,
1162 GCForeground | GCBackground | GCGraphicsExposures, 1114 GCForeground | GCBackground | GCGraphicsExposures,
1163 &gcvalue); 1115 &gcvalue);
1164 1116
1165 drawable = new rxvt_drawable (display, vt); 1117 drawable = new rxvt_drawable (this, vt);
1166 1118
1167#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1119#ifdef RXVT_SCROLLBAR
1168 gcvalue.foreground = pix_colors[Color_topShadow]; 1120 gcvalue.foreground = pix_colors[Color_topShadow];
1169 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1121 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1170 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1122 gcvalue.foreground = pix_colors[Color_bottomShadow];
1171 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1123 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1172 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1124 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1173 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1125 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1174#endif 1126#endif
1175 1127
1176#ifdef OFF_FOCUS_FADING 1128#ifdef OFF_FOCUS_FADING
1177 // initially we are in unfocused state 1129 // initially we are in unfocused state
1178 if (rs[Rs_fade]) 1130 if (rs[Rs_fade])
1179 pix_colors = pix_colors_unfocused; 1131 pix_colors = pix_colors_unfocused;
1180#endif 1132#endif
1181 1133
1182 pointer_unblank (); 1134 pointer_unblank ();
1183 scr_recolour (); 1135 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} 1136}
1195 1137
1196/* ------------------------------------------------------------------------- * 1138/* ------------------------------------------------------------------------- *
1197 * GET TTY CURRENT STATE * 1139 * GET TTY CURRENT STATE *
1198 * ------------------------------------------------------------------------- */ 1140 * ------------------------------------------------------------------------- */
1199void 1141void
1200rxvt_get_ttymode (ttymode_t *tio, int erase) 1142rxvt_get_ttymode (ttymode_t *tio, int erase)
1201{ 1143{
1202#ifdef HAVE_TERMIOS_H
1203 /* 1144 /*
1204 * standard System V termios interface 1145 * standard System V termios interface
1205 */ 1146 */
1206 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1147 if (tcgetattr (STDIN_FILENO, tio) < 0)
1207 { 1148 {
1208 // return error - use system defaults, 1149 // return error - use system defaults,
1209 // where possible, and zero elsewhere 1150 // where possible, and zero elsewhere
1210 memset (tio, 0, sizeof (ttymode_t)); 1151 memset (tio, 0, sizeof (ttymode_t));
1211 1152
… …
1274 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1215 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1275# if defined (ECHOCTL) && defined (ECHOKE) 1216# if defined (ECHOCTL) && defined (ECHOKE)
1276 | ECHOCTL | ECHOKE 1217 | ECHOCTL | ECHOKE
1277# endif 1218# endif
1278 | ECHOE | ECHOK); 1219 | 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 1220
1327 /* 1221 /*
1328 * Debugging 1222 * Debugging
1329 */ 1223 */
1330#ifdef DEBUG_TTYMODE 1224#ifdef DEBUG_TTYMODE
1331#ifdef HAVE_TERMIOS_H
1332 /* c_iflag bits */ 1225 /* c_iflag bits */
1333 fprintf (stderr, "Input flags\n"); 1226 fprintf (stderr, "Input flags\n");
1334 1227
1335 /* cpp token stringize doesn't work on all machines <sigh> */ 1228 /* cpp token stringize doesn't work on all machines <sigh> */
1336# define FOO(flag,name) \ 1229# define FOO(flag,name) \
… …
1399 FOO (VLNEXT, "VLNEXT"); 1292 FOO (VLNEXT, "VLNEXT");
1400# endif 1293# endif
1401 1294
1402 fprintf (stderr, "\n"); 1295 fprintf (stderr, "\n");
1403# undef FOO 1296# undef FOO
1404# endif /* HAVE_TERMIOS_H */ 1297#endif /* DEBUG_TTYMODE */
1405#endif /* DEBUG_TTYMODE */
1406} 1298}
1407 1299
1408/*----------------------------------------------------------------------*/ 1300/*----------------------------------------------------------------------*/
1409/* 1301/*
1410 * Run the command in a subprocess and return a file descriptor for the 1302 * Run the command in a subprocess and return a file descriptor for the
… …
1415rxvt_term::run_command (const char *const *argv) 1307rxvt_term::run_command (const char *const *argv)
1416{ 1308{
1417#if ENABLE_FRILLS 1309#if ENABLE_FRILLS
1418 if (rs[Rs_pty_fd]) 1310 if (rs[Rs_pty_fd])
1419 { 1311 {
1420 pty.pty = atoi (rs[Rs_pty_fd]); 1312 pty->pty = atoi (rs[Rs_pty_fd]);
1421 1313
1422 if (pty.pty >= 0) 1314 if (pty->pty >= 0)
1423 { 1315 {
1424 if (getfd_hook) 1316 if (getfd_hook)
1425 pty.pty = (*getfd_hook) (pty.pty); 1317 pty->pty = (*getfd_hook) (pty->pty);
1426 1318
1427 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK)) 1319 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1428 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1320 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1429 } 1321 }
1430 } 1322 }
1431 else 1323 else
1432#endif 1324#endif
1433 if (!pty.get ()) 1325 if (!pty->get ())
1434 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1326 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1435 1327
1328 int er;
1329
1330#ifndef NO_BACKSPACE_KEY
1331 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1332 er = rs[Rs_backspace_key][0];
1333 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1334 er = '\177'; /* the initial state anyway */
1335 else
1336#endif
1337 er = -1;
1338
1339 rxvt_get_ttymode (&tio, er);
1340 /* init terminal attributes */
1341 cfsetospeed (&tio, BAUDRATE);
1342 cfsetispeed (&tio, BAUDRATE);
1343 tcsetattr (pty->tty, TCSANOW, &tio);
1436 pty.set_utf8_mode (enc_utf8); 1344 pty->set_utf8_mode (enc_utf8);
1437 1345
1438 /* set initial window size */ 1346 /* set initial window size */
1439 tt_winch (); 1347 tt_winch ();
1440
1441 int er;
1442
1443#ifndef NO_BACKSPACE_KEY
1444 if (key_backspace[0] && !key_backspace[1])
1445 er = key_backspace[0];
1446 else if (strcmp (key_backspace, "DEC") == 0)
1447 er = '\177'; /* the initial state anyway */
1448 else
1449#endif
1450 er = -1;
1451
1452 rxvt_get_ttymode (&tio, er);
1453 1348
1454#if ENABLE_FRILLS 1349#if ENABLE_FRILLS
1455 if (rs[Rs_pty_fd]) 1350 if (rs[Rs_pty_fd])
1456 return; 1351 return;
1457#endif 1352#endif
1458 1353
1459#ifndef __QNX__
1460 /* spin off the command interpreter */ 1354 /* spin off the command interpreter */
1461 switch (cmd_pid = fork ()) 1355 switch (cmd_pid = fork ())
1462 { 1356 {
1463 case -1: 1357 case -1:
1464 { 1358 {
… …
1466 rxvt_fatal ("can't fork, aborting.\n"); 1360 rxvt_fatal ("can't fork, aborting.\n");
1467 } 1361 }
1468 case 0: 1362 case 0:
1469 init_env (); 1363 init_env ();
1470 1364
1471 if (!pty.make_controlling_tty ()) 1365 if (!pty->make_controlling_tty ())
1472 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1366 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1473 else 1367 else
1474 { 1368 {
1475 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1369 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1476 dup2 (pty.tty, STDIN_FILENO); 1370 dup2 (pty->tty, STDIN_FILENO);
1477 dup2 (pty.tty, STDOUT_FILENO); 1371 dup2 (pty->tty, STDOUT_FILENO);
1478 dup2 (pty.tty, STDERR_FILENO); 1372 dup2 (pty->tty, STDERR_FILENO);
1479 1373
1480 // close all our file handles that we do no longer need 1374 // close all our file handles that we do no longer need
1481 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1375 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1482 { 1376 {
1483 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1377 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1484 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1378 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1485 } 1379 }
1486 1380
1487 run_child (argv); 1381 run_child (argv);
1488 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1382 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1489 } 1383 }
1490 1384
1491 _exit (EXIT_FAILURE); 1385 _exit (EXIT_FAILURE);
1492 1386
1493 default: 1387 default:
1494 { 1388 if (!option (Opt_utmpInhibit))
1495#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1389 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1496 int fdstdin;
1497 1390
1498 fdstdin = dup (STDIN_FILENO); 1391 pty->close_tty ();
1499 dup2 (pty.tty, STDIN_FILENO);
1500#endif
1501 1392
1502#ifdef UTMP_SUPPORT 1393 child_ev.start (cmd_pid);
1503 privileged_utmp (SAVE);
1504#endif
1505 1394
1506#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1395 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1507
1508 dup2 (fdstdin, STDIN_FILENO);
1509 close (fdstdin);
1510#endif
1511 }
1512
1513 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1514 break; 1396 break;
1515 } 1397 }
1516#else /* __QNX__ uses qnxspawn () */
1517 fchmod (pty.tty, 0622);
1518 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1519 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1520
1521 if (run_child (argv) == -1)
1522 exit (EXIT_FAILURE);
1523#endif
1524} 1398}
1525 1399
1526/* ------------------------------------------------------------------------- * 1400/* ------------------------------------------------------------------------- *
1527 * CHILD PROCESS OPERATIONS * 1401 * CHILD PROCESS OPERATIONS *
1528 * ------------------------------------------------------------------------- */ 1402 * ------------------------------------------------------------------------- */
… …
1533int 1407int
1534rxvt_term::run_child (const char *const *argv) 1408rxvt_term::run_child (const char *const *argv)
1535{ 1409{
1536 char *login; 1410 char *login;
1537 1411
1538 TEMP_ENV; // not very temporary...
1539
1540 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1541
1542 if (OPTION (Opt_console)) 1412 if (option (Opt_console))
1413 {
1543 { /* be virtual console, fail silently */ 1414 /* be virtual console, fail silently */
1544#ifdef TIOCCONS 1415#ifdef TIOCCONS
1545 unsigned int on = 1; 1416 unsigned int on = 1;
1546 1417
1547 ioctl (STDIN_FILENO, TIOCCONS, &on); 1418 ioctl (STDIN_FILENO, TIOCCONS, &on);
1548#elif defined (SRIOCSREDIR) 1419#elif defined (SRIOCSREDIR)
… …
1550 1421
1551 fd = open (CONSOLE, O_WRONLY, 0); 1422 fd = open (CONSOLE, O_WRONLY, 0);
1552 if (fd >= 0) 1423 if (fd >= 0)
1553 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1424 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1554 close (fd); 1425 close (fd);
1555#endif /* SRIOCSREDIR */ 1426#endif /* SRIOCSREDIR */
1556 } 1427 }
1557 1428
1558 /* reset signals and spin off the command interpreter */ 1429 /* reset signals and spin off the command interpreter */
1559 signal (SIGINT, SIG_DFL); 1430 signal (SIGINT, SIG_DFL);
1560 signal (SIGQUIT, SIG_DFL); 1431 signal (SIGQUIT, SIG_DFL);
… …
1567 */ 1438 */
1568#ifdef SIGTSTP 1439#ifdef SIGTSTP
1569 signal (SIGTSTP, SIG_IGN); 1440 signal (SIGTSTP, SIG_IGN);
1570 signal (SIGTTIN, SIG_IGN); 1441 signal (SIGTTIN, SIG_IGN);
1571 signal (SIGTTOU, SIG_IGN); 1442 signal (SIGTTOU, SIG_IGN);
1572#endif /* SIGTSTP */ 1443#endif /* SIGTSTP */
1573 1444
1574 // unblock signals (signals are blocked by iom.C 1445 // unblock signals (signals are blocked by iom.C
1575 sigset_t ss; 1446 sigset_t ss;
1576 sigemptyset (&ss); 1447 sigemptyset (&ss);
1577 sigprocmask (SIG_SETMASK, &ss, 0); 1448 sigprocmask (SIG_SETMASK, &ss, 0);
1578 1449
1579#ifndef __QNX__
1580 /* command interpreter path */ 1450 /* command interpreter path */
1581 if (argv != NULL) 1451 if (argv)
1582 { 1452 {
1583# ifdef DEBUG_CMD 1453# ifdef DEBUG_CMD
1584 int i; 1454 int i;
1585 1455
1586 for (i = 0; argv[i]; i++) 1456 for (i = 0; argv[i]; i++)
… …
1595 const char *argv0, *shell; 1465 const char *argv0, *shell;
1596 1466
1597 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1467 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1598 shell = "/bin/sh"; 1468 shell = "/bin/sh";
1599 1469
1600 argv0 = (const char *)rxvt_r_basename (shell); 1470 argv0 = (const char *)rxvt_basename (shell);
1601 1471
1602 if (OPTION (Opt_loginShell)) 1472 if (option (Opt_loginShell))
1603 { 1473 {
1604 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1474 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1605 1475
1606 login[0] = '-'; 1476 login[0] = '-';
1607 strcpy (&login[1], argv0); 1477 strcpy (&login[1], argv0);
1608 argv0 = login; 1478 argv0 = login;
1609 } 1479 }
1610 1480
1611 execlp (shell, argv0, NULL); 1481 execlp (shell, argv0, (char *)0);
1612 /* no error message: STDERR is closed! */ 1482 /* no error message: STDERR is closed! */
1613 } 1483 }
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 1484
1671 return -1; 1485 return -1;
1672} 1486}
1673 1487
1674/*----------------------- end-of-file (C source) -----------------------*/ 1488/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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