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.121 by root, Wed Nov 30 21:05:39 2005 UTC vs.
Revision 1.232 by sasha, Tue Dec 18 15:44:55 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
227 if (pix_colors == NULL)
228 return false;
229
230#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
231 TermWin.pixmap = None;
232#endif
233 291
234 MEvent.time = CurrentTime; 292 MEvent.time = CurrentTime;
235 MEvent.button = AnyButton; 293 MEvent.button = AnyButton;
236 options = DEFAULT_OPTIONS;
237 want_refresh = 1; 294 want_refresh = 1;
238 priv_modes = SavedModes = PrivMode_Default; 295 priv_modes = SavedModes = PrivMode_Default;
239 TermWin.focus = 0;
240 TermWin.ncol = 80; 296 ncol = 80;
241 TermWin.nrow = 24; 297 nrow = 24;
242 TermWin.int_bwidth = INTERNALBORDERWIDTH; 298 int_bwidth = INTERNALBORDERWIDTH;
243 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 299 ext_bwidth = EXTERNALBORDERWIDTH;
244 TermWin.lineSpace = LINESPACE; 300 lineSpace = LINESPACE;
245 TermWin.saveLines = SAVELINES; 301 saveLines = SAVELINES;
246 numpix_colors = TOTAL_COLORS;
247 302
248 refresh_limit = 1;
249 refresh_type = SLOW_REFRESH; 303 refresh_type = SLOW_REFRESH;
250 prev_nrow = prev_ncol = 0;
251 304
252 oldcursor.row = oldcursor.col = -1; 305 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; 306 last_bot = last_state = -1;
260 307
261#ifdef MENUBAR 308 set_option (Opt_scrollBar);
262 menu_readonly = 1; 309 set_option (Opt_scrollTtyOutput);
263# if ! (MENUBAR_MAX > 1) 310 set_option (Opt_jumpScroll);
264 CurrentBar = &BarList; 311 set_option (Opt_skipScroll);
265# endif /* (MENUBAR_MAX > 1) */ 312 set_option (Opt_secondaryScreen);
266#endif 313 set_option (Opt_secondaryScroll);
267 314 set_option (Opt_pastableTabs);
268 return true; 315 set_option (Opt_intensityStyles);
316 set_option (Opt_iso14755_52);
269} 317}
270 318
271void 319void
272rxvt_term::init_secondary () 320rxvt_term::init_secondary ()
273{ 321{
… …
280 if ((i = open ("/dev/null", O_RDONLY)) < 0) 328 if ((i = open ("/dev/null", O_RDONLY)) < 0)
281 { 329 {
282 /* TODO: BOO HISS */ 330 /* TODO: BOO HISS */
283 dup2 (STDERR_FILENO, STDIN_FILENO); 331 dup2 (STDERR_FILENO, STDIN_FILENO);
284 } 332 }
285 else if (i > STDIN_FILENO) 333 else if (i != STDIN_FILENO)
286 { 334 {
287 dup2 (i, STDIN_FILENO); 335 dup2 (i, STDIN_FILENO);
288 close (i); 336 close (i);
289 } 337 }
290 338
… …
305/*----------------------------------------------------------------------*/ 353/*----------------------------------------------------------------------*/
306const char ** 354const char **
307rxvt_term::init_resources (int argc, const char *const *argv) 355rxvt_term::init_resources (int argc, const char *const *argv)
308{ 356{
309 int i, r_argc; 357 int i, r_argc;
310 char *val;
311 const char **cmd_argv, **r_argv; 358 const char **cmd_argv, **r_argv;
312 359
313 /* 360 /*
314 * Look for -exec option. Find => split and make cmd_argv[] of command args 361 * Look for -e option. Find => split and make cmd_argv[] of command args
315 */ 362 */
316 for (r_argc = 0; r_argc < argc; r_argc++) 363 for (r_argc = 0; r_argc < argc; r_argc++)
317 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 364 if (!strcmp (argv[r_argc], "-e"))
318 break; 365 break;
366
367 if (r_argc == argc)
368 cmd_argv = NULL;
369 else if (!argv[r_argc + 1])
370 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
371 else
372 {
373 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
374
375 for (i = 0; i < argc - r_argc - 1; i++)
376 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
377
378 cmd_argv[i] = NULL;
379 }
319 380
320 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 381 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
321 382
322 for (i = 0; i < r_argc; i++) 383 for (i = 0; i < r_argc; i++)
323 r_argv[i] = (const char *)argv[i]; 384 r_argv[i] = (const char *)argv[i];
324 385
325 r_argv[i] = NULL; 386 r_argv[i] = NULL;
326 387
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]); 388 rs[Rs_name] = rxvt_basename (argv[0]);
340 389
341 /* 390 /*
342 * Open display, get options/resources and create the window 391 * Open display, get options/resources and create the window
343 */ 392 */
393
344 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 394 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
345 rs[Rs_display_name] = ":0"; 395 rs[Rs_display_name] = ":0";
346 396
347 get_options (r_argc, r_argv); 397 get_options (r_argc, r_argv);
348 398
349 if (!(display = displays.get (rs[Rs_display_name]))) 399 if (!(display = displays.get (rs[Rs_display_name])))
400 {
401 free (r_argv);
350 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 402 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
403 }
351 404
405 // using a local pointer decreases code size a lot
406 xa = display->xa;
407
408 set (display);
352 extract_resources (); 409 extract_resources ();
410
411#if XFT
412 if (rs[Rs_depth])
413 select_visual (strtol (rs[Rs_depth], 0, 0));
414#endif
415
416#ifdef HAVE_AFTERIMAGE
417 set_application_name ((char*)rs[Rs_name]);
418 set_output_threshold (OUTPUT_LEVEL_WARNING);
419 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
420#endif
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 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 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 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 463 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
464
379 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)
380 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 466 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
467
381 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 468 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
382 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 469 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
383#endif 470#endif
384 471
385#ifdef POINTER_BLANK 472#ifdef POINTER_BLANK
386 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 473 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
387 pointerBlankDelay = i; 474 pointerBlankDelay = i;
388 else 475 else
389 pointerBlankDelay = 2; 476 pointerBlankDelay = 2;
390#endif 477#endif
391 478
392 /* no point having a scrollbar without having any scrollback! */ 479 /* no point having a scrollbar without having any scrollback! */
393 if (!TermWin.saveLines) 480 if (!saveLines)
394 options &= ~Opt_scrollBar; 481 set_option (Opt_scrollBar, 0);
395 482
396#ifdef PRINTPIPE 483#ifdef PRINTPIPE
397 if (!rs[Rs_print_pipe]) 484 if (!rs[Rs_print_pipe])
398 rs[Rs_print_pipe] = PRINTPIPE; 485 rs[Rs_print_pipe] = PRINTPIPE;
399#endif 486#endif
… …
402 rs[Rs_cutchars] = CUTCHARS; 489 rs[Rs_cutchars] = CUTCHARS;
403 490
404#ifndef NO_BACKSPACE_KEY 491#ifndef NO_BACKSPACE_KEY
405 if (!rs[Rs_backspace_key]) 492 if (!rs[Rs_backspace_key])
406# ifdef DEFAULT_BACKSPACE 493# ifdef DEFAULT_BACKSPACE
407 key_backspace = DEFAULT_BACKSPACE; 494 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
408# else 495# else
409 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 496 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
410# endif 497# 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 498#endif
419 499
420#ifndef NO_DELETE_KEY 500#ifndef NO_DELETE_KEY
421 if (!rs[Rs_delete_key]) 501 if (!rs[Rs_delete_key])
422# ifdef DEFAULT_DELETE 502# ifdef DEFAULT_DELETE
423 key_delete = DEFAULT_DELETE; 503 rs[Rs_delete_key] = DEFAULT_DELETE;
424# else 504# else
425 key_delete = "\033[3~"; 505 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 506# endif
435 if (rs[Rs_answerbackstring]) 507#endif
436 {
437 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
438 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
439 }
440 508
441#ifdef HAVE_SCROLLBARS 509#ifdef HAVE_SCROLLBARS
442 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]);
443#endif 511#endif
444 512
445#ifdef XTERM_REVERSE_VIDEO 513#ifdef XTERM_REVERSE_VIDEO
446 /* this is how xterm implements reverseVideo */ 514 /* this is how xterm implements reverseVideo */
447 if (options & Opt_reverseVideo) 515 if (option (Opt_reverseVideo))
448 { 516 {
449 if (!rs[Rs_color + Color_fg]) 517 if (!rs[Rs_color + Color_fg])
450 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 518 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
519
451 if (!rs[Rs_color + Color_bg]) 520 if (!rs[Rs_color + Color_bg])
452 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 521 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
453 } 522 }
454#endif 523#endif
455 524
… …
457 if (!rs[Rs_color + i]) 526 if (!rs[Rs_color + i])
458 rs[Rs_color + i] = def_colorName[i]; 527 rs[Rs_color + i] = def_colorName[i];
459 528
460#ifndef XTERM_REVERSE_VIDEO 529#ifndef XTERM_REVERSE_VIDEO
461 /* this is how we implement reverseVideo */ 530 /* this is how we implement reverseVideo */
462 if (options & Opt_reverseVideo) 531 if (option (Opt_reverseVideo))
463 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 532 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
464#endif 533#endif
465 534
466 /* convenient aliases for setting fg/bg to colors */ 535 /* convenient aliases for setting fg/bg to colors */
467 color_aliases (Color_fg); 536 color_aliases (Color_fg);
468 color_aliases (Color_bg); 537 color_aliases (Color_bg);
469#ifndef NO_CURSORCOLOR 538#ifndef NO_CURSORCOLOR
470 color_aliases (Color_cursor); 539 color_aliases (Color_cursor);
471 color_aliases (Color_cursor2); 540 color_aliases (Color_cursor2);
472#endif /* NO_CURSORCOLOR */ 541#endif /* NO_CURSORCOLOR */
473 color_aliases (Color_pointer_fg); 542 color_aliases (Color_pointer_fg);
474 color_aliases (Color_pointer_bg); 543 color_aliases (Color_pointer_bg);
475 color_aliases (Color_border); 544 color_aliases (Color_border);
476#ifndef NO_BOLD_UNDERLINE_REVERSE 545#ifndef NO_BOLD_UNDERLINE_REVERSE
477 color_aliases (Color_BD); 546 color_aliases (Color_BD);
478 color_aliases (Color_UL); 547 color_aliases (Color_UL);
479 color_aliases (Color_RV); 548 color_aliases (Color_RV);
480#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 549#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
481 550
482 if (!rs[Rs_color + Color_border]) 551 if (!rs[Rs_color + Color_border])
483 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 552 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
484 553
485 return cmd_argv; 554 return cmd_argv;
… …
488/*----------------------------------------------------------------------*/ 557/*----------------------------------------------------------------------*/
489void 558void
490rxvt_term::init_env () 559rxvt_term::init_env ()
491{ 560{
492 int i; 561 int i;
493 unsigned int u;
494 char *val; 562 char *val;
495 563
496#ifdef DISPLAY_IS_IP 564#ifdef DISPLAY_IS_IP
497 /* Fixup display_name for export over pty to any interested terminal 565 /* 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 566 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
506 */ 574 */
507 val = rxvt_network_display (rs[Rs_display_name]); 575 val = rxvt_network_display (rs[Rs_display_name]);
508 rs[Rs_display_name] = (const char *)val; 576 rs[Rs_display_name] = (const char *)val;
509 577
510 if (val == NULL) 578 if (val == NULL)
511#endif /* DISPLAY_IS_IP */ 579#endif /* DISPLAY_IS_IP */
512 val = XDisplayString (display->display); 580 val = XDisplayString (dpy);
513 581
514 if (rs[Rs_display_name] == NULL) 582 if (rs[Rs_display_name] == NULL)
515 rs[Rs_display_name] = val; /* use broken `:0' value */ 583 rs[Rs_display_name] = val; /* use broken `:0' value */
516 584
517 i = strlen (val); 585 i = strlen (val);
518 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 586 env_display = (char *)rxvt_malloc (i + 9);
519 587
520 sprintf (env_display, "DISPLAY=%s", val); 588 sprintf (env_display, "DISPLAY=%s", val);
521 589
522 /* avoiding the math library: 590 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
523 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */
524 for (i = 0, u = (unsigned int)TermWin.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)TermWin.parent[0]);
531 591
532 /* add entries to the environment: 592 /* add entries to the environment:
533 * @ DISPLAY: in case we started with -display 593 * @ DISPLAY: in case we started with -display
534 * @ WINDOWID: X window id number of the window 594 * @ WINDOWID: X window id number of the window
535 * @ COLORTERM: terminal sub-name and also indicates its color 595 * @ COLORTERM: terminal sub-name and also indicates its color
… …
537 * @ TERMINFO: path to terminfo directory 597 * @ TERMINFO: path to terminfo directory
538 * @ COLORFGBG: fg;bg color codes 598 * @ COLORFGBG: fg;bg color codes
539 */ 599 */
540 putenv (env_display); 600 putenv (env_display);
541 putenv (env_windowid); 601 putenv (env_windowid);
602
542 if (env_colorfgbg) 603 if (env_colorfgbg)
543 putenv (env_colorfgbg); 604 putenv (env_colorfgbg);
544 605
545#ifdef RXVT_TERMINFO 606#ifdef RXVT_TERMINFO
546 putenv ("TERMINFO=" RXVT_TERMINFO); 607 putenv ("TERMINFO=" RXVT_TERMINFO);
547#endif 608#endif
548 609
549 if (display->depth <= 2) 610 if (depth <= 2)
550 putenv ("COLORTERM=" COLORTERMENV "-mono"); 611 putenv ("COLORTERM=" COLORTERMENV "-mono");
551 else 612 else
552 putenv ("COLORTERM=" COLORTERMENVFULL); 613 putenv ("COLORTERM=" COLORTERMENVFULL);
553 614
554 if (rs[Rs_term_name] != NULL) 615 if (rs[Rs_term_name] != NULL)
555 { 616 {
556 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);
557 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 618 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
558 putenv (env_term); 619 putenv (env_term);
559 } 620 }
560 else 621 else
561 putenv ("TERM=" TERMENV); 622 putenv ("TERM=" TERMENV);
… …
563#ifdef HAVE_UNSETENV 624#ifdef HAVE_UNSETENV
564 /* avoid passing old settings and confusing term size */ 625 /* avoid passing old settings and confusing term size */
565 unsetenv ("LINES"); 626 unsetenv ("LINES");
566 unsetenv ("COLUMNS"); 627 unsetenv ("COLUMNS");
567 unsetenv ("TERMCAP"); /* terminfo should be okay */ 628 unsetenv ("TERMCAP"); /* terminfo should be okay */
568#endif /* HAVE_UNSETENV */ 629#endif /* HAVE_UNSETENV */
569} 630}
570 631
571/*----------------------------------------------------------------------*/ 632/*----------------------------------------------------------------------*/
572/* 633/*
573 * This is more or less stolen straight from XFree86 xterm. 634 * This is more or less stolen straight from XFree86 xterm.
574 * This should support all European type languages. 635 * This should support all European type languages.
575 */ 636 */
576void 637void
577rxvt_term::set_locale (const char *locale) 638rxvt_term::set_locale (const char *locale)
578{ 639{
640 set_environ (envv);
641
579#if HAVE_XSETLOCALE || HAVE_SETLOCALE 642#if HAVE_XSETLOCALE || HAVE_SETLOCALE
580 free (this->locale); 643 free (this->locale);
581 this->locale = setlocale (LC_CTYPE, locale); 644 this->locale = setlocale (LC_CTYPE, locale);
582 645
583 if (!this->locale) 646 if (!this->locale)
584 { 647 {
585 if (*locale) 648 if (*locale)
586 { 649 {
587 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);
588 setlocale (LC_CTYPE, ""); 651 setlocale (LC_CTYPE, "C");
589 } 652 }
590 else 653 else
591 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");
592 655
593 this->locale = ""; 656 this->locale = "C";
594 } 657 }
595 658
596 659
597 this->locale = rxvt_strdup (this->locale); 660 this->locale = strdup (this->locale);
598 SET_LOCALE (this->locale); 661 SET_LOCALE (this->locale);
599 mbstate.reset (); 662 mbstate.reset ();
600#endif 663#endif
601 664
602#if HAVE_NL_LANGINFO 665#if HAVE_NL_LANGINFO
… …
613} 676}
614 677
615void 678void
616rxvt_term::init_xlocale () 679rxvt_term::init_xlocale ()
617{ 680{
681 set_environ (envv);
682
618#ifdef USE_XIM 683#ifdef USE_XIM
619 if (!locale) 684 if (!locale)
620 rxvt_warn ("setting locale failed, working without locale support.\n"); 685 rxvt_warn ("setting locale failed, working without locale support.\n");
621 else 686 else
622 { 687 {
… …
644 * Initialize the command connection. 709 * Initialize the command connection.
645 * This should be called after the X server connection is established. 710 * This should be called after the X server connection is established.
646 */ 711 */
647 712
648#ifdef META8_OPTION 713#ifdef META8_OPTION
649 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 714 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
650#endif 715#endif
651 716
652 get_ourmods (); 717 get_ourmods ();
653 718
654 if (!(options & Opt_scrollTtyOutput)) 719 if (!option (Opt_scrollTtyOutput))
655 priv_modes |= PrivMode_TtyOutputInh; 720 priv_modes |= PrivMode_TtyOutputInh;
656 if (options & Opt_scrollTtyKeypress) 721 if (option (Opt_scrollTtyKeypress))
657 priv_modes |= PrivMode_Keypress; 722 priv_modes |= PrivMode_Keypress;
658 if (!(options & Opt_jumpScroll)) 723 if (!option (Opt_jumpScroll))
659 priv_modes |= PrivMode_smoothScroll; 724 priv_modes |= PrivMode_smoothScroll;
660 725
661#ifndef NO_BACKSPACE_KEY 726#ifndef NO_BACKSPACE_KEY
662 if (strcmp (key_backspace, "DEC") == 0) 727 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
663 priv_modes |= PrivMode_HaveBackSpace; 728 priv_modes |= PrivMode_HaveBackSpace;
664#endif 729#endif
665 730
666 /* add value for scrollBar */ 731 /* add value for scrollBar */
667 if (scrollbar_visible ()) 732 if (scrollBar.state)
668 { 733 {
669 priv_modes |= PrivMode_scrollBar; 734 priv_modes |= PrivMode_scrollBar;
670 SavedModes |= PrivMode_scrollBar; 735 SavedModes |= PrivMode_scrollBar;
671 } 736 }
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 737
684 run_command (argv); 738 run_command (argv);
685} 739}
686 740
687/*----------------------------------------------------------------------*/ 741/*----------------------------------------------------------------------*/
… …
691 int i; 745 int i;
692 746
693#ifdef OFF_FOCUS_FADING 747#ifdef OFF_FOCUS_FADING
694 pix_colors = pix_colors_focused; 748 pix_colors = pix_colors_focused;
695#endif 749#endif
696 750
697 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 751 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
698 { 752 {
753 const char *name = rs[Rs_color + i];
754
755 if (!name)
756 continue;
757
699 rxvt_color xcol; 758 rxvt_color xcol;
700 759
701 if (!rs[Rs_color + i]) 760 if (!set_color (xcol, name))
702 continue;
703
704 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
705 { 761 {
706#ifndef XTERM_REVERSE_VIDEO 762#ifndef XTERM_REVERSE_VIDEO
707 if (i < 2 && (options & Opt_reverseVideo)) 763 if (i < 2 && option (Opt_reverseVideo))
708 rs[Rs_color + i] = def_colorName[!i]; 764 name = def_colorName [1 - i];
709 else 765 else
710#endif 766#endif
711 rs[Rs_color + i] = def_colorName[i]; 767 name = def_colorName [i];
712 768
713 if (!rs[Rs_color + i]) 769 if (!name)
714 continue; 770 continue;
715 771
716 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 772 if (!set_color (xcol, name))
717 { 773 {
718 switch (i) 774 switch (i)
719 { 775 {
720 case Color_fg: 776 case Color_fg:
721 case Color_bg: 777 case Color_bg:
722 /* fatal: need bg/fg color */
723 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 778 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
724 /* NOTREACHED */ 779 name = "";
725 break; 780 break;
726#ifndef NO_CURSORCOLOR 781#ifndef NO_CURSORCOLOR
727 case Color_cursor2: 782 case Color_cursor2:
728 xcol = pix_colors[Color_fg]; 783#endif
729 break;
730#endif /* ! NO_CURSORCOLOR */
731 case Color_pointer_fg: 784 case Color_pointer_fg:
732 xcol = pix_colors[Color_fg]; 785 name = rs[Rs_color + Color_fg];
786 xcol.set (this, name);
733 break; 787 break;
734 default: 788 default:
735 xcol = pix_colors[Color_bg]; /* None */ 789 name = rs[Rs_color + Color_bg];
790 xcol.set (this, name);
736 break; 791 break;
737 } 792 }
738 } 793 }
739 } 794 }
740 795
741 pix_colors[i] = xcol; 796 pix_colors[i] = xcol;
742 SET_PIXCOLOR (i); 797 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 { 798 }
799
800 if (depth <= 2)
801 {
753 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);
754 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);
755 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);
756 } 805 }
757 806
758 /* 807 /*
759 * get scrollBar/menuBar shadow colors 808 * get scrollBar shadow colors
760 * 809 *
761 * The calculations of topShadow/bottomShadow values are adapted 810 * The calculations of topShadow/bottomShadow values are adapted
762 * from the fvwm window manager. 811 * from the fvwm window manager.
763 */ 812 */
764#ifdef KEEP_SCROLLCOLOR 813#ifdef KEEP_SCROLLCOLOR
765
766 if (display->depth <= 2) 814 if (depth <= 2)
767 { 815 {
768 /* Monochrome */ 816 /* Monochrome */
769 pix_colors[Color_scroll] = pix_colors[Color_fg]; 817 alias_color (Color_scroll, Color_fg);
770 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 818 alias_color (Color_topShadow, Color_bg);
771 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 819 alias_color (Color_bottomShadow, Color_bg);
772 } 820 }
773 else 821 else
774 { 822 {
775 rxvt_color xcol[2]; 823 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 824
780 xcol[1] = pix_colors[Color_scroll]; 825 rgba cscroll;
781 xcol[0].set (display, 65535, 65535, 65535); 826 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 827
790 /* topShadowColor */ 828 /* topShadowColor */
791 if (!xcol[1].set (display, 829 if (!pix_colors[Color_topShadow].set (this,
792 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 830 rgba (
793 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 831 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
794 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 832 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
795 xcol[1] = pix_colors[Color_White]; 833 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
796 834 cscroll.a)
797 pix_colors[Color_topShadow] = xcol[1]; 835 ))
836 alias_color (Color_topShadow, Color_White);
798 } 837 }
799#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
800} 844}
801 845
802/*----------------------------------------------------------------------*/ 846/*----------------------------------------------------------------------*/
803/* color aliases, fg/bg bright-bold */ 847/* color aliases, fg/bg bright-bold */
804void 848void
… …
807 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 851 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
808 { 852 {
809 int i = atoi (rs[Rs_color + idx]); 853 int i = atoi (rs[Rs_color + idx]);
810 854
811 if (i >= 8 && i <= 15) 855 if (i >= 8 && i <= 15)
812 { /* bright colors */ 856 /* bright colors */
813 i -= 8;
814#ifndef NO_BRIGHTCOLOR
815 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 857 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
816 return; 858 else if (i >= 0 && i <= 7)
817#endif 859 /* normal colors */
818 }
819
820 if (i >= 0 && i <= 7) /* normal colors */
821 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 860 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
822 } 861 }
823} 862}
824 863
825/*----------------------------------------------------------------------*/ 864/*----------------------------------------------------------------------*/
… …
845 884
846 if (rsmod 885 if (rsmod
847 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 886 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
848 requestedmeta = rsmod[3] - '0'; 887 requestedmeta = rsmod[3] - '0';
849 888
850 map = XGetModifierMapping (display->display); 889 map = XGetModifierMapping (dpy);
851 kc = map->modifiermap; 890 kc = map->modifiermap;
852 891
853 for (i = 1; i < 6; i++) 892 for (i = 1; i < 6; i++)
854 { 893 {
855 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 894 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
857 for (j = map->max_keypermod; j--; k++) 896 for (j = map->max_keypermod; j--; k++)
858 { 897 {
859 if (kc[k] == 0) 898 if (kc[k] == 0)
860 break; 899 break;
861 900
862 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 901 switch (XKeycodeToKeysym (dpy, kc[k], 0))
863 { 902 {
864 case XK_Num_Lock: 903 case XK_Num_Lock:
865 ModNumLockMask = modmasks[i - 1]; 904 ModNumLockMask = modmasks[i - 1];
866 continue; 905 continue;
867 906
… …
917rxvt_term::create_windows (int argc, const char *const *argv) 956rxvt_term::create_windows (int argc, const char *const *argv)
918{ 957{
919 XClassHint classHint; 958 XClassHint classHint;
920 XWMHints wmHint; 959 XWMHints wmHint;
921#if ENABLE_FRILLS 960#if ENABLE_FRILLS
922 Atom prop = None;
923 MWMHints mwmhints; 961 MWMHints mwmhints = { };
924#endif 962#endif
925 XGCValues gcvalue; 963 XGCValues gcvalue;
926 long vt_emask;
927 XSetWindowAttributes attributes; 964 XSetWindowAttributes attributes;
928 XWindowAttributes gattr;
929 Window top, parent; 965 Window top, parent;
930 dDisp;
931 966
932#ifdef USING_W11LIB 967 dLocal (Display *, dpy);
933 /* enable W11 callbacks */
934 W11AddEventHandler (disp, rxvt_W11_process_x_event);
935#endif
936 968
937 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 969 /* grab colors before netscape does */
938 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 970 Get_Colours ();
939 971
940 if (options & Opt_transparent) 972 if (!set_fonts ())
941 { 973 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
942 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 974
943 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 975 parent = display->root;
944 } 976
977 attributes.override_redirect = !!option (Opt_override_redirect);
945 978
946#if ENABLE_FRILLS 979#if ENABLE_FRILLS
947 if (options & Opt_borderLess) 980 if (option (Opt_borderLess))
948 { 981 {
949 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 982 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
950
951 if (prop == None)
952 { 983 {
953 /* 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");
954#ifdef PREFER_24BIT
955 attributes.override_redirect = TRUE; 985 attributes.override_redirect = true;
956#endif
957 mwmhints.flags = 0;
958 } 986 }
959 else 987 else
960 { 988 {
961 mwmhints.flags = MWM_HINTS_DECORATIONS; 989 mwmhints.flags = MWM_HINTS_DECORATIONS;
962 mwmhints.decorations = 0;
963 } 990 }
964 } 991 }
965 else
966 mwmhints.flags = 0;
967#endif 992#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 993
977#if ENABLE_XEMBED 994#if ENABLE_XEMBED
978 if (rs[Rs_embed]) 995 if (rs[Rs_embed])
979 { 996 {
980 XWindowAttributes wattr; 997 XWindowAttributes wattr;
981 998
982 parent = strtol (rs[Rs_embed], 0, 0); 999 parent = strtol (rs[Rs_embed], 0, 0);
983 1000
984 if (!XGetWindowAttributes (disp, parent, &wattr)) 1001 if (!XGetWindowAttributes (dpy, parent, &wattr))
985 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 1002 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
986 1003
987 window_calc (wattr.width, wattr.height); 1004 window_calc (wattr.width, wattr.height);
988 } 1005 }
989
990#endif 1006#endif
1007
991 window_calc (0, 0); 1008 window_calc (0, 0);
992 1009
993 /* sub-window placement & size in rxvt_resize_subwindows () */ 1010 /* sub-window placement & size in rxvt_resize_subwindows () */
994#ifdef PREFER_24BIT
995 attributes.background_pixel = pix_colors_focused[Color_border]; 1011 attributes.background_pixel = pix_colors_focused [Color_border];
996 attributes.border_pixel = pix_colors_focused[Color_border]; 1012 attributes.border_pixel = pix_colors_focused [Color_border];
997 attributes.colormap = display->cmap; 1013 attributes.colormap = cmap;
1014
998 top = XCreateWindow (disp, parent, 1015 top = XCreateWindow (dpy, parent,
999 szHint.x, szHint.y, 1016 szHint.x, szHint.y,
1000 szHint.width, szHint.height, 1017 szHint.width, szHint.height,
1001 TermWin.ext_bwidth, 1018 ext_bwidth,
1002 display->depth, InputOutput, 1019 depth, InputOutput, visual,
1003 display->visual,
1004 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 1020 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1005#else 1021 &attributes);
1006 top = XCreateSimpleWindow (disp, parent,
1007 szHint.x, szHint.y,
1008 szHint.width, szHint.height,
1009 TermWin.ext_bwidth,
1010 pix_colors_focused[Color_border],
1011 pix_colors_focused[Color_border]);
1012#endif
1013 1022
1014 TermWin.parent[0] = top; 1023 this->parent[0] = top;
1015 1024
1016 old_width = szHint.width; 1025 old_width = szHint.width;
1017 old_height = szHint.height; 1026 old_height = szHint.height;
1018 1027
1019 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1028 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1020 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1029 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1021 1030
1022 classHint.res_name = (char *)rs[Rs_name]; 1031 classHint.res_name = (char *)rs[Rs_name];
1023 classHint.res_class = (char *)RESCLASS; 1032 classHint.res_class = (char *)RESCLASS;
1024 1033
1025 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1034 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1026 wmHint.input = True; 1035 wmHint.input = True;
1027 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1036 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1028 wmHint.window_group = top; 1037 wmHint.window_group = top;
1029 1038
1030 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 1039 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1031 &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
1032 1047
1033 Atom protocols[] = { 1048 Atom protocols[] = {
1034 xa[XA_WM_DELETE_WINDOW], 1049 xa[XA_WM_DELETE_WINDOW],
1035#if ENABLE_EWMH 1050#if ENABLE_EWMH
1036 xa[XA_NET_WM_PING], 1051 xa[XA_NET_WM_PING],
1037#endif 1052#endif
1038 }; 1053 };
1039 1054
1040 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
1041 1061
1042#if ENABLE_EWMH 1062#if ENABLE_EWMH
1043 long pid = getpid (); 1063 long pid = getpid ();
1044 1064
1045 XChangeProperty (disp, top, 1065 XChangeProperty (dpy, top,
1046 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1066 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1047 PropModeReplace, (unsigned char *)&pid, 1); 1067 PropModeReplace, (unsigned char *)&pid, 1);
1048 1068
1049 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1069 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1050#endif 1070#endif
1051 1071
1052 XSelectInput (disp, top, 1072 XSelectInput (dpy, top,
1053 KeyPressMask 1073 KeyPressMask
1054#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1074#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1055 | KeyReleaseMask 1075 | KeyReleaseMask
1056#endif 1076#endif
1057 | FocusChangeMask | VisibilityChangeMask 1077 | FocusChangeMask | VisibilityChangeMask
1058 | ExposureMask | StructureNotifyMask); 1078 | ExposureMask | StructureNotifyMask);
1059 1079
1060 termwin_ev.start (display, top); 1080 termwin_ev.start (display, top);
1061 1081
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 */ 1082 /* vt cursor: Black-on-White is standard, but this is more popular */
1069 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1083 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1070 1084
1071#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1085#ifdef HAVE_SCROLLBARS
1072 /* cursor (menuBar/scrollBar): Black-on-White */ 1086 /* cursor scrollBar: Black-on-White */
1073 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1087 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1074#endif 1088#endif
1075 1089
1076 /* the vt window */ 1090 /* the vt window */
1077 TermWin.vt = XCreateSimpleWindow (disp, top, 1091 vt = XCreateSimpleWindow (dpy, top,
1078 window_vt_x,
1079 window_vt_y, 1092 window_vt_x, window_vt_y,
1080 TermWin_TotalWidth (), 1093 width, height,
1081 TermWin_TotalHeight (),
1082 0, 1094 0,
1083 pix_colors_focused[Color_fg], 1095 pix_colors_focused[Color_fg],
1084 pix_colors_focused[Color_bg]); 1096 pix_colors_focused[Color_bg]);
1085#ifdef DEBUG_X
1086 XStoreName (disp, TermWin.vt, "vt window");
1087#endif
1088 1097
1089 attributes.bit_gravity = NorthWestGravity; 1098 attributes.bit_gravity = NorthWestGravity;
1090 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes); 1099 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1091 1100
1092 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1101 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1093 1102
1094#ifdef POINTER_BLANK
1095 if (options & Opt_pointerBlank) 1103 if (option (Opt_pointerBlank))
1096 vt_emask |= PointerMotionMask; 1104 vt_emask |= PointerMotionMask;
1097 else 1105 else
1098#endif
1099 vt_emask |= Button1MotionMask | Button3MotionMask; 1106 vt_emask |= Button1MotionMask | Button3MotionMask;
1100 1107
1101 XSelectInput (disp, TermWin.vt, vt_emask); 1108 vt_select_input ();
1109
1102 vt_ev.start (display, TermWin.vt); 1110 vt_ev.start (display, vt);
1103
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 1111
1147 /* graphics context for the vt window */ 1112 /* graphics context for the vt window */
1148 gcvalue.foreground = pix_colors[Color_fg]; 1113 gcvalue.foreground = pix_colors[Color_fg];
1149 gcvalue.background = pix_colors[Color_bg]; 1114 gcvalue.background = pix_colors[Color_bg];
1150 gcvalue.graphics_exposures = 1; 1115 gcvalue.graphics_exposures = 0;
1151 TermWin.gc = XCreateGC (disp, TermWin.vt, 1116
1117 gc = XCreateGC (dpy, vt,
1152 GCForeground | GCBackground | GCGraphicsExposures, 1118 GCForeground | GCBackground | GCGraphicsExposures,
1153 &gcvalue); 1119 &gcvalue);
1154 1120
1155 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1121 drawable = new rxvt_drawable (this, vt);
1156 1122
1157#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1123#ifdef RXVT_SCROLLBAR
1158 gcvalue.foreground = pix_colors[Color_topShadow]; 1124 gcvalue.foreground = pix_colors[Color_topShadow];
1159 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1125 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1160 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1126 gcvalue.foreground = pix_colors[Color_bottomShadow];
1161 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1127 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1162 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1128 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1163 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1129 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1164#endif 1130#endif
1165 1131
1166#ifdef OFF_FOCUS_FADING 1132#ifdef OFF_FOCUS_FADING
1167 // initially we are in unfocused state 1133 // initially we are in unfocused state
1168 if (rs[Rs_fade]) 1134 if (rs[Rs_fade])
1169 pix_colors = pix_colors_unfocused; 1135 pix_colors = pix_colors_unfocused;
1170#endif 1136#endif
1171 1137
1172 pointer_unblank (); 1138 pointer_unblank ();
1173 scr_recolour (); 1139 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} 1140}
1185 1141
1186/* ------------------------------------------------------------------------- * 1142/* ------------------------------------------------------------------------- *
1187 * GET TTY CURRENT STATE * 1143 * GET TTY CURRENT STATE *
1188 * ------------------------------------------------------------------------- */ 1144 * ------------------------------------------------------------------------- */
1189void 1145void
1190rxvt_get_ttymode (ttymode_t *tio, int erase) 1146rxvt_get_ttymode (ttymode_t *tio, int erase)
1191{ 1147{
1192#ifdef HAVE_TERMIOS_H
1193 /* 1148 /*
1194 * standard System V termios interface 1149 * standard System V termios interface
1195 */ 1150 */
1196 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1151 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1197 { 1152 {
1198 /* 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
1199 tio->c_cc[VINTR] = CINTR; 1157 tio->c_cc[VINTR] = CINTR;
1200 tio->c_cc[VQUIT] = CQUIT; 1158 tio->c_cc[VQUIT] = CQUIT;
1201 tio->c_cc[VERASE] = CERASE; 1159 tio->c_cc[VERASE] = CERASE;
1160#ifdef VERASE2
1161 tio->c_cc[VERASE2] = CERASE2;
1162#endif
1202 tio->c_cc[VKILL] = CKILL; 1163 tio->c_cc[VKILL] = CKILL;
1203 tio->c_cc[VSTART] = CSTART; 1164 tio->c_cc[VSTART] = CSTART;
1204 tio->c_cc[VSTOP] = CSTOP; 1165 tio->c_cc[VSTOP] = CSTOP;
1205 tio->c_cc[VSUSP] = CSUSP; 1166 tio->c_cc[VSUSP] = CSUSP;
1206# ifdef VDSUSP 1167# ifdef VDSUSP
… …
1258 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1219 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1259# if defined (ECHOCTL) && defined (ECHOKE) 1220# if defined (ECHOCTL) && defined (ECHOKE)
1260 | ECHOCTL | ECHOKE 1221 | ECHOCTL | ECHOKE
1261# endif 1222# endif
1262 | ECHOE | ECHOK); 1223 | 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 1224
1311 /* 1225 /*
1312 * Debugging 1226 * Debugging
1313 */ 1227 */
1314#ifdef DEBUG_TTYMODE 1228#ifdef DEBUG_TTYMODE
1315#ifdef HAVE_TERMIOS_H
1316 /* c_iflag bits */ 1229 /* c_iflag bits */
1317 fprintf (stderr, "Input flags\n"); 1230 fprintf (stderr, "Input flags\n");
1318 1231
1319 /* cpp token stringize doesn't work on all machines <sigh> */ 1232 /* cpp token stringize doesn't work on all machines <sigh> */
1320# define FOO(flag,name) \ 1233# define FOO(flag,name) \
… …
1383 FOO (VLNEXT, "VLNEXT"); 1296 FOO (VLNEXT, "VLNEXT");
1384# endif 1297# endif
1385 1298
1386 fprintf (stderr, "\n"); 1299 fprintf (stderr, "\n");
1387# undef FOO 1300# undef FOO
1388# endif /* HAVE_TERMIOS_H */ 1301#endif /* DEBUG_TTYMODE */
1389#endif /* DEBUG_TTYMODE */
1390} 1302}
1391 1303
1392/*----------------------------------------------------------------------*/ 1304/*----------------------------------------------------------------------*/
1393/* 1305/*
1394 * 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
… …
1399rxvt_term::run_command (const char *const *argv) 1311rxvt_term::run_command (const char *const *argv)
1400{ 1312{
1401#if ENABLE_FRILLS 1313#if ENABLE_FRILLS
1402 if (rs[Rs_pty_fd]) 1314 if (rs[Rs_pty_fd])
1403 { 1315 {
1404 pty.pty = atoi (rs[Rs_pty_fd]); 1316 pty->pty = atoi (rs[Rs_pty_fd]);
1405 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 }
1406 } 1326 }
1407 else 1327 else
1408#endif 1328#endif
1409 if (!pty.get ()) 1329 if (!pty->get ())
1410 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1330 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1411 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 */
1412 pty.set_utf8_mode (enc_utf8); 1345 pty->set_utf8_mode (enc_utf8);
1413 1346
1414 /* set initial window size */ 1347 /* set initial window size */
1415 tt_winch (); 1348 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 1349
1430#if ENABLE_FRILLS 1350#if ENABLE_FRILLS
1431 if (rs[Rs_pty_fd]) 1351 if (rs[Rs_pty_fd])
1432 return; 1352 return;
1433#endif 1353#endif
1434 1354
1435#ifndef __QNX__
1436 /* spin off the command interpreter */ 1355 /* spin off the command interpreter */
1437 switch (cmd_pid = fork ()) 1356 switch (cmd_pid = fork ())
1438 { 1357 {
1439 case -1: 1358 case -1:
1440 { 1359 {
… …
1442 rxvt_fatal ("can't fork, aborting.\n"); 1361 rxvt_fatal ("can't fork, aborting.\n");
1443 } 1362 }
1444 case 0: 1363 case 0:
1445 init_env (); 1364 init_env ();
1446 1365
1447 if (!pty.make_controlling_tty ()) 1366 if (!pty->make_controlling_tty ())
1448 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1367 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1449 else 1368 else
1450 { 1369 {
1451 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1370 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1452 dup2 (pty.tty, STDIN_FILENO); 1371 dup2 (pty->tty, STDIN_FILENO);
1453 dup2 (pty.tty, STDOUT_FILENO); 1372 dup2 (pty->tty, STDOUT_FILENO);
1454 dup2 (pty.tty, STDERR_FILENO); 1373 dup2 (pty->tty, STDERR_FILENO);
1455 1374
1456 // close all our file handles that we do no longer need 1375 // close all our file handles that we do no longer need
1457 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1376 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1458 { 1377 {
1459 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1378 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1460 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1379 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1461 } 1380 }
1462 1381
1463 run_child (argv); 1382 run_child (argv);
1464 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1383 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1465 } 1384 }
1466 1385
1467 _exit (EXIT_FAILURE); 1386 _exit (EXIT_FAILURE);
1468 1387
1469 default: 1388 default:
1470 { 1389 if (!option (Opt_utmpInhibit))
1471#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1390 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1472 int fdstdin;
1473 1391
1474 fdstdin = dup (STDIN_FILENO); 1392 pty->close_tty ();
1475 dup2 (pty.tty, STDIN_FILENO);
1476#endif
1477 1393
1478#ifdef UTMP_SUPPORT 1394 child_ev.start (cmd_pid);
1479 privileged_utmp (SAVE);
1480#endif
1481 1395
1482#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1396 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; 1397 break;
1491 } 1398 }
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} 1399}
1501 1400
1502/* ------------------------------------------------------------------------- * 1401/* ------------------------------------------------------------------------- *
1503 * CHILD PROCESS OPERATIONS * 1402 * CHILD PROCESS OPERATIONS *
1504 * ------------------------------------------------------------------------- */ 1403 * ------------------------------------------------------------------------- */
… …
1509int 1408int
1510rxvt_term::run_child (const char *const *argv) 1409rxvt_term::run_child (const char *const *argv)
1511{ 1410{
1512 char *login; 1411 char *login;
1513 1412
1514 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1515
1516 if (options & Opt_console) 1413 if (option (Opt_console))
1414 {
1517 { /* be virtual console, fail silently */ 1415 /* be virtual console, fail silently */
1518#ifdef TIOCCONS 1416#ifdef TIOCCONS
1519 unsigned int on = 1; 1417 unsigned int on = 1;
1520 1418
1521 ioctl (STDIN_FILENO, TIOCCONS, &on); 1419 ioctl (STDIN_FILENO, TIOCCONS, &on);
1522#elif defined (SRIOCSREDIR) 1420#elif defined (SRIOCSREDIR)
… …
1524 1422
1525 fd = open (CONSOLE, O_WRONLY, 0); 1423 fd = open (CONSOLE, O_WRONLY, 0);
1526 if (fd >= 0) 1424 if (fd >= 0)
1527 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1425 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1528 close (fd); 1426 close (fd);
1529#endif /* SRIOCSREDIR */ 1427#endif /* SRIOCSREDIR */
1530 } 1428 }
1531 1429
1532 /* reset signals and spin off the command interpreter */ 1430 /* reset signals and spin off the command interpreter */
1533 signal (SIGINT, SIG_DFL); 1431 signal (SIGINT, SIG_DFL);
1534 signal (SIGQUIT, SIG_DFL); 1432 signal (SIGQUIT, SIG_DFL);
… …
1541 */ 1439 */
1542#ifdef SIGTSTP 1440#ifdef SIGTSTP
1543 signal (SIGTSTP, SIG_IGN); 1441 signal (SIGTSTP, SIG_IGN);
1544 signal (SIGTTIN, SIG_IGN); 1442 signal (SIGTTIN, SIG_IGN);
1545 signal (SIGTTOU, SIG_IGN); 1443 signal (SIGTTOU, SIG_IGN);
1546#endif /* SIGTSTP */ 1444#endif /* SIGTSTP */
1547 1445
1548 // unblock signals (signals are blocked by iom.C 1446 // unblock signals (signals are blocked by iom.C
1549 sigset_t ss; 1447 sigset_t ss;
1550 sigemptyset (&ss); 1448 sigemptyset (&ss);
1551 sigprocmask (SIG_SETMASK, &ss, 0); 1449 sigprocmask (SIG_SETMASK, &ss, 0);
1552 1450
1553#ifndef __QNX__
1554 /* command interpreter path */ 1451 /* command interpreter path */
1555 if (argv != NULL) 1452 if (argv)
1556 { 1453 {
1557# ifdef DEBUG_CMD 1454# ifdef DEBUG_CMD
1558 int i; 1455 int i;
1559 1456
1560 for (i = 0; argv[i]; i++) 1457 for (i = 0; argv[i]; i++)
… …
1564 execvp (argv[0], (char *const *)argv); 1461 execvp (argv[0], (char *const *)argv);
1565 /* no error message: STDERR is closed! */ 1462 /* no error message: STDERR is closed! */
1566 } 1463 }
1567 else 1464 else
1568 { 1465 {
1569 const char *argv0, *shell; 1466 const char *argv0, *shell;
1570 1467
1571 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1468 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1572 shell = "/bin/sh"; 1469 shell = "/bin/sh";
1573 1470
1574 argv0 = (const char *)rxvt_r_basename (shell); 1471 argv0 = (const char *)rxvt_basename (shell);
1575 1472
1576 if (options & Opt_loginShell) 1473 if (option (Opt_loginShell))
1577 { 1474 {
1578 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1475 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1579 1476
1580 login[0] = '-'; 1477 login[0] = '-';
1581 strcpy (&login[1], argv0); 1478 strcpy (&login[1], argv0);
1582 argv0 = login; 1479 argv0 = login;
1583 } 1480 }
1481
1584 execlp (shell, argv0, NULL); 1482 execlp (shell, argv0, (char *)0);
1585 /* no error message: STDERR is closed! */ 1483 /* no error message: STDERR is closed! */
1586 } 1484 }
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 1485
1644 return -1; 1486 return -1;
1645} 1487}
1646 1488
1647/*----------------------- end-of-file (C source) -----------------------*/ 1489/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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