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

Diff Legend

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