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.117 by root, Thu Jul 7 19:37:47 2005 UTC vs.
Revision 1.217 by root, Tue Oct 9 13:36:10 2007 UTC

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

Diff Legend

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