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.175 by root, Sat Jan 20 00:37:13 2007 UTC vs.
Revision 1.255 by root, Tue Nov 4 13:20:40 2008 UTC

… …
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 "rgb:00/00/00", // 0: black (Black) 153 "rgb:00/00/00", // 0: black (Black)
49 "rgb:cd/00/00", // 1: red (Red3) 154 "rgb:cd/00/00", // 1: red (Red3)
50 "rgb:00/cd/00", // 2: green (Green3) 155 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: ywlloe (Yellow3) 156 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "rgb:00/00/cd", // 4: blue (Blue3) 157 "rgb:00/00/cd", // 4: blue (Blue3)
53 "rgb:cd/00/cd", // 5: magenta (Magenta3) 158 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "rgb:00/cd/cd", // 6: cyan (Cyan3) 159 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 160# ifdef XTERM_COLORS
56 "rgb:e5/e5/e5", // 7: white (Grey90) 161 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 162# else
58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite) 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 "rgb:4d/4d/4d", // 8: bright black (Grey30) 167 "rgb:4d/4d/4d", // 8: bright black (Grey30)
… …
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 "rgb:00/00/00", 280 "rgb:00/00/00",
176#endif 281#endif
177 }; 282 };
178 283
179bool 284void
180rxvt_term::init_vars () 285rxvt_term::init_vars ()
181{ 286{
182 pix_colors = // 287 pix_colors = pix_colors_focused;
183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
184#ifdef OFF_FOCUS_FADING
185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
186#endif
187
188#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
189 pixmap = None;
190#endif
191 288
192 MEvent.time = CurrentTime; 289 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 290 MEvent.button = AnyButton;
194 options = DEFAULT_OPTIONS;
195 want_refresh = 1; 291 want_refresh = 1;
196 priv_modes = SavedModes = PrivMode_Default; 292 priv_modes = SavedModes = PrivMode_Default;
197 ncol = 80; 293 ncol = 80;
198 nrow = 24; 294 nrow = 24;
199 int_bwidth = INTERNALBORDERWIDTH; 295 int_bwidth = INTERNALBORDERWIDTH;
200 ext_bwidth = EXTERNALBORDERWIDTH; 296 ext_bwidth = EXTERNALBORDERWIDTH;
201 lineSpace = LINESPACE; 297 lineSpace = LINESPACE;
202 saveLines = SAVELINES; 298 saveLines = SAVELINES;
203 numpix_colors = TOTAL_COLORS;
204 299
205 refresh_limit = 1;
206 refresh_type = SLOW_REFRESH; 300 refresh_type = SLOW_REFRESH;
207 301
208 oldcursor.row = oldcursor.col = -1; 302 oldcursor.row = oldcursor.col = -1;
209#ifdef XPM_BACKGROUND
210 /* bgPixmap.w = bgPixmap.h = 0; */
211 bgPixmap.x = bgPixmap.y = 50;
212 bgPixmap.pixmap = None;
213#endif
214 303
215 last_bot = last_state = -1; 304 set_option (Opt_scrollBar);
216 305 set_option (Opt_scrollTtyOutput);
217 return true; 306 set_option (Opt_jumpScroll);
307 set_option (Opt_skipScroll);
308 set_option (Opt_secondaryScreen);
309 set_option (Opt_secondaryScroll);
310 set_option (Opt_pastableTabs);
311 set_option (Opt_intensityStyles);
312 set_option (Opt_iso14755_52);
313 set_option (Opt_buffered);
218} 314}
219 315
220void 316static void
221rxvt_term::init_secondary () 317init_secondary ()
222{ 318{
223 int i; 319 int i;
224 320
225 /*
226 * Close all unused file descriptors
227 * We don't want them, we don't need them.
228 */
229 if ((i = open ("/dev/null", O_RDONLY)) < 0) 321 if ((i = open ("/dev/null", O_RDONLY)) < 0)
230 { 322 {
231 /* TODO: BOO HISS */
232 dup2 (STDERR_FILENO, STDIN_FILENO); 323 dup2 (STDERR_FILENO, STDIN_FILENO);
233 } 324 }
234 else if (i > STDIN_FILENO) 325 else if (i != STDIN_FILENO)
235 { 326 {
236 dup2 (i, STDIN_FILENO); 327 dup2 (i, STDIN_FILENO);
237 close (i); 328 close (i);
238 } 329 }
239 330
240 dup2 (STDERR_FILENO, STDOUT_FILENO); 331 dup2 (STDERR_FILENO, STDOUT_FILENO);
241
242#if 0 // schmorp sayz closing filies is murder
243 for (i = STDERR_FILENO + 1; i < num_fds; i++)
244 {
245#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
246 if (i == 4 || i == 7)
247 continue;
248#endif
249 close (i);
250 }
251#endif
252} 332}
253 333
254/*----------------------------------------------------------------------*/ 334/*----------------------------------------------------------------------*/
255const char ** 335const char **
256rxvt_term::init_resources (int argc, const char *const *argv) 336rxvt_term::init_resources (int argc, const char *const *argv)
257{ 337{
258 int i, r_argc; 338 int i, r_argc;
259 char *val;
260 const char **cmd_argv, **r_argv; 339 const char **cmd_argv, **r_argv;
261 340
262 /* 341 /*
263 * Look for -e option. Find => split and make cmd_argv[] of command args 342 * Look for -e option. Find => split and make cmd_argv[] of command args
264 */ 343 */
265 for (r_argc = 0; r_argc < argc; r_argc++) 344 for (r_argc = 0; r_argc < argc; r_argc++)
266 if (!strcmp (argv[r_argc], "-e")) 345 if (!strcmp (argv[r_argc], "-e"))
267 break; 346 break;
268 347
348 if (r_argc == argc)
349 cmd_argv = NULL;
350 else if (!argv[r_argc + 1])
351 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
352 else
353 {
354 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
355
356 for (i = 0; i < argc - r_argc - 1; i++)
357 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
358
359 cmd_argv[i] = NULL;
360 }
361
269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 362 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
270 363
271 for (i = 0; i < r_argc; i++) 364 for (i = 0; i < r_argc; i++)
272 r_argv[i] = (const char *)argv[i]; 365 r_argv[i] = (const char *)argv[i];
273 366
274 r_argv[i] = NULL; 367 r_argv[i] = NULL;
275 368
276 if (r_argc == argc)
277 cmd_argv = NULL;
278 else
279 {
280 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
281
282 for (i = 0; i < argc - r_argc - 1; i++)
283 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
284
285 cmd_argv[i] = NULL;
286 }
287
288 rs[Rs_name] = rxvt_r_basename (argv[0]); 369 rs[Rs_name] = rxvt_basename (argv[0]);
289 370
290 /* 371 /*
291 * Open display, get options/resources and create the window 372 * Open display, get options/resources and create the window
292 */ 373 */
293 374
… …
295 rs[Rs_display_name] = ":0"; 376 rs[Rs_display_name] = ":0";
296 377
297 get_options (r_argc, r_argv); 378 get_options (r_argc, r_argv);
298 379
299 if (!(display = displays.get (rs[Rs_display_name]))) 380 if (!(display = displays.get (rs[Rs_display_name])))
381 {
382 free (r_argv);
300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 383 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
384 }
301 385
302 // using a local pointer decreases code size a lot 386 // using a local pointer decreases code size a lot
303 xa = display->xa; 387 xa = display->xa;
304 388
305 set (display); 389 set (display);
… …
313 free (r_argv); 397 free (r_argv);
314 398
315 for (int i = NUM_RESOURCES; i--; ) 399 for (int i = NUM_RESOURCES; i--; )
316 if (rs [i] == resval_undef) 400 if (rs [i] == resval_undef)
317 rs [i] = 0; 401 rs [i] = 0;
402
403#ifdef HAVE_AFTERIMAGE
404 set_application_name ((char *)rs[Rs_name]);
405 set_output_threshold (OUTPUT_LEVEL_WARNING);
406#endif
318 407
319#if ENABLE_PERL 408#if ENABLE_PERL
320 if (!rs[Rs_perl_ext_1]) 409 if (!rs[Rs_perl_ext_1])
321 rs[Rs_perl_ext_1] = "default"; 410 rs[Rs_perl_ext_1] = "default";
322 411
… …
333 * set any defaults not already set 422 * set any defaults not already set
334 */ 423 */
335 if (cmd_argv && cmd_argv[0]) 424 if (cmd_argv && cmd_argv[0])
336 { 425 {
337 if (!rs[Rs_title]) 426 if (!rs[Rs_title])
338 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 427 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
428
339 if (!rs[Rs_iconName]) 429 if (!rs[Rs_iconName])
340 rs[Rs_iconName] = rs[Rs_title]; 430 rs[Rs_iconName] = rs[Rs_title];
341 } 431 }
342 else 432 else
343 { 433 {
344 if (!rs[Rs_title]) 434 if (!rs[Rs_title])
345 rs[Rs_title] = rs[Rs_name]; 435 rs[Rs_title] = rs[Rs_name];
436
346 if (!rs[Rs_iconName]) 437 if (!rs[Rs_iconName])
347 rs[Rs_iconName] = rs[Rs_name]; 438 rs[Rs_iconName] = rs[Rs_name];
348 } 439 }
349 440
350 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 441 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
370 461
371 /* no point having a scrollbar without having any scrollback! */ 462 /* no point having a scrollbar without having any scrollback! */
372 if (!saveLines) 463 if (!saveLines)
373 set_option (Opt_scrollBar, 0); 464 set_option (Opt_scrollBar, 0);
374 465
375#ifdef PRINTPIPE
376 if (!rs[Rs_print_pipe])
377 rs[Rs_print_pipe] = PRINTPIPE;
378#endif
379
380 if (!rs[Rs_cutchars]) 466 if (!rs[Rs_cutchars])
381 rs[Rs_cutchars] = CUTCHARS; 467 rs[Rs_cutchars] = CUTCHARS;
382 468
383#ifndef NO_BACKSPACE_KEY 469#ifndef NO_BACKSPACE_KEY
384 if (!rs[Rs_backspace_key]) 470 if (!rs[Rs_backspace_key])
385# ifdef DEFAULT_BACKSPACE 471# ifdef DEFAULT_BACKSPACE
386 key_backspace = DEFAULT_BACKSPACE; 472 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
387# else 473# else
388 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 474 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
389# endif 475# endif
390 else
391 {
392 val = strdup (rs[Rs_backspace_key]);
393 rxvt_Str_trim (val);
394 rxvt_Str_escaped (val);
395 key_backspace = val;
396 }
397#endif 476#endif
398 477
399#ifndef NO_DELETE_KEY 478#ifndef NO_DELETE_KEY
400 if (!rs[Rs_delete_key]) 479 if (!rs[Rs_delete_key])
401# ifdef DEFAULT_DELETE 480# ifdef DEFAULT_DELETE
402 key_delete = DEFAULT_DELETE; 481 rs[Rs_delete_key] = DEFAULT_DELETE;
403# else 482# else
404 key_delete = "\033[3~"; 483 rs[Rs_delete_key] = "\033[3~";
405# endif
406 else
407 {
408 val = strdup (rs[Rs_delete_key]);
409 rxvt_Str_trim (val);
410 rxvt_Str_escaped (val);
411 key_delete = val;
412 }
413#endif 484# endif
414 if (rs[Rs_answerbackstring])
415 {
416 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
417 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
418 }
419
420#ifdef HAVE_SCROLLBARS
421 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
422#endif 485#endif
486
487 scrollBar.setup (this);
423 488
424#ifdef XTERM_REVERSE_VIDEO 489#ifdef XTERM_REVERSE_VIDEO
425 /* this is how xterm implements reverseVideo */ 490 /* this is how xterm implements reverseVideo */
426 if (OPTION (Opt_reverseVideo)) 491 if (option (Opt_reverseVideo))
427 { 492 {
428 if (!rs[Rs_color + Color_fg]) 493 if (!rs[Rs_color + Color_fg])
429 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 494 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
430 495
431 if (!rs[Rs_color + Color_bg]) 496 if (!rs[Rs_color + Color_bg])
… …
437 if (!rs[Rs_color + i]) 502 if (!rs[Rs_color + i])
438 rs[Rs_color + i] = def_colorName[i]; 503 rs[Rs_color + i] = def_colorName[i];
439 504
440#ifndef XTERM_REVERSE_VIDEO 505#ifndef XTERM_REVERSE_VIDEO
441 /* this is how we implement reverseVideo */ 506 /* this is how we implement reverseVideo */
442 if (OPTION (Opt_reverseVideo)) 507 if (option (Opt_reverseVideo))
443 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 508 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
444#endif 509#endif
445 510
446 /* convenient aliases for setting fg/bg to colors */ 511 /* convenient aliases for setting fg/bg to colors */
447 color_aliases (Color_fg); 512 color_aliases (Color_fg);
448 color_aliases (Color_bg); 513 color_aliases (Color_bg);
449#ifndef NO_CURSORCOLOR 514#ifndef NO_CURSORCOLOR
450 color_aliases (Color_cursor); 515 color_aliases (Color_cursor);
451 color_aliases (Color_cursor2); 516 color_aliases (Color_cursor2);
452#endif /* NO_CURSORCOLOR */ 517#endif /* NO_CURSORCOLOR */
453 color_aliases (Color_pointer_fg); 518 color_aliases (Color_pointer_fg);
454 color_aliases (Color_pointer_bg); 519 color_aliases (Color_pointer_bg);
455 color_aliases (Color_border); 520 color_aliases (Color_border);
456#ifndef NO_BOLD_UNDERLINE_REVERSE 521#ifndef NO_BOLD_UNDERLINE_REVERSE
457 color_aliases (Color_BD); 522 color_aliases (Color_BD);
458 color_aliases (Color_UL); 523 color_aliases (Color_UL);
459 color_aliases (Color_RV); 524 color_aliases (Color_RV);
460#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 525#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
461 526
462 if (!rs[Rs_color + Color_border]) 527 if (!rs[Rs_color + Color_border])
463 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 528 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
464 529
465 return cmd_argv; 530 return cmd_argv;
531}
532
533/*----------------------------------------------------------------------*/
534void
535rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
536{
537 this->envv = envv;
538
539 SET_R (this);
540 set_locale ("");
541 set_environ (envv); // a few things in X do not call setlocale :(
542
543 init_vars ();
544
545 init_secondary ();
546
547 const char **cmd_argv = init_resources (argc, argv);
548
549#ifdef KEYSYM_RESOURCE
550 keyboard->register_done ();
551#endif
552
553 if (const char *path = rs[Rs_chdir])
554 if (*path) // ignored if empty
555 {
556 if (*path != '/')
557 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
558
559 if (chdir (path))
560 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
561 }
562
563 if (option (Opt_scrollBar))
564 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
565
566 pty = ptytty::create ();
567
568 create_windows (argc, argv);
569
570 init_xlocale ();
571
572 scr_reset (); // initialize screen
573
574#if 0
575 XSynchronize (dpy, True);
576#endif
577
578 if (option (Opt_scrollBar))
579 scrollBar.resize (); /* create and map scrollbar */
580#ifdef HAVE_BG_PIXMAP
581 {
582 bgPixmap.set_target (this);
583 bgPixmap.invalidate ();
584
585#ifdef ENABLE_TRANSPARENCY
586 if (option (Opt_transparent))
587 {
588 bgPixmap.set_transparent ();
589
590#ifdef HAVE_AFTERIMAGE
591 if (rs [Rs_blurradius])
592 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
593#endif
594 if (ISSET_PIXCOLOR (Color_tint))
595 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
596
597 if (rs [Rs_shade])
598 bgPixmap.set_shade (rs [Rs_shade]);
599
600 bgPixmap.set_root_pixmap ();
601 XSelectInput (dpy, display->root, PropertyChangeMask);
602 rootwin_ev.start (display, display->root);
603 }
604#endif
605
606#ifdef BG_IMAGE_FROM_FILE
607 if (rs[Rs_backgroundPixmap])
608 {
609 const char *p = rs[Rs_backgroundPixmap];
610
611 if ((p = strchr (p, ';')) != 0)
612 {
613 p++;
614 bgPixmap.set_geometry (p);
615 }
616 else
617 bgPixmap.set_defaultGeometry ();
618
619 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
620 if (!bgPixmap.window_position_sensitive ())
621 update_background ();
622 }
623#endif
624 }
625#endif
626
627#if ENABLE_PERL
628 rootwin_ev.start (display, display->root);
629#endif
630
631 set_colorfgbg ();
632
633 init_command (cmd_argv);
634
635 free (cmd_argv);
636
637 if (pty->pty >= 0)
638 pty_ev.start (pty->pty, ev::READ);
639
640 HOOK_INVOKE ((this, HOOK_START, DT_END));
641
642#if ENABLE_XEMBED
643 if (rs[Rs_embed])
644 {
645 long info[2] = { 0, XEMBED_MAPPED };
646
647 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
648 32, PropModeReplace, (unsigned char *)&info, 2);
649 }
650#endif
651
652 XMapWindow (dpy, vt);
653 XMapWindow (dpy, parent[0]);
654
655 refresh_check ();
466} 656}
467 657
468/*----------------------------------------------------------------------*/ 658/*----------------------------------------------------------------------*/
469void 659void
470rxvt_term::init_env () 660rxvt_term::init_env ()
471{ 661{
472 int i; 662 int i;
473 unsigned int u;
474 char *val; 663 char *val;
475 664
476#ifdef DISPLAY_IS_IP 665#ifdef DISPLAY_IS_IP
477 /* Fixup display_name for export over pty to any interested terminal 666 /* Fixup display_name for export over pty to any interested terminal
478 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 667 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
486 */ 675 */
487 val = rxvt_network_display (rs[Rs_display_name]); 676 val = rxvt_network_display (rs[Rs_display_name]);
488 rs[Rs_display_name] = (const char *)val; 677 rs[Rs_display_name] = (const char *)val;
489 678
490 if (val == NULL) 679 if (val == NULL)
491#endif /* DISPLAY_IS_IP */ 680#endif /* DISPLAY_IS_IP */
492 val = XDisplayString (dpy); 681 val = XDisplayString (dpy);
493 682
494 if (rs[Rs_display_name] == NULL) 683 if (rs[Rs_display_name] == NULL)
495 rs[Rs_display_name] = val; /* use broken `:0' value */ 684 rs[Rs_display_name] = val; /* use broken `:0' value */
496 685
497 i = strlen (val); 686 i = strlen (val);
498 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 687 env_display = (char *)rxvt_malloc (i + 9);
499 688
500 sprintf (env_display, "DISPLAY=%s", val); 689 sprintf (env_display, "DISPLAY=%s", val);
501 690
502 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 691 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
503 692
… …
524 else 713 else
525 putenv ("COLORTERM=" COLORTERMENVFULL); 714 putenv ("COLORTERM=" COLORTERMENVFULL);
526 715
527 if (rs[Rs_term_name] != NULL) 716 if (rs[Rs_term_name] != NULL)
528 { 717 {
529 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 718 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
530 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 719 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
531 putenv (env_term); 720 putenv (env_term);
532 } 721 }
533 else 722 else
534 putenv ("TERM=" TERMENV); 723 putenv ("TERM=" TERMENV);
… …
536#ifdef HAVE_UNSETENV 725#ifdef HAVE_UNSETENV
537 /* avoid passing old settings and confusing term size */ 726 /* avoid passing old settings and confusing term size */
538 unsetenv ("LINES"); 727 unsetenv ("LINES");
539 unsetenv ("COLUMNS"); 728 unsetenv ("COLUMNS");
540 unsetenv ("TERMCAP"); /* terminfo should be okay */ 729 unsetenv ("TERMCAP"); /* terminfo should be okay */
541#endif /* HAVE_UNSETENV */ 730#endif /* HAVE_UNSETENV */
542} 731}
543 732
544/*----------------------------------------------------------------------*/ 733/*----------------------------------------------------------------------*/
545/* 734/*
546 * This is more or less stolen straight from XFree86 xterm. 735 * This is more or less stolen straight from XFree86 xterm.
… …
567 756
568 this->locale = "C"; 757 this->locale = "C";
569 } 758 }
570 759
571 760
572 this->locale = rxvt_strdup (this->locale); 761 this->locale = strdup (this->locale);
573 SET_LOCALE (this->locale); 762 SET_LOCALE (this->locale);
574 mbstate.reset (); 763 mbstate.reset ();
575#endif 764#endif
576 765
577#if HAVE_NL_LANGINFO 766#if HAVE_NL_LANGINFO
… …
621 * Initialize the command connection. 810 * Initialize the command connection.
622 * This should be called after the X server connection is established. 811 * This should be called after the X server connection is established.
623 */ 812 */
624 813
625#ifdef META8_OPTION 814#ifdef META8_OPTION
626 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 815 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
627#endif 816#endif
628 817
629 get_ourmods (); 818 get_ourmods ();
630 819
631 if (!OPTION (Opt_scrollTtyOutput)) 820 if (!option (Opt_scrollTtyOutput))
632 priv_modes |= PrivMode_TtyOutputInh; 821 priv_modes |= PrivMode_TtyOutputInh;
633 if (OPTION (Opt_scrollTtyKeypress)) 822 if (option (Opt_scrollTtyKeypress))
634 priv_modes |= PrivMode_Keypress; 823 priv_modes |= PrivMode_Keypress;
635 if (!OPTION (Opt_jumpScroll)) 824 if (!option (Opt_jumpScroll))
636 priv_modes |= PrivMode_smoothScroll; 825 priv_modes |= PrivMode_smoothScroll;
637 826
638#ifndef NO_BACKSPACE_KEY 827#ifndef NO_BACKSPACE_KEY
639 if (strcmp (key_backspace, "DEC") == 0) 828 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
640 priv_modes |= PrivMode_HaveBackSpace; 829 priv_modes |= PrivMode_HaveBackSpace;
641#endif 830#endif
642 831
643 /* add value for scrollBar */ 832 /* add value for scrollBar */
644 if (scrollBar.state) 833 if (scrollBar.state)
… …
650 run_command (argv); 839 run_command (argv);
651} 840}
652 841
653/*----------------------------------------------------------------------*/ 842/*----------------------------------------------------------------------*/
654void 843void
655rxvt_term::Get_Colours () 844rxvt_term::get_colours ()
656{ 845{
657 int i; 846 int i;
658 847
659#ifdef OFF_FOCUS_FADING 848#ifdef OFF_FOCUS_FADING
660 pix_colors = pix_colors_focused; 849 pix_colors = pix_colors_focused;
661#endif 850#endif
662 851
663 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 852 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
664 { 853 {
665 const char *name = rs[Rs_color + i]; 854 const char *name = rs[Rs_color + i];
666 855
667 if (!name) 856 if (!name)
… …
670 rxvt_color xcol; 859 rxvt_color xcol;
671 860
672 if (!set_color (xcol, name)) 861 if (!set_color (xcol, name))
673 { 862 {
674#ifndef XTERM_REVERSE_VIDEO 863#ifndef XTERM_REVERSE_VIDEO
675 if (i < 2 && OPTION (Opt_reverseVideo)) 864 if (i < 2 && option (Opt_reverseVideo))
676 name = def_colorName [1 - i]; 865 name = def_colorName [1 - i];
677 else 866 else
678#endif 867#endif
679 name = def_colorName [i]; 868 name = def_colorName [i];
680 869
… …
720 * get scrollBar shadow colors 909 * get scrollBar shadow colors
721 * 910 *
722 * The calculations of topShadow/bottomShadow values are adapted 911 * The calculations of topShadow/bottomShadow values are adapted
723 * from the fvwm window manager. 912 * from the fvwm window manager.
724 */ 913 */
725#ifdef KEEP_SCROLLCOLOR 914#ifdef RXVT_SCROLLBAR
726 if (depth <= 2) 915 if (depth <= 2)
727 { 916 {
728 /* Monochrome */ 917 /* Monochrome */
729 alias_color (Color_scroll, Color_fg); 918 alias_color (Color_scroll, Color_fg);
730 alias_color (Color_topShadow, Color_bg); 919 alias_color (Color_topShadow, Color_bg);
… …
745 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 934 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
746 cscroll.a) 935 cscroll.a)
747 )) 936 ))
748 alias_color (Color_topShadow, Color_White); 937 alias_color (Color_topShadow, Color_White);
749 } 938 }
750#endif /* KEEP_SCROLLCOLOR */ 939#endif
751 940
752#ifdef OFF_FOCUS_FADING 941#ifdef OFF_FOCUS_FADING
753 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 942 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
754 update_fade_color (i); 943 update_fade_color (i);
755#endif 944#endif
… …
763 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 952 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
764 { 953 {
765 int i = atoi (rs[Rs_color + idx]); 954 int i = atoi (rs[Rs_color + idx]);
766 955
767 if (i >= 8 && i <= 15) 956 if (i >= 8 && i <= 15)
768 { /* bright colors */ 957 /* bright colors */
769 i -= 8;
770 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 958 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
771 return; 959 else if (i >= 0 && i <= 7)
772 } 960 /* normal colors */
773
774 if (i >= 0 && i <= 7) /* normal colors */
775 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 961 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
776 } 962 }
777} 963}
778 964
779/*----------------------------------------------------------------------*/ 965/*----------------------------------------------------------------------*/
… …
871rxvt_term::create_windows (int argc, const char *const *argv) 1057rxvt_term::create_windows (int argc, const char *const *argv)
872{ 1058{
873 XClassHint classHint; 1059 XClassHint classHint;
874 XWMHints wmHint; 1060 XWMHints wmHint;
875#if ENABLE_FRILLS 1061#if ENABLE_FRILLS
876 MWMHints mwmhints; 1062 MWMHints mwmhints = { };
877#endif 1063#endif
878 XGCValues gcvalue; 1064 XGCValues gcvalue;
879 XSetWindowAttributes attributes; 1065 XSetWindowAttributes attributes;
880 Window top, parent; 1066 Window top, parent;
881 1067
882 dLocal (Display *, dpy); 1068 dLocal (Display *, dpy);
883 1069
884 /* grab colors before netscape does */ 1070 /* grab colors before netscape does */
885 Get_Colours (); 1071 get_colours ();
886 1072
887 if (!set_fonts ()) 1073 if (!set_fonts ())
888 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1074 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
889 1075
890 parent = display->root; 1076 parent = display->root;
891 1077
892 attributes.override_redirect = !!OPTION (Opt_override_redirect); 1078 attributes.override_redirect = !!option (Opt_override_redirect);
893 1079
894#if ENABLE_FRILLS 1080#if ENABLE_FRILLS
895 if (OPTION (Opt_borderLess)) 1081 if (option (Opt_borderLess))
896 { 1082 {
897 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 1083 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
898 { 1084 {
899 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 1085 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
900 attributes.override_redirect = true; 1086 attributes.override_redirect = true;
901 mwmhints.flags = 0;
902 } 1087 }
903 else 1088 else
904 { 1089 {
905 mwmhints.flags = MWM_HINTS_DECORATIONS; 1090 mwmhints.flags = MWM_HINTS_DECORATIONS;
906 mwmhints.decorations = 0;
907 } 1091 }
908 } 1092 }
909 else
910 mwmhints.flags = 0;
911#endif 1093#endif
912 1094
913#if ENABLE_XEMBED 1095#if ENABLE_XEMBED
914 if (rs[Rs_embed]) 1096 if (rs[Rs_embed])
915 { 1097 {
… …
950 classHint.res_name = (char *)rs[Rs_name]; 1132 classHint.res_name = (char *)rs[Rs_name];
951 classHint.res_class = (char *)RESCLASS; 1133 classHint.res_class = (char *)RESCLASS;
952 1134
953 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1135 wmHint.flags = InputHint | StateHint | WindowGroupHint;
954 wmHint.input = True; 1136 wmHint.input = True;
955 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1137 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
956 wmHint.window_group = top; 1138 wmHint.window_group = top;
957 1139
958 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1140 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
959 &szHint, &wmHint, &classHint); 1141 &szHint, &wmHint, &classHint);
1142#if ENABLE_EWMH
1143# ifdef HAVE_AFTERIMAGE
1144 /*
1145 * set up icon hint
1146 * rs [Rs_iconfile] is path to icon, asv has been created in init_resources
1147 */
1148
1149 if (rs [Rs_iconfile])
1150 {
1151 init_asv ();
1152
1153 ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1154 if (asv && im)
1155 {
1156 int w = im->width;
1157 int h = im->height;
1158 long* buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1159 ASImage *result = scale_asimage (asv, im,
1160 w, h, ASA_ARGB32,
1161 100, ASIMAGE_QUALITY_DEFAULT);
1162 destroy_asimage (&im);
1163
1164 if (buffer && result)
1165 {
1166 ARGB32 *asbuf = result->alt.argb32;
1167 buffer [0] = w;
1168 buffer [1] = h;
1169
1170 for (unsigned int i = 0; i < w * h; ++i)
1171 buffer [i + 2] = asbuf [i];
1172
1173 destroy_asimage (&result);
1174 XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1175 PropModeReplace, (const unsigned char*) buffer, 2 + w * h);
1176 free (buffer);
1177 }
1178 else
1179 {
1180 if (!buffer)
1181 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1182
1183 if (!result)
1184 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1185 }
1186 }
1187 else
1188 rxvt_warn ("Loading image icon failed, continuing without.\n");
1189 }
1190# endif
1191#endif
960 1192
961#if ENABLE_FRILLS 1193#if ENABLE_FRILLS
962 if (mwmhints.flags) 1194 if (mwmhints.flags)
963 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1195 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
964 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1196 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
998 1230
999 termwin_ev.start (display, top); 1231 termwin_ev.start (display, top);
1000 1232
1001 /* vt cursor: Black-on-White is standard, but this is more popular */ 1233 /* vt cursor: Black-on-White is standard, but this is more popular */
1002 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1234 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1003
1004#ifdef HAVE_SCROLLBARS
1005 /* cursor scrollBar: Black-on-White */
1006 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1007#endif
1008 1235
1009 /* the vt window */ 1236 /* the vt window */
1010 vt = XCreateSimpleWindow (dpy, top, 1237 vt = XCreateSimpleWindow (dpy, top,
1011 window_vt_x, window_vt_y, 1238 window_vt_x, window_vt_y,
1012 width, height, 1239 width, height,
… …
1017 attributes.bit_gravity = NorthWestGravity; 1244 attributes.bit_gravity = NorthWestGravity;
1018 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes); 1245 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1019 1246
1020 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1247 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1021 1248
1022 if (OPTION (Opt_pointerBlank)) 1249 if (option (Opt_pointerBlank))
1023 vt_emask |= PointerMotionMask; 1250 vt_emask |= PointerMotionMask;
1024 else 1251 else
1025 vt_emask |= Button1MotionMask | Button3MotionMask; 1252 vt_emask |= Button1MotionMask | Button3MotionMask;
1026 1253
1027 vt_select_input (); 1254 vt_select_input ();
1028 1255
1029 vt_ev.start (display, vt); 1256 vt_ev.start (display, vt);
1030
1031#ifdef XPM_BACKGROUND
1032 if (rs[Rs_backgroundPixmap] != NULL
1033 && !OPTION (Opt_transparent))
1034 {
1035 const char *p = rs[Rs_backgroundPixmap];
1036
1037 if ((p = strchr (p, ';')) != NULL)
1038 {
1039 p++;
1040 scale_pixmap (p);
1041 }
1042
1043 set_bgPixmap (rs[Rs_backgroundPixmap]);
1044 scr_touch (true);
1045 }
1046#endif
1047 1257
1048 /* graphics context for the vt window */ 1258 /* graphics context for the vt window */
1049 gcvalue.foreground = pix_colors[Color_fg]; 1259 gcvalue.foreground = pix_colors[Color_fg];
1050 gcvalue.background = pix_colors[Color_bg]; 1260 gcvalue.background = pix_colors[Color_bg];
1051 gcvalue.graphics_exposures = 0; 1261 gcvalue.graphics_exposures = 0;
… …
1054 GCForeground | GCBackground | GCGraphicsExposures, 1264 GCForeground | GCBackground | GCGraphicsExposures,
1055 &gcvalue); 1265 &gcvalue);
1056 1266
1057 drawable = new rxvt_drawable (this, vt); 1267 drawable = new rxvt_drawable (this, vt);
1058 1268
1059#ifdef RXVT_SCROLLBAR
1060 gcvalue.foreground = pix_colors[Color_topShadow];
1061 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1062 gcvalue.foreground = pix_colors[Color_bottomShadow];
1063 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1064 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1065 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1066#endif
1067
1068#ifdef OFF_FOCUS_FADING 1269#ifdef OFF_FOCUS_FADING
1069 // initially we are in unfocused state 1270 // initially we are in unfocused state
1070 if (rs[Rs_fade]) 1271 if (rs[Rs_fade])
1071 pix_colors = pix_colors_unfocused; 1272 pix_colors = pix_colors_unfocused;
1072#endif 1273#endif
… …
1077 1278
1078/* ------------------------------------------------------------------------- * 1279/* ------------------------------------------------------------------------- *
1079 * GET TTY CURRENT STATE * 1280 * GET TTY CURRENT STATE *
1080 * ------------------------------------------------------------------------- */ 1281 * ------------------------------------------------------------------------- */
1081void 1282void
1082rxvt_get_ttymode (ttymode_t *tio, int erase) 1283rxvt_get_ttymode (struct termios *tio, int erase)
1083{ 1284{
1084#ifdef HAVE_TERMIOS_H
1085 /* 1285 /*
1086 * standard System V termios interface 1286 * standard System V termios interface
1087 */ 1287 */
1088 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1288 if (tcgetattr (STDIN_FILENO, tio) < 0)
1089 { 1289 {
1090 // return error - use system defaults, 1290 // return error - use system defaults,
1091 // where possible, and zero elsewhere 1291 // where possible, and zero elsewhere
1092 memset (tio, 0, sizeof (ttymode_t)); 1292 memset (tio, 0, sizeof (struct termios));
1093 1293
1094 tio->c_cc[VINTR] = CINTR; 1294 tio->c_cc[VINTR] = CINTR;
1095 tio->c_cc[VQUIT] = CQUIT; 1295 tio->c_cc[VQUIT] = CQUIT;
1096 tio->c_cc[VERASE] = CERASE; 1296 tio->c_cc[VERASE] = CERASE;
1097#ifdef VERASE2 1297#ifdef VERASE2
… …
1156 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1356 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1157# if defined (ECHOCTL) && defined (ECHOKE) 1357# if defined (ECHOCTL) && defined (ECHOKE)
1158 | ECHOCTL | ECHOKE 1358 | ECHOCTL | ECHOKE
1159# endif 1359# endif
1160 | ECHOE | ECHOK); 1360 | ECHOE | ECHOK);
1161# else /* HAVE_TERMIOS_H */
1162
1163 /*
1164 * sgtty interface
1165 */
1166
1167 /* get parameters -- gtty */
1168 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1169 {
1170 tio->sg.sg_erase = CERASE; /* ^H */
1171 tio->sg.sg_kill = CKILL; /* ^U */
1172 }
1173
1174 if (erase != -1)
1175 tio->sg.sg_erase = (char)erase;
1176
1177 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1178
1179 /* get special characters */
1180 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1181 {
1182 tio->tc.t_intrc = CINTR; /* ^C */
1183 tio->tc.t_quitc = CQUIT; /* ^\ */
1184 tio->tc.t_startc = CSTART; /* ^Q */
1185 tio->tc.t_stopc = CSTOP; /* ^S */
1186 tio->tc.t_eofc = CEOF; /* ^D */
1187 tio->tc.t_brkc = -1;
1188 }
1189
1190 /* get local special chars */
1191 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1192 {
1193 tio->lc.t_suspc = CSUSP; /* ^Z */
1194 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1195 tio->lc.t_rprntc = CRPRNT; /* ^R */
1196 tio->lc.t_flushc = CFLUSH; /* ^O */
1197 tio->lc.t_werasc = CWERASE; /* ^W */
1198 tio->lc.t_lnextc = CLNEXT; /* ^V */
1199 }
1200 /* get line discipline */
1201 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1202# ifdef NTTYDISC
1203 tio->line = NTTYDISC;
1204# endif /* NTTYDISC */
1205
1206 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1207#endif /* HAVE_TERMIOS_H */
1208 1361
1209 /* 1362 /*
1210 * Debugging 1363 * Debugging
1211 */ 1364 */
1212#ifdef DEBUG_TTYMODE 1365#ifdef DEBUG_TTYMODE
1213#ifdef HAVE_TERMIOS_H
1214 /* c_iflag bits */ 1366 /* c_iflag bits */
1215 fprintf (stderr, "Input flags\n"); 1367 fprintf (stderr, "Input flags\n");
1216 1368
1217 /* cpp token stringize doesn't work on all machines <sigh> */ 1369 /* cpp token stringize doesn't work on all machines <sigh> */
1218# define FOO(flag,name) \ 1370# define FOO(flag,name) \
… …
1281 FOO (VLNEXT, "VLNEXT"); 1433 FOO (VLNEXT, "VLNEXT");
1282# endif 1434# endif
1283 1435
1284 fprintf (stderr, "\n"); 1436 fprintf (stderr, "\n");
1285# undef FOO 1437# undef FOO
1286# endif /* HAVE_TERMIOS_H */ 1438#endif /* DEBUG_TTYMODE */
1287#endif /* DEBUG_TTYMODE */
1288} 1439}
1289 1440
1290/*----------------------------------------------------------------------*/ 1441/*----------------------------------------------------------------------*/
1291/* 1442/*
1292 * Run the command in a subprocess and return a file descriptor for the 1443 * Run the command in a subprocess and return a file descriptor for the
… …
1316 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1467 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1317 1468
1318 int er; 1469 int er;
1319 1470
1320#ifndef NO_BACKSPACE_KEY 1471#ifndef NO_BACKSPACE_KEY
1321 if (key_backspace[0] && !key_backspace[1]) 1472 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1322 er = key_backspace[0]; 1473 er = rs[Rs_backspace_key][0];
1323 else if (strcmp (key_backspace, "DEC") == 0) 1474 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1324 er = '\177'; /* the initial state anyway */ 1475 er = '\177'; /* the initial state anyway */
1325 else 1476 else
1326#endif 1477#endif
1327 er = -1; 1478 er = -1;
1328 1479
1329 rxvt_get_ttymode (&tio, er); 1480 rxvt_get_ttymode (&tio, er);
1481 /* init terminal attributes */
1482 cfsetospeed (&tio, BAUDRATE);
1483 cfsetispeed (&tio, BAUDRATE);
1484 tcsetattr (pty->tty, TCSANOW, &tio);
1330 pty->set_utf8_mode (enc_utf8); 1485 pty->set_utf8_mode (enc_utf8);
1331 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1332 1486
1333 /* set initial window size */ 1487 /* set initial window size */
1334 tt_winch (); 1488 tt_winch ();
1335 1489
1336#if ENABLE_FRILLS 1490#if ENABLE_FRILLS
… …
1370 } 1524 }
1371 1525
1372 _exit (EXIT_FAILURE); 1526 _exit (EXIT_FAILURE);
1373 1527
1374 default: 1528 default:
1375 if (!OPTION (Opt_utmpInhibit)) 1529 if (!option (Opt_utmpInhibit))
1376 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1530 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1377 1531
1378 pty->close_tty (); 1532 pty->close_tty ();
1379 1533
1380 child_ev.start (cmd_pid); 1534 child_ev.start (cmd_pid);
1381 1535
… …
1394int 1548int
1395rxvt_term::run_child (const char *const *argv) 1549rxvt_term::run_child (const char *const *argv)
1396{ 1550{
1397 char *login; 1551 char *login;
1398 1552
1399 if (OPTION (Opt_console)) 1553 if (option (Opt_console))
1554 {
1400 { /* be virtual console, fail silently */ 1555 /* be virtual console, fail silently */
1401#ifdef TIOCCONS 1556#ifdef TIOCCONS
1402 unsigned int on = 1; 1557 unsigned int on = 1;
1403 1558
1404 ioctl (STDIN_FILENO, TIOCCONS, &on); 1559 ioctl (STDIN_FILENO, TIOCCONS, &on);
1405#elif defined (SRIOCSREDIR) 1560#elif defined (SRIOCSREDIR)
… …
1407 1562
1408 fd = open (CONSOLE, O_WRONLY, 0); 1563 fd = open (CONSOLE, O_WRONLY, 0);
1409 if (fd >= 0) 1564 if (fd >= 0)
1410 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1565 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1411 close (fd); 1566 close (fd);
1412#endif /* SRIOCSREDIR */ 1567#endif /* SRIOCSREDIR */
1413 } 1568 }
1414 1569
1415 /* reset signals and spin off the command interpreter */ 1570 /* reset signals and spin off the command interpreter */
1416 signal (SIGINT, SIG_DFL); 1571 signal (SIGINT, SIG_DFL);
1417 signal (SIGQUIT, SIG_DFL); 1572 signal (SIGQUIT, SIG_DFL);
… …
1424 */ 1579 */
1425#ifdef SIGTSTP 1580#ifdef SIGTSTP
1426 signal (SIGTSTP, SIG_IGN); 1581 signal (SIGTSTP, SIG_IGN);
1427 signal (SIGTTIN, SIG_IGN); 1582 signal (SIGTTIN, SIG_IGN);
1428 signal (SIGTTOU, SIG_IGN); 1583 signal (SIGTTOU, SIG_IGN);
1429#endif /* SIGTSTP */ 1584#endif /* SIGTSTP */
1430
1431 // unblock signals (signals are blocked by iom.C
1432 sigset_t ss;
1433 sigemptyset (&ss);
1434 sigprocmask (SIG_SETMASK, &ss, 0);
1435 1585
1436 /* command interpreter path */ 1586 /* command interpreter path */
1437 if (argv != NULL) 1587 if (argv)
1438 { 1588 {
1439# ifdef DEBUG_CMD 1589# ifdef DEBUG_CMD
1440 int i; 1590 int i;
1441 1591
1442 for (i = 0; argv[i]; i++) 1592 for (i = 0; argv[i]; i++)
… …
1451 const char *argv0, *shell; 1601 const char *argv0, *shell;
1452 1602
1453 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1603 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1454 shell = "/bin/sh"; 1604 shell = "/bin/sh";
1455 1605
1456 argv0 = (const char *)rxvt_r_basename (shell); 1606 argv0 = (const char *)rxvt_basename (shell);
1457 1607
1458 if (OPTION (Opt_loginShell)) 1608 if (option (Opt_loginShell))
1459 { 1609 {
1460 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1610 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1461 1611
1462 login[0] = '-'; 1612 login[0] = '-';
1463 strcpy (&login[1], argv0); 1613 strcpy (&login[1], argv0);
1464 argv0 = login; 1614 argv0 = login;
1465 } 1615 }
1466 1616
1467 execlp (shell, argv0, NULL); 1617 execlp (shell, argv0, (char *)0);
1468 /* no error message: STDERR is closed! */ 1618 /* no error message: STDERR is closed! */
1469 } 1619 }
1470 1620
1471 return -1; 1621 return -1;
1472} 1622}

Diff Legend

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