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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines