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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines