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.183 by root, Tue May 29 04:02:18 2007 UTC vs.
Revision 1.240 by ayin, Sat Jan 19 13:05:55 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-2007 Marc Lehmann <pcg@goof.com>
15 * 16 *
16 * This program is free software; you can redistribute it and/or modify 17 * This program is free software; you can redistribute it and/or modify
17 * it under the terms of the GNU General Public License as published by 18 * it under the terms of the GNU General Public License as published by
18 * the Free Software Foundation; either version 2 of the License, or 19 * the Free Software Foundation; either version 2 of the License, or
19 * (at your option) any later version. 20 * (at your option) any later version.
33 34
34#include "../config.h" /* NECESSARY */ 35#include "../config.h" /* NECESSARY */
35#include "rxvt.h" /* NECESSARY */ 36#include "rxvt.h" /* NECESSARY */
36#include "rxvtutil.h" 37#include "rxvtutil.h"
37#include "init.h" 38#include "init.h"
39#include "keyboard.h"
38 40
39#include <limits> 41#include <limits>
40 42
41#include <csignal> 43#include <csignal>
44
45#include <fcntl.h>
46
47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE
49# include <X11/Xlocale.h>
50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale>
53# endif
54#endif
55
56#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h>
58#endif
59
60#ifdef DISPLAY_IS_IP
61/* On Solaris link with -lsocket and -lnsl */
62#include <sys/types.h>
63#include <sys/socket.h>
64
65/* these next two are probably only on Sun (not Solaris) */
66#ifdef HAVE_SYS_SOCKIO_H
67#include <sys/sockio.h>
68#endif
69#ifdef HAVE_SYS_BYTEORDER_H
70#include <sys/byteorder.h>
71#endif
72
73#include <netinet/in.h>
74#include <arpa/inet.h>
75#include <net/if.h>
76#include <net/if_arp.h>
77
78static char *
79rxvt_network_display (const char *display)
80{
81 char buffer[1024], *rval = NULL;
82 struct ifconf ifc;
83 struct ifreq *ifr;
84 int i, skfd;
85
86 if (display[0] != ':' && strncmp (display, "unix:", 5))
87 return (char *) display; /* nothing to do */
88
89 ifc.ifc_len = sizeof (buffer); /* Get names of all ifaces */
90 ifc.ifc_buf = buffer;
91
92 if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
93 {
94 perror ("socket");
95 return NULL;
96 }
97
98 if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0)
99 {
100 perror ("SIOCGIFCONF");
101 close (skfd);
102 return NULL;
103 }
104
105 for (i = 0, ifr = ifc.ifc_req;
106 i < (ifc.ifc_len / sizeof (struct ifreq));
107 i++, ifr++)
108 {
109 struct ifreq ifr2;
110
111 strcpy (ifr2.ifr_name, ifr->ifr_name);
112
113 if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0)
114 {
115 unsigned long addr;
116 struct sockaddr_in *p_addr;
117
118 p_addr = (struct sockaddr_in *) &ifr2.ifr_addr;
119 addr = htonl ((unsigned long)p_addr->sin_addr.s_addr);
120
121 /*
122 * not "0.0.0.0" or "127.0.0.1" - so format the address
123 */
124 if (addr && addr != 0x7F000001)
125 {
126 char *colon = strchr (display, ':');
127
128 if (colon == NULL)
129 colon = ":0.0";
130
131 rval = rxvt_malloc (strlen (colon) + 16);
132 sprintf (rval, "%d.%d.%d.%d%s",
133 (int) ((addr >> 030) & 0xFF),
134 (int) ((addr >> 020) & 0xFF),
135 (int) ((addr >> 010) & 0xFF),
136 (int) (addr & 0xFF), colon);
137 break;
138 }
139 }
140 }
141
142 close (skfd);
143
144 return rval;
145}
146#endif
42 147
43const char *const def_colorName[] = 148const char *const def_colorName[] =
44 { 149 {
45 COLOR_FOREGROUND, 150 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 151 COLOR_BACKGROUND,
50 "rgb:00/cd/00", // 2: green (Green3) 155 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: yellow (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 272#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 273 COLOR_SCROLLBAR,
169 COLOR_SCROLLTROUGH, 274 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 275#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 276#if ENABLE_TRANSPARENCY
172 NULL, 277 NULL,
173#endif 278#endif
174#if OFF_FOCUS_FADING 279#if OFF_FOCUS_FADING
175 "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 want_refresh = 1; 291 want_refresh = 1;
195 priv_modes = SavedModes = PrivMode_Default; 292 priv_modes = SavedModes = PrivMode_Default;
197 nrow = 24; 294 nrow = 24;
198 int_bwidth = INTERNALBORDERWIDTH; 295 int_bwidth = INTERNALBORDERWIDTH;
199 ext_bwidth = EXTERNALBORDERWIDTH; 296 ext_bwidth = EXTERNALBORDERWIDTH;
200 lineSpace = LINESPACE; 297 lineSpace = LINESPACE;
201 saveLines = SAVELINES; 298 saveLines = SAVELINES;
202 numpix_colors = TOTAL_COLORS;
203 299
204 refresh_limit = 1;
205 refresh_type = SLOW_REFRESH; 300 refresh_type = SLOW_REFRESH;
206 301
207 oldcursor.row = oldcursor.col = -1; 302 oldcursor.row = oldcursor.col = -1;
208#ifdef XPM_BACKGROUND
209 /* bgPixmap.w = bgPixmap.h = 0; */
210 bgPixmap.x = bgPixmap.y = 0;
211 bgPixmap.pixmap = None;
212#endif
213
214 last_bot = last_state = -1;
215 303
216 set_option (Opt_scrollBar); 304 set_option (Opt_scrollBar);
217 set_option (Opt_scrollTtyOutput); 305 set_option (Opt_scrollTtyOutput);
218 set_option (Opt_jumpScroll); 306 set_option (Opt_jumpScroll);
307 set_option (Opt_skipScroll);
219 set_option (Opt_secondaryScreen); 308 set_option (Opt_secondaryScreen);
220 set_option (Opt_secondaryScroll); 309 set_option (Opt_secondaryScroll);
221 set_option (Opt_pastableTabs); 310 set_option (Opt_pastableTabs);
222 set_option (Opt_intensityStyles); 311 set_option (Opt_intensityStyles);
223 312 set_option (Opt_iso14755_52);
224 return true;
225} 313}
226 314
227void 315static void
228rxvt_term::init_secondary () 316init_secondary ()
229{ 317{
230 int i; 318 int i;
231 319
232 /* 320 /*
233 * Close all unused file descriptors 321 * Close all unused file descriptors
236 if ((i = open ("/dev/null", O_RDONLY)) < 0) 324 if ((i = open ("/dev/null", O_RDONLY)) < 0)
237 { 325 {
238 /* TODO: BOO HISS */ 326 /* TODO: BOO HISS */
239 dup2 (STDERR_FILENO, STDIN_FILENO); 327 dup2 (STDERR_FILENO, STDIN_FILENO);
240 } 328 }
241 else if (i > STDIN_FILENO) 329 else if (i != STDIN_FILENO)
242 { 330 {
243 dup2 (i, STDIN_FILENO); 331 dup2 (i, STDIN_FILENO);
244 close (i); 332 close (i);
245 } 333 }
246 334
261/*----------------------------------------------------------------------*/ 349/*----------------------------------------------------------------------*/
262const char ** 350const char **
263rxvt_term::init_resources (int argc, const char *const *argv) 351rxvt_term::init_resources (int argc, const char *const *argv)
264{ 352{
265 int i, r_argc; 353 int i, r_argc;
266 char *val;
267 const char **cmd_argv, **r_argv; 354 const char **cmd_argv, **r_argv;
268 355
269 /* 356 /*
270 * Look for -e option. Find => split and make cmd_argv[] of command args 357 * Look for -e option. Find => split and make cmd_argv[] of command args
271 */ 358 */
272 for (r_argc = 0; r_argc < argc; r_argc++) 359 for (r_argc = 0; r_argc < argc; r_argc++)
273 if (!strcmp (argv[r_argc], "-e")) 360 if (!strcmp (argv[r_argc], "-e"))
274 break; 361 break;
275 362
363 if (r_argc == argc)
364 cmd_argv = NULL;
365 else if (!argv[r_argc + 1])
366 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
367 else
368 {
369 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
370
371 for (i = 0; i < argc - r_argc - 1; i++)
372 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
373
374 cmd_argv[i] = NULL;
375 }
376
276 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 377 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
277 378
278 for (i = 0; i < r_argc; i++) 379 for (i = 0; i < r_argc; i++)
279 r_argv[i] = (const char *)argv[i]; 380 r_argv[i] = (const char *)argv[i];
280 381
281 r_argv[i] = NULL; 382 r_argv[i] = NULL;
282 383
283 if (r_argc == argc)
284 cmd_argv = NULL;
285 else
286 {
287 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
288
289 for (i = 0; i < argc - r_argc - 1; i++)
290 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
291
292 cmd_argv[i] = NULL;
293 }
294
295 rs[Rs_name] = rxvt_r_basename (argv[0]); 384 rs[Rs_name] = rxvt_basename (argv[0]);
296 385
297 /* 386 /*
298 * Open display, get options/resources and create the window 387 * Open display, get options/resources and create the window
299 */ 388 */
300 389
302 rs[Rs_display_name] = ":0"; 391 rs[Rs_display_name] = ":0";
303 392
304 get_options (r_argc, r_argv); 393 get_options (r_argc, r_argv);
305 394
306 if (!(display = displays.get (rs[Rs_display_name]))) 395 if (!(display = displays.get (rs[Rs_display_name])))
396 {
397 free (r_argv);
307 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 398 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
399 }
308 400
309 // using a local pointer decreases code size a lot 401 // using a local pointer decreases code size a lot
310 xa = display->xa; 402 xa = display->xa;
311 403
312 set (display); 404 set (display);
315#if XFT 407#if XFT
316 if (rs[Rs_depth]) 408 if (rs[Rs_depth])
317 select_visual (strtol (rs[Rs_depth], 0, 0)); 409 select_visual (strtol (rs[Rs_depth], 0, 0));
318#endif 410#endif
319 411
412#ifdef HAVE_AFTERIMAGE
413 set_application_name ((char*)rs[Rs_name]);
414 set_output_threshold (OUTPUT_LEVEL_WARNING);
415 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
416#endif
320 free (r_argv); 417 free (r_argv);
321 418
322 for (int i = NUM_RESOURCES; i--; ) 419 for (int i = NUM_RESOURCES; i--; )
323 if (rs [i] == resval_undef) 420 if (rs [i] == resval_undef)
324 rs [i] = 0; 421 rs [i] = 0;
340 * set any defaults not already set 437 * set any defaults not already set
341 */ 438 */
342 if (cmd_argv && cmd_argv[0]) 439 if (cmd_argv && cmd_argv[0])
343 { 440 {
344 if (!rs[Rs_title]) 441 if (!rs[Rs_title])
345 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 442 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
346 if (!rs[Rs_iconName]) 443 if (!rs[Rs_iconName])
347 rs[Rs_iconName] = rs[Rs_title]; 444 rs[Rs_iconName] = rs[Rs_title];
348 } 445 }
349 else 446 else
350 { 447 {
388 rs[Rs_cutchars] = CUTCHARS; 485 rs[Rs_cutchars] = CUTCHARS;
389 486
390#ifndef NO_BACKSPACE_KEY 487#ifndef NO_BACKSPACE_KEY
391 if (!rs[Rs_backspace_key]) 488 if (!rs[Rs_backspace_key])
392# ifdef DEFAULT_BACKSPACE 489# ifdef DEFAULT_BACKSPACE
393 key_backspace = DEFAULT_BACKSPACE; 490 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
394# else 491# else
395 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 492 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
396# endif 493# endif
397 else
398 {
399 val = strdup (rs[Rs_backspace_key]);
400 rxvt_Str_trim (val);
401 rxvt_Str_escaped (val);
402 key_backspace = val;
403 }
404#endif 494#endif
405 495
406#ifndef NO_DELETE_KEY 496#ifndef NO_DELETE_KEY
407 if (!rs[Rs_delete_key]) 497 if (!rs[Rs_delete_key])
408# ifdef DEFAULT_DELETE 498# ifdef DEFAULT_DELETE
409 key_delete = DEFAULT_DELETE; 499 rs[Rs_delete_key] = DEFAULT_DELETE;
410# else 500# else
411 key_delete = "\033[3~"; 501 rs[Rs_delete_key] = "\033[3~";
412# endif
413 else
414 {
415 val = strdup (rs[Rs_delete_key]);
416 rxvt_Str_trim (val);
417 rxvt_Str_escaped (val);
418 key_delete = val;
419 }
420#endif 502# endif
421 if (rs[Rs_answerbackstring]) 503#endif
422 {
423 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
424 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
425 }
426 504
427#ifdef HAVE_SCROLLBARS 505#ifdef HAVE_SCROLLBARS
428 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 506 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
429#endif 507#endif
430 508
454 color_aliases (Color_fg); 532 color_aliases (Color_fg);
455 color_aliases (Color_bg); 533 color_aliases (Color_bg);
456#ifndef NO_CURSORCOLOR 534#ifndef NO_CURSORCOLOR
457 color_aliases (Color_cursor); 535 color_aliases (Color_cursor);
458 color_aliases (Color_cursor2); 536 color_aliases (Color_cursor2);
459#endif /* NO_CURSORCOLOR */ 537#endif /* NO_CURSORCOLOR */
460 color_aliases (Color_pointer_fg); 538 color_aliases (Color_pointer_fg);
461 color_aliases (Color_pointer_bg); 539 color_aliases (Color_pointer_bg);
462 color_aliases (Color_border); 540 color_aliases (Color_border);
463#ifndef NO_BOLD_UNDERLINE_REVERSE 541#ifndef NO_BOLD_UNDERLINE_REVERSE
464 color_aliases (Color_BD); 542 color_aliases (Color_BD);
465 color_aliases (Color_UL); 543 color_aliases (Color_UL);
466 color_aliases (Color_RV); 544 color_aliases (Color_RV);
467#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 545#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
468 546
469 if (!rs[Rs_color + Color_border]) 547 if (!rs[Rs_color + Color_border])
470 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 548 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
471 549
472 return cmd_argv; 550 return cmd_argv;
551}
552
553/*----------------------------------------------------------------------*/
554void
555rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
556{
557 this->envv = envv;
558
559 SET_R (this);
560 set_locale ("");
561 set_environ (envv); // few things in X do not call setlocale :(
562
563 init_vars ();
564
565 init_secondary ();
566
567 const char **cmd_argv = init_resources (argc, argv);
568
569#ifdef KEYSYM_RESOURCE
570 keyboard->register_done ();
571#endif
572
573#ifdef HAVE_SCROLLBARS
574 if (option (Opt_scrollBar))
575 scrollBar.setIdle (); /* set existence for size calculations */
576#endif
577
578 pty = ptytty::create ();
579
580 create_windows (argc, argv);
581
582 init_xlocale ();
583
584 scr_reset (); // initialize screen
585
586#if 0
587 XSynchronize (dpy, True);
588#endif
589
590#ifdef HAVE_SCROLLBARS
591 if (option (Opt_scrollBar))
592 resize_scrollbar (); /* create and map scrollbar */
593#endif
594#ifdef HAVE_BG_PIXMAP
595 {
596 bgPixmap.set_target (this);
597 bgPixmap.invalidate ();
598
599#ifdef ENABLE_TRANSPARENCY
600 if (option (Opt_transparent))
601 {
602 bgPixmap.set_transparent ();
603
604#ifdef HAVE_AFTERIMAGE
605 if (rs [Rs_blurradius])
606 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
607#endif
608 if (ISSET_PIXCOLOR (Color_tint))
609 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
610
611 if (rs [Rs_shade])
612 bgPixmap.set_shade (rs [Rs_shade]);
613
614 bgPixmap.set_root_pixmap ();
615 XSelectInput (dpy, display->root, PropertyChangeMask);
616 rootwin_ev.start (display, display->root);
617 }
618#endif
619
620#ifdef BG_IMAGE_FROM_FILE
621 if (rs[Rs_backgroundPixmap])
622 {
623 const char *p = rs[Rs_backgroundPixmap];
624
625 if ((p = strchr (p, ';')) != 0)
626 {
627 p++;
628 bgPixmap.set_geometry (p);
629 }
630 else
631 bgPixmap.set_defaultGeometry ();
632
633 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
634 if (!bgPixmap.window_position_sensitive ())
635 update_background ();
636 }
637#endif
638 }
639#endif
640
641#if ENABLE_PERL
642 rootwin_ev.start (display, display->root);
643#endif
644
645 set_colorfgbg ();
646
647 init_command (cmd_argv);
648
649 free (cmd_argv);
650
651 if (pty->pty >= 0)
652 pty_ev.start (pty->pty, ev::READ);
653
654 HOOK_INVOKE ((this, HOOK_START, DT_END));
655
656#if ENABLE_XEMBED
657 if (rs[Rs_embed])
658 {
659 long info[2] = { 0, XEMBED_MAPPED };
660
661 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
662 32, PropModeReplace, (unsigned char *)&info, 2);
663 }
664#endif
665
666 XMapWindow (dpy, vt);
667 XMapWindow (dpy, parent[0]);
668
669 refresh_check ();
473} 670}
474 671
475/*----------------------------------------------------------------------*/ 672/*----------------------------------------------------------------------*/
476void 673void
477rxvt_term::init_env () 674rxvt_term::init_env ()
478{ 675{
479 int i; 676 int i;
480 unsigned int u;
481 char *val; 677 char *val;
482 678
483#ifdef DISPLAY_IS_IP 679#ifdef DISPLAY_IS_IP
484 /* Fixup display_name for export over pty to any interested terminal 680 /* Fixup display_name for export over pty to any interested terminal
485 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 681 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
493 */ 689 */
494 val = rxvt_network_display (rs[Rs_display_name]); 690 val = rxvt_network_display (rs[Rs_display_name]);
495 rs[Rs_display_name] = (const char *)val; 691 rs[Rs_display_name] = (const char *)val;
496 692
497 if (val == NULL) 693 if (val == NULL)
498#endif /* DISPLAY_IS_IP */ 694#endif /* DISPLAY_IS_IP */
499 val = XDisplayString (dpy); 695 val = XDisplayString (dpy);
500 696
501 if (rs[Rs_display_name] == NULL) 697 if (rs[Rs_display_name] == NULL)
502 rs[Rs_display_name] = val; /* use broken `:0' value */ 698 rs[Rs_display_name] = val; /* use broken `:0' value */
503 699
504 i = strlen (val); 700 i = strlen (val);
505 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 701 env_display = (char *)rxvt_malloc (i + 9);
506 702
507 sprintf (env_display, "DISPLAY=%s", val); 703 sprintf (env_display, "DISPLAY=%s", val);
508 704
509 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 705 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
510 706
531 else 727 else
532 putenv ("COLORTERM=" COLORTERMENVFULL); 728 putenv ("COLORTERM=" COLORTERMENVFULL);
533 729
534 if (rs[Rs_term_name] != NULL) 730 if (rs[Rs_term_name] != NULL)
535 { 731 {
536 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 732 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
537 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 733 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
538 putenv (env_term); 734 putenv (env_term);
539 } 735 }
540 else 736 else
541 putenv ("TERM=" TERMENV); 737 putenv ("TERM=" TERMENV);
543#ifdef HAVE_UNSETENV 739#ifdef HAVE_UNSETENV
544 /* avoid passing old settings and confusing term size */ 740 /* avoid passing old settings and confusing term size */
545 unsetenv ("LINES"); 741 unsetenv ("LINES");
546 unsetenv ("COLUMNS"); 742 unsetenv ("COLUMNS");
547 unsetenv ("TERMCAP"); /* terminfo should be okay */ 743 unsetenv ("TERMCAP"); /* terminfo should be okay */
548#endif /* HAVE_UNSETENV */ 744#endif /* HAVE_UNSETENV */
549} 745}
550 746
551/*----------------------------------------------------------------------*/ 747/*----------------------------------------------------------------------*/
552/* 748/*
553 * This is more or less stolen straight from XFree86 xterm. 749 * This is more or less stolen straight from XFree86 xterm.
574 770
575 this->locale = "C"; 771 this->locale = "C";
576 } 772 }
577 773
578 774
579 this->locale = rxvt_strdup (this->locale); 775 this->locale = strdup (this->locale);
580 SET_LOCALE (this->locale); 776 SET_LOCALE (this->locale);
581 mbstate.reset (); 777 mbstate.reset ();
582#endif 778#endif
583 779
584#if HAVE_NL_LANGINFO 780#if HAVE_NL_LANGINFO
641 priv_modes |= PrivMode_Keypress; 837 priv_modes |= PrivMode_Keypress;
642 if (!option (Opt_jumpScroll)) 838 if (!option (Opt_jumpScroll))
643 priv_modes |= PrivMode_smoothScroll; 839 priv_modes |= PrivMode_smoothScroll;
644 840
645#ifndef NO_BACKSPACE_KEY 841#ifndef NO_BACKSPACE_KEY
646 if (strcmp (key_backspace, "DEC") == 0) 842 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
647 priv_modes |= PrivMode_HaveBackSpace; 843 priv_modes |= PrivMode_HaveBackSpace;
648#endif 844#endif
649 845
650 /* add value for scrollBar */ 846 /* add value for scrollBar */
651 if (scrollBar.state) 847 if (scrollBar.state)
664 int i; 860 int i;
665 861
666#ifdef OFF_FOCUS_FADING 862#ifdef OFF_FOCUS_FADING
667 pix_colors = pix_colors_focused; 863 pix_colors = pix_colors_focused;
668#endif 864#endif
669 865
670 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 866 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
671 { 867 {
672 const char *name = rs[Rs_color + i]; 868 const char *name = rs[Rs_color + i];
673 869
674 if (!name) 870 if (!name)
752 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 948 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
753 cscroll.a) 949 cscroll.a)
754 )) 950 ))
755 alias_color (Color_topShadow, Color_White); 951 alias_color (Color_topShadow, Color_White);
756 } 952 }
757#endif /* KEEP_SCROLLCOLOR */ 953#endif /* KEEP_SCROLLCOLOR */
758 954
759#ifdef OFF_FOCUS_FADING 955#ifdef OFF_FOCUS_FADING
760 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 956 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
761 update_fade_color (i); 957 update_fade_color (i);
762#endif 958#endif
770 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 966 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
771 { 967 {
772 int i = atoi (rs[Rs_color + idx]); 968 int i = atoi (rs[Rs_color + idx]);
773 969
774 if (i >= 8 && i <= 15) 970 if (i >= 8 && i <= 15)
775 { /* bright colors */ 971 /* bright colors */
776 i -= 8;
777 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 972 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
778 return; 973 else if (i >= 0 && i <= 7)
779 } 974 /* normal colors */
780
781 if (i >= 0 && i <= 7) /* normal colors */
782 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 975 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
783 } 976 }
784} 977}
785 978
786/*----------------------------------------------------------------------*/ 979/*----------------------------------------------------------------------*/
878rxvt_term::create_windows (int argc, const char *const *argv) 1071rxvt_term::create_windows (int argc, const char *const *argv)
879{ 1072{
880 XClassHint classHint; 1073 XClassHint classHint;
881 XWMHints wmHint; 1074 XWMHints wmHint;
882#if ENABLE_FRILLS 1075#if ENABLE_FRILLS
883 MWMHints mwmhints; 1076 MWMHints mwmhints = { };
884#endif 1077#endif
885 XGCValues gcvalue; 1078 XGCValues gcvalue;
886 XSetWindowAttributes attributes; 1079 XSetWindowAttributes attributes;
887 Window top, parent; 1080 Window top, parent;
888 1081
901#if ENABLE_FRILLS 1094#if ENABLE_FRILLS
902 if (option (Opt_borderLess)) 1095 if (option (Opt_borderLess))
903 { 1096 {
904 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 1097 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
905 { 1098 {
906 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 1099 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
907 attributes.override_redirect = true; 1100 attributes.override_redirect = true;
908 mwmhints.flags = 0;
909 } 1101 }
910 else 1102 else
911 { 1103 {
912 mwmhints.flags = MWM_HINTS_DECORATIONS; 1104 mwmhints.flags = MWM_HINTS_DECORATIONS;
913 mwmhints.decorations = 0;
914 } 1105 }
915 } 1106 }
916 else
917 mwmhints.flags = 0;
918#endif 1107#endif
919 1108
920#if ENABLE_XEMBED 1109#if ENABLE_XEMBED
921 if (rs[Rs_embed]) 1110 if (rs[Rs_embed])
922 { 1111 {
1006 termwin_ev.start (display, top); 1195 termwin_ev.start (display, top);
1007 1196
1008 /* vt cursor: Black-on-White is standard, but this is more popular */ 1197 /* vt cursor: Black-on-White is standard, but this is more popular */
1009 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1198 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1010 1199
1011#ifdef HAVE_SCROLLBARS
1012 /* cursor scrollBar: Black-on-White */
1013 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1014#endif
1015
1016 /* the vt window */ 1200 /* the vt window */
1017 vt = XCreateSimpleWindow (dpy, top, 1201 vt = XCreateSimpleWindow (dpy, top,
1018 window_vt_x, window_vt_y, 1202 window_vt_x, window_vt_y,
1019 width, height, 1203 width, height,
1020 0, 1204 0,
1033 1217
1034 vt_select_input (); 1218 vt_select_input ();
1035 1219
1036 vt_ev.start (display, vt); 1220 vt_ev.start (display, vt);
1037 1221
1038#ifdef XPM_BACKGROUND
1039 if (rs[Rs_backgroundPixmap] != NULL
1040 && !option (Opt_transparent))
1041 {
1042 const char *p = rs[Rs_backgroundPixmap];
1043
1044 if ((p = strchr (p, ';')) != NULL)
1045 {
1046 p++;
1047 scale_pixmap (p);
1048 }
1049
1050 set_bgPixmap (rs[Rs_backgroundPixmap]);
1051 scr_touch (true);
1052 }
1053#endif
1054
1055 /* graphics context for the vt window */ 1222 /* graphics context for the vt window */
1056 gcvalue.foreground = pix_colors[Color_fg]; 1223 gcvalue.foreground = pix_colors[Color_fg];
1057 gcvalue.background = pix_colors[Color_bg]; 1224 gcvalue.background = pix_colors[Color_bg];
1058 gcvalue.graphics_exposures = 0; 1225 gcvalue.graphics_exposures = 0;
1059 1226
1061 GCForeground | GCBackground | GCGraphicsExposures, 1228 GCForeground | GCBackground | GCGraphicsExposures,
1062 &gcvalue); 1229 &gcvalue);
1063 1230
1064 drawable = new rxvt_drawable (this, vt); 1231 drawable = new rxvt_drawable (this, vt);
1065 1232
1066#ifdef RXVT_SCROLLBAR
1067 gcvalue.foreground = pix_colors[Color_topShadow];
1068 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1069 gcvalue.foreground = pix_colors[Color_bottomShadow];
1070 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1071 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1072 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1073#endif
1074
1075#ifdef OFF_FOCUS_FADING 1233#ifdef OFF_FOCUS_FADING
1076 // initially we are in unfocused state 1234 // initially we are in unfocused state
1077 if (rs[Rs_fade]) 1235 if (rs[Rs_fade])
1078 pix_colors = pix_colors_unfocused; 1236 pix_colors = pix_colors_unfocused;
1079#endif 1237#endif
1084 1242
1085/* ------------------------------------------------------------------------- * 1243/* ------------------------------------------------------------------------- *
1086 * GET TTY CURRENT STATE * 1244 * GET TTY CURRENT STATE *
1087 * ------------------------------------------------------------------------- */ 1245 * ------------------------------------------------------------------------- */
1088void 1246void
1089rxvt_get_ttymode (ttymode_t *tio, int erase) 1247rxvt_get_ttymode (struct termios *tio, int erase)
1090{ 1248{
1091 /* 1249 /*
1092 * standard System V termios interface 1250 * standard System V termios interface
1093 */ 1251 */
1094 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1252 if (tcgetattr (STDIN_FILENO, tio) < 0)
1095 { 1253 {
1096 // return error - use system defaults, 1254 // return error - use system defaults,
1097 // where possible, and zero elsewhere 1255 // where possible, and zero elsewhere
1098 memset (tio, 0, sizeof (ttymode_t)); 1256 memset (tio, 0, sizeof (struct termios));
1099 1257
1100 tio->c_cc[VINTR] = CINTR; 1258 tio->c_cc[VINTR] = CINTR;
1101 tio->c_cc[VQUIT] = CQUIT; 1259 tio->c_cc[VQUIT] = CQUIT;
1102 tio->c_cc[VERASE] = CERASE; 1260 tio->c_cc[VERASE] = CERASE;
1103#ifdef VERASE2 1261#ifdef VERASE2
1167 1325
1168 /* 1326 /*
1169 * Debugging 1327 * Debugging
1170 */ 1328 */
1171#ifdef DEBUG_TTYMODE 1329#ifdef DEBUG_TTYMODE
1172#ifdef HAVE_TERMIOS_H
1173 /* c_iflag bits */ 1330 /* c_iflag bits */
1174 fprintf (stderr, "Input flags\n"); 1331 fprintf (stderr, "Input flags\n");
1175 1332
1176 /* cpp token stringize doesn't work on all machines <sigh> */ 1333 /* cpp token stringize doesn't work on all machines <sigh> */
1177# define FOO(flag,name) \ 1334# define FOO(flag,name) \
1240 FOO (VLNEXT, "VLNEXT"); 1397 FOO (VLNEXT, "VLNEXT");
1241# endif 1398# endif
1242 1399
1243 fprintf (stderr, "\n"); 1400 fprintf (stderr, "\n");
1244# undef FOO 1401# undef FOO
1245# endif /* HAVE_TERMIOS_H */ 1402#endif /* DEBUG_TTYMODE */
1246#endif /* DEBUG_TTYMODE */
1247} 1403}
1248 1404
1249/*----------------------------------------------------------------------*/ 1405/*----------------------------------------------------------------------*/
1250/* 1406/*
1251 * Run the command in a subprocess and return a file descriptor for the 1407 * Run the command in a subprocess and return a file descriptor for the
1275 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1431 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1276 1432
1277 int er; 1433 int er;
1278 1434
1279#ifndef NO_BACKSPACE_KEY 1435#ifndef NO_BACKSPACE_KEY
1280 if (key_backspace[0] && !key_backspace[1]) 1436 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1281 er = key_backspace[0]; 1437 er = rs[Rs_backspace_key][0];
1282 else if (strcmp (key_backspace, "DEC") == 0) 1438 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1283 er = '\177'; /* the initial state anyway */ 1439 er = '\177'; /* the initial state anyway */
1284 else 1440 else
1285#endif 1441#endif
1286 er = -1; 1442 er = -1;
1287 1443
1288 rxvt_get_ttymode (&tio, er); 1444 rxvt_get_ttymode (&tio, er);
1289 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1445 /* init terminal attributes */
1446 cfsetospeed (&tio, BAUDRATE);
1447 cfsetispeed (&tio, BAUDRATE);
1448 tcsetattr (pty->tty, TCSANOW, &tio);
1290 pty->set_utf8_mode (enc_utf8); 1449 pty->set_utf8_mode (enc_utf8);
1291 1450
1292 /* set initial window size */ 1451 /* set initial window size */
1293 tt_winch (); 1452 tt_winch ();
1294 1453
1354rxvt_term::run_child (const char *const *argv) 1513rxvt_term::run_child (const char *const *argv)
1355{ 1514{
1356 char *login; 1515 char *login;
1357 1516
1358 if (option (Opt_console)) 1517 if (option (Opt_console))
1518 {
1359 { /* be virtual console, fail silently */ 1519 /* be virtual console, fail silently */
1360#ifdef TIOCCONS 1520#ifdef TIOCCONS
1361 unsigned int on = 1; 1521 unsigned int on = 1;
1362 1522
1363 ioctl (STDIN_FILENO, TIOCCONS, &on); 1523 ioctl (STDIN_FILENO, TIOCCONS, &on);
1364#elif defined (SRIOCSREDIR) 1524#elif defined (SRIOCSREDIR)
1366 1526
1367 fd = open (CONSOLE, O_WRONLY, 0); 1527 fd = open (CONSOLE, O_WRONLY, 0);
1368 if (fd >= 0) 1528 if (fd >= 0)
1369 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1529 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1370 close (fd); 1530 close (fd);
1371#endif /* SRIOCSREDIR */ 1531#endif /* SRIOCSREDIR */
1372 } 1532 }
1373 1533
1374 /* reset signals and spin off the command interpreter */ 1534 /* reset signals and spin off the command interpreter */
1375 signal (SIGINT, SIG_DFL); 1535 signal (SIGINT, SIG_DFL);
1376 signal (SIGQUIT, SIG_DFL); 1536 signal (SIGQUIT, SIG_DFL);
1383 */ 1543 */
1384#ifdef SIGTSTP 1544#ifdef SIGTSTP
1385 signal (SIGTSTP, SIG_IGN); 1545 signal (SIGTSTP, SIG_IGN);
1386 signal (SIGTTIN, SIG_IGN); 1546 signal (SIGTTIN, SIG_IGN);
1387 signal (SIGTTOU, SIG_IGN); 1547 signal (SIGTTOU, SIG_IGN);
1388#endif /* SIGTSTP */ 1548#endif /* SIGTSTP */
1389 1549
1390 // unblock signals (signals are blocked by iom.C 1550 // unblock signals (signals are blocked by iom.C
1391 sigset_t ss; 1551 sigset_t ss;
1392 sigemptyset (&ss); 1552 sigemptyset (&ss);
1393 sigprocmask (SIG_SETMASK, &ss, 0); 1553 sigprocmask (SIG_SETMASK, &ss, 0);
1394 1554
1395 /* command interpreter path */ 1555 /* command interpreter path */
1396 if (argv != NULL) 1556 if (argv)
1397 { 1557 {
1398# ifdef DEBUG_CMD 1558# ifdef DEBUG_CMD
1399 int i; 1559 int i;
1400 1560
1401 for (i = 0; argv[i]; i++) 1561 for (i = 0; argv[i]; i++)
1410 const char *argv0, *shell; 1570 const char *argv0, *shell;
1411 1571
1412 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1572 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1413 shell = "/bin/sh"; 1573 shell = "/bin/sh";
1414 1574
1415 argv0 = (const char *)rxvt_r_basename (shell); 1575 argv0 = (const char *)rxvt_basename (shell);
1416 1576
1417 if (option (Opt_loginShell)) 1577 if (option (Opt_loginShell))
1418 { 1578 {
1419 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1579 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1420 1580
1421 login[0] = '-'; 1581 login[0] = '-';
1422 strcpy (&login[1], argv0); 1582 strcpy (&login[1], argv0);
1423 argv0 = login; 1583 argv0 = login;
1424 } 1584 }
1425 1585
1426 execlp (shell, argv0, NULL); 1586 execlp (shell, argv0, (char *)0);
1427 /* no error message: STDERR is closed! */ 1587 /* no error message: STDERR is closed! */
1428 } 1588 }
1429 1589
1430 return -1; 1590 return -1;
1431} 1591}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines