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.191 by root, Tue Jul 24 14:32:47 2007 UTC vs.
Revision 1.239 by ayin, Sat Jan 19 13:00:07 2008 UTC

1 /*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: init.C 2 * File: init.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
11 * - extensive modifications 14 * - extensive modifications
12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13 * - QNX support
14 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 15 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
15 * 16 *
16 * This program is free software; you can redistribute it and/or modify 17 * This program is free software; you can redistribute it and/or modify
17 * it under the terms of the GNU General Public License as published by 18 * it under the terms of the GNU General Public License as published by
18 * the Free Software Foundation; either version 2 of the License, or 19 * the Free Software Foundation; either version 2 of the License, or
19 * (at your option) any later version. 20 * (at your option) any later version.
… …
33 34
34#include "../config.h" /* NECESSARY */ 35#include "../config.h" /* NECESSARY */
35#include "rxvt.h" /* NECESSARY */ 36#include "rxvt.h" /* NECESSARY */
36#include "rxvtutil.h" 37#include "rxvtutil.h"
37#include "init.h" 38#include "init.h"
39#include "keyboard.h"
38 40
39#include <limits> 41#include <limits>
40 42
41#include <csignal> 43#include <csignal>
44
45#include <fcntl.h>
46
47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE
49# include <X11/Xlocale.h>
50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale>
53# endif
54#endif
55
56#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h>
58#endif
59
60#ifdef DISPLAY_IS_IP
61/* On Solaris link with -lsocket and -lnsl */
62#include <sys/types.h>
63#include <sys/socket.h>
64
65/* these next two are probably only on Sun (not Solaris) */
66#ifdef HAVE_SYS_SOCKIO_H
67#include <sys/sockio.h>
68#endif
69#ifdef HAVE_SYS_BYTEORDER_H
70#include <sys/byteorder.h>
71#endif
72
73#include <netinet/in.h>
74#include <arpa/inet.h>
75#include <net/if.h>
76#include <net/if_arp.h>
77
78static char *
79rxvt_network_display (const char *display)
80{
81 char buffer[1024], *rval = NULL;
82 struct ifconf ifc;
83 struct ifreq *ifr;
84 int i, skfd;
85
86 if (display[0] != ':' && strncmp (display, "unix:", 5))
87 return (char *) display; /* nothing to do */
88
89 ifc.ifc_len = sizeof (buffer); /* Get names of all ifaces */
90 ifc.ifc_buf = buffer;
91
92 if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
93 {
94 perror ("socket");
95 return NULL;
96 }
97
98 if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0)
99 {
100 perror ("SIOCGIFCONF");
101 close (skfd);
102 return NULL;
103 }
104
105 for (i = 0, ifr = ifc.ifc_req;
106 i < (ifc.ifc_len / sizeof (struct ifreq));
107 i++, ifr++)
108 {
109 struct ifreq ifr2;
110
111 strcpy (ifr2.ifr_name, ifr->ifr_name);
112
113 if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0)
114 {
115 unsigned long addr;
116 struct sockaddr_in *p_addr;
117
118 p_addr = (struct sockaddr_in *) &ifr2.ifr_addr;
119 addr = htonl ((unsigned long)p_addr->sin_addr.s_addr);
120
121 /*
122 * not "0.0.0.0" or "127.0.0.1" - so format the address
123 */
124 if (addr && addr != 0x7F000001)
125 {
126 char *colon = strchr (display, ':');
127
128 if (colon == NULL)
129 colon = ":0.0";
130
131 rval = rxvt_malloc (strlen (colon) + 16);
132 sprintf (rval, "%d.%d.%d.%d%s",
133 (int) ((addr >> 030) & 0xFF),
134 (int) ((addr >> 020) & 0xFF),
135 (int) ((addr >> 010) & 0xFF),
136 (int) (addr & 0xFF), colon);
137 break;
138 }
139 }
140 }
141
142 close (skfd);
143
144 return rval;
145}
146#endif
42 147
43const char *const def_colorName[] = 148const char *const def_colorName[] =
44 { 149 {
45 COLOR_FOREGROUND, 150 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 151 COLOR_BACKGROUND,
… …
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(ENABLE_TRANSPARENCY)
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_type = SLOW_REFRESH; 300 refresh_type = SLOW_REFRESH;
205 301
206 oldcursor.row = oldcursor.col = -1; 302 oldcursor.row = oldcursor.col = -1;
207#ifdef XPM_BACKGROUND
208 /* bgPixmap.w = bgPixmap.h = 0; */
209 bgPixmap.x = bgPixmap.y = 0;
210 bgPixmap.pixmap = None;
211#endif
212
213 last_bot = last_state = -1;
214 303
215 set_option (Opt_scrollBar); 304 set_option (Opt_scrollBar);
216 set_option (Opt_scrollTtyOutput); 305 set_option (Opt_scrollTtyOutput);
217 set_option (Opt_jumpScroll); 306 set_option (Opt_jumpScroll);
218 set_option (Opt_skipScroll); 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 set_option (Opt_iso14755_52); 312 set_option (Opt_iso14755_52);
224
225 return true;
226} 313}
227 314
228void 315void
229rxvt_term::init_secondary () 316rxvt_term::init_secondary ()
230{ 317{
… …
237 if ((i = open ("/dev/null", O_RDONLY)) < 0) 324 if ((i = open ("/dev/null", O_RDONLY)) < 0)
238 { 325 {
239 /* TODO: BOO HISS */ 326 /* TODO: BOO HISS */
240 dup2 (STDERR_FILENO, STDIN_FILENO); 327 dup2 (STDERR_FILENO, STDIN_FILENO);
241 } 328 }
242 else if (i > STDIN_FILENO) 329 else if (i != STDIN_FILENO)
243 { 330 {
244 dup2 (i, STDIN_FILENO); 331 dup2 (i, STDIN_FILENO);
245 close (i); 332 close (i);
246 } 333 }
247 334
… …
262/*----------------------------------------------------------------------*/ 349/*----------------------------------------------------------------------*/
263const char ** 350const char **
264rxvt_term::init_resources (int argc, const char *const *argv) 351rxvt_term::init_resources (int argc, const char *const *argv)
265{ 352{
266 int i, r_argc; 353 int i, r_argc;
267 char *val;
268 const char **cmd_argv, **r_argv; 354 const char **cmd_argv, **r_argv;
269 355
270 /* 356 /*
271 * 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
272 */ 358 */
273 for (r_argc = 0; r_argc < argc; r_argc++) 359 for (r_argc = 0; r_argc < argc; r_argc++)
274 if (!strcmp (argv[r_argc], "-e")) 360 if (!strcmp (argv[r_argc], "-e"))
275 break; 361 break;
276 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
277 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 377 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
278 378
279 for (i = 0; i < r_argc; i++) 379 for (i = 0; i < r_argc; i++)
280 r_argv[i] = (const char *)argv[i]; 380 r_argv[i] = (const char *)argv[i];
281 381
282 r_argv[i] = NULL; 382 r_argv[i] = NULL;
283 383
284 if (r_argc == argc)
285 cmd_argv = NULL;
286 else
287 {
288 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
289
290 for (i = 0; i < argc - r_argc - 1; i++)
291 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
292
293 cmd_argv[i] = NULL;
294 }
295
296 rs[Rs_name] = rxvt_r_basename (argv[0]); 384 rs[Rs_name] = rxvt_basename (argv[0]);
297 385
298 /* 386 /*
299 * Open display, get options/resources and create the window 387 * Open display, get options/resources and create the window
300 */ 388 */
301 389
… …
303 rs[Rs_display_name] = ":0"; 391 rs[Rs_display_name] = ":0";
304 392
305 get_options (r_argc, r_argv); 393 get_options (r_argc, r_argv);
306 394
307 if (!(display = displays.get (rs[Rs_display_name]))) 395 if (!(display = displays.get (rs[Rs_display_name])))
396 {
397 free (r_argv);
308 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 }
309 400
310 // using a local pointer decreases code size a lot 401 // using a local pointer decreases code size a lot
311 xa = display->xa; 402 xa = display->xa;
312 403
313 set (display); 404 set (display);
… …
317 if (rs[Rs_depth]) 408 if (rs[Rs_depth])
318 select_visual (strtol (rs[Rs_depth], 0, 0)); 409 select_visual (strtol (rs[Rs_depth], 0, 0));
319#endif 410#endif
320 411
321#ifdef HAVE_AFTERIMAGE 412#ifdef HAVE_AFTERIMAGE
322 ::dpy = NULL ; /* init global var from libAfter... */ 413 set_application_name ((char*)rs[Rs_name]);
414 set_output_threshold (OUTPUT_LEVEL_WARNING);
323 asv = AFTERIMAGE_DPY_OP (create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL)); 415 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
324#endif 416#endif
325 free (r_argv); 417 free (r_argv);
326 418
327 for (int i = NUM_RESOURCES; i--; ) 419 for (int i = NUM_RESOURCES; i--; )
328 if (rs [i] == resval_undef) 420 if (rs [i] == resval_undef)
… …
345 * set any defaults not already set 437 * set any defaults not already set
346 */ 438 */
347 if (cmd_argv && cmd_argv[0]) 439 if (cmd_argv && cmd_argv[0])
348 { 440 {
349 if (!rs[Rs_title]) 441 if (!rs[Rs_title])
350 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 442 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
351 if (!rs[Rs_iconName]) 443 if (!rs[Rs_iconName])
352 rs[Rs_iconName] = rs[Rs_title]; 444 rs[Rs_iconName] = rs[Rs_title];
353 } 445 }
354 else 446 else
355 { 447 {
… …
393 rs[Rs_cutchars] = CUTCHARS; 485 rs[Rs_cutchars] = CUTCHARS;
394 486
395#ifndef NO_BACKSPACE_KEY 487#ifndef NO_BACKSPACE_KEY
396 if (!rs[Rs_backspace_key]) 488 if (!rs[Rs_backspace_key])
397# ifdef DEFAULT_BACKSPACE 489# ifdef DEFAULT_BACKSPACE
398 key_backspace = DEFAULT_BACKSPACE; 490 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
399# else 491# else
400 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 492 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
401# endif 493# endif
402 else
403 {
404 val = strdup (rs[Rs_backspace_key]);
405 rxvt_Str_trim (val);
406 rxvt_Str_escaped (val);
407 key_backspace = val;
408 }
409#endif 494#endif
410 495
411#ifndef NO_DELETE_KEY 496#ifndef NO_DELETE_KEY
412 if (!rs[Rs_delete_key]) 497 if (!rs[Rs_delete_key])
413# ifdef DEFAULT_DELETE 498# ifdef DEFAULT_DELETE
414 key_delete = DEFAULT_DELETE; 499 rs[Rs_delete_key] = DEFAULT_DELETE;
415# else 500# else
416 key_delete = "\033[3~"; 501 rs[Rs_delete_key] = "\033[3~";
417# endif
418 else
419 {
420 val = strdup (rs[Rs_delete_key]);
421 rxvt_Str_trim (val);
422 rxvt_Str_escaped (val);
423 key_delete = val;
424 }
425#endif 502# endif
426 if (rs[Rs_answerbackstring]) 503#endif
427 {
428 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
429 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
430 }
431 504
432#ifdef HAVE_SCROLLBARS 505#ifdef HAVE_SCROLLBARS
433 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]);
434#endif 507#endif
435 508
… …
459 color_aliases (Color_fg); 532 color_aliases (Color_fg);
460 color_aliases (Color_bg); 533 color_aliases (Color_bg);
461#ifndef NO_CURSORCOLOR 534#ifndef NO_CURSORCOLOR
462 color_aliases (Color_cursor); 535 color_aliases (Color_cursor);
463 color_aliases (Color_cursor2); 536 color_aliases (Color_cursor2);
464#endif /* NO_CURSORCOLOR */ 537#endif /* NO_CURSORCOLOR */
465 color_aliases (Color_pointer_fg); 538 color_aliases (Color_pointer_fg);
466 color_aliases (Color_pointer_bg); 539 color_aliases (Color_pointer_bg);
467 color_aliases (Color_border); 540 color_aliases (Color_border);
468#ifndef NO_BOLD_UNDERLINE_REVERSE 541#ifndef NO_BOLD_UNDERLINE_REVERSE
469 color_aliases (Color_BD); 542 color_aliases (Color_BD);
470 color_aliases (Color_UL); 543 color_aliases (Color_UL);
471 color_aliases (Color_RV); 544 color_aliases (Color_RV);
472#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 545#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
473 546
474 if (!rs[Rs_color + Color_border]) 547 if (!rs[Rs_color + Color_border])
475 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 548 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
476 549
477 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 ();
478} 670}
479 671
480/*----------------------------------------------------------------------*/ 672/*----------------------------------------------------------------------*/
481void 673void
482rxvt_term::init_env () 674rxvt_term::init_env ()
483{ 675{
484 int i; 676 int i;
485 unsigned int u;
486 char *val; 677 char *val;
487 678
488#ifdef DISPLAY_IS_IP 679#ifdef DISPLAY_IS_IP
489 /* Fixup display_name for export over pty to any interested terminal 680 /* Fixup display_name for export over pty to any interested terminal
490 * 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
… …
498 */ 689 */
499 val = rxvt_network_display (rs[Rs_display_name]); 690 val = rxvt_network_display (rs[Rs_display_name]);
500 rs[Rs_display_name] = (const char *)val; 691 rs[Rs_display_name] = (const char *)val;
501 692
502 if (val == NULL) 693 if (val == NULL)
503#endif /* DISPLAY_IS_IP */ 694#endif /* DISPLAY_IS_IP */
504 val = XDisplayString (dpy); 695 val = XDisplayString (dpy);
505 696
506 if (rs[Rs_display_name] == NULL) 697 if (rs[Rs_display_name] == NULL)
507 rs[Rs_display_name] = val; /* use broken `:0' value */ 698 rs[Rs_display_name] = val; /* use broken `:0' value */
508 699
509 i = strlen (val); 700 i = strlen (val);
510 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 701 env_display = (char *)rxvt_malloc (i + 9);
511 702
512 sprintf (env_display, "DISPLAY=%s", val); 703 sprintf (env_display, "DISPLAY=%s", val);
513 704
514 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 705 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
515 706
… …
536 else 727 else
537 putenv ("COLORTERM=" COLORTERMENVFULL); 728 putenv ("COLORTERM=" COLORTERMENVFULL);
538 729
539 if (rs[Rs_term_name] != NULL) 730 if (rs[Rs_term_name] != NULL)
540 { 731 {
541 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);
542 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 733 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
543 putenv (env_term); 734 putenv (env_term);
544 } 735 }
545 else 736 else
546 putenv ("TERM=" TERMENV); 737 putenv ("TERM=" TERMENV);
… …
548#ifdef HAVE_UNSETENV 739#ifdef HAVE_UNSETENV
549 /* avoid passing old settings and confusing term size */ 740 /* avoid passing old settings and confusing term size */
550 unsetenv ("LINES"); 741 unsetenv ("LINES");
551 unsetenv ("COLUMNS"); 742 unsetenv ("COLUMNS");
552 unsetenv ("TERMCAP"); /* terminfo should be okay */ 743 unsetenv ("TERMCAP"); /* terminfo should be okay */
553#endif /* HAVE_UNSETENV */ 744#endif /* HAVE_UNSETENV */
554} 745}
555 746
556/*----------------------------------------------------------------------*/ 747/*----------------------------------------------------------------------*/
557/* 748/*
558 * This is more or less stolen straight from XFree86 xterm. 749 * This is more or less stolen straight from XFree86 xterm.
… …
579 770
580 this->locale = "C"; 771 this->locale = "C";
581 } 772 }
582 773
583 774
584 this->locale = rxvt_strdup (this->locale); 775 this->locale = strdup (this->locale);
585 SET_LOCALE (this->locale); 776 SET_LOCALE (this->locale);
586 mbstate.reset (); 777 mbstate.reset ();
587#endif 778#endif
588 779
589#if HAVE_NL_LANGINFO 780#if HAVE_NL_LANGINFO
… …
646 priv_modes |= PrivMode_Keypress; 837 priv_modes |= PrivMode_Keypress;
647 if (!option (Opt_jumpScroll)) 838 if (!option (Opt_jumpScroll))
648 priv_modes |= PrivMode_smoothScroll; 839 priv_modes |= PrivMode_smoothScroll;
649 840
650#ifndef NO_BACKSPACE_KEY 841#ifndef NO_BACKSPACE_KEY
651 if (strcmp (key_backspace, "DEC") == 0) 842 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
652 priv_modes |= PrivMode_HaveBackSpace; 843 priv_modes |= PrivMode_HaveBackSpace;
653#endif 844#endif
654 845
655 /* add value for scrollBar */ 846 /* add value for scrollBar */
656 if (scrollBar.state) 847 if (scrollBar.state)
… …
669 int i; 860 int i;
670 861
671#ifdef OFF_FOCUS_FADING 862#ifdef OFF_FOCUS_FADING
672 pix_colors = pix_colors_focused; 863 pix_colors = pix_colors_focused;
673#endif 864#endif
674 865
675 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 866 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
676 { 867 {
677 const char *name = rs[Rs_color + i]; 868 const char *name = rs[Rs_color + i];
678 869
679 if (!name) 870 if (!name)
… …
757 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),
758 cscroll.a) 949 cscroll.a)
759 )) 950 ))
760 alias_color (Color_topShadow, Color_White); 951 alias_color (Color_topShadow, Color_White);
761 } 952 }
762#endif /* KEEP_SCROLLCOLOR */ 953#endif /* KEEP_SCROLLCOLOR */
763 954
764#ifdef OFF_FOCUS_FADING 955#ifdef OFF_FOCUS_FADING
765 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 956 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
766 update_fade_color (i); 957 update_fade_color (i);
767#endif 958#endif
… …
775 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 966 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
776 { 967 {
777 int i = atoi (rs[Rs_color + idx]); 968 int i = atoi (rs[Rs_color + idx]);
778 969
779 if (i >= 8 && i <= 15) 970 if (i >= 8 && i <= 15)
780 { /* bright colors */ 971 /* bright colors */
781 i -= 8;
782 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 972 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
783 return; 973 else if (i >= 0 && i <= 7)
784 } 974 /* normal colors */
785
786 if (i >= 0 && i <= 7) /* normal colors */
787 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 975 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
788 } 976 }
789} 977}
790 978
791/*----------------------------------------------------------------------*/ 979/*----------------------------------------------------------------------*/
… …
883rxvt_term::create_windows (int argc, const char *const *argv) 1071rxvt_term::create_windows (int argc, const char *const *argv)
884{ 1072{
885 XClassHint classHint; 1073 XClassHint classHint;
886 XWMHints wmHint; 1074 XWMHints wmHint;
887#if ENABLE_FRILLS 1075#if ENABLE_FRILLS
888 MWMHints mwmhints; 1076 MWMHints mwmhints = { };
889#endif 1077#endif
890 XGCValues gcvalue; 1078 XGCValues gcvalue;
891 XSetWindowAttributes attributes; 1079 XSetWindowAttributes attributes;
892 Window top, parent; 1080 Window top, parent;
893 1081
… …
906#if ENABLE_FRILLS 1094#if ENABLE_FRILLS
907 if (option (Opt_borderLess)) 1095 if (option (Opt_borderLess))
908 { 1096 {
909 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 1097 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
910 { 1098 {
911 /* 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");
912 attributes.override_redirect = true; 1100 attributes.override_redirect = true;
913 mwmhints.flags = 0;
914 } 1101 }
915 else 1102 else
916 { 1103 {
917 mwmhints.flags = MWM_HINTS_DECORATIONS; 1104 mwmhints.flags = MWM_HINTS_DECORATIONS;
918 mwmhints.decorations = 0;
919 } 1105 }
920 } 1106 }
921 else
922 mwmhints.flags = 0;
923#endif 1107#endif
924 1108
925#if ENABLE_XEMBED 1109#if ENABLE_XEMBED
926 if (rs[Rs_embed]) 1110 if (rs[Rs_embed])
927 { 1111 {
… …
1011 termwin_ev.start (display, top); 1195 termwin_ev.start (display, top);
1012 1196
1013 /* 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 */
1014 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1198 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1015 1199
1016#ifdef HAVE_SCROLLBARS
1017 /* cursor scrollBar: Black-on-White */
1018 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1019#endif
1020
1021 /* the vt window */ 1200 /* the vt window */
1022 vt = XCreateSimpleWindow (dpy, top, 1201 vt = XCreateSimpleWindow (dpy, top,
1023 window_vt_x, window_vt_y, 1202 window_vt_x, window_vt_y,
1024 width, height, 1203 width, height,
1025 0, 1204 0,
… …
1038 1217
1039 vt_select_input (); 1218 vt_select_input ();
1040 1219
1041 vt_ev.start (display, vt); 1220 vt_ev.start (display, vt);
1042 1221
1043#ifdef XPM_BACKGROUND
1044 if (rs[Rs_backgroundPixmap] != NULL
1045#ifndef HAVE_AFTERIMAGE
1046 && !option (Opt_transparent)
1047#endif
1048 )
1049 {
1050 const char *p = rs[Rs_backgroundPixmap];
1051
1052 if ((p = strchr (p, ';')) != NULL)
1053 {
1054 p++;
1055 scale_pixmap (p);
1056 }
1057
1058 set_bgPixmap (rs[Rs_backgroundPixmap]);
1059 scr_touch (true);
1060 }
1061#endif
1062
1063 /* graphics context for the vt window */ 1222 /* graphics context for the vt window */
1064 gcvalue.foreground = pix_colors[Color_fg]; 1223 gcvalue.foreground = pix_colors[Color_fg];
1065 gcvalue.background = pix_colors[Color_bg]; 1224 gcvalue.background = pix_colors[Color_bg];
1066 gcvalue.graphics_exposures = 0; 1225 gcvalue.graphics_exposures = 0;
1067 1226
… …
1069 GCForeground | GCBackground | GCGraphicsExposures, 1228 GCForeground | GCBackground | GCGraphicsExposures,
1070 &gcvalue); 1229 &gcvalue);
1071 1230
1072 drawable = new rxvt_drawable (this, vt); 1231 drawable = new rxvt_drawable (this, vt);
1073 1232
1074#ifdef RXVT_SCROLLBAR
1075 gcvalue.foreground = pix_colors[Color_topShadow];
1076 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1077 gcvalue.foreground = pix_colors[Color_bottomShadow];
1078 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1079 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1080 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1081#endif
1082
1083#ifdef OFF_FOCUS_FADING 1233#ifdef OFF_FOCUS_FADING
1084 // initially we are in unfocused state 1234 // initially we are in unfocused state
1085 if (rs[Rs_fade]) 1235 if (rs[Rs_fade])
1086 pix_colors = pix_colors_unfocused; 1236 pix_colors = pix_colors_unfocused;
1087#endif 1237#endif
… …
1092 1242
1093/* ------------------------------------------------------------------------- * 1243/* ------------------------------------------------------------------------- *
1094 * GET TTY CURRENT STATE * 1244 * GET TTY CURRENT STATE *
1095 * ------------------------------------------------------------------------- */ 1245 * ------------------------------------------------------------------------- */
1096void 1246void
1097rxvt_get_ttymode (ttymode_t *tio, int erase) 1247rxvt_get_ttymode (struct termios *tio, int erase)
1098{ 1248{
1099 /* 1249 /*
1100 * standard System V termios interface 1250 * standard System V termios interface
1101 */ 1251 */
1102 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1252 if (tcgetattr (STDIN_FILENO, tio) < 0)
1103 { 1253 {
1104 // return error - use system defaults, 1254 // return error - use system defaults,
1105 // where possible, and zero elsewhere 1255 // where possible, and zero elsewhere
1106 memset (tio, 0, sizeof (ttymode_t)); 1256 memset (tio, 0, sizeof (struct termios));
1107 1257
1108 tio->c_cc[VINTR] = CINTR; 1258 tio->c_cc[VINTR] = CINTR;
1109 tio->c_cc[VQUIT] = CQUIT; 1259 tio->c_cc[VQUIT] = CQUIT;
1110 tio->c_cc[VERASE] = CERASE; 1260 tio->c_cc[VERASE] = CERASE;
1111#ifdef VERASE2 1261#ifdef VERASE2
… …
1175 1325
1176 /* 1326 /*
1177 * Debugging 1327 * Debugging
1178 */ 1328 */
1179#ifdef DEBUG_TTYMODE 1329#ifdef DEBUG_TTYMODE
1180#ifdef HAVE_TERMIOS_H
1181 /* c_iflag bits */ 1330 /* c_iflag bits */
1182 fprintf (stderr, "Input flags\n"); 1331 fprintf (stderr, "Input flags\n");
1183 1332
1184 /* cpp token stringize doesn't work on all machines <sigh> */ 1333 /* cpp token stringize doesn't work on all machines <sigh> */
1185# define FOO(flag,name) \ 1334# define FOO(flag,name) \
… …
1248 FOO (VLNEXT, "VLNEXT"); 1397 FOO (VLNEXT, "VLNEXT");
1249# endif 1398# endif
1250 1399
1251 fprintf (stderr, "\n"); 1400 fprintf (stderr, "\n");
1252# undef FOO 1401# undef FOO
1253# endif /* HAVE_TERMIOS_H */ 1402#endif /* DEBUG_TTYMODE */
1254#endif /* DEBUG_TTYMODE */
1255} 1403}
1256 1404
1257/*----------------------------------------------------------------------*/ 1405/*----------------------------------------------------------------------*/
1258/* 1406/*
1259 * 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
… …
1283 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1431 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1284 1432
1285 int er; 1433 int er;
1286 1434
1287#ifndef NO_BACKSPACE_KEY 1435#ifndef NO_BACKSPACE_KEY
1288 if (key_backspace[0] && !key_backspace[1]) 1436 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1289 er = key_backspace[0]; 1437 er = rs[Rs_backspace_key][0];
1290 else if (strcmp (key_backspace, "DEC") == 0) 1438 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1291 er = '\177'; /* the initial state anyway */ 1439 er = '\177'; /* the initial state anyway */
1292 else 1440 else
1293#endif 1441#endif
1294 er = -1; 1442 er = -1;
1295 1443
1296 rxvt_get_ttymode (&tio, er); 1444 rxvt_get_ttymode (&tio, er);
1297 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);
1298 pty->set_utf8_mode (enc_utf8); 1449 pty->set_utf8_mode (enc_utf8);
1299 1450
1300 /* set initial window size */ 1451 /* set initial window size */
1301 tt_winch (); 1452 tt_winch ();
1302 1453
… …
1362rxvt_term::run_child (const char *const *argv) 1513rxvt_term::run_child (const char *const *argv)
1363{ 1514{
1364 char *login; 1515 char *login;
1365 1516
1366 if (option (Opt_console)) 1517 if (option (Opt_console))
1518 {
1367 { /* be virtual console, fail silently */ 1519 /* be virtual console, fail silently */
1368#ifdef TIOCCONS 1520#ifdef TIOCCONS
1369 unsigned int on = 1; 1521 unsigned int on = 1;
1370 1522
1371 ioctl (STDIN_FILENO, TIOCCONS, &on); 1523 ioctl (STDIN_FILENO, TIOCCONS, &on);
1372#elif defined (SRIOCSREDIR) 1524#elif defined (SRIOCSREDIR)
… …
1374 1526
1375 fd = open (CONSOLE, O_WRONLY, 0); 1527 fd = open (CONSOLE, O_WRONLY, 0);
1376 if (fd >= 0) 1528 if (fd >= 0)
1377 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1529 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1378 close (fd); 1530 close (fd);
1379#endif /* SRIOCSREDIR */ 1531#endif /* SRIOCSREDIR */
1380 } 1532 }
1381 1533
1382 /* reset signals and spin off the command interpreter */ 1534 /* reset signals and spin off the command interpreter */
1383 signal (SIGINT, SIG_DFL); 1535 signal (SIGINT, SIG_DFL);
1384 signal (SIGQUIT, SIG_DFL); 1536 signal (SIGQUIT, SIG_DFL);
… …
1391 */ 1543 */
1392#ifdef SIGTSTP 1544#ifdef SIGTSTP
1393 signal (SIGTSTP, SIG_IGN); 1545 signal (SIGTSTP, SIG_IGN);
1394 signal (SIGTTIN, SIG_IGN); 1546 signal (SIGTTIN, SIG_IGN);
1395 signal (SIGTTOU, SIG_IGN); 1547 signal (SIGTTOU, SIG_IGN);
1396#endif /* SIGTSTP */ 1548#endif /* SIGTSTP */
1397 1549
1398 // unblock signals (signals are blocked by iom.C 1550 // unblock signals (signals are blocked by iom.C
1399 sigset_t ss; 1551 sigset_t ss;
1400 sigemptyset (&ss); 1552 sigemptyset (&ss);
1401 sigprocmask (SIG_SETMASK, &ss, 0); 1553 sigprocmask (SIG_SETMASK, &ss, 0);
1402 1554
1403 /* command interpreter path */ 1555 /* command interpreter path */
1404 if (argv != NULL) 1556 if (argv)
1405 { 1557 {
1406# ifdef DEBUG_CMD 1558# ifdef DEBUG_CMD
1407 int i; 1559 int i;
1408 1560
1409 for (i = 0; argv[i]; i++) 1561 for (i = 0; argv[i]; i++)
… …
1418 const char *argv0, *shell; 1570 const char *argv0, *shell;
1419 1571
1420 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1572 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1421 shell = "/bin/sh"; 1573 shell = "/bin/sh";
1422 1574
1423 argv0 = (const char *)rxvt_r_basename (shell); 1575 argv0 = (const char *)rxvt_basename (shell);
1424 1576
1425 if (option (Opt_loginShell)) 1577 if (option (Opt_loginShell))
1426 { 1578 {
1427 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1579 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1428 1580
1429 login[0] = '-'; 1581 login[0] = '-';
1430 strcpy (&login[1], argv0); 1582 strcpy (&login[1], argv0);
1431 argv0 = login; 1583 argv0 = login;
1432 } 1584 }
1433 1585
1434 execlp (shell, argv0, NULL); 1586 execlp (shell, argv0, (char *)0);
1435 /* no error message: STDERR is closed! */ 1587 /* no error message: STDERR is closed! */
1436 } 1588 }
1437 1589
1438 return -1; 1590 return -1;
1439} 1591}

Diff Legend

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