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.144 by root, Tue Jan 17 11:02:10 2006 UTC vs.
Revision 1.237 by ayin, Mon Dec 31 15:45:29 2007 UTC

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

Diff Legend

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