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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines