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.108 by root, Fri Feb 4 11:41:23 2005 UTC vs.
Revision 1.233 by ayin, Fri Dec 21 16:21:06 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines