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.204 by sasha, Thu Aug 9 22:08:21 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 ENABLE_TRANSPARENCY 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 288
189 MEvent.time = CurrentTime; 289 MEvent.time = CurrentTime;
190 MEvent.button = AnyButton; 290 MEvent.button = AnyButton;
191 want_refresh = 1; 291 want_refresh = 1;
192 priv_modes = SavedModes = PrivMode_Default; 292 priv_modes = SavedModes = PrivMode_Default;
… …
194 nrow = 24; 294 nrow = 24;
195 int_bwidth = INTERNALBORDERWIDTH; 295 int_bwidth = INTERNALBORDERWIDTH;
196 ext_bwidth = EXTERNALBORDERWIDTH; 296 ext_bwidth = EXTERNALBORDERWIDTH;
197 lineSpace = LINESPACE; 297 lineSpace = LINESPACE;
198 saveLines = SAVELINES; 298 saveLines = SAVELINES;
199 numpix_colors = TOTAL_COLORS;
200 299
201 refresh_type = SLOW_REFRESH; 300 refresh_type = SLOW_REFRESH;
202 301
203 oldcursor.row = oldcursor.col = -1; 302 oldcursor.row = oldcursor.col = -1;
204#ifdef HAVE_BG_PIXMAP
205#ifdef HAVE_AFTERIMAGE
206 bgPixmap.original_asim = NULL;
207#endif
208 /* bgPixmap.w = bgPixmap.h = 0; */
209#ifdef XPM_BACKGROUND
210 bgPixmap.h_scale = bgPixmap.v_scale = 0;
211 bgPixmap.h_align = bgPixmap.v_align = 0;
212#endif
213 bgPixmap.flags = 0;
214 bgPixmap.pixmap = None;
215#endif
216 last_bot = last_state = -1;
217 303
218 set_option (Opt_scrollBar); 304 set_option (Opt_scrollBar);
219 set_option (Opt_scrollTtyOutput); 305 set_option (Opt_scrollTtyOutput);
220 set_option (Opt_jumpScroll); 306 set_option (Opt_jumpScroll);
221 set_option (Opt_skipScroll); 307 set_option (Opt_skipScroll);
222 set_option (Opt_secondaryScreen); 308 set_option (Opt_secondaryScreen);
223 set_option (Opt_secondaryScroll); 309 set_option (Opt_secondaryScroll);
224 set_option (Opt_pastableTabs); 310 set_option (Opt_pastableTabs);
225 set_option (Opt_intensityStyles); 311 set_option (Opt_intensityStyles);
226 set_option (Opt_iso14755_52); 312 set_option (Opt_iso14755_52);
227
228 return true;
229} 313}
230 314
231void 315static void
232rxvt_term::init_secondary () 316init_secondary ()
233{ 317{
234 int i; 318 int i;
235 319
236 /* 320 /*
237 * Close all unused file descriptors 321 * Close all unused file descriptors
… …
240 if ((i = open ("/dev/null", O_RDONLY)) < 0) 324 if ((i = open ("/dev/null", O_RDONLY)) < 0)
241 { 325 {
242 /* TODO: BOO HISS */ 326 /* TODO: BOO HISS */
243 dup2 (STDERR_FILENO, STDIN_FILENO); 327 dup2 (STDERR_FILENO, STDIN_FILENO);
244 } 328 }
245 else if (i > STDIN_FILENO) 329 else if (i != STDIN_FILENO)
246 { 330 {
247 dup2 (i, STDIN_FILENO); 331 dup2 (i, STDIN_FILENO);
248 close (i); 332 close (i);
249 } 333 }
250 334
… …
265/*----------------------------------------------------------------------*/ 349/*----------------------------------------------------------------------*/
266const char ** 350const char **
267rxvt_term::init_resources (int argc, const char *const *argv) 351rxvt_term::init_resources (int argc, const char *const *argv)
268{ 352{
269 int i, r_argc; 353 int i, r_argc;
270 char *val;
271 const char **cmd_argv, **r_argv; 354 const char **cmd_argv, **r_argv;
272 355
273 /* 356 /*
274 * 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
275 */ 358 */
276 for (r_argc = 0; r_argc < argc; r_argc++) 359 for (r_argc = 0; r_argc < argc; r_argc++)
277 if (!strcmp (argv[r_argc], "-e")) 360 if (!strcmp (argv[r_argc], "-e"))
278 break; 361 break;
279 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
280 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 377 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
281 378
282 for (i = 0; i < r_argc; i++) 379 for (i = 0; i < r_argc; i++)
283 r_argv[i] = (const char *)argv[i]; 380 r_argv[i] = (const char *)argv[i];
284 381
285 r_argv[i] = NULL; 382 r_argv[i] = NULL;
286 383
287 if (r_argc == argc)
288 cmd_argv = NULL;
289 else
290 {
291 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
292
293 for (i = 0; i < argc - r_argc - 1; i++)
294 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
295
296 cmd_argv[i] = NULL;
297 }
298
299 rs[Rs_name] = rxvt_r_basename (argv[0]); 384 rs[Rs_name] = rxvt_basename (argv[0]);
300 385
301 /* 386 /*
302 * Open display, get options/resources and create the window 387 * Open display, get options/resources and create the window
303 */ 388 */
304 389
… …
306 rs[Rs_display_name] = ":0"; 391 rs[Rs_display_name] = ":0";
307 392
308 get_options (r_argc, r_argv); 393 get_options (r_argc, r_argv);
309 394
310 if (!(display = displays.get (rs[Rs_display_name]))) 395 if (!(display = displays.get (rs[Rs_display_name])))
396 {
397 free (r_argv);
311 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 }
312 400
313 // using a local pointer decreases code size a lot 401 // using a local pointer decreases code size a lot
314 xa = display->xa; 402 xa = display->xa;
315 403
316 set (display); 404 set (display);
… …
320 if (rs[Rs_depth]) 408 if (rs[Rs_depth])
321 select_visual (strtol (rs[Rs_depth], 0, 0)); 409 select_visual (strtol (rs[Rs_depth], 0, 0));
322#endif 410#endif
323 411
324#ifdef HAVE_AFTERIMAGE 412#ifdef HAVE_AFTERIMAGE
413 set_application_name ((char*)rs[Rs_name]);
414 set_output_threshold (OUTPUT_LEVEL_WARNING);
325 asv = 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);
326#endif 416#endif
327 free (r_argv); 417 free (r_argv);
328
329 bgPixmap.set_target (this);
330 418
331 for (int i = NUM_RESOURCES; i--; ) 419 for (int i = NUM_RESOURCES; i--; )
332 if (rs [i] == resval_undef) 420 if (rs [i] == resval_undef)
333 rs [i] = 0; 421 rs [i] = 0;
334 422
… …
349 * set any defaults not already set 437 * set any defaults not already set
350 */ 438 */
351 if (cmd_argv && cmd_argv[0]) 439 if (cmd_argv && cmd_argv[0])
352 { 440 {
353 if (!rs[Rs_title]) 441 if (!rs[Rs_title])
354 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 442 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
355 if (!rs[Rs_iconName]) 443 if (!rs[Rs_iconName])
356 rs[Rs_iconName] = rs[Rs_title]; 444 rs[Rs_iconName] = rs[Rs_title];
357 } 445 }
358 else 446 else
359 { 447 {
… …
397 rs[Rs_cutchars] = CUTCHARS; 485 rs[Rs_cutchars] = CUTCHARS;
398 486
399#ifndef NO_BACKSPACE_KEY 487#ifndef NO_BACKSPACE_KEY
400 if (!rs[Rs_backspace_key]) 488 if (!rs[Rs_backspace_key])
401# ifdef DEFAULT_BACKSPACE 489# ifdef DEFAULT_BACKSPACE
402 key_backspace = DEFAULT_BACKSPACE; 490 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
403# else 491# else
404 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 492 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
405# endif 493# endif
406 else
407 {
408 val = strdup (rs[Rs_backspace_key]);
409 rxvt_Str_trim (val);
410 rxvt_Str_escaped (val);
411 key_backspace = val;
412 }
413#endif 494#endif
414 495
415#ifndef NO_DELETE_KEY 496#ifndef NO_DELETE_KEY
416 if (!rs[Rs_delete_key]) 497 if (!rs[Rs_delete_key])
417# ifdef DEFAULT_DELETE 498# ifdef DEFAULT_DELETE
418 key_delete = DEFAULT_DELETE; 499 rs[Rs_delete_key] = DEFAULT_DELETE;
419# else 500# else
420 key_delete = "\033[3~"; 501 rs[Rs_delete_key] = "\033[3~";
421# endif
422 else
423 {
424 val = strdup (rs[Rs_delete_key]);
425 rxvt_Str_trim (val);
426 rxvt_Str_escaped (val);
427 key_delete = val;
428 }
429#endif 502# endif
430 if (rs[Rs_answerbackstring]) 503#endif
431 {
432 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
433 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
434 }
435 504
436#ifdef HAVE_SCROLLBARS 505#ifdef HAVE_SCROLLBARS
437 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]);
438#endif 507#endif
439 508
… …
463 color_aliases (Color_fg); 532 color_aliases (Color_fg);
464 color_aliases (Color_bg); 533 color_aliases (Color_bg);
465#ifndef NO_CURSORCOLOR 534#ifndef NO_CURSORCOLOR
466 color_aliases (Color_cursor); 535 color_aliases (Color_cursor);
467 color_aliases (Color_cursor2); 536 color_aliases (Color_cursor2);
468#endif /* NO_CURSORCOLOR */ 537#endif /* NO_CURSORCOLOR */
469 color_aliases (Color_pointer_fg); 538 color_aliases (Color_pointer_fg);
470 color_aliases (Color_pointer_bg); 539 color_aliases (Color_pointer_bg);
471 color_aliases (Color_border); 540 color_aliases (Color_border);
472#ifndef NO_BOLD_UNDERLINE_REVERSE 541#ifndef NO_BOLD_UNDERLINE_REVERSE
473 color_aliases (Color_BD); 542 color_aliases (Color_BD);
474 color_aliases (Color_UL); 543 color_aliases (Color_UL);
475 color_aliases (Color_RV); 544 color_aliases (Color_RV);
476#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 545#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
477 546
478 if (!rs[Rs_color + Color_border]) 547 if (!rs[Rs_color + Color_border])
479 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 548 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
480 549
481 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 ();
482} 670}
483 671
484/*----------------------------------------------------------------------*/ 672/*----------------------------------------------------------------------*/
485void 673void
486rxvt_term::init_env () 674rxvt_term::init_env ()
487{ 675{
488 int i; 676 int i;
489 unsigned int u;
490 char *val; 677 char *val;
491 678
492#ifdef DISPLAY_IS_IP 679#ifdef DISPLAY_IS_IP
493 /* Fixup display_name for export over pty to any interested terminal 680 /* Fixup display_name for export over pty to any interested terminal
494 * 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
… …
502 */ 689 */
503 val = rxvt_network_display (rs[Rs_display_name]); 690 val = rxvt_network_display (rs[Rs_display_name]);
504 rs[Rs_display_name] = (const char *)val; 691 rs[Rs_display_name] = (const char *)val;
505 692
506 if (val == NULL) 693 if (val == NULL)
507#endif /* DISPLAY_IS_IP */ 694#endif /* DISPLAY_IS_IP */
508 val = XDisplayString (dpy); 695 val = XDisplayString (dpy);
509 696
510 if (rs[Rs_display_name] == NULL) 697 if (rs[Rs_display_name] == NULL)
511 rs[Rs_display_name] = val; /* use broken `:0' value */ 698 rs[Rs_display_name] = val; /* use broken `:0' value */
512 699
513 i = strlen (val); 700 i = strlen (val);
514 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 701 env_display = (char *)rxvt_malloc (i + 9);
515 702
516 sprintf (env_display, "DISPLAY=%s", val); 703 sprintf (env_display, "DISPLAY=%s", val);
517 704
518 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 705 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
519 706
… …
540 else 727 else
541 putenv ("COLORTERM=" COLORTERMENVFULL); 728 putenv ("COLORTERM=" COLORTERMENVFULL);
542 729
543 if (rs[Rs_term_name] != NULL) 730 if (rs[Rs_term_name] != NULL)
544 { 731 {
545 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);
546 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 733 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
547 putenv (env_term); 734 putenv (env_term);
548 } 735 }
549 else 736 else
550 putenv ("TERM=" TERMENV); 737 putenv ("TERM=" TERMENV);
… …
552#ifdef HAVE_UNSETENV 739#ifdef HAVE_UNSETENV
553 /* avoid passing old settings and confusing term size */ 740 /* avoid passing old settings and confusing term size */
554 unsetenv ("LINES"); 741 unsetenv ("LINES");
555 unsetenv ("COLUMNS"); 742 unsetenv ("COLUMNS");
556 unsetenv ("TERMCAP"); /* terminfo should be okay */ 743 unsetenv ("TERMCAP"); /* terminfo should be okay */
557#endif /* HAVE_UNSETENV */ 744#endif /* HAVE_UNSETENV */
558} 745}
559 746
560/*----------------------------------------------------------------------*/ 747/*----------------------------------------------------------------------*/
561/* 748/*
562 * This is more or less stolen straight from XFree86 xterm. 749 * This is more or less stolen straight from XFree86 xterm.
… …
583 770
584 this->locale = "C"; 771 this->locale = "C";
585 } 772 }
586 773
587 774
588 this->locale = rxvt_strdup (this->locale); 775 this->locale = strdup (this->locale);
589 SET_LOCALE (this->locale); 776 SET_LOCALE (this->locale);
590 mbstate.reset (); 777 mbstate.reset ();
591#endif 778#endif
592 779
593#if HAVE_NL_LANGINFO 780#if HAVE_NL_LANGINFO
… …
650 priv_modes |= PrivMode_Keypress; 837 priv_modes |= PrivMode_Keypress;
651 if (!option (Opt_jumpScroll)) 838 if (!option (Opt_jumpScroll))
652 priv_modes |= PrivMode_smoothScroll; 839 priv_modes |= PrivMode_smoothScroll;
653 840
654#ifndef NO_BACKSPACE_KEY 841#ifndef NO_BACKSPACE_KEY
655 if (strcmp (key_backspace, "DEC") == 0) 842 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
656 priv_modes |= PrivMode_HaveBackSpace; 843 priv_modes |= PrivMode_HaveBackSpace;
657#endif 844#endif
658 845
659 /* add value for scrollBar */ 846 /* add value for scrollBar */
660 if (scrollBar.state) 847 if (scrollBar.state)
… …
673 int i; 860 int i;
674 861
675#ifdef OFF_FOCUS_FADING 862#ifdef OFF_FOCUS_FADING
676 pix_colors = pix_colors_focused; 863 pix_colors = pix_colors_focused;
677#endif 864#endif
678 865
679 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 866 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
680 { 867 {
681 const char *name = rs[Rs_color + i]; 868 const char *name = rs[Rs_color + i];
682 869
683 if (!name) 870 if (!name)
… …
761 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),
762 cscroll.a) 949 cscroll.a)
763 )) 950 ))
764 alias_color (Color_topShadow, Color_White); 951 alias_color (Color_topShadow, Color_White);
765 } 952 }
766#endif /* KEEP_SCROLLCOLOR */ 953#endif /* KEEP_SCROLLCOLOR */
767 954
768#ifdef OFF_FOCUS_FADING 955#ifdef OFF_FOCUS_FADING
769 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 956 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
770 update_fade_color (i); 957 update_fade_color (i);
771#endif 958#endif
… …
779 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 966 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
780 { 967 {
781 int i = atoi (rs[Rs_color + idx]); 968 int i = atoi (rs[Rs_color + idx]);
782 969
783 if (i >= 8 && i <= 15) 970 if (i >= 8 && i <= 15)
784 { /* bright colors */ 971 /* bright colors */
785 i -= 8;
786 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 972 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
787 return; 973 else if (i >= 0 && i <= 7)
788 } 974 /* normal colors */
789
790 if (i >= 0 && i <= 7) /* normal colors */
791 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 975 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
792 } 976 }
793} 977}
794 978
795/*----------------------------------------------------------------------*/ 979/*----------------------------------------------------------------------*/
… …
910#if ENABLE_FRILLS 1094#if ENABLE_FRILLS
911 if (option (Opt_borderLess)) 1095 if (option (Opt_borderLess))
912 { 1096 {
913 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 1097 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
914 { 1098 {
915 /* 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");
916 attributes.override_redirect = true; 1100 attributes.override_redirect = true;
917 mwmhints.flags = 0;
918 } 1101 }
919 else 1102 else
920 { 1103 {
921 mwmhints.flags = MWM_HINTS_DECORATIONS; 1104 mwmhints.flags = MWM_HINTS_DECORATIONS;
922 mwmhints.decorations = 0;
923 } 1105 }
924 } 1106 }
925 else
926 mwmhints.flags = 0;
927#endif 1107#endif
928 1108
929#if ENABLE_XEMBED 1109#if ENABLE_XEMBED
930 if (rs[Rs_embed]) 1110 if (rs[Rs_embed])
931 { 1111 {
… …
1015 termwin_ev.start (display, top); 1195 termwin_ev.start (display, top);
1016 1196
1017 /* 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 */
1018 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1198 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1019 1199
1020#ifdef HAVE_SCROLLBARS
1021 /* cursor scrollBar: Black-on-White */
1022 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1023#endif
1024
1025 /* the vt window */ 1200 /* the vt window */
1026 vt = XCreateSimpleWindow (dpy, top, 1201 vt = XCreateSimpleWindow (dpy, top,
1027 window_vt_x, window_vt_y, 1202 window_vt_x, window_vt_y,
1028 width, height, 1203 width, height,
1029 0, 1204 0,
… …
1042 1217
1043 vt_select_input (); 1218 vt_select_input ();
1044 1219
1045 vt_ev.start (display, vt); 1220 vt_ev.start (display, vt);
1046 1221
1047#ifdef XPM_BACKGROUND
1048 if (rs[Rs_backgroundPixmap] != NULL)
1049 {
1050 const char *p = rs[Rs_backgroundPixmap];
1051
1052 if ((p = strchr (p, ';')) != NULL)
1053 {
1054 p++;
1055 bgPixmap.handle_geometry (p);
1056 }
1057 else
1058 bgPixmap.set_defaultGeometry ();
1059
1060 set_bgPixmap (rs[Rs_backgroundPixmap]);
1061 scr_touch (true);
1062 }
1063#endif
1064
1065 /* graphics context for the vt window */ 1222 /* graphics context for the vt window */
1066 gcvalue.foreground = pix_colors[Color_fg]; 1223 gcvalue.foreground = pix_colors[Color_fg];
1067 gcvalue.background = pix_colors[Color_bg]; 1224 gcvalue.background = pix_colors[Color_bg];
1068 gcvalue.graphics_exposures = 0; 1225 gcvalue.graphics_exposures = 0;
1069 1226
… …
1071 GCForeground | GCBackground | GCGraphicsExposures, 1228 GCForeground | GCBackground | GCGraphicsExposures,
1072 &gcvalue); 1229 &gcvalue);
1073 1230
1074 drawable = new rxvt_drawable (this, vt); 1231 drawable = new rxvt_drawable (this, vt);
1075 1232
1076#ifdef RXVT_SCROLLBAR
1077 gcvalue.foreground = pix_colors[Color_topShadow];
1078 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1079 gcvalue.foreground = pix_colors[Color_bottomShadow];
1080 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1081 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1082 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1083#endif
1084
1085#ifdef OFF_FOCUS_FADING 1233#ifdef OFF_FOCUS_FADING
1086 // initially we are in unfocused state 1234 // initially we are in unfocused state
1087 if (rs[Rs_fade]) 1235 if (rs[Rs_fade])
1088 pix_colors = pix_colors_unfocused; 1236 pix_colors = pix_colors_unfocused;
1089#endif 1237#endif
… …
1094 1242
1095/* ------------------------------------------------------------------------- * 1243/* ------------------------------------------------------------------------- *
1096 * GET TTY CURRENT STATE * 1244 * GET TTY CURRENT STATE *
1097 * ------------------------------------------------------------------------- */ 1245 * ------------------------------------------------------------------------- */
1098void 1246void
1099rxvt_get_ttymode (ttymode_t *tio, int erase) 1247rxvt_get_ttymode (struct termios *tio, int erase)
1100{ 1248{
1101 /* 1249 /*
1102 * standard System V termios interface 1250 * standard System V termios interface
1103 */ 1251 */
1104 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1252 if (tcgetattr (STDIN_FILENO, tio) < 0)
1105 { 1253 {
1106 // return error - use system defaults, 1254 // return error - use system defaults,
1107 // where possible, and zero elsewhere 1255 // where possible, and zero elsewhere
1108 memset (tio, 0, sizeof (ttymode_t)); 1256 memset (tio, 0, sizeof (struct termios));
1109 1257
1110 tio->c_cc[VINTR] = CINTR; 1258 tio->c_cc[VINTR] = CINTR;
1111 tio->c_cc[VQUIT] = CQUIT; 1259 tio->c_cc[VQUIT] = CQUIT;
1112 tio->c_cc[VERASE] = CERASE; 1260 tio->c_cc[VERASE] = CERASE;
1113#ifdef VERASE2 1261#ifdef VERASE2
… …
1177 1325
1178 /* 1326 /*
1179 * Debugging 1327 * Debugging
1180 */ 1328 */
1181#ifdef DEBUG_TTYMODE 1329#ifdef DEBUG_TTYMODE
1182#ifdef HAVE_TERMIOS_H
1183 /* c_iflag bits */ 1330 /* c_iflag bits */
1184 fprintf (stderr, "Input flags\n"); 1331 fprintf (stderr, "Input flags\n");
1185 1332
1186 /* cpp token stringize doesn't work on all machines <sigh> */ 1333 /* cpp token stringize doesn't work on all machines <sigh> */
1187# define FOO(flag,name) \ 1334# define FOO(flag,name) \
… …
1250 FOO (VLNEXT, "VLNEXT"); 1397 FOO (VLNEXT, "VLNEXT");
1251# endif 1398# endif
1252 1399
1253 fprintf (stderr, "\n"); 1400 fprintf (stderr, "\n");
1254# undef FOO 1401# undef FOO
1255# endif /* HAVE_TERMIOS_H */ 1402#endif /* DEBUG_TTYMODE */
1256#endif /* DEBUG_TTYMODE */
1257} 1403}
1258 1404
1259/*----------------------------------------------------------------------*/ 1405/*----------------------------------------------------------------------*/
1260/* 1406/*
1261 * 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
… …
1285 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1431 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1286 1432
1287 int er; 1433 int er;
1288 1434
1289#ifndef NO_BACKSPACE_KEY 1435#ifndef NO_BACKSPACE_KEY
1290 if (key_backspace[0] && !key_backspace[1]) 1436 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1291 er = key_backspace[0]; 1437 er = rs[Rs_backspace_key][0];
1292 else if (strcmp (key_backspace, "DEC") == 0) 1438 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1293 er = '\177'; /* the initial state anyway */ 1439 er = '\177'; /* the initial state anyway */
1294 else 1440 else
1295#endif 1441#endif
1296 er = -1; 1442 er = -1;
1297 1443
1298 rxvt_get_ttymode (&tio, er); 1444 rxvt_get_ttymode (&tio, er);
1299 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);
1300 pty->set_utf8_mode (enc_utf8); 1449 pty->set_utf8_mode (enc_utf8);
1301 1450
1302 /* set initial window size */ 1451 /* set initial window size */
1303 tt_winch (); 1452 tt_winch ();
1304 1453
… …
1364rxvt_term::run_child (const char *const *argv) 1513rxvt_term::run_child (const char *const *argv)
1365{ 1514{
1366 char *login; 1515 char *login;
1367 1516
1368 if (option (Opt_console)) 1517 if (option (Opt_console))
1518 {
1369 { /* be virtual console, fail silently */ 1519 /* be virtual console, fail silently */
1370#ifdef TIOCCONS 1520#ifdef TIOCCONS
1371 unsigned int on = 1; 1521 unsigned int on = 1;
1372 1522
1373 ioctl (STDIN_FILENO, TIOCCONS, &on); 1523 ioctl (STDIN_FILENO, TIOCCONS, &on);
1374#elif defined (SRIOCSREDIR) 1524#elif defined (SRIOCSREDIR)
… …
1376 1526
1377 fd = open (CONSOLE, O_WRONLY, 0); 1527 fd = open (CONSOLE, O_WRONLY, 0);
1378 if (fd >= 0) 1528 if (fd >= 0)
1379 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1529 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1380 close (fd); 1530 close (fd);
1381#endif /* SRIOCSREDIR */ 1531#endif /* SRIOCSREDIR */
1382 } 1532 }
1383 1533
1384 /* reset signals and spin off the command interpreter */ 1534 /* reset signals and spin off the command interpreter */
1385 signal (SIGINT, SIG_DFL); 1535 signal (SIGINT, SIG_DFL);
1386 signal (SIGQUIT, SIG_DFL); 1536 signal (SIGQUIT, SIG_DFL);
… …
1393 */ 1543 */
1394#ifdef SIGTSTP 1544#ifdef SIGTSTP
1395 signal (SIGTSTP, SIG_IGN); 1545 signal (SIGTSTP, SIG_IGN);
1396 signal (SIGTTIN, SIG_IGN); 1546 signal (SIGTTIN, SIG_IGN);
1397 signal (SIGTTOU, SIG_IGN); 1547 signal (SIGTTOU, SIG_IGN);
1398#endif /* SIGTSTP */ 1548#endif /* SIGTSTP */
1399 1549
1400 // unblock signals (signals are blocked by iom.C 1550 // unblock signals (signals are blocked by iom.C
1401 sigset_t ss; 1551 sigset_t ss;
1402 sigemptyset (&ss); 1552 sigemptyset (&ss);
1403 sigprocmask (SIG_SETMASK, &ss, 0); 1553 sigprocmask (SIG_SETMASK, &ss, 0);
1404 1554
1405 /* command interpreter path */ 1555 /* command interpreter path */
1406 if (argv != NULL) 1556 if (argv)
1407 { 1557 {
1408# ifdef DEBUG_CMD 1558# ifdef DEBUG_CMD
1409 int i; 1559 int i;
1410 1560
1411 for (i = 0; argv[i]; i++) 1561 for (i = 0; argv[i]; i++)
… …
1420 const char *argv0, *shell; 1570 const char *argv0, *shell;
1421 1571
1422 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1572 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1423 shell = "/bin/sh"; 1573 shell = "/bin/sh";
1424 1574
1425 argv0 = (const char *)rxvt_r_basename (shell); 1575 argv0 = (const char *)rxvt_basename (shell);
1426 1576
1427 if (option (Opt_loginShell)) 1577 if (option (Opt_loginShell))
1428 { 1578 {
1429 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1579 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1430 1580
1431 login[0] = '-'; 1581 login[0] = '-';
1432 strcpy (&login[1], argv0); 1582 strcpy (&login[1], argv0);
1433 argv0 = login; 1583 argv0 = login;
1434 } 1584 }
1435 1585
1436 execlp (shell, argv0, NULL); 1586 execlp (shell, argv0, (char *)0);
1437 /* no error message: STDERR is closed! */ 1587 /* no error message: STDERR is closed! */
1438 } 1588 }
1439 1589
1440 return -1; 1590 return -1;
1441} 1591}

Diff Legend

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