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.147 by root, Tue Jan 17 16:50:42 2006 UTC vs.
Revision 1.259 by root, Sat May 30 08:51:23 2009 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-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 "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
168 COLOR_SCROLLBAR, 272 COLOR_SCROLLBAR,
273#ifdef RXVT_SCROLLBAR
169 COLOR_SCROLLTROUGH, 274 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 275#endif
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;
298 letterSpace = LETTERSPACE;
245 saveLines = SAVELINES; 299 saveLines = SAVELINES;
246 numpix_colors = TOTAL_COLORS;
247 300
248 refresh_limit = 1;
249 refresh_type = SLOW_REFRESH; 301 refresh_type = SLOW_REFRESH;
250 prev_nrow = prev_ncol = 0;
251 302
252 oldcursor.row = oldcursor.col = -1; 303 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 304
259 last_bot = last_state = -1; 305 set_option (Opt_scrollBar);
260 306 set_option (Opt_scrollTtyOutput);
261 return true; 307 set_option (Opt_jumpScroll);
308 set_option (Opt_skipScroll);
309 set_option (Opt_secondaryScreen);
310 set_option (Opt_secondaryScroll);
311 set_option (Opt_pastableTabs);
312 set_option (Opt_intensityStyles);
313 set_option (Opt_iso14755_52);
314 set_option (Opt_buffered);
262} 315}
263 316
264void 317static void
265rxvt_term::init_secondary () 318init_secondary ()
266{ 319{
267 int i; 320 int i;
268 321
269 /*
270 * Close all unused file descriptors
271 * We don't want them, we don't need them.
272 */
273 if ((i = open ("/dev/null", O_RDONLY)) < 0) 322 if ((i = open ("/dev/null", O_RDONLY)) < 0)
274 { 323 {
275 /* TODO: BOO HISS */
276 dup2 (STDERR_FILENO, STDIN_FILENO); 324 dup2 (STDERR_FILENO, STDIN_FILENO);
277 } 325 }
278 else if (i > STDIN_FILENO) 326 else if (i != STDIN_FILENO)
279 { 327 {
280 dup2 (i, STDIN_FILENO); 328 dup2 (i, STDIN_FILENO);
281 close (i); 329 close (i);
282 } 330 }
283 331
284 dup2 (STDERR_FILENO, STDOUT_FILENO); 332 dup2 (STDERR_FILENO, STDOUT_FILENO);
285
286#if 0 // schmorp sayz closing filies is murder
287 for (i = STDERR_FILENO + 1; i < num_fds; i++)
288 {
289#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
290 if (i == 4 || i == 7)
291 continue;
292#endif
293 close (i);
294 }
295#endif
296} 333}
297 334
298/*----------------------------------------------------------------------*/ 335/*----------------------------------------------------------------------*/
299const char ** 336const char **
300rxvt_term::init_resources (int argc, const char *const *argv) 337rxvt_term::init_resources (int argc, const char *const *argv)
301{ 338{
302 int i, r_argc; 339 int i, r_argc;
303 char *val;
304 const char **cmd_argv, **r_argv; 340 const char **cmd_argv, **r_argv;
305 341
306 /* 342 /*
307 * Look for -exec option. Find => split and make cmd_argv[] of command args 343 * Look for -e option. Find => split and make cmd_argv[] of command args
308 */ 344 */
309 for (r_argc = 0; r_argc < argc; r_argc++) 345 for (r_argc = 0; r_argc < argc; r_argc++)
310 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 346 if (!strcmp (argv[r_argc], "-e"))
311 break; 347 break;
348
349 if (r_argc == argc)
350 cmd_argv = NULL;
351 else if (!argv[r_argc + 1])
352 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
353 else
354 {
355 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
356
357 for (i = 0; i < argc - r_argc - 1; i++)
358 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
359
360 cmd_argv[i] = NULL;
361 }
312 362
313 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 363 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
314 364
315 for (i = 0; i < r_argc; i++) 365 for (i = 0; i < r_argc; i++)
316 r_argv[i] = (const char *)argv[i]; 366 r_argv[i] = (const char *)argv[i];
317 367
318 r_argv[i] = NULL; 368 r_argv[i] = NULL;
319 369
320 if (r_argc == argc)
321 cmd_argv = NULL;
322 else
323 {
324 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
325
326 for (i = 0; i < argc - r_argc - 1; i++)
327 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
328
329 cmd_argv[i] = NULL;
330 }
331
332 rs[Rs_name] = rxvt_r_basename (argv[0]); 370 rs[Rs_name] = rxvt_basename (argv[0]);
333 371
334 /* 372 /*
335 * Open display, get options/resources and create the window 373 * Open display, get options/resources and create the window
336 */ 374 */
337 375
… …
339 rs[Rs_display_name] = ":0"; 377 rs[Rs_display_name] = ":0";
340 378
341 get_options (r_argc, r_argv); 379 get_options (r_argc, r_argv);
342 380
343 if (!(display = displays.get (rs[Rs_display_name]))) 381 if (!(display = displays.get (rs[Rs_display_name])))
382 {
383 free (r_argv);
344 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 384 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
385 }
345 386
387 // using a local pointer decreases code size a lot
388 xa = display->xa;
389
390 set (display);
346 extract_resources (); 391 extract_resources ();
347 392
393#if XFT
394 if (rs[Rs_depth])
395 select_visual (strtol (rs[Rs_depth], 0, 0));
396#endif
397
348 free (r_argv); 398 free (r_argv);
399
400 for (int i = NUM_RESOURCES; i--; )
401 if (rs [i] == resval_undef)
402 rs [i] = 0;
403
404#ifdef HAVE_AFTERIMAGE
405 set_application_name ((char *)rs[Rs_name]);
406 set_output_threshold (OUTPUT_LEVEL_WARNING);
407#endif
408
409#if ENABLE_PERL
410 if (!rs[Rs_perl_ext_1])
411 rs[Rs_perl_ext_1] = "default";
412
413 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
414 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
415 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
416 {
417 rxvt_perl.init (this);
418 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
419 }
420#endif
349 421
350 /* 422 /*
351 * set any defaults not already set 423 * set any defaults not already set
352 */ 424 */
353 if (cmd_argv && cmd_argv[0]) 425 if (cmd_argv && cmd_argv[0])
354 { 426 {
355 if (!rs[Rs_title]) 427 if (!rs[Rs_title])
356 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 428 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
429
357 if (!rs[Rs_iconName]) 430 if (!rs[Rs_iconName])
358 rs[Rs_iconName] = rs[Rs_title]; 431 rs[Rs_iconName] = rs[Rs_title];
359 } 432 }
360 else 433 else
361 { 434 {
362 if (!rs[Rs_title]) 435 if (!rs[Rs_title])
363 rs[Rs_title] = rs[Rs_name]; 436 rs[Rs_title] = rs[Rs_name];
437
364 if (!rs[Rs_iconName]) 438 if (!rs[Rs_iconName])
365 rs[Rs_iconName] = rs[Rs_name]; 439 rs[Rs_iconName] = rs[Rs_name];
366 } 440 }
367 441
368 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 442 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
375 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 449 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
376 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 450 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
377 451
378 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 452 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
379 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 453 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
454
455 if (rs[Rs_letterSpace])
456 letterSpace = atoi (rs[Rs_letterSpace]);
380#endif 457#endif
381 458
382#ifdef POINTER_BLANK 459#ifdef POINTER_BLANK
383 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 460 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
384 pointerBlankDelay = i; 461 pointerBlankDelay = i;
… …
388 465
389 /* no point having a scrollbar without having any scrollback! */ 466 /* no point having a scrollbar without having any scrollback! */
390 if (!saveLines) 467 if (!saveLines)
391 set_option (Opt_scrollBar, 0); 468 set_option (Opt_scrollBar, 0);
392 469
393#ifdef PRINTPIPE
394 if (!rs[Rs_print_pipe])
395 rs[Rs_print_pipe] = PRINTPIPE;
396#endif
397
398 if (!rs[Rs_cutchars]) 470 if (!rs[Rs_cutchars])
399 rs[Rs_cutchars] = CUTCHARS; 471 rs[Rs_cutchars] = CUTCHARS;
400 472
401#ifndef NO_BACKSPACE_KEY 473#ifndef NO_BACKSPACE_KEY
402 if (!rs[Rs_backspace_key]) 474 if (!rs[Rs_backspace_key])
403# ifdef DEFAULT_BACKSPACE 475# ifdef DEFAULT_BACKSPACE
404 key_backspace = DEFAULT_BACKSPACE; 476 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
405# else 477# else
406 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 478 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
407# endif 479# endif
408 else
409 {
410 val = strdup (rs[Rs_backspace_key]);
411 rxvt_Str_trim (val);
412 rxvt_Str_escaped (val);
413 key_backspace = val;
414 }
415#endif 480#endif
416 481
417#ifndef NO_DELETE_KEY 482#ifndef NO_DELETE_KEY
418 if (!rs[Rs_delete_key]) 483 if (!rs[Rs_delete_key])
419# ifdef DEFAULT_DELETE 484# ifdef DEFAULT_DELETE
420 key_delete = DEFAULT_DELETE; 485 rs[Rs_delete_key] = DEFAULT_DELETE;
421# else 486# else
422 key_delete = "\033[3~"; 487 rs[Rs_delete_key] = "\033[3~";
423# endif
424 else
425 {
426 val = strdup (rs[Rs_delete_key]);
427 rxvt_Str_trim (val);
428 rxvt_Str_escaped (val);
429 key_delete = val;
430 }
431#endif 488# endif
432 if (rs[Rs_answerbackstring])
433 {
434 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
435 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
436 }
437
438#ifdef HAVE_SCROLLBARS
439 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
440#endif 489#endif
490
491 scrollBar.setup (this);
441 492
442#ifdef XTERM_REVERSE_VIDEO 493#ifdef XTERM_REVERSE_VIDEO
443 /* this is how xterm implements reverseVideo */ 494 /* this is how xterm implements reverseVideo */
444 if (OPTION (Opt_reverseVideo)) 495 if (option (Opt_reverseVideo))
445 { 496 {
446 if (!rs[Rs_color + Color_fg]) 497 if (!rs[Rs_color + Color_fg])
447 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 498 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
499
448 if (!rs[Rs_color + Color_bg]) 500 if (!rs[Rs_color + Color_bg])
449 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 501 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
450 } 502 }
451#endif 503#endif
452 504
… …
454 if (!rs[Rs_color + i]) 506 if (!rs[Rs_color + i])
455 rs[Rs_color + i] = def_colorName[i]; 507 rs[Rs_color + i] = def_colorName[i];
456 508
457#ifndef XTERM_REVERSE_VIDEO 509#ifndef XTERM_REVERSE_VIDEO
458 /* this is how we implement reverseVideo */ 510 /* this is how we implement reverseVideo */
459 if (OPTION (Opt_reverseVideo)) 511 if (option (Opt_reverseVideo))
460 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 512 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
461#endif 513#endif
462 514
463 /* convenient aliases for setting fg/bg to colors */ 515 /* convenient aliases for setting fg/bg to colors */
464 color_aliases (Color_fg); 516 color_aliases (Color_fg);
465 color_aliases (Color_bg); 517 color_aliases (Color_bg);
466#ifndef NO_CURSORCOLOR 518#ifndef NO_CURSORCOLOR
467 color_aliases (Color_cursor); 519 color_aliases (Color_cursor);
468 color_aliases (Color_cursor2); 520 color_aliases (Color_cursor2);
469#endif /* NO_CURSORCOLOR */ 521#endif /* NO_CURSORCOLOR */
470 color_aliases (Color_pointer_fg); 522 color_aliases (Color_pointer_fg);
471 color_aliases (Color_pointer_bg); 523 color_aliases (Color_pointer_bg);
472 color_aliases (Color_border); 524 color_aliases (Color_border);
473#ifndef NO_BOLD_UNDERLINE_REVERSE 525#ifndef NO_BOLD_UNDERLINE_REVERSE
474 color_aliases (Color_BD); 526 color_aliases (Color_BD);
475 color_aliases (Color_UL); 527 color_aliases (Color_UL);
476 color_aliases (Color_RV); 528 color_aliases (Color_RV);
477#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 529#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
478 530
479 if (!rs[Rs_color + Color_border]) 531 if (!rs[Rs_color + Color_border])
480 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 532 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
481 533
482 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); // a 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 if (const char *path = rs[Rs_chdir])
558 if (*path) // ignored if empty
559 {
560 if (*path != '/')
561 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
562
563 if (chdir (path))
564 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
565 }
566
567 if (option (Opt_scrollBar))
568 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
569
570 pty = ptytty::create ();
571
572 create_windows (argc, argv);
573
574 init_xlocale ();
575
576 scr_poweron (); // initialize screen
577
578#if 0
579 XSynchronize (dpy, True);
580#endif
581
582 if (option (Opt_scrollBar))
583 scrollBar.resize (); /* create and map scrollbar */
584#ifdef HAVE_BG_PIXMAP
585 {
586 bgPixmap.set_target (this);
587 bgPixmap.invalidate ();
588
589#ifdef ENABLE_TRANSPARENCY
590 if (option (Opt_transparent))
591 {
592 bgPixmap.set_transparent ();
593
594#ifdef HAVE_AFTERIMAGE
595 if (rs [Rs_blurradius])
596 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
597#endif
598 if (ISSET_PIXCOLOR (Color_tint))
599 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
600
601 if (rs [Rs_shade])
602 bgPixmap.set_shade (rs [Rs_shade]);
603
604 bgPixmap.set_root_pixmap ();
605 XSelectInput (dpy, display->root, PropertyChangeMask);
606 rootwin_ev.start (display, display->root);
607 }
608#endif
609
610#ifdef BG_IMAGE_FROM_FILE
611 if (rs[Rs_backgroundPixmap])
612 {
613 const char *p = rs[Rs_backgroundPixmap];
614
615 if ((p = strchr (p, ';')) != 0)
616 {
617 p++;
618 bgPixmap.set_geometry (p);
619 }
620 else
621 bgPixmap.set_defaultGeometry ();
622
623 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
624 if (!bgPixmap.window_position_sensitive ())
625 update_background ();
626 }
627#endif
628 }
629#endif
630
631#if ENABLE_PERL
632 rootwin_ev.start (display, display->root);
633#endif
634
635 set_colorfgbg ();
636
637 init_command (cmd_argv);
638
639 free (cmd_argv);
640
641 if (pty->pty >= 0)
642 pty_ev.start (pty->pty, ev::READ);
643
644 HOOK_INVOKE ((this, HOOK_START, DT_END));
645
646#if ENABLE_XEMBED
647 if (rs[Rs_embed])
648 {
649 long info[2] = { 0, XEMBED_MAPPED };
650
651 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
652 32, PropModeReplace, (unsigned char *)&info, 2);
653 }
654#endif
655
656 XMapWindow (dpy, vt);
657 XMapWindow (dpy, parent[0]);
658
659 refresh_check ();
483} 660}
484 661
485/*----------------------------------------------------------------------*/ 662/*----------------------------------------------------------------------*/
486void 663void
487rxvt_term::init_env () 664rxvt_term::init_env ()
488{ 665{
489 int i; 666 int i;
490 unsigned int u;
491 char *val; 667 char *val;
492 668
493#ifdef DISPLAY_IS_IP 669#ifdef DISPLAY_IS_IP
494 /* Fixup display_name for export over pty to any interested terminal 670 /* Fixup display_name for export over pty to any interested terminal
495 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 671 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
503 */ 679 */
504 val = rxvt_network_display (rs[Rs_display_name]); 680 val = rxvt_network_display (rs[Rs_display_name]);
505 rs[Rs_display_name] = (const char *)val; 681 rs[Rs_display_name] = (const char *)val;
506 682
507 if (val == NULL) 683 if (val == NULL)
508#endif /* DISPLAY_IS_IP */ 684#endif /* DISPLAY_IS_IP */
509 val = XDisplayString (display->display); 685 val = XDisplayString (dpy);
510 686
511 if (rs[Rs_display_name] == NULL) 687 if (rs[Rs_display_name] == NULL)
512 rs[Rs_display_name] = val; /* use broken `:0' value */ 688 rs[Rs_display_name] = val; /* use broken `:0' value */
513 689
514 i = strlen (val); 690 i = strlen (val);
515 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 691 env_display = (char *)rxvt_malloc (i + 9);
516 692
517 sprintf (env_display, "DISPLAY=%s", val); 693 sprintf (env_display, "DISPLAY=%s", val);
518 694
519 /* avoiding the math library: 695 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
520 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
521 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
522 ;
523 max_it (i, 1);
524 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
525
526 sprintf (env_windowid, "WINDOWID=%u",
527 (unsigned int)parent[0]);
528 696
529 /* add entries to the environment: 697 /* add entries to the environment:
530 * @ DISPLAY: in case we started with -display 698 * @ DISPLAY: in case we started with -display
531 * @ WINDOWID: X window id number of the window 699 * @ WINDOWID: X window id number of the window
532 * @ COLORTERM: terminal sub-name and also indicates its color 700 * @ COLORTERM: terminal sub-name and also indicates its color
… …
534 * @ TERMINFO: path to terminfo directory 702 * @ TERMINFO: path to terminfo directory
535 * @ COLORFGBG: fg;bg color codes 703 * @ COLORFGBG: fg;bg color codes
536 */ 704 */
537 putenv (env_display); 705 putenv (env_display);
538 putenv (env_windowid); 706 putenv (env_windowid);
707
539 if (env_colorfgbg) 708 if (env_colorfgbg)
540 putenv (env_colorfgbg); 709 putenv (env_colorfgbg);
541 710
542#ifdef RXVT_TERMINFO 711#ifdef RXVT_TERMINFO
543 putenv ("TERMINFO=" RXVT_TERMINFO); 712 putenv ("TERMINFO=" RXVT_TERMINFO);
544#endif 713#endif
545 714
546 if (display->depth <= 2) 715 if (depth <= 2)
547 putenv ("COLORTERM=" COLORTERMENV "-mono"); 716 putenv ("COLORTERM=" COLORTERMENV "-mono");
548 else 717 else
549 putenv ("COLORTERM=" COLORTERMENVFULL); 718 putenv ("COLORTERM=" COLORTERMENVFULL);
550 719
551 if (rs[Rs_term_name] != NULL) 720 if (rs[Rs_term_name] != NULL)
552 { 721 {
553 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 722 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
554 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 723 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
555 putenv (env_term); 724 putenv (env_term);
556 } 725 }
557 else 726 else
558 putenv ("TERM=" TERMENV); 727 putenv ("TERM=" TERMENV);
… …
560#ifdef HAVE_UNSETENV 729#ifdef HAVE_UNSETENV
561 /* avoid passing old settings and confusing term size */ 730 /* avoid passing old settings and confusing term size */
562 unsetenv ("LINES"); 731 unsetenv ("LINES");
563 unsetenv ("COLUMNS"); 732 unsetenv ("COLUMNS");
564 unsetenv ("TERMCAP"); /* terminfo should be okay */ 733 unsetenv ("TERMCAP"); /* terminfo should be okay */
565#endif /* HAVE_UNSETENV */ 734#endif /* HAVE_UNSETENV */
566} 735}
567 736
568/*----------------------------------------------------------------------*/ 737/*----------------------------------------------------------------------*/
569/* 738/*
570 * This is more or less stolen straight from XFree86 xterm. 739 * This is more or less stolen straight from XFree86 xterm.
… …
591 760
592 this->locale = "C"; 761 this->locale = "C";
593 } 762 }
594 763
595 764
596 this->locale = rxvt_strdup (this->locale); 765 this->locale = strdup (this->locale);
597 SET_LOCALE (this->locale); 766 SET_LOCALE (this->locale);
598 mbstate.reset (); 767 mbstate.reset ();
599#endif 768#endif
600 769
601#if HAVE_NL_LANGINFO 770#if HAVE_NL_LANGINFO
… …
645 * Initialize the command connection. 814 * Initialize the command connection.
646 * This should be called after the X server connection is established. 815 * This should be called after the X server connection is established.
647 */ 816 */
648 817
649#ifdef META8_OPTION 818#ifdef META8_OPTION
650 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 819 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
651#endif 820#endif
652 821
653 get_ourmods (); 822 get_ourmods ();
654 823
655 if (!OPTION (Opt_scrollTtyOutput)) 824 if (!option (Opt_scrollTtyOutput))
656 priv_modes |= PrivMode_TtyOutputInh; 825 priv_modes |= PrivMode_TtyOutputInh;
657 if (OPTION (Opt_scrollTtyKeypress)) 826 if (option (Opt_scrollTtyKeypress))
658 priv_modes |= PrivMode_Keypress; 827 priv_modes |= PrivMode_Keypress;
659 if (!OPTION (Opt_jumpScroll)) 828 if (!option (Opt_jumpScroll))
660 priv_modes |= PrivMode_smoothScroll; 829 priv_modes |= PrivMode_smoothScroll;
661 830
662#ifndef NO_BACKSPACE_KEY 831#ifndef NO_BACKSPACE_KEY
663 if (strcmp (key_backspace, "DEC") == 0) 832 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
664 priv_modes |= PrivMode_HaveBackSpace; 833 priv_modes |= PrivMode_HaveBackSpace;
665#endif 834#endif
666 835
667 /* add value for scrollBar */ 836 /* add value for scrollBar */
668 if (scrollBar.state) 837 if (scrollBar.state)
… …
674 run_command (argv); 843 run_command (argv);
675} 844}
676 845
677/*----------------------------------------------------------------------*/ 846/*----------------------------------------------------------------------*/
678void 847void
679rxvt_term::Get_Colours () 848rxvt_term::get_colours ()
680{ 849{
681 int i; 850 int i;
682 851
683#ifdef OFF_FOCUS_FADING 852#ifdef OFF_FOCUS_FADING
684 pix_colors = pix_colors_focused; 853 pix_colors = pix_colors_focused;
685#endif 854#endif
686 855
687 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 856 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
688 { 857 {
858 const char *name = rs[Rs_color + i];
859
860 if (!name)
861 continue;
862
689 rxvt_color xcol; 863 rxvt_color xcol;
690 864
691 if (!rs[Rs_color + i]) 865 if (!set_color (xcol, name))
692 continue;
693
694 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
695 { 866 {
696#ifndef XTERM_REVERSE_VIDEO 867#ifndef XTERM_REVERSE_VIDEO
697 if (i < 2 && OPTION (Opt_reverseVideo)) 868 if (i < 2 && option (Opt_reverseVideo))
698 rs[Rs_color + i] = def_colorName[!i]; 869 name = def_colorName [1 - i];
699 else 870 else
700#endif 871#endif
701 rs[Rs_color + i] = def_colorName[i]; 872 name = def_colorName [i];
702 873
703 if (!rs[Rs_color + i]) 874 if (!name)
704 continue; 875 continue;
705 876
706 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 877 if (!set_color (xcol, name))
707 { 878 {
708 switch (i) 879 switch (i)
709 { 880 {
710 case Color_fg: 881 case Color_fg:
711 case Color_bg: 882 case Color_bg:
712 /* fatal: need bg/fg color */
713 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 883 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
714 /* NOTREACHED */ 884 name = "";
715 break; 885 break;
716#ifndef NO_CURSORCOLOR 886#ifndef NO_CURSORCOLOR
717 case Color_cursor2: 887 case Color_cursor2:
718 xcol = pix_colors[Color_fg]; 888#endif
719 break;
720#endif /* ! NO_CURSORCOLOR */
721 case Color_pointer_fg: 889 case Color_pointer_fg:
722 xcol = pix_colors[Color_fg]; 890 name = rs[Rs_color + Color_fg];
891 xcol.set (this, name);
723 break; 892 break;
724 default: 893 default:
725 xcol = pix_colors[Color_bg]; /* None */ 894 name = rs[Rs_color + Color_bg];
895 xcol.set (this, name);
726 break; 896 break;
727 } 897 }
728 } 898 }
729 } 899 }
730 900
731 pix_colors[i] = xcol; 901 pix_colors[i] = xcol;
732 SET_PIXCOLOR (i); 902 rs[Rs_color + i] = name;
733 }
734
735#ifdef OFF_FOCUS_FADING
736 if (rs[Rs_fade])
737 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
738 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
739#endif
740
741 if (display->depth <= 2)
742 { 903 }
904
905 if (depth <= 2)
906 {
743 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 907 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
744 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 908 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
745 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 909 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
746 } 910 }
747 911
748 /* 912 /*
749 * get scrollBar shadow colors 913 * get scrollBar shadow colors
750 * 914 *
751 * The calculations of topShadow/bottomShadow values are adapted 915 * The calculations of topShadow/bottomShadow values are adapted
752 * from the fvwm window manager. 916 * from the fvwm window manager.
753 */ 917 */
754#ifdef KEEP_SCROLLCOLOR 918#ifdef RXVT_SCROLLBAR
755
756 if (display->depth <= 2) 919 if (depth <= 2)
757 { 920 {
758 /* Monochrome */ 921 /* Monochrome */
759 pix_colors[Color_scroll] = pix_colors[Color_fg]; 922 alias_color (Color_scroll, Color_fg);
760 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 923 alias_color (Color_topShadow, Color_bg);
761 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 924 alias_color (Color_bottomShadow, Color_bg);
762 } 925 }
763 else 926 else
764 { 927 {
765 rxvt_color xcol[2]; 928 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
766 /* xcol[0] == white
767 * xcol[1] == top shadow
768 * xcol[2] == bot shadow */
769 929
770 xcol[1] = pix_colors[Color_scroll]; 930 rgba cscroll;
771 xcol[0].set (display, 65535, 65535, 65535); 931 pix_colors [Color_scroll].get (cscroll);
772
773 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
774
775 xcol[0].get (display, pr0, pg0, pb0);
776 xcol[1].get (display, pr1, pg1, pb1);
777
778 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
779 932
780 /* topShadowColor */ 933 /* topShadowColor */
781 if (!xcol[1].set (display, 934 if (!pix_colors[Color_topShadow].set (this,
782 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 935 rgba (
783 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 936 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
784 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 937 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
785 xcol[1] = pix_colors[Color_White]; 938 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
786 939 cscroll.a)
787 pix_colors[Color_topShadow] = xcol[1]; 940 ))
941 alias_color (Color_topShadow, Color_White);
788 } 942 }
789#endif /* KEEP_SCROLLCOLOR */ 943#endif
944
945#ifdef OFF_FOCUS_FADING
946 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
947 update_fade_color (i);
948#endif
790} 949}
791 950
792/*----------------------------------------------------------------------*/ 951/*----------------------------------------------------------------------*/
793/* color aliases, fg/bg bright-bold */ 952/* color aliases, fg/bg bright-bold */
794void 953void
… …
797 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 956 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
798 { 957 {
799 int i = atoi (rs[Rs_color + idx]); 958 int i = atoi (rs[Rs_color + idx]);
800 959
801 if (i >= 8 && i <= 15) 960 if (i >= 8 && i <= 15)
802 { /* bright colors */ 961 /* bright colors */
803 i -= 8;
804 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 962 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
805 return; 963 else if (i >= 0 && i <= 7)
806 } 964 /* normal colors */
807
808 if (i >= 0 && i <= 7) /* normal colors */
809 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 965 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
810 } 966 }
811} 967}
812 968
813/*----------------------------------------------------------------------*/ 969/*----------------------------------------------------------------------*/
… …
833 989
834 if (rsmod 990 if (rsmod
835 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 991 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
836 requestedmeta = rsmod[3] - '0'; 992 requestedmeta = rsmod[3] - '0';
837 993
838 map = XGetModifierMapping (display->display); 994 map = XGetModifierMapping (dpy);
839 kc = map->modifiermap; 995 kc = map->modifiermap;
840 996
841 for (i = 1; i < 6; i++) 997 for (i = 1; i < 6; i++)
842 { 998 {
843 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 999 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
845 for (j = map->max_keypermod; j--; k++) 1001 for (j = map->max_keypermod; j--; k++)
846 { 1002 {
847 if (kc[k] == 0) 1003 if (kc[k] == 0)
848 break; 1004 break;
849 1005
850 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 1006 switch (XKeycodeToKeysym (dpy, kc[k], 0))
851 { 1007 {
852 case XK_Num_Lock: 1008 case XK_Num_Lock:
853 ModNumLockMask = modmasks[i - 1]; 1009 ModNumLockMask = modmasks[i - 1];
854 continue; 1010 continue;
855 1011
… …
905rxvt_term::create_windows (int argc, const char *const *argv) 1061rxvt_term::create_windows (int argc, const char *const *argv)
906{ 1062{
907 XClassHint classHint; 1063 XClassHint classHint;
908 XWMHints wmHint; 1064 XWMHints wmHint;
909#if ENABLE_FRILLS 1065#if ENABLE_FRILLS
910 Atom prop = None;
911 MWMHints mwmhints; 1066 MWMHints mwmhints = { };
912#endif 1067#endif
913 XGCValues gcvalue; 1068 XGCValues gcvalue;
914 XSetWindowAttributes attributes; 1069 XSetWindowAttributes attributes;
915 XWindowAttributes gattr;
916 Window top, parent; 1070 Window top, parent;
917 dDisp;
918 1071
919#ifdef USING_W11LIB 1072 dLocal (Display *, dpy);
920 /* enable W11 callbacks */
921 W11AddEventHandler (disp, rxvt_W11_process_x_event);
922#endif
923 1073
924 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 1074 /* grab colors before netscape does */
925 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 1075 get_colours ();
926 1076
927 if (OPTION (Opt_transparent)) 1077 if (!set_fonts ())
928 { 1078 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
929 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 1079
930 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 1080 parent = display->root;
931 } 1081
1082 attributes.override_redirect = !!option (Opt_override_redirect);
932 1083
933#if ENABLE_FRILLS 1084#if ENABLE_FRILLS
934 if (OPTION (Opt_borderLess)) 1085 if (option (Opt_borderLess))
935 { 1086 {
936 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 1087 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
937
938 if (prop == None)
939 { 1088 {
940 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 1089 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
941#ifdef PREFER_24BIT
942 attributes.override_redirect = TRUE; 1090 attributes.override_redirect = true;
943#endif
944 mwmhints.flags = 0;
945 } 1091 }
946 else 1092 else
947 { 1093 {
948 mwmhints.flags = MWM_HINTS_DECORATIONS; 1094 mwmhints.flags = MWM_HINTS_DECORATIONS;
949 mwmhints.decorations = 0;
950 } 1095 }
951 } 1096 }
952 else
953 mwmhints.flags = 0;
954#endif 1097#endif
955
956 /* grab colors before netscape does */
957 Get_Colours ();
958
959 if (!set_fonts ())
960 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
961
962 parent = DefaultRootWindow (disp);
963 1098
964#if ENABLE_XEMBED 1099#if ENABLE_XEMBED
965 if (rs[Rs_embed]) 1100 if (rs[Rs_embed])
966 { 1101 {
967 XWindowAttributes wattr; 1102 XWindowAttributes wattr;
968 1103
969 parent = strtol (rs[Rs_embed], 0, 0); 1104 parent = strtol (rs[Rs_embed], 0, 0);
970 1105
971 if (!XGetWindowAttributes (disp, parent, &wattr)) 1106 if (!XGetWindowAttributes (dpy, parent, &wattr))
972 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 1107 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
973 1108
974 window_calc (wattr.width, wattr.height); 1109 window_calc (wattr.width, wattr.height);
975 } 1110 }
976#endif 1111#endif
977 1112
978 window_calc (0, 0); 1113 window_calc (0, 0);
979 1114
980 /* sub-window placement & size in rxvt_resize_subwindows () */ 1115 /* sub-window placement & size in rxvt_resize_subwindows () */
981#ifdef PREFER_24BIT
982 attributes.background_pixel = pix_colors_focused[Color_border]; 1116 attributes.background_pixel = pix_colors_focused [Color_border];
983 attributes.border_pixel = pix_colors_focused[Color_border]; 1117 attributes.border_pixel = pix_colors_focused [Color_border];
984 attributes.colormap = display->cmap; 1118 attributes.colormap = cmap;
1119
985 top = XCreateWindow (disp, parent, 1120 top = XCreateWindow (dpy, parent,
986 szHint.x, szHint.y, 1121 szHint.x, szHint.y,
987 szHint.width, szHint.height, 1122 szHint.width, szHint.height,
988 ext_bwidth, 1123 ext_bwidth,
989 display->depth, InputOutput, 1124 depth, InputOutput, visual,
990 display->visual,
991 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 1125 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
992#else 1126 &attributes);
993 top = XCreateSimpleWindow (disp, parent,
994 szHint.x, szHint.y,
995 szHint.width, szHint.height,
996 ext_bwidth,
997 pix_colors_focused[Color_border],
998 pix_colors_focused[Color_border]);
999#endif
1000 1127
1001 this->parent[0] = top; 1128 this->parent[0] = top;
1002 1129
1003 old_width = szHint.width; 1130 old_width = szHint.width;
1004 old_height = szHint.height; 1131 old_height = szHint.height;
1005 1132
1006 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1133 set_title (rs [Rs_title]);
1007 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1134 set_icon_name (rs [Rs_iconName]);
1008 1135
1009 classHint.res_name = (char *)rs[Rs_name]; 1136 classHint.res_name = (char *)rs[Rs_name];
1010 classHint.res_class = (char *)RESCLASS; 1137 classHint.res_class = (char *)RESCLASS;
1011 1138
1012 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1139 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1013 wmHint.input = True; 1140 wmHint.input = True;
1014 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1141 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1015 wmHint.window_group = top; 1142 wmHint.window_group = top;
1016 1143
1017 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 1144 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1018 &szHint, &wmHint, &classHint); 1145 &szHint, &wmHint, &classHint);
1146#if ENABLE_EWMH
1147# ifdef HAVE_AFTERIMAGE
1148 /*
1149 * set up icon hint
1150 * rs [Rs_iconfile] is path to icon, asv has been created in init_resources
1151 */
1152
1153 if (rs [Rs_iconfile])
1154 {
1155 init_asv ();
1156
1157 ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1158 if (asv && im)
1159 {
1160 int w = im->width;
1161 int h = im->height;
1162 long* buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1163 ASImage *result = scale_asimage (asv, im,
1164 w, h, ASA_ARGB32,
1165 100, ASIMAGE_QUALITY_DEFAULT);
1166 destroy_asimage (&im);
1167
1168 if (buffer && result)
1169 {
1170 ARGB32 *asbuf = result->alt.argb32;
1171 buffer [0] = w;
1172 buffer [1] = h;
1173
1174 for (unsigned int i = 0; i < w * h; ++i)
1175 buffer [i + 2] = asbuf [i];
1176
1177 destroy_asimage (&result);
1178 XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1179 PropModeReplace, (const unsigned char*) buffer, 2 + w * h);
1180 free (buffer);
1181 }
1182 else
1183 {
1184 if (!buffer)
1185 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1186
1187 if (!result)
1188 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1189 }
1190 }
1191 else
1192 rxvt_warn ("Loading image icon failed, continuing without.\n");
1193 }
1194# endif
1195#endif
1196
1197#if ENABLE_FRILLS
1198 if (mwmhints.flags)
1199 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1200 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1201#endif
1019 1202
1020 Atom protocols[] = { 1203 Atom protocols[] = {
1021 xa[XA_WM_DELETE_WINDOW], 1204 xa[XA_WM_DELETE_WINDOW],
1022#if ENABLE_EWMH 1205#if ENABLE_EWMH
1023 xa[XA_NET_WM_PING], 1206 xa[XA_NET_WM_PING],
1024#endif 1207#endif
1025 }; 1208 };
1026 1209
1027 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1210 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1028 1211
1029#if ENABLE_FRILLS 1212#if ENABLE_FRILLS
1030 if (rs[Rs_transient_for]) 1213 if (rs[Rs_transient_for])
1031 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1214 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1032#endif 1215#endif
1033 1216
1034#if ENABLE_EWMH 1217#if ENABLE_EWMH
1035 long pid = getpid (); 1218 long pid = getpid ();
1036 1219
1037 XChangeProperty (disp, top, 1220 XChangeProperty (dpy, top,
1038 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1221 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1039 PropModeReplace, (unsigned char *)&pid, 1); 1222 PropModeReplace, (unsigned char *)&pid, 1);
1040 1223
1041 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1224 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1042#endif 1225#endif
1043 1226
1044 XSelectInput (disp, top, 1227 XSelectInput (dpy, top,
1045 KeyPressMask 1228 KeyPressMask
1046#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1229#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1047 | KeyReleaseMask 1230 | KeyReleaseMask
1048#endif 1231#endif
1049 | FocusChangeMask | VisibilityChangeMask 1232 | FocusChangeMask | VisibilityChangeMask
1050 | ExposureMask | StructureNotifyMask); 1233 | ExposureMask | StructureNotifyMask);
1051 1234
1052 termwin_ev.start (display, top); 1235 termwin_ev.start (display, top);
1053 1236
1054#if ENABLE_FRILLS
1055 if (mwmhints.flags)
1056 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1057 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1058#endif
1059
1060 /* vt cursor: Black-on-White is standard, but this is more popular */ 1237 /* vt cursor: Black-on-White is standard, but this is more popular */
1061 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1238 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1062
1063#ifdef HAVE_SCROLLBARS
1064 /* cursor scrollBar: Black-on-White */
1065 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1066#endif
1067 1239
1068 /* the vt window */ 1240 /* the vt window */
1069 vt = XCreateSimpleWindow (disp, top, 1241 vt = XCreateSimpleWindow (dpy, top,
1070 window_vt_x,
1071 window_vt_y, 1242 window_vt_x, window_vt_y,
1072 width,
1073 height, 1243 width, height,
1074 0, 1244 0,
1075 pix_colors_focused[Color_fg], 1245 pix_colors_focused[Color_fg],
1076 pix_colors_focused[Color_bg]); 1246 pix_colors_focused[Color_bg]);
1077#ifdef DEBUG_X
1078 XStoreName (disp, vt, "vt window");
1079#endif
1080 1247
1081 attributes.bit_gravity = NorthWestGravity; 1248 attributes.bit_gravity = NorthWestGravity;
1082 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1249 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1083 1250
1084 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1251 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1085 1252
1086 if (OPTION (Opt_pointerBlank)) 1253 if (option (Opt_pointerBlank))
1087 vt_emask |= PointerMotionMask; 1254 vt_emask |= PointerMotionMask;
1088 else 1255 else
1089 vt_emask |= Button1MotionMask | Button3MotionMask; 1256 vt_emask |= Button1MotionMask | Button3MotionMask;
1090 1257
1091 vt_select_input (); 1258 vt_select_input ();
1092 1259
1093 vt_ev.start (display, vt); 1260 vt_ev.start (display, vt);
1094 1261
1095#ifdef XPM_BACKGROUND
1096 if (rs[Rs_backgroundPixmap] != NULL
1097 && ! OPTION (Opt_transparent))
1098 {
1099 const char *p = rs[Rs_backgroundPixmap];
1100
1101 if ((p = strchr (p, ';')) != NULL)
1102 {
1103 p++;
1104 scale_pixmap (p);
1105 }
1106
1107 set_bgPixmap (rs[Rs_backgroundPixmap]);
1108 scr_touch (true);
1109 }
1110#endif
1111
1112 /* graphics context for the vt window */ 1262 /* graphics context for the vt window */
1113 gcvalue.foreground = pix_colors[Color_fg]; 1263 gcvalue.foreground = pix_colors[Color_fg];
1114 gcvalue.background = pix_colors[Color_bg]; 1264 gcvalue.background = pix_colors[Color_bg];
1115 gcvalue.graphics_exposures = 1; 1265 gcvalue.graphics_exposures = 0;
1266
1116 gc = XCreateGC (disp, vt, 1267 gc = XCreateGC (dpy, vt,
1117 GCForeground | GCBackground | GCGraphicsExposures, 1268 GCForeground | GCBackground | GCGraphicsExposures,
1118 &gcvalue); 1269 &gcvalue);
1119 1270
1120 drawable = new rxvt_drawable (display, vt); 1271 drawable = new rxvt_drawable (this, vt);
1121
1122#ifdef RXVT_SCROLLBAR
1123 gcvalue.foreground = pix_colors[Color_topShadow];
1124 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1125 gcvalue.foreground = pix_colors[Color_bottomShadow];
1126 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1127 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1128 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1129#endif
1130 1272
1131#ifdef OFF_FOCUS_FADING 1273#ifdef OFF_FOCUS_FADING
1132 // initially we are in unfocused state 1274 // initially we are in unfocused state
1133 if (rs[Rs_fade]) 1275 if (rs[Rs_fade])
1134 pix_colors = pix_colors_unfocused; 1276 pix_colors = pix_colors_unfocused;
1135#endif 1277#endif
1136 1278
1137 pointer_unblank (); 1279 pointer_unblank ();
1138 scr_recolour (); 1280 scr_recolour ();
1139
1140#if ENABLE_XEMBED
1141 if (rs[Rs_embed])
1142 {
1143 long info[2] = { 0, XEMBED_MAPPED };
1144
1145 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1146 32, PropModeReplace, (unsigned char *)&info, 2);
1147 }
1148#endif
1149} 1281}
1150 1282
1151/* ------------------------------------------------------------------------- * 1283/* ------------------------------------------------------------------------- *
1152 * GET TTY CURRENT STATE * 1284 * GET TTY CURRENT STATE *
1153 * ------------------------------------------------------------------------- */ 1285 * ------------------------------------------------------------------------- */
1154void 1286void
1155rxvt_get_ttymode (ttymode_t *tio, int erase) 1287rxvt_get_ttymode (struct termios *tio, int erase)
1156{ 1288{
1157#ifdef HAVE_TERMIOS_H
1158 /* 1289 /*
1159 * standard System V termios interface 1290 * standard System V termios interface
1160 */ 1291 */
1161 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1292 if (tcgetattr (STDIN_FILENO, tio) < 0)
1162 { 1293 {
1163 // return error - use system defaults, 1294 // return error - use system defaults,
1164 // where possible, and zero elsewhere 1295 // where possible, and zero elsewhere
1165 memset (tio, 0, sizeof (ttymode_t)); 1296 memset (tio, 0, sizeof (struct termios));
1166 1297
1167 tio->c_cc[VINTR] = CINTR; 1298 tio->c_cc[VINTR] = CINTR;
1168 tio->c_cc[VQUIT] = CQUIT; 1299 tio->c_cc[VQUIT] = CQUIT;
1169 tio->c_cc[VERASE] = CERASE; 1300 tio->c_cc[VERASE] = CERASE;
1170#ifdef VERASE2 1301#ifdef VERASE2
… …
1229 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1360 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1230# if defined (ECHOCTL) && defined (ECHOKE) 1361# if defined (ECHOCTL) && defined (ECHOKE)
1231 | ECHOCTL | ECHOKE 1362 | ECHOCTL | ECHOKE
1232# endif 1363# endif
1233 | ECHOE | ECHOK); 1364 | ECHOE | ECHOK);
1234# else /* HAVE_TERMIOS_H */
1235
1236 /*
1237 * sgtty interface
1238 */
1239
1240 /* get parameters -- gtty */
1241 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1242 {
1243 tio->sg.sg_erase = CERASE; /* ^H */
1244 tio->sg.sg_kill = CKILL; /* ^U */
1245 }
1246
1247 if (erase != -1)
1248 tio->sg.sg_erase = (char)erase;
1249
1250 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1251
1252 /* get special characters */
1253 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1254 {
1255 tio->tc.t_intrc = CINTR; /* ^C */
1256 tio->tc.t_quitc = CQUIT; /* ^\ */
1257 tio->tc.t_startc = CSTART; /* ^Q */
1258 tio->tc.t_stopc = CSTOP; /* ^S */
1259 tio->tc.t_eofc = CEOF; /* ^D */
1260 tio->tc.t_brkc = -1;
1261 }
1262
1263 /* get local special chars */
1264 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1265 {
1266 tio->lc.t_suspc = CSUSP; /* ^Z */
1267 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1268 tio->lc.t_rprntc = CRPRNT; /* ^R */
1269 tio->lc.t_flushc = CFLUSH; /* ^O */
1270 tio->lc.t_werasc = CWERASE; /* ^W */
1271 tio->lc.t_lnextc = CLNEXT; /* ^V */
1272 }
1273 /* get line discipline */
1274 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1275# ifdef NTTYDISC
1276 tio->line = NTTYDISC;
1277# endif /* NTTYDISC */
1278
1279 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1280#endif /* HAVE_TERMIOS_H */
1281 1365
1282 /* 1366 /*
1283 * Debugging 1367 * Debugging
1284 */ 1368 */
1285#ifdef DEBUG_TTYMODE 1369#ifdef DEBUG_TTYMODE
1286#ifdef HAVE_TERMIOS_H
1287 /* c_iflag bits */ 1370 /* c_iflag bits */
1288 fprintf (stderr, "Input flags\n"); 1371 fprintf (stderr, "Input flags\n");
1289 1372
1290 /* cpp token stringize doesn't work on all machines <sigh> */ 1373 /* cpp token stringize doesn't work on all machines <sigh> */
1291# define FOO(flag,name) \ 1374# define FOO(flag,name) \
… …
1354 FOO (VLNEXT, "VLNEXT"); 1437 FOO (VLNEXT, "VLNEXT");
1355# endif 1438# endif
1356 1439
1357 fprintf (stderr, "\n"); 1440 fprintf (stderr, "\n");
1358# undef FOO 1441# undef FOO
1359# endif /* HAVE_TERMIOS_H */ 1442#endif /* DEBUG_TTYMODE */
1360#endif /* DEBUG_TTYMODE */
1361} 1443}
1362 1444
1363/*----------------------------------------------------------------------*/ 1445/*----------------------------------------------------------------------*/
1364/* 1446/*
1365 * Run the command in a subprocess and return a file descriptor for the 1447 * Run the command in a subprocess and return a file descriptor for the
… …
1386 else 1468 else
1387#endif 1469#endif
1388 if (!pty->get ()) 1470 if (!pty->get ())
1389 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1471 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1390 1472
1473 int er;
1474
1475#ifndef NO_BACKSPACE_KEY
1476 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1477 er = rs[Rs_backspace_key][0];
1478 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1479 er = '\177'; /* the initial state anyway */
1480 else
1481#endif
1482 er = -1;
1483
1484 rxvt_get_ttymode (&tio, er);
1485 /* init terminal attributes */
1486 cfsetospeed (&tio, BAUDRATE);
1487 cfsetispeed (&tio, BAUDRATE);
1488 tcsetattr (pty->tty, TCSANOW, &tio);
1391 pty->set_utf8_mode (enc_utf8); 1489 pty->set_utf8_mode (enc_utf8);
1392 1490
1393 /* set initial window size */ 1491 /* set initial window size */
1394 tt_winch (); 1492 tt_winch ();
1395
1396 int er;
1397
1398#ifndef NO_BACKSPACE_KEY
1399 if (key_backspace[0] && !key_backspace[1])
1400 er = key_backspace[0];
1401 else if (strcmp (key_backspace, "DEC") == 0)
1402 er = '\177'; /* the initial state anyway */
1403 else
1404#endif
1405 er = -1;
1406
1407 rxvt_get_ttymode (&tio, er);
1408 1493
1409#if ENABLE_FRILLS 1494#if ENABLE_FRILLS
1410 if (rs[Rs_pty_fd]) 1495 if (rs[Rs_pty_fd])
1411 return; 1496 return;
1412#endif 1497#endif
… …
1443 } 1528 }
1444 1529
1445 _exit (EXIT_FAILURE); 1530 _exit (EXIT_FAILURE);
1446 1531
1447 default: 1532 default:
1448#if UTMP_SUPPORT
1449 if (!OPTION (Opt_utmpInhibit)) 1533 if (!option (Opt_utmpInhibit))
1450 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1534 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1451#endif
1452 1535
1453 pty->close_tty (); 1536 pty->close_tty ();
1537
1538 child_ev.start (cmd_pid);
1539
1540 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1454 break; 1541 break;
1455 } 1542 }
1456} 1543}
1457 1544
1458/* ------------------------------------------------------------------------- * 1545/* ------------------------------------------------------------------------- *
… …
1465int 1552int
1466rxvt_term::run_child (const char *const *argv) 1553rxvt_term::run_child (const char *const *argv)
1467{ 1554{
1468 char *login; 1555 char *login;
1469 1556
1470 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1471
1472 if (OPTION (Opt_console)) 1557 if (option (Opt_console))
1558 {
1473 { /* be virtual console, fail silently */ 1559 /* be virtual console, fail silently */
1474#ifdef TIOCCONS 1560#ifdef TIOCCONS
1475 unsigned int on = 1; 1561 unsigned int on = 1;
1476 1562
1477 ioctl (STDIN_FILENO, TIOCCONS, &on); 1563 ioctl (STDIN_FILENO, TIOCCONS, &on);
1478#elif defined (SRIOCSREDIR) 1564#elif defined (SRIOCSREDIR)
… …
1480 1566
1481 fd = open (CONSOLE, O_WRONLY, 0); 1567 fd = open (CONSOLE, O_WRONLY, 0);
1482 if (fd >= 0) 1568 if (fd >= 0)
1483 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1569 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1484 close (fd); 1570 close (fd);
1485#endif /* SRIOCSREDIR */ 1571#endif /* SRIOCSREDIR */
1486 } 1572 }
1487 1573
1488 /* reset signals and spin off the command interpreter */ 1574 /* reset signals and spin off the command interpreter */
1489 signal (SIGINT, SIG_DFL); 1575 signal (SIGINT, SIG_DFL);
1490 signal (SIGQUIT, SIG_DFL); 1576 signal (SIGQUIT, SIG_DFL);
… …
1497 */ 1583 */
1498#ifdef SIGTSTP 1584#ifdef SIGTSTP
1499 signal (SIGTSTP, SIG_IGN); 1585 signal (SIGTSTP, SIG_IGN);
1500 signal (SIGTTIN, SIG_IGN); 1586 signal (SIGTTIN, SIG_IGN);
1501 signal (SIGTTOU, SIG_IGN); 1587 signal (SIGTTOU, SIG_IGN);
1502#endif /* SIGTSTP */ 1588#endif /* SIGTSTP */
1503
1504 // unblock signals (signals are blocked by iom.C
1505 sigset_t ss;
1506 sigemptyset (&ss);
1507 sigprocmask (SIG_SETMASK, &ss, 0);
1508 1589
1509 /* command interpreter path */ 1590 /* command interpreter path */
1510 if (argv != NULL) 1591 if (argv)
1511 { 1592 {
1512# ifdef DEBUG_CMD 1593# ifdef DEBUG_CMD
1513 int i; 1594 int i;
1514 1595
1515 for (i = 0; argv[i]; i++) 1596 for (i = 0; argv[i]; i++)
… …
1524 const char *argv0, *shell; 1605 const char *argv0, *shell;
1525 1606
1526 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1607 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1527 shell = "/bin/sh"; 1608 shell = "/bin/sh";
1528 1609
1529 argv0 = (const char *)rxvt_r_basename (shell); 1610 argv0 = rxvt_basename (shell);
1530 1611
1531 if (OPTION (Opt_loginShell)) 1612 if (option (Opt_loginShell))
1532 { 1613 {
1533 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1614 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1534 1615
1535 login[0] = '-'; 1616 login[0] = '-';
1536 strcpy (&login[1], argv0); 1617 strcpy (&login[1], argv0);
1537 argv0 = login; 1618 argv0 = login;
1538 } 1619 }
1539 1620
1540 execlp (shell, argv0, NULL); 1621 execlp (shell, argv0, (char *)0);
1541 /* no error message: STDERR is closed! */ 1622 /* no error message: STDERR is closed! */
1542 } 1623 }
1543 1624
1544 return -1; 1625 return -1;
1545} 1626}

Diff Legend

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