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

Diff Legend

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