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

Diff Legend

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