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.135 by root, Sat Jan 7 19:29:17 2006 UTC vs.
Revision 1.231 by ayin, Tue Dec 18 12:04:50 2007 UTC

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

Diff Legend

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