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

Diff Legend

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