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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines