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.124 by root, Wed Dec 21 14:19:19 2005 UTC vs.
Revision 1.229 by root, Fri Dec 14 02:22:24 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
174#if OFF_FOCUS_FADING 278#if OFF_FOCUS_FADING
175 "black", 279 "rgb:00/00/00",
176#endif 280#endif
177 }; 281 };
178 282
179const char *const xa_names[] = 283void
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
216 };
217
218bool
219rxvt_term::init_vars () 284rxvt_term::init_vars ()
220{ 285{
286 pix_colors = //
221 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 287 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
222#ifdef OFF_FOCUS_FADING 288#ifdef OFF_FOCUS_FADING
223 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 289 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
224#endif 290#endif
225 pix_colors = pix_colors_focused;
226 291
227 if (pix_colors == NULL)
228 return false;
229
230#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
231 pixmap = None;
232#endif
233 292
234 MEvent.time = CurrentTime; 293 MEvent.time = CurrentTime;
235 MEvent.button = AnyButton; 294 MEvent.button = AnyButton;
236 options = DEFAULT_OPTIONS;
237 want_refresh = 1; 295 want_refresh = 1;
238 priv_modes = SavedModes = PrivMode_Default; 296 priv_modes = SavedModes = PrivMode_Default;
239 focus = 0;
240 ncol = 80; 297 ncol = 80;
241 nrow = 24; 298 nrow = 24;
242 int_bwidth = INTERNALBORDERWIDTH; 299 int_bwidth = INTERNALBORDERWIDTH;
243 ext_bwidth = EXTERNALBORDERWIDTH; 300 ext_bwidth = EXTERNALBORDERWIDTH;
244 lineSpace = LINESPACE; 301 lineSpace = LINESPACE;
245 saveLines = SAVELINES; 302 saveLines = SAVELINES;
246 numpix_colors = TOTAL_COLORS; 303 numpix_colors = TOTAL_COLORS;
247 304
248 refresh_limit = 1;
249 refresh_type = SLOW_REFRESH; 305 refresh_type = SLOW_REFRESH;
250 prev_nrow = prev_ncol = 0;
251 306
252 oldcursor.row = oldcursor.col = -1; 307 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; 308 last_bot = last_state = -1;
260 309
261#ifdef MENUBAR 310 set_option (Opt_scrollBar);
262 menu_readonly = 1; 311 set_option (Opt_scrollTtyOutput);
263# if ! (MENUBAR_MAX > 1) 312 set_option (Opt_jumpScroll);
264 CurrentBar = &BarList; 313 set_option (Opt_skipScroll);
265# endif /* (MENUBAR_MAX > 1) */ 314 set_option (Opt_secondaryScreen);
266#endif 315 set_option (Opt_secondaryScroll);
267 316 set_option (Opt_pastableTabs);
268 return true; 317 set_option (Opt_intensityStyles);
318 set_option (Opt_iso14755_52);
269} 319}
270 320
271void 321void
272rxvt_term::init_secondary () 322rxvt_term::init_secondary ()
273{ 323{
… …
280 if ((i = open ("/dev/null", O_RDONLY)) < 0) 330 if ((i = open ("/dev/null", O_RDONLY)) < 0)
281 { 331 {
282 /* TODO: BOO HISS */ 332 /* TODO: BOO HISS */
283 dup2 (STDERR_FILENO, STDIN_FILENO); 333 dup2 (STDERR_FILENO, STDIN_FILENO);
284 } 334 }
285 else if (i > STDIN_FILENO) 335 else if (i != STDIN_FILENO)
286 { 336 {
287 dup2 (i, STDIN_FILENO); 337 dup2 (i, STDIN_FILENO);
288 close (i); 338 close (i);
289 } 339 }
290 340
… …
305/*----------------------------------------------------------------------*/ 355/*----------------------------------------------------------------------*/
306const char ** 356const char **
307rxvt_term::init_resources (int argc, const char *const *argv) 357rxvt_term::init_resources (int argc, const char *const *argv)
308{ 358{
309 int i, r_argc; 359 int i, r_argc;
310 char *val;
311 const char **cmd_argv, **r_argv; 360 const char **cmd_argv, **r_argv;
312 361
313 /* 362 /*
314 * Look for -exec option. Find => split and make cmd_argv[] of command args 363 * Look for -e option. Find => split and make cmd_argv[] of command args
315 */ 364 */
316 for (r_argc = 0; r_argc < argc; r_argc++) 365 for (r_argc = 0; r_argc < argc; r_argc++)
317 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 366 if (!strcmp (argv[r_argc], "-e"))
318 break; 367 break;
368
369 if (r_argc == argc)
370 cmd_argv = NULL;
371 else if (!argv[r_argc + 1])
372 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
373 else
374 {
375 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
376
377 for (i = 0; i < argc - r_argc - 1; i++)
378 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
379
380 cmd_argv[i] = NULL;
381 }
319 382
320 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 383 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
321 384
322 for (i = 0; i < r_argc; i++) 385 for (i = 0; i < r_argc; i++)
323 r_argv[i] = (const char *)argv[i]; 386 r_argv[i] = (const char *)argv[i];
324 387
325 r_argv[i] = NULL; 388 r_argv[i] = NULL;
326 389
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]); 390 rs[Rs_name] = rxvt_basename (argv[0]);
340 391
341 /* 392 /*
342 * Open display, get options/resources and create the window 393 * Open display, get options/resources and create the window
343 */ 394 */
395
344 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 396 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
345 rs[Rs_display_name] = ":0"; 397 rs[Rs_display_name] = ":0";
346 398
347 get_options (r_argc, r_argv); 399 get_options (r_argc, r_argv);
348 400
349 if (!(display = displays.get (rs[Rs_display_name]))) 401 if (!(display = displays.get (rs[Rs_display_name])))
402 {
403 free (r_argv);
350 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 404 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
405 }
351 406
407 // using a local pointer decreases code size a lot
408 xa = display->xa;
409
410 set (display);
352 extract_resources (); 411 extract_resources ();
412
413#if XFT
414 if (rs[Rs_depth])
415 select_visual (strtol (rs[Rs_depth], 0, 0));
416#endif
417
418#ifdef HAVE_AFTERIMAGE
419 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
420#endif
353 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
354 439
355 /* 440 /*
356 * set any defaults not already set 441 * set any defaults not already set
357 */ 442 */
358 if (cmd_argv && cmd_argv[0]) 443 if (cmd_argv && cmd_argv[0])
359 { 444 {
360 if (!rs[Rs_title]) 445 if (!rs[Rs_title])
361 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 446 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
362 if (!rs[Rs_iconName]) 447 if (!rs[Rs_iconName])
363 rs[Rs_iconName] = rs[Rs_title]; 448 rs[Rs_iconName] = rs[Rs_title];
364 } 449 }
365 else 450 else
366 { 451 {
… …
369 if (!rs[Rs_iconName]) 454 if (!rs[Rs_iconName])
370 rs[Rs_iconName] = rs[Rs_name]; 455 rs[Rs_iconName] = rs[Rs_name];
371 } 456 }
372 457
373 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 458 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
374 saveLines = min (i, MAX_POSITIVE_INT16); 459 saveLines = min (i, MAX_SAVELINES);
375 460
376#if ENABLE_FRILLS 461#if ENABLE_FRILLS
377 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)
378 int_bwidth = min (i, MAX_POSITIVE_INT16); 463 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
379 464
380 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)
381 ext_bwidth = min (i, MAX_POSITIVE_INT16); 466 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
382 467
383 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 468 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
384 lineSpace = min (i, MAX_POSITIVE_INT16); 469 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
385#endif 470#endif
386 471
387#ifdef POINTER_BLANK 472#ifdef POINTER_BLANK
388 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 473 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
389 pointerBlankDelay = i; 474 pointerBlankDelay = i;
… …
391 pointerBlankDelay = 2; 476 pointerBlankDelay = 2;
392#endif 477#endif
393 478
394 /* no point having a scrollbar without having any scrollback! */ 479 /* no point having a scrollbar without having any scrollback! */
395 if (!saveLines) 480 if (!saveLines)
396 options &= ~Opt_scrollBar; 481 set_option (Opt_scrollBar, 0);
397 482
398#ifdef PRINTPIPE 483#ifdef PRINTPIPE
399 if (!rs[Rs_print_pipe]) 484 if (!rs[Rs_print_pipe])
400 rs[Rs_print_pipe] = PRINTPIPE; 485 rs[Rs_print_pipe] = PRINTPIPE;
401#endif 486#endif
… …
404 rs[Rs_cutchars] = CUTCHARS; 489 rs[Rs_cutchars] = CUTCHARS;
405 490
406#ifndef NO_BACKSPACE_KEY 491#ifndef NO_BACKSPACE_KEY
407 if (!rs[Rs_backspace_key]) 492 if (!rs[Rs_backspace_key])
408# ifdef DEFAULT_BACKSPACE 493# ifdef DEFAULT_BACKSPACE
409 key_backspace = DEFAULT_BACKSPACE; 494 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
410# else 495# else
411 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 496 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
412# endif 497# endif
413 else
414 {
415 val = strdup (rs[Rs_backspace_key]);
416 rxvt_Str_trim (val);
417 rxvt_Str_escaped (val);
418 key_backspace = val;
419 }
420#endif 498#endif
421 499
422#ifndef NO_DELETE_KEY 500#ifndef NO_DELETE_KEY
423 if (!rs[Rs_delete_key]) 501 if (!rs[Rs_delete_key])
424# ifdef DEFAULT_DELETE 502# ifdef DEFAULT_DELETE
425 key_delete = DEFAULT_DELETE; 503 rs[Rs_delete_key] = DEFAULT_DELETE;
426# else 504# else
427 key_delete = "\033[3~"; 505 rs[Rs_delete_key] = "\033[3~";
428# endif
429 else
430 {
431 val = strdup (rs[Rs_delete_key]);
432 rxvt_Str_trim (val);
433 rxvt_Str_escaped (val);
434 key_delete = val;
435 }
436#endif 506# endif
437 if (rs[Rs_answerbackstring]) 507#endif
438 {
439 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
440 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
441 }
442 508
443#ifdef HAVE_SCROLLBARS 509#ifdef HAVE_SCROLLBARS
444 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]);
445#endif 511#endif
446 512
447#ifdef XTERM_REVERSE_VIDEO 513#ifdef XTERM_REVERSE_VIDEO
448 /* this is how xterm implements reverseVideo */ 514 /* this is how xterm implements reverseVideo */
449 if (options & Opt_reverseVideo) 515 if (option (Opt_reverseVideo))
450 { 516 {
451 if (!rs[Rs_color + Color_fg]) 517 if (!rs[Rs_color + Color_fg])
452 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 518 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
519
453 if (!rs[Rs_color + Color_bg]) 520 if (!rs[Rs_color + Color_bg])
454 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 521 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
455 } 522 }
456#endif 523#endif
457 524
… …
459 if (!rs[Rs_color + i]) 526 if (!rs[Rs_color + i])
460 rs[Rs_color + i] = def_colorName[i]; 527 rs[Rs_color + i] = def_colorName[i];
461 528
462#ifndef XTERM_REVERSE_VIDEO 529#ifndef XTERM_REVERSE_VIDEO
463 /* this is how we implement reverseVideo */ 530 /* this is how we implement reverseVideo */
464 if (options & Opt_reverseVideo) 531 if (option (Opt_reverseVideo))
465 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 532 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
466#endif 533#endif
467 534
468 /* convenient aliases for setting fg/bg to colors */ 535 /* convenient aliases for setting fg/bg to colors */
469 color_aliases (Color_fg); 536 color_aliases (Color_fg);
470 color_aliases (Color_bg); 537 color_aliases (Color_bg);
471#ifndef NO_CURSORCOLOR 538#ifndef NO_CURSORCOLOR
472 color_aliases (Color_cursor); 539 color_aliases (Color_cursor);
473 color_aliases (Color_cursor2); 540 color_aliases (Color_cursor2);
474#endif /* NO_CURSORCOLOR */ 541#endif /* NO_CURSORCOLOR */
475 color_aliases (Color_pointer_fg); 542 color_aliases (Color_pointer_fg);
476 color_aliases (Color_pointer_bg); 543 color_aliases (Color_pointer_bg);
477 color_aliases (Color_border); 544 color_aliases (Color_border);
478#ifndef NO_BOLD_UNDERLINE_REVERSE 545#ifndef NO_BOLD_UNDERLINE_REVERSE
479 color_aliases (Color_BD); 546 color_aliases (Color_BD);
480 color_aliases (Color_UL); 547 color_aliases (Color_UL);
481 color_aliases (Color_RV); 548 color_aliases (Color_RV);
482#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 549#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
483 550
484 if (!rs[Rs_color + Color_border]) 551 if (!rs[Rs_color + Color_border])
485 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 552 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
486 553
487 return cmd_argv; 554 return cmd_argv;
… …
490/*----------------------------------------------------------------------*/ 557/*----------------------------------------------------------------------*/
491void 558void
492rxvt_term::init_env () 559rxvt_term::init_env ()
493{ 560{
494 int i; 561 int i;
495 unsigned int u;
496 char *val; 562 char *val;
497 563
498#ifdef DISPLAY_IS_IP 564#ifdef DISPLAY_IS_IP
499 /* Fixup display_name for export over pty to any interested terminal 565 /* Fixup display_name for export over pty to any interested terminal
500 * 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
… …
508 */ 574 */
509 val = rxvt_network_display (rs[Rs_display_name]); 575 val = rxvt_network_display (rs[Rs_display_name]);
510 rs[Rs_display_name] = (const char *)val; 576 rs[Rs_display_name] = (const char *)val;
511 577
512 if (val == NULL) 578 if (val == NULL)
513#endif /* DISPLAY_IS_IP */ 579#endif /* DISPLAY_IS_IP */
514 val = XDisplayString (display->display); 580 val = XDisplayString (dpy);
515 581
516 if (rs[Rs_display_name] == NULL) 582 if (rs[Rs_display_name] == NULL)
517 rs[Rs_display_name] = val; /* use broken `:0' value */ 583 rs[Rs_display_name] = val; /* use broken `:0' value */
518 584
519 i = strlen (val); 585 i = strlen (val);
520 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 586 env_display = (char *)rxvt_malloc (i + 9);
521 587
522 sprintf (env_display, "DISPLAY=%s", val); 588 sprintf (env_display, "DISPLAY=%s", val);
523 589
524 /* avoiding the math library: 590 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
525 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
526 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
527 ;
528 max_it (i, 1);
529 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
530
531 sprintf (env_windowid, "WINDOWID=%u",
532 (unsigned int)parent[0]);
533 591
534 /* add entries to the environment: 592 /* add entries to the environment:
535 * @ DISPLAY: in case we started with -display 593 * @ DISPLAY: in case we started with -display
536 * @ WINDOWID: X window id number of the window 594 * @ WINDOWID: X window id number of the window
537 * @ COLORTERM: terminal sub-name and also indicates its color 595 * @ COLORTERM: terminal sub-name and also indicates its color
… …
539 * @ TERMINFO: path to terminfo directory 597 * @ TERMINFO: path to terminfo directory
540 * @ COLORFGBG: fg;bg color codes 598 * @ COLORFGBG: fg;bg color codes
541 */ 599 */
542 putenv (env_display); 600 putenv (env_display);
543 putenv (env_windowid); 601 putenv (env_windowid);
602
544 if (env_colorfgbg) 603 if (env_colorfgbg)
545 putenv (env_colorfgbg); 604 putenv (env_colorfgbg);
546 605
547#ifdef RXVT_TERMINFO 606#ifdef RXVT_TERMINFO
548 putenv ("TERMINFO=" RXVT_TERMINFO); 607 putenv ("TERMINFO=" RXVT_TERMINFO);
549#endif 608#endif
550 609
551 if (display->depth <= 2) 610 if (depth <= 2)
552 putenv ("COLORTERM=" COLORTERMENV "-mono"); 611 putenv ("COLORTERM=" COLORTERMENV "-mono");
553 else 612 else
554 putenv ("COLORTERM=" COLORTERMENVFULL); 613 putenv ("COLORTERM=" COLORTERMENVFULL);
555 614
556 if (rs[Rs_term_name] != NULL) 615 if (rs[Rs_term_name] != NULL)
557 { 616 {
558 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);
559 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 618 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
560 putenv (env_term); 619 putenv (env_term);
561 } 620 }
562 else 621 else
563 putenv ("TERM=" TERMENV); 622 putenv ("TERM=" TERMENV);
… …
565#ifdef HAVE_UNSETENV 624#ifdef HAVE_UNSETENV
566 /* avoid passing old settings and confusing term size */ 625 /* avoid passing old settings and confusing term size */
567 unsetenv ("LINES"); 626 unsetenv ("LINES");
568 unsetenv ("COLUMNS"); 627 unsetenv ("COLUMNS");
569 unsetenv ("TERMCAP"); /* terminfo should be okay */ 628 unsetenv ("TERMCAP"); /* terminfo should be okay */
570#endif /* HAVE_UNSETENV */ 629#endif /* HAVE_UNSETENV */
571} 630}
572 631
573/*----------------------------------------------------------------------*/ 632/*----------------------------------------------------------------------*/
574/* 633/*
575 * This is more or less stolen straight from XFree86 xterm. 634 * This is more or less stolen straight from XFree86 xterm.
576 * This should support all European type languages. 635 * This should support all European type languages.
577 */ 636 */
578void 637void
579rxvt_term::set_locale (const char *locale) 638rxvt_term::set_locale (const char *locale)
580{ 639{
640 set_environ (envv);
641
581#if HAVE_XSETLOCALE || HAVE_SETLOCALE 642#if HAVE_XSETLOCALE || HAVE_SETLOCALE
582 free (this->locale); 643 free (this->locale);
583 this->locale = setlocale (LC_CTYPE, locale); 644 this->locale = setlocale (LC_CTYPE, locale);
584 645
585 if (!this->locale) 646 if (!this->locale)
586 { 647 {
587 if (*locale) 648 if (*locale)
588 { 649 {
589 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);
590 setlocale (LC_CTYPE, ""); 651 setlocale (LC_CTYPE, "C");
591 } 652 }
592 else 653 else
593 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");
594 655
595 this->locale = ""; 656 this->locale = "C";
596 } 657 }
597 658
598 659
599 this->locale = rxvt_strdup (this->locale); 660 this->locale = strdup (this->locale);
600 SET_LOCALE (this->locale); 661 SET_LOCALE (this->locale);
601 mbstate.reset (); 662 mbstate.reset ();
602#endif 663#endif
603 664
604#if HAVE_NL_LANGINFO 665#if HAVE_NL_LANGINFO
… …
615} 676}
616 677
617void 678void
618rxvt_term::init_xlocale () 679rxvt_term::init_xlocale ()
619{ 680{
681 set_environ (envv);
682
620#ifdef USE_XIM 683#ifdef USE_XIM
621 if (!locale) 684 if (!locale)
622 rxvt_warn ("setting locale failed, working without locale support.\n"); 685 rxvt_warn ("setting locale failed, working without locale support.\n");
623 else 686 else
624 { 687 {
… …
646 * Initialize the command connection. 709 * Initialize the command connection.
647 * This should be called after the X server connection is established. 710 * This should be called after the X server connection is established.
648 */ 711 */
649 712
650#ifdef META8_OPTION 713#ifdef META8_OPTION
651 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 714 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
652#endif 715#endif
653 716
654 get_ourmods (); 717 get_ourmods ();
655 718
656 if (!(options & Opt_scrollTtyOutput)) 719 if (!option (Opt_scrollTtyOutput))
657 priv_modes |= PrivMode_TtyOutputInh; 720 priv_modes |= PrivMode_TtyOutputInh;
658 if (options & Opt_scrollTtyKeypress) 721 if (option (Opt_scrollTtyKeypress))
659 priv_modes |= PrivMode_Keypress; 722 priv_modes |= PrivMode_Keypress;
660 if (!(options & Opt_jumpScroll)) 723 if (!option (Opt_jumpScroll))
661 priv_modes |= PrivMode_smoothScroll; 724 priv_modes |= PrivMode_smoothScroll;
662 725
663#ifndef NO_BACKSPACE_KEY 726#ifndef NO_BACKSPACE_KEY
664 if (strcmp (key_backspace, "DEC") == 0) 727 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
665 priv_modes |= PrivMode_HaveBackSpace; 728 priv_modes |= PrivMode_HaveBackSpace;
666#endif 729#endif
667 730
668 /* add value for scrollBar */ 731 /* add value for scrollBar */
669 if (scrollbar_visible ()) 732 if (scrollBar.state)
670 { 733 {
671 priv_modes |= PrivMode_scrollBar; 734 priv_modes |= PrivMode_scrollBar;
672 SavedModes |= PrivMode_scrollBar; 735 SavedModes |= PrivMode_scrollBar;
673 } 736 }
674
675 if (menubar_visible ())
676 {
677 priv_modes |= PrivMode_menuBar;
678 SavedModes |= PrivMode_menuBar;
679 }
680
681#ifdef CURSOR_BLINK
682 if (options & Opt_cursorBlink)
683 (void)gettimeofday (&lastcursorchange, NULL);
684#endif
685 737
686 run_command (argv); 738 run_command (argv);
687} 739}
688 740
689/*----------------------------------------------------------------------*/ 741/*----------------------------------------------------------------------*/
… …
693 int i; 745 int i;
694 746
695#ifdef OFF_FOCUS_FADING 747#ifdef OFF_FOCUS_FADING
696 pix_colors = pix_colors_focused; 748 pix_colors = pix_colors_focused;
697#endif 749#endif
698 750
699 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 751 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
700 { 752 {
753 const char *name = rs[Rs_color + i];
754
755 if (!name)
756 continue;
757
701 rxvt_color xcol; 758 rxvt_color xcol;
702 759
703 if (!rs[Rs_color + i]) 760 if (!set_color (xcol, name))
704 continue;
705
706 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
707 { 761 {
708#ifndef XTERM_REVERSE_VIDEO 762#ifndef XTERM_REVERSE_VIDEO
709 if (i < 2 && (options & Opt_reverseVideo)) 763 if (i < 2 && option (Opt_reverseVideo))
710 rs[Rs_color + i] = def_colorName[!i]; 764 name = def_colorName [1 - i];
711 else 765 else
712#endif 766#endif
713 rs[Rs_color + i] = def_colorName[i]; 767 name = def_colorName [i];
714 768
715 if (!rs[Rs_color + i]) 769 if (!name)
716 continue; 770 continue;
717 771
718 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 772 if (!set_color (xcol, name))
719 { 773 {
720 switch (i) 774 switch (i)
721 { 775 {
722 case Color_fg: 776 case Color_fg:
723 case Color_bg: 777 case Color_bg:
724 /* fatal: need bg/fg color */
725 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 778 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
726 /* NOTREACHED */ 779 name = "";
727 break; 780 break;
728#ifndef NO_CURSORCOLOR 781#ifndef NO_CURSORCOLOR
729 case Color_cursor2: 782 case Color_cursor2:
730 xcol = pix_colors[Color_fg]; 783#endif
731 break;
732#endif /* ! NO_CURSORCOLOR */
733 case Color_pointer_fg: 784 case Color_pointer_fg:
734 xcol = pix_colors[Color_fg]; 785 name = rs[Rs_color + Color_fg];
786 xcol.set (this, name);
735 break; 787 break;
736 default: 788 default:
737 xcol = pix_colors[Color_bg]; /* None */ 789 name = rs[Rs_color + Color_bg];
790 xcol.set (this, name);
738 break; 791 break;
739 } 792 }
740 } 793 }
741 } 794 }
742 795
743 pix_colors[i] = xcol; 796 pix_colors[i] = xcol;
744 SET_PIXCOLOR (i); 797 rs[Rs_color + i] = name;
745 }
746
747#ifdef OFF_FOCUS_FADING
748 if (rs[Rs_fade])
749 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
750 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
751#endif
752
753 if (display->depth <= 2)
754 { 798 }
799
800 if (depth <= 2)
801 {
755 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);
756 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);
757 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);
758 } 805 }
759 806
760 /* 807 /*
761 * get scrollBar/menuBar shadow colors 808 * get scrollBar shadow colors
762 * 809 *
763 * The calculations of topShadow/bottomShadow values are adapted 810 * The calculations of topShadow/bottomShadow values are adapted
764 * from the fvwm window manager. 811 * from the fvwm window manager.
765 */ 812 */
766#ifdef KEEP_SCROLLCOLOR 813#ifdef KEEP_SCROLLCOLOR
767
768 if (display->depth <= 2) 814 if (depth <= 2)
769 { 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;
931 Window top, parent; 965 Window top, parent;
932 dDisp;
933 966
934#ifdef USING_W11LIB 967 dLocal (Display *, dpy);
935 /* enable W11 callbacks */
936 W11AddEventHandler (disp, rxvt_W11_process_x_event);
937#endif
938 968
939 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 969 /* grab colors before netscape does */
940 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 970 Get_Colours ();
941 971
942 if (options & Opt_transparent) 972 if (!set_fonts ())
943 { 973 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
944 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 974
945 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 975 parent = display->root;
946 } 976
977 attributes.override_redirect = !!option (Opt_override_redirect);
947 978
948#if ENABLE_FRILLS 979#if ENABLE_FRILLS
949 if (options & Opt_borderLess) 980 if (option (Opt_borderLess))
950 { 981 {
951 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 982 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
952
953 if (prop == None)
954 { 983 {
955 /* 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");
956#ifdef PREFER_24BIT
957 attributes.override_redirect = TRUE; 985 attributes.override_redirect = true;
958#endif
959 mwmhints.flags = 0;
960 } 986 }
961 else 987 else
962 { 988 {
963 mwmhints.flags = MWM_HINTS_DECORATIONS; 989 mwmhints.flags = MWM_HINTS_DECORATIONS;
964 mwmhints.decorations = 0;
965 } 990 }
966 } 991 }
967 else
968 mwmhints.flags = 0;
969#endif 992#endif
970
971 /* grab colors before netscape does */
972 Get_Colours ();
973
974 if (!set_fonts ())
975 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
976
977 parent = DefaultRootWindow (disp);
978 993
979#if ENABLE_XEMBED 994#if ENABLE_XEMBED
980 if (rs[Rs_embed]) 995 if (rs[Rs_embed])
981 { 996 {
982 XWindowAttributes wattr; 997 XWindowAttributes wattr;
983 998
984 parent = strtol (rs[Rs_embed], 0, 0); 999 parent = strtol (rs[Rs_embed], 0, 0);
985 1000
986 if (!XGetWindowAttributes (disp, parent, &wattr)) 1001 if (!XGetWindowAttributes (dpy, parent, &wattr))
987 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 1002 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
988 1003
989 window_calc (wattr.width, wattr.height); 1004 window_calc (wattr.width, wattr.height);
990 } 1005 }
991#endif 1006#endif
992 1007
993 window_calc (0, 0); 1008 window_calc (0, 0);
994 1009
995 /* sub-window placement & size in rxvt_resize_subwindows () */ 1010 /* sub-window placement & size in rxvt_resize_subwindows () */
996#ifdef PREFER_24BIT
997 attributes.background_pixel = pix_colors_focused[Color_border]; 1011 attributes.background_pixel = pix_colors_focused [Color_border];
998 attributes.border_pixel = pix_colors_focused[Color_border]; 1012 attributes.border_pixel = pix_colors_focused [Color_border];
999 attributes.colormap = display->cmap; 1013 attributes.colormap = cmap;
1014
1000 top = XCreateWindow (disp, parent, 1015 top = XCreateWindow (dpy, parent,
1001 szHint.x, szHint.y, 1016 szHint.x, szHint.y,
1002 szHint.width, szHint.height, 1017 szHint.width, szHint.height,
1003 ext_bwidth, 1018 ext_bwidth,
1004 display->depth, InputOutput, 1019 depth, InputOutput, visual,
1005 display->visual,
1006 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 1020 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1007#else 1021 &attributes);
1008 top = XCreateSimpleWindow (disp, parent,
1009 szHint.x, szHint.y,
1010 szHint.width, szHint.height,
1011 ext_bwidth,
1012 pix_colors_focused[Color_border],
1013 pix_colors_focused[Color_border]);
1014#endif
1015 1022
1016 this->parent[0] = top; 1023 this->parent[0] = top;
1017 1024
1018 old_width = szHint.width; 1025 old_width = szHint.width;
1019 old_height = szHint.height; 1026 old_height = szHint.height;
1020 1027
1021 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1028 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1022 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1029 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1023 1030
1024 classHint.res_name = (char *)rs[Rs_name]; 1031 classHint.res_name = (char *)rs[Rs_name];
1025 classHint.res_class = (char *)RESCLASS; 1032 classHint.res_class = (char *)RESCLASS;
1026 1033
1027 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1034 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1028 wmHint.input = True; 1035 wmHint.input = True;
1029 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1036 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1030 wmHint.window_group = top; 1037 wmHint.window_group = top;
1031 1038
1032 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 1039 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1033 &szHint, &wmHint, &classHint); 1040 &szHint, &wmHint, &classHint);
1041
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
1034 1047
1035 Atom protocols[] = { 1048 Atom protocols[] = {
1036 xa[XA_WM_DELETE_WINDOW], 1049 xa[XA_WM_DELETE_WINDOW],
1037#if ENABLE_EWMH 1050#if ENABLE_EWMH
1038 xa[XA_NET_WM_PING], 1051 xa[XA_NET_WM_PING],
1039#endif 1052#endif
1040 }; 1053 };
1041 1054
1042 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 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
1043 1061
1044#if ENABLE_EWMH 1062#if ENABLE_EWMH
1045 long pid = getpid (); 1063 long pid = getpid ();
1046 1064
1047 XChangeProperty (disp, top, 1065 XChangeProperty (dpy, top,
1048 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1066 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1049 PropModeReplace, (unsigned char *)&pid, 1); 1067 PropModeReplace, (unsigned char *)&pid, 1);
1050 1068
1051 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1069 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1052#endif 1070#endif
1053 1071
1054 XSelectInput (disp, top, 1072 XSelectInput (dpy, top,
1055 KeyPressMask 1073 KeyPressMask
1056#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1074#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1057 | KeyReleaseMask 1075 | KeyReleaseMask
1058#endif 1076#endif
1059 | FocusChangeMask | VisibilityChangeMask 1077 | FocusChangeMask | VisibilityChangeMask
1060 | ExposureMask | StructureNotifyMask); 1078 | ExposureMask | StructureNotifyMask);
1061 1079
1062 termwin_ev.start (display, top); 1080 termwin_ev.start (display, top);
1063 1081
1064#if ENABLE_FRILLS
1065 if (mwmhints.flags)
1066 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1067 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1068#endif
1069
1070 /* 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 */
1071 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1083 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1072 1084
1073#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1085#ifdef HAVE_SCROLLBARS
1074 /* cursor (menuBar/scrollBar): Black-on-White */ 1086 /* cursor scrollBar: Black-on-White */
1075 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1087 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1076#endif 1088#endif
1077 1089
1078 /* the vt window */ 1090 /* the vt window */
1079 vt = XCreateSimpleWindow (disp, top, 1091 vt = XCreateSimpleWindow (dpy, top,
1080 window_vt_x,
1081 window_vt_y, 1092 window_vt_x, window_vt_y,
1082 TermWin_TotalWidth (), 1093 width, height,
1083 TermWin_TotalHeight (),
1084 0, 1094 0,
1085 pix_colors_focused[Color_fg], 1095 pix_colors_focused[Color_fg],
1086 pix_colors_focused[Color_bg]); 1096 pix_colors_focused[Color_bg]);
1087#ifdef DEBUG_X
1088 XStoreName (disp, vt, "vt window");
1089#endif
1090 1097
1091 attributes.bit_gravity = NorthWestGravity; 1098 attributes.bit_gravity = NorthWestGravity;
1092 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1099 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1093 1100
1094 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1101 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1095 1102
1096#ifdef POINTER_BLANK
1097 if (options & Opt_pointerBlank) 1103 if (option (Opt_pointerBlank))
1098 vt_emask |= PointerMotionMask; 1104 vt_emask |= PointerMotionMask;
1099 else 1105 else
1100#endif
1101 vt_emask |= Button1MotionMask | Button3MotionMask; 1106 vt_emask |= Button1MotionMask | Button3MotionMask;
1102 1107
1103 XSelectInput (disp, vt, vt_emask); 1108 vt_select_input ();
1109
1104 vt_ev.start (display, vt); 1110 vt_ev.start (display, vt);
1105 1111
1106#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1107 if (menuBar_height ())
1108 {
1109 menuBar.win = XCreateSimpleWindow (disp, top,
1110 window_vt_x, 0,
1111 TermWin_TotalWidth (),
1112 menuBar_TotalHeight (),
1113 0,
1114 pix_colors_focused[Color_fg],
1115 pix_colors_focused[Color_scroll]);
1116
1117#ifdef DEBUG_X
1118 XStoreName (disp, menuBar.win, "menubar");
1119#endif
1120
1121 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1122
1123 XDefineCursor (disp, menuBar.win,
1124 XCreateFontCursor (disp, XC_left_ptr));
1125
1126 XSelectInput (disp, menuBar.win,
1127 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1128 menubar_ev.start (display, menuBar.win);
1129 }
1130#endif
1131
1132#ifdef XPM_BACKGROUND
1133 if (rs[Rs_backgroundPixmap] != NULL
1134 && ! (options & Opt_transparent))
1135 {
1136 const char *p = rs[Rs_backgroundPixmap];
1137
1138 if ((p = strchr (p, ';')) != NULL)
1139 {
1140 p++;
1141 scale_pixmap (p);
1142 }
1143
1144 set_bgPixmap (rs[Rs_backgroundPixmap]);
1145 scr_touch (true);
1146 }
1147#endif
1148
1149 /* graphics context for the vt window */ 1112 /* graphics context for the vt window */
1150 gcvalue.foreground = pix_colors[Color_fg]; 1113 gcvalue.foreground = pix_colors[Color_fg];
1151 gcvalue.background = pix_colors[Color_bg]; 1114 gcvalue.background = pix_colors[Color_bg];
1152 gcvalue.graphics_exposures = 1; 1115 gcvalue.graphics_exposures = 0;
1116
1153 gc = XCreateGC (disp, vt, 1117 gc = XCreateGC (dpy, vt,
1154 GCForeground | GCBackground | GCGraphicsExposures, 1118 GCForeground | GCBackground | GCGraphicsExposures,
1155 &gcvalue); 1119 &gcvalue);
1156 1120
1157 drawable = new rxvt_drawable (display, vt); 1121 drawable = new rxvt_drawable (this, vt);
1158 1122
1159#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1123#ifdef RXVT_SCROLLBAR
1160 gcvalue.foreground = pix_colors[Color_topShadow]; 1124 gcvalue.foreground = pix_colors[Color_topShadow];
1161 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1125 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1162 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1126 gcvalue.foreground = pix_colors[Color_bottomShadow];
1163 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1127 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1164 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1128 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1165 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1129 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1166#endif 1130#endif
1167 1131
1168#ifdef OFF_FOCUS_FADING 1132#ifdef OFF_FOCUS_FADING
1169 // initially we are in unfocused state 1133 // initially we are in unfocused state
1170 if (rs[Rs_fade]) 1134 if (rs[Rs_fade])
1171 pix_colors = pix_colors_unfocused; 1135 pix_colors = pix_colors_unfocused;
1172#endif 1136#endif
1173 1137
1174 pointer_unblank (); 1138 pointer_unblank ();
1175 scr_recolour (); 1139 scr_recolour ();
1176
1177#if ENABLE_XEMBED
1178 if (rs[Rs_embed])
1179 {
1180 long info[2] = { 0, XEMBED_MAPPED };
1181
1182 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1183 32, PropModeReplace, (unsigned char *)&info, 2);
1184 }
1185#endif
1186} 1140}
1187 1141
1188/* ------------------------------------------------------------------------- * 1142/* ------------------------------------------------------------------------- *
1189 * GET TTY CURRENT STATE * 1143 * GET TTY CURRENT STATE *
1190 * ------------------------------------------------------------------------- */ 1144 * ------------------------------------------------------------------------- */
1191void 1145void
1192rxvt_get_ttymode (ttymode_t *tio, int erase) 1146rxvt_get_ttymode (ttymode_t *tio, int erase)
1193{ 1147{
1194#ifdef HAVE_TERMIOS_H
1195 /* 1148 /*
1196 * standard System V termios interface 1149 * standard System V termios interface
1197 */ 1150 */
1198 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1151 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1199 { 1152 {
1200 /* 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
1201 tio->c_cc[VINTR] = CINTR; 1157 tio->c_cc[VINTR] = CINTR;
1202 tio->c_cc[VQUIT] = CQUIT; 1158 tio->c_cc[VQUIT] = CQUIT;
1203 tio->c_cc[VERASE] = CERASE; 1159 tio->c_cc[VERASE] = CERASE;
1160#ifdef VERASE2
1161 tio->c_cc[VERASE2] = CERASE2;
1162#endif
1204 tio->c_cc[VKILL] = CKILL; 1163 tio->c_cc[VKILL] = CKILL;
1205 tio->c_cc[VSTART] = CSTART; 1164 tio->c_cc[VSTART] = CSTART;
1206 tio->c_cc[VSTOP] = CSTOP; 1165 tio->c_cc[VSTOP] = CSTOP;
1207 tio->c_cc[VSUSP] = CSUSP; 1166 tio->c_cc[VSUSP] = CSUSP;
1208# ifdef VDSUSP 1167# ifdef VDSUSP
… …
1260 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1219 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1261# if defined (ECHOCTL) && defined (ECHOKE) 1220# if defined (ECHOCTL) && defined (ECHOKE)
1262 | ECHOCTL | ECHOKE 1221 | ECHOCTL | ECHOKE
1263# endif 1222# endif
1264 | ECHOE | ECHOK); 1223 | ECHOE | ECHOK);
1265# else /* HAVE_TERMIOS_H */
1266
1267 /*
1268 * sgtty interface
1269 */
1270
1271 /* get parameters -- gtty */
1272 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1273 {
1274 tio->sg.sg_erase = CERASE; /* ^H */
1275 tio->sg.sg_kill = CKILL; /* ^U */
1276 }
1277
1278 if (erase != -1)
1279 tio->sg.sg_erase = (char)erase;
1280
1281 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1282
1283 /* get special characters */
1284 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1285 {
1286 tio->tc.t_intrc = CINTR; /* ^C */
1287 tio->tc.t_quitc = CQUIT; /* ^\ */
1288 tio->tc.t_startc = CSTART; /* ^Q */
1289 tio->tc.t_stopc = CSTOP; /* ^S */
1290 tio->tc.t_eofc = CEOF; /* ^D */
1291 tio->tc.t_brkc = -1;
1292 }
1293
1294 /* get local special chars */
1295 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1296 {
1297 tio->lc.t_suspc = CSUSP; /* ^Z */
1298 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1299 tio->lc.t_rprntc = CRPRNT; /* ^R */
1300 tio->lc.t_flushc = CFLUSH; /* ^O */
1301 tio->lc.t_werasc = CWERASE; /* ^W */
1302 tio->lc.t_lnextc = CLNEXT; /* ^V */
1303 }
1304 /* get line discipline */
1305 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1306# ifdef NTTYDISC
1307 tio->line = NTTYDISC;
1308# endif /* NTTYDISC */
1309
1310 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1311#endif /* HAVE_TERMIOS_H */
1312 1224
1313 /* 1225 /*
1314 * Debugging 1226 * Debugging
1315 */ 1227 */
1316#ifdef DEBUG_TTYMODE 1228#ifdef DEBUG_TTYMODE
1317#ifdef HAVE_TERMIOS_H
1318 /* c_iflag bits */ 1229 /* c_iflag bits */
1319 fprintf (stderr, "Input flags\n"); 1230 fprintf (stderr, "Input flags\n");
1320 1231
1321 /* cpp token stringize doesn't work on all machines <sigh> */ 1232 /* cpp token stringize doesn't work on all machines <sigh> */
1322# define FOO(flag,name) \ 1233# define FOO(flag,name) \
… …
1385 FOO (VLNEXT, "VLNEXT"); 1296 FOO (VLNEXT, "VLNEXT");
1386# endif 1297# endif
1387 1298
1388 fprintf (stderr, "\n"); 1299 fprintf (stderr, "\n");
1389# undef FOO 1300# undef FOO
1390# endif /* HAVE_TERMIOS_H */ 1301#endif /* DEBUG_TTYMODE */
1391#endif /* DEBUG_TTYMODE */
1392} 1302}
1393 1303
1394/*----------------------------------------------------------------------*/ 1304/*----------------------------------------------------------------------*/
1395/* 1305/*
1396 * 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
… …
1401rxvt_term::run_command (const char *const *argv) 1311rxvt_term::run_command (const char *const *argv)
1402{ 1312{
1403#if ENABLE_FRILLS 1313#if ENABLE_FRILLS
1404 if (rs[Rs_pty_fd]) 1314 if (rs[Rs_pty_fd])
1405 { 1315 {
1406 pty.pty = atoi (rs[Rs_pty_fd]); 1316 pty->pty = atoi (rs[Rs_pty_fd]);
1407 fcntl (pty.pty, F_SETFL, O_NONBLOCK); 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 }
1408 } 1326 }
1409 else 1327 else
1410#endif 1328#endif
1411 if (!pty.get ()) 1329 if (!pty->get ())
1412 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1330 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1413 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 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1414 pty.set_utf8_mode (enc_utf8); 1345 pty->set_utf8_mode (enc_utf8);
1415 1346
1416 /* set initial window size */ 1347 /* set initial window size */
1417 tt_winch (); 1348 tt_winch ();
1418
1419 int er;
1420
1421#ifndef NO_BACKSPACE_KEY
1422 if (key_backspace[0] && !key_backspace[1])
1423 er = key_backspace[0];
1424 else if (strcmp (key_backspace, "DEC") == 0)
1425 er = '\177'; /* the initial state anyway */
1426 else
1427#endif
1428 er = -1;
1429
1430 rxvt_get_ttymode (&tio, er);
1431 1349
1432#if ENABLE_FRILLS 1350#if ENABLE_FRILLS
1433 if (rs[Rs_pty_fd]) 1351 if (rs[Rs_pty_fd])
1434 return; 1352 return;
1435#endif 1353#endif
1436 1354
1437#ifndef __QNX__
1438 /* spin off the command interpreter */ 1355 /* spin off the command interpreter */
1439 switch (cmd_pid = fork ()) 1356 switch (cmd_pid = fork ())
1440 { 1357 {
1441 case -1: 1358 case -1:
1442 { 1359 {
… …
1444 rxvt_fatal ("can't fork, aborting.\n"); 1361 rxvt_fatal ("can't fork, aborting.\n");
1445 } 1362 }
1446 case 0: 1363 case 0:
1447 init_env (); 1364 init_env ();
1448 1365
1449 if (!pty.make_controlling_tty ()) 1366 if (!pty->make_controlling_tty ())
1450 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1367 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1451 else 1368 else
1452 { 1369 {
1453 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1370 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1454 dup2 (pty.tty, STDIN_FILENO); 1371 dup2 (pty->tty, STDIN_FILENO);
1455 dup2 (pty.tty, STDOUT_FILENO); 1372 dup2 (pty->tty, STDOUT_FILENO);
1456 dup2 (pty.tty, STDERR_FILENO); 1373 dup2 (pty->tty, STDERR_FILENO);
1457 1374
1458 // close all our file handles that we do no longer need 1375 // close all our file handles that we do no longer need
1459 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1376 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1460 { 1377 {
1461 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1378 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1462 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1379 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1463 } 1380 }
1464 1381
1465 run_child (argv); 1382 run_child (argv);
1466 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1383 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1467 } 1384 }
1468 1385
1469 _exit (EXIT_FAILURE); 1386 _exit (EXIT_FAILURE);
1470 1387
1471 default: 1388 default:
1472 { 1389 if (!option (Opt_utmpInhibit))
1473#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1390 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1474 int fdstdin;
1475 1391
1476 fdstdin = dup (STDIN_FILENO); 1392 pty->close_tty ();
1477 dup2 (pty.tty, STDIN_FILENO);
1478#endif
1479 1393
1480#ifdef UTMP_SUPPORT 1394 child_ev.start (cmd_pid);
1481 privileged_utmp (SAVE);
1482#endif
1483 1395
1484#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1396 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1485
1486 dup2 (fdstdin, STDIN_FILENO);
1487 close (fdstdin);
1488#endif
1489 }
1490
1491 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1492 break; 1397 break;
1493 } 1398 }
1494#else /* __QNX__ uses qnxspawn () */
1495 fchmod (pty.tty, 0622);
1496 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1497 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1498
1499 if (run_child (argv) == -1)
1500 exit (EXIT_FAILURE);
1501#endif
1502} 1399}
1503 1400
1504/* ------------------------------------------------------------------------- * 1401/* ------------------------------------------------------------------------- *
1505 * CHILD PROCESS OPERATIONS * 1402 * CHILD PROCESS OPERATIONS *
1506 * ------------------------------------------------------------------------- */ 1403 * ------------------------------------------------------------------------- */
… …
1511int 1408int
1512rxvt_term::run_child (const char *const *argv) 1409rxvt_term::run_child (const char *const *argv)
1513{ 1410{
1514 char *login; 1411 char *login;
1515 1412
1516 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1517
1518 if (options & Opt_console) 1413 if (option (Opt_console))
1414 {
1519 { /* be virtual console, fail silently */ 1415 /* be virtual console, fail silently */
1520#ifdef TIOCCONS 1416#ifdef TIOCCONS
1521 unsigned int on = 1; 1417 unsigned int on = 1;
1522 1418
1523 ioctl (STDIN_FILENO, TIOCCONS, &on); 1419 ioctl (STDIN_FILENO, TIOCCONS, &on);
1524#elif defined (SRIOCSREDIR) 1420#elif defined (SRIOCSREDIR)
… …
1526 1422
1527 fd = open (CONSOLE, O_WRONLY, 0); 1423 fd = open (CONSOLE, O_WRONLY, 0);
1528 if (fd >= 0) 1424 if (fd >= 0)
1529 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1425 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1530 close (fd); 1426 close (fd);
1531#endif /* SRIOCSREDIR */ 1427#endif /* SRIOCSREDIR */
1532 } 1428 }
1533 1429
1534 /* reset signals and spin off the command interpreter */ 1430 /* reset signals and spin off the command interpreter */
1535 signal (SIGINT, SIG_DFL); 1431 signal (SIGINT, SIG_DFL);
1536 signal (SIGQUIT, SIG_DFL); 1432 signal (SIGQUIT, SIG_DFL);
… …
1543 */ 1439 */
1544#ifdef SIGTSTP 1440#ifdef SIGTSTP
1545 signal (SIGTSTP, SIG_IGN); 1441 signal (SIGTSTP, SIG_IGN);
1546 signal (SIGTTIN, SIG_IGN); 1442 signal (SIGTTIN, SIG_IGN);
1547 signal (SIGTTOU, SIG_IGN); 1443 signal (SIGTTOU, SIG_IGN);
1548#endif /* SIGTSTP */ 1444#endif /* SIGTSTP */
1549 1445
1550 // unblock signals (signals are blocked by iom.C 1446 // unblock signals (signals are blocked by iom.C
1551 sigset_t ss; 1447 sigset_t ss;
1552 sigemptyset (&ss); 1448 sigemptyset (&ss);
1553 sigprocmask (SIG_SETMASK, &ss, 0); 1449 sigprocmask (SIG_SETMASK, &ss, 0);
1554 1450
1555#ifndef __QNX__
1556 /* command interpreter path */ 1451 /* command interpreter path */
1557 if (argv != NULL) 1452 if (argv)
1558 { 1453 {
1559# ifdef DEBUG_CMD 1454# ifdef DEBUG_CMD
1560 int i; 1455 int i;
1561 1456
1562 for (i = 0; argv[i]; i++) 1457 for (i = 0; argv[i]; i++)
… …
1566 execvp (argv[0], (char *const *)argv); 1461 execvp (argv[0], (char *const *)argv);
1567 /* no error message: STDERR is closed! */ 1462 /* no error message: STDERR is closed! */
1568 } 1463 }
1569 else 1464 else
1570 { 1465 {
1571 const char *argv0, *shell; 1466 const char *argv0, *shell;
1572 1467
1573 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1468 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1574 shell = "/bin/sh"; 1469 shell = "/bin/sh";
1575 1470
1576 argv0 = (const char *)rxvt_r_basename (shell); 1471 argv0 = (const char *)rxvt_basename (shell);
1577 1472
1578 if (options & Opt_loginShell) 1473 if (option (Opt_loginShell))
1579 { 1474 {
1580 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1475 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1581 1476
1582 login[0] = '-'; 1477 login[0] = '-';
1583 strcpy (&login[1], argv0); 1478 strcpy (&login[1], argv0);
1584 argv0 = login; 1479 argv0 = login;
1585 } 1480 }
1481
1586 execlp (shell, argv0, NULL); 1482 execlp (shell, argv0, (char *)0);
1587 /* no error message: STDERR is closed! */ 1483 /* no error message: STDERR is closed! */
1588 } 1484 }
1589
1590#else /* __QNX__ uses qnxspawn () */
1591
1592 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1593 char *command = NULL, fullcommand[_MAX_PATH];
1594 char **arg_v, *arg_a[2] = { NULL, NULL };
1595
1596 if (argv != NULL)
1597 {
1598 if (access (argv[0], X_OK) == -1)
1599 {
1600 if (strchr (argv[0], '/') == NULL)
1601 {
1602 searchenv (argv[0], "PATH", fullcommand);
1603
1604 if (fullcommand[0] != '\0')
1605 command = fullcommand;
1606 }
1607
1608 if (access (command, X_OK) == -1)
1609 return -1;
1610 }
1611 else
1612 command = argv[0];
1613
1614 arg_v = argv;
1615 }
1616 else
1617 {
1618 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1619 command = "/bin/sh";
1620
1621 arg_a[0] = my_basename (command);
1622
1623 if (options & Opt_loginShell)
1624 {
1625 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1626
1627 login[0] = '-';
1628 strcpy (&login[1], arg_a[0]);
1629 arg_a[0] = login;
1630 }
1631
1632 arg_v = arg_a;
1633 }
1634
1635 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1636 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1637 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1638 command, arg_v, environ, iov_a, 0);
1639 if (login)
1640 free (login);
1641
1642 pty.close_tty ();
1643 return pty.pty;
1644#endif
1645 1485
1646 return -1; 1486 return -1;
1647} 1487}
1648 1488
1649/*----------------------- end-of-file (C source) -----------------------*/ 1489/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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