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.199 by sasha, Fri Aug 3 22:40:10 2007 UTC vs.
Revision 1.241 by root, Sat Jan 19 14:23:33 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 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 bgPixmap.h_scale = bgPixmap.v_scale = 0;
210 bgPixmap.h_align = bgPixmap.v_align = 0;
211 bgPixmap.flags = 0;
212 bgPixmap.pixmap = None;
213#endif
214
215 last_bot = last_state = -1;
216 303
217 set_option (Opt_scrollBar); 304 set_option (Opt_scrollBar);
218 set_option (Opt_scrollTtyOutput); 305 set_option (Opt_scrollTtyOutput);
219 set_option (Opt_jumpScroll); 306 set_option (Opt_jumpScroll);
220 set_option (Opt_skipScroll); 307 set_option (Opt_skipScroll);
221 set_option (Opt_secondaryScreen); 308 set_option (Opt_secondaryScreen);
222 set_option (Opt_secondaryScroll); 309 set_option (Opt_secondaryScroll);
223 set_option (Opt_pastableTabs); 310 set_option (Opt_pastableTabs);
224 set_option (Opt_intensityStyles); 311 set_option (Opt_intensityStyles);
225 set_option (Opt_iso14755_52); 312 set_option (Opt_iso14755_52);
226
227 return true;
228} 313}
229 314
230void 315static void
231rxvt_term::init_secondary () 316init_secondary ()
232{ 317{
233 int i; 318 int i;
234 319
235 /* 320 /*
236 * Close all unused file descriptors 321 * Close all unused file descriptors
… …
239 if ((i = open ("/dev/null", O_RDONLY)) < 0) 324 if ((i = open ("/dev/null", O_RDONLY)) < 0)
240 { 325 {
241 /* TODO: BOO HISS */ 326 /* TODO: BOO HISS */
242 dup2 (STDERR_FILENO, STDIN_FILENO); 327 dup2 (STDERR_FILENO, STDIN_FILENO);
243 } 328 }
244 else if (i > STDIN_FILENO) 329 else if (i != STDIN_FILENO)
245 { 330 {
246 dup2 (i, STDIN_FILENO); 331 dup2 (i, STDIN_FILENO);
247 close (i); 332 close (i);
248 } 333 }
249 334
250 dup2 (STDERR_FILENO, STDOUT_FILENO); 335 dup2 (STDERR_FILENO, STDOUT_FILENO);
251
252#if 0 // schmorp sayz closing filies is murder
253 for (i = STDERR_FILENO + 1; i < num_fds; i++)
254 {
255#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
256 if (i == 4 || i == 7)
257 continue;
258#endif
259 close (i);
260 }
261#endif
262} 336}
263 337
264/*----------------------------------------------------------------------*/ 338/*----------------------------------------------------------------------*/
265const char ** 339const char **
266rxvt_term::init_resources (int argc, const char *const *argv) 340rxvt_term::init_resources (int argc, const char *const *argv)
267{ 341{
268 int i, r_argc; 342 int i, r_argc;
269 char *val;
270 const char **cmd_argv, **r_argv; 343 const char **cmd_argv, **r_argv;
271 344
272 /* 345 /*
273 * Look for -e option. Find => split and make cmd_argv[] of command args 346 * Look for -e option. Find => split and make cmd_argv[] of command args
274 */ 347 */
275 for (r_argc = 0; r_argc < argc; r_argc++) 348 for (r_argc = 0; r_argc < argc; r_argc++)
276 if (!strcmp (argv[r_argc], "-e")) 349 if (!strcmp (argv[r_argc], "-e"))
277 break; 350 break;
278 351
352 if (r_argc == argc)
353 cmd_argv = NULL;
354 else if (!argv[r_argc + 1])
355 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
356 else
357 {
358 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
359
360 for (i = 0; i < argc - r_argc - 1; i++)
361 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
362
363 cmd_argv[i] = NULL;
364 }
365
279 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 366 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
280 367
281 for (i = 0; i < r_argc; i++) 368 for (i = 0; i < r_argc; i++)
282 r_argv[i] = (const char *)argv[i]; 369 r_argv[i] = (const char *)argv[i];
283 370
284 r_argv[i] = NULL; 371 r_argv[i] = NULL;
285 372
286 if (r_argc == argc)
287 cmd_argv = NULL;
288 else
289 {
290 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
291
292 for (i = 0; i < argc - r_argc - 1; i++)
293 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
294
295 cmd_argv[i] = NULL;
296 }
297
298 rs[Rs_name] = rxvt_r_basename (argv[0]); 373 rs[Rs_name] = rxvt_basename (argv[0]);
299 374
300 /* 375 /*
301 * Open display, get options/resources and create the window 376 * Open display, get options/resources and create the window
302 */ 377 */
303 378
… …
305 rs[Rs_display_name] = ":0"; 380 rs[Rs_display_name] = ":0";
306 381
307 get_options (r_argc, r_argv); 382 get_options (r_argc, r_argv);
308 383
309 if (!(display = displays.get (rs[Rs_display_name]))) 384 if (!(display = displays.get (rs[Rs_display_name])))
385 {
386 free (r_argv);
310 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 387 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
388 }
311 389
312 // using a local pointer decreases code size a lot 390 // using a local pointer decreases code size a lot
313 xa = display->xa; 391 xa = display->xa;
314 392
315 set (display); 393 set (display);
… …
319 if (rs[Rs_depth]) 397 if (rs[Rs_depth])
320 select_visual (strtol (rs[Rs_depth], 0, 0)); 398 select_visual (strtol (rs[Rs_depth], 0, 0));
321#endif 399#endif
322 400
323#ifdef HAVE_AFTERIMAGE 401#ifdef HAVE_AFTERIMAGE
402 set_application_name ((char*)rs[Rs_name]);
403 set_output_threshold (OUTPUT_LEVEL_WARNING);
324 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL); 404 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
325#endif 405#endif
326 free (r_argv); 406 free (r_argv);
327 407
328 for (int i = NUM_RESOURCES; i--; ) 408 for (int i = NUM_RESOURCES; i--; )
… …
346 * set any defaults not already set 426 * set any defaults not already set
347 */ 427 */
348 if (cmd_argv && cmd_argv[0]) 428 if (cmd_argv && cmd_argv[0])
349 { 429 {
350 if (!rs[Rs_title]) 430 if (!rs[Rs_title])
351 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 431 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
352 if (!rs[Rs_iconName]) 432 if (!rs[Rs_iconName])
353 rs[Rs_iconName] = rs[Rs_title]; 433 rs[Rs_iconName] = rs[Rs_title];
354 } 434 }
355 else 435 else
356 { 436 {
… …
394 rs[Rs_cutchars] = CUTCHARS; 474 rs[Rs_cutchars] = CUTCHARS;
395 475
396#ifndef NO_BACKSPACE_KEY 476#ifndef NO_BACKSPACE_KEY
397 if (!rs[Rs_backspace_key]) 477 if (!rs[Rs_backspace_key])
398# ifdef DEFAULT_BACKSPACE 478# ifdef DEFAULT_BACKSPACE
399 key_backspace = DEFAULT_BACKSPACE; 479 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
400# else 480# else
401 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 481 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
402# endif 482# endif
403 else
404 {
405 val = strdup (rs[Rs_backspace_key]);
406 rxvt_Str_trim (val);
407 rxvt_Str_escaped (val);
408 key_backspace = val;
409 }
410#endif 483#endif
411 484
412#ifndef NO_DELETE_KEY 485#ifndef NO_DELETE_KEY
413 if (!rs[Rs_delete_key]) 486 if (!rs[Rs_delete_key])
414# ifdef DEFAULT_DELETE 487# ifdef DEFAULT_DELETE
415 key_delete = DEFAULT_DELETE; 488 rs[Rs_delete_key] = DEFAULT_DELETE;
416# else 489# else
417 key_delete = "\033[3~"; 490 rs[Rs_delete_key] = "\033[3~";
418# endif
419 else
420 {
421 val = strdup (rs[Rs_delete_key]);
422 rxvt_Str_trim (val);
423 rxvt_Str_escaped (val);
424 key_delete = val;
425 }
426#endif 491# endif
427 if (rs[Rs_answerbackstring]) 492#endif
428 {
429 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
430 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
431 }
432 493
433#ifdef HAVE_SCROLLBARS 494#ifdef HAVE_SCROLLBARS
434 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 495 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
435#endif 496#endif
436 497
… …
460 color_aliases (Color_fg); 521 color_aliases (Color_fg);
461 color_aliases (Color_bg); 522 color_aliases (Color_bg);
462#ifndef NO_CURSORCOLOR 523#ifndef NO_CURSORCOLOR
463 color_aliases (Color_cursor); 524 color_aliases (Color_cursor);
464 color_aliases (Color_cursor2); 525 color_aliases (Color_cursor2);
465#endif /* NO_CURSORCOLOR */ 526#endif /* NO_CURSORCOLOR */
466 color_aliases (Color_pointer_fg); 527 color_aliases (Color_pointer_fg);
467 color_aliases (Color_pointer_bg); 528 color_aliases (Color_pointer_bg);
468 color_aliases (Color_border); 529 color_aliases (Color_border);
469#ifndef NO_BOLD_UNDERLINE_REVERSE 530#ifndef NO_BOLD_UNDERLINE_REVERSE
470 color_aliases (Color_BD); 531 color_aliases (Color_BD);
471 color_aliases (Color_UL); 532 color_aliases (Color_UL);
472 color_aliases (Color_RV); 533 color_aliases (Color_RV);
473#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 534#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
474 535
475 if (!rs[Rs_color + Color_border]) 536 if (!rs[Rs_color + Color_border])
476 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 537 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
477 538
478 return cmd_argv; 539 return cmd_argv;
540}
541
542/*----------------------------------------------------------------------*/
543void
544rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
545{
546 this->envv = envv;
547
548 SET_R (this);
549 set_locale ("");
550 set_environ (envv); // few things in X do not call setlocale :(
551
552 init_vars ();
553
554 init_secondary ();
555
556 const char **cmd_argv = init_resources (argc, argv);
557
558#ifdef KEYSYM_RESOURCE
559 keyboard->register_done ();
560#endif
561
562#ifdef HAVE_SCROLLBARS
563 if (option (Opt_scrollBar))
564 scrollBar.setIdle (); /* set existence for size calculations */
565#endif
566
567 pty = ptytty::create ();
568
569 create_windows (argc, argv);
570
571 init_xlocale ();
572
573 scr_reset (); // initialize screen
574
575#if 0
576 XSynchronize (dpy, True);
577#endif
578
579#ifdef HAVE_SCROLLBARS
580 if (option (Opt_scrollBar))
581 resize_scrollbar (); /* create and map scrollbar */
582#endif
583#ifdef HAVE_BG_PIXMAP
584 {
585 bgPixmap.set_target (this);
586 bgPixmap.invalidate ();
587
588#ifdef ENABLE_TRANSPARENCY
589 if (option (Opt_transparent))
590 {
591 bgPixmap.set_transparent ();
592
593#ifdef HAVE_AFTERIMAGE
594 if (rs [Rs_blurradius])
595 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
596#endif
597 if (ISSET_PIXCOLOR (Color_tint))
598 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
599
600 if (rs [Rs_shade])
601 bgPixmap.set_shade (rs [Rs_shade]);
602
603 bgPixmap.set_root_pixmap ();
604 XSelectInput (dpy, display->root, PropertyChangeMask);
605 rootwin_ev.start (display, display->root);
606 }
607#endif
608
609#ifdef BG_IMAGE_FROM_FILE
610 if (rs[Rs_backgroundPixmap])
611 {
612 const char *p = rs[Rs_backgroundPixmap];
613
614 if ((p = strchr (p, ';')) != 0)
615 {
616 p++;
617 bgPixmap.set_geometry (p);
618 }
619 else
620 bgPixmap.set_defaultGeometry ();
621
622 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
623 if (!bgPixmap.window_position_sensitive ())
624 update_background ();
625 }
626#endif
627 }
628#endif
629
630#if ENABLE_PERL
631 rootwin_ev.start (display, display->root);
632#endif
633
634 set_colorfgbg ();
635
636 init_command (cmd_argv);
637
638 free (cmd_argv);
639
640 if (pty->pty >= 0)
641 pty_ev.start (pty->pty, ev::READ);
642
643 HOOK_INVOKE ((this, HOOK_START, DT_END));
644
645#if ENABLE_XEMBED
646 if (rs[Rs_embed])
647 {
648 long info[2] = { 0, XEMBED_MAPPED };
649
650 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
651 32, PropModeReplace, (unsigned char *)&info, 2);
652 }
653#endif
654
655 XMapWindow (dpy, vt);
656 XMapWindow (dpy, parent[0]);
657
658 refresh_check ();
479} 659}
480 660
481/*----------------------------------------------------------------------*/ 661/*----------------------------------------------------------------------*/
482void 662void
483rxvt_term::init_env () 663rxvt_term::init_env ()
484{ 664{
485 int i; 665 int i;
486 unsigned int u;
487 char *val; 666 char *val;
488 667
489#ifdef DISPLAY_IS_IP 668#ifdef DISPLAY_IS_IP
490 /* Fixup display_name for export over pty to any interested terminal 669 /* Fixup display_name for export over pty to any interested terminal
491 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 670 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
499 */ 678 */
500 val = rxvt_network_display (rs[Rs_display_name]); 679 val = rxvt_network_display (rs[Rs_display_name]);
501 rs[Rs_display_name] = (const char *)val; 680 rs[Rs_display_name] = (const char *)val;
502 681
503 if (val == NULL) 682 if (val == NULL)
504#endif /* DISPLAY_IS_IP */ 683#endif /* DISPLAY_IS_IP */
505 val = XDisplayString (dpy); 684 val = XDisplayString (dpy);
506 685
507 if (rs[Rs_display_name] == NULL) 686 if (rs[Rs_display_name] == NULL)
508 rs[Rs_display_name] = val; /* use broken `:0' value */ 687 rs[Rs_display_name] = val; /* use broken `:0' value */
509 688
510 i = strlen (val); 689 i = strlen (val);
511 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 690 env_display = (char *)rxvt_malloc (i + 9);
512 691
513 sprintf (env_display, "DISPLAY=%s", val); 692 sprintf (env_display, "DISPLAY=%s", val);
514 693
515 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 694 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
516 695
… …
537 else 716 else
538 putenv ("COLORTERM=" COLORTERMENVFULL); 717 putenv ("COLORTERM=" COLORTERMENVFULL);
539 718
540 if (rs[Rs_term_name] != NULL) 719 if (rs[Rs_term_name] != NULL)
541 { 720 {
542 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 721 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
543 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 722 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
544 putenv (env_term); 723 putenv (env_term);
545 } 724 }
546 else 725 else
547 putenv ("TERM=" TERMENV); 726 putenv ("TERM=" TERMENV);
… …
549#ifdef HAVE_UNSETENV 728#ifdef HAVE_UNSETENV
550 /* avoid passing old settings and confusing term size */ 729 /* avoid passing old settings and confusing term size */
551 unsetenv ("LINES"); 730 unsetenv ("LINES");
552 unsetenv ("COLUMNS"); 731 unsetenv ("COLUMNS");
553 unsetenv ("TERMCAP"); /* terminfo should be okay */ 732 unsetenv ("TERMCAP"); /* terminfo should be okay */
554#endif /* HAVE_UNSETENV */ 733#endif /* HAVE_UNSETENV */
555} 734}
556 735
557/*----------------------------------------------------------------------*/ 736/*----------------------------------------------------------------------*/
558/* 737/*
559 * This is more or less stolen straight from XFree86 xterm. 738 * This is more or less stolen straight from XFree86 xterm.
… …
580 759
581 this->locale = "C"; 760 this->locale = "C";
582 } 761 }
583 762
584 763
585 this->locale = rxvt_strdup (this->locale); 764 this->locale = strdup (this->locale);
586 SET_LOCALE (this->locale); 765 SET_LOCALE (this->locale);
587 mbstate.reset (); 766 mbstate.reset ();
588#endif 767#endif
589 768
590#if HAVE_NL_LANGINFO 769#if HAVE_NL_LANGINFO
… …
647 priv_modes |= PrivMode_Keypress; 826 priv_modes |= PrivMode_Keypress;
648 if (!option (Opt_jumpScroll)) 827 if (!option (Opt_jumpScroll))
649 priv_modes |= PrivMode_smoothScroll; 828 priv_modes |= PrivMode_smoothScroll;
650 829
651#ifndef NO_BACKSPACE_KEY 830#ifndef NO_BACKSPACE_KEY
652 if (strcmp (key_backspace, "DEC") == 0) 831 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
653 priv_modes |= PrivMode_HaveBackSpace; 832 priv_modes |= PrivMode_HaveBackSpace;
654#endif 833#endif
655 834
656 /* add value for scrollBar */ 835 /* add value for scrollBar */
657 if (scrollBar.state) 836 if (scrollBar.state)
… …
670 int i; 849 int i;
671 850
672#ifdef OFF_FOCUS_FADING 851#ifdef OFF_FOCUS_FADING
673 pix_colors = pix_colors_focused; 852 pix_colors = pix_colors_focused;
674#endif 853#endif
675 854
676 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 855 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
677 { 856 {
678 const char *name = rs[Rs_color + i]; 857 const char *name = rs[Rs_color + i];
679 858
680 if (!name) 859 if (!name)
… …
758 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 937 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
759 cscroll.a) 938 cscroll.a)
760 )) 939 ))
761 alias_color (Color_topShadow, Color_White); 940 alias_color (Color_topShadow, Color_White);
762 } 941 }
763#endif /* KEEP_SCROLLCOLOR */ 942#endif /* KEEP_SCROLLCOLOR */
764 943
765#ifdef OFF_FOCUS_FADING 944#ifdef OFF_FOCUS_FADING
766 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 945 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
767 update_fade_color (i); 946 update_fade_color (i);
768#endif 947#endif
… …
776 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 955 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
777 { 956 {
778 int i = atoi (rs[Rs_color + idx]); 957 int i = atoi (rs[Rs_color + idx]);
779 958
780 if (i >= 8 && i <= 15) 959 if (i >= 8 && i <= 15)
781 { /* bright colors */ 960 /* bright colors */
782 i -= 8;
783 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 961 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
784 return; 962 else if (i >= 0 && i <= 7)
785 } 963 /* normal colors */
786
787 if (i >= 0 && i <= 7) /* normal colors */
788 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 964 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
789 } 965 }
790} 966}
791 967
792/*----------------------------------------------------------------------*/ 968/*----------------------------------------------------------------------*/
… …
907#if ENABLE_FRILLS 1083#if ENABLE_FRILLS
908 if (option (Opt_borderLess)) 1084 if (option (Opt_borderLess))
909 { 1085 {
910 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 1086 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
911 { 1087 {
912 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 1088 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
913 attributes.override_redirect = true; 1089 attributes.override_redirect = true;
914 mwmhints.flags = 0;
915 } 1090 }
916 else 1091 else
917 { 1092 {
918 mwmhints.flags = MWM_HINTS_DECORATIONS; 1093 mwmhints.flags = MWM_HINTS_DECORATIONS;
919 mwmhints.decorations = 0;
920 } 1094 }
921 } 1095 }
922 else
923 mwmhints.flags = 0;
924#endif 1096#endif
925 1097
926#if ENABLE_XEMBED 1098#if ENABLE_XEMBED
927 if (rs[Rs_embed]) 1099 if (rs[Rs_embed])
928 { 1100 {
… …
1012 termwin_ev.start (display, top); 1184 termwin_ev.start (display, top);
1013 1185
1014 /* vt cursor: Black-on-White is standard, but this is more popular */ 1186 /* vt cursor: Black-on-White is standard, but this is more popular */
1015 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1187 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1016 1188
1017#ifdef HAVE_SCROLLBARS
1018 /* cursor scrollBar: Black-on-White */
1019 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1020#endif
1021
1022 /* the vt window */ 1189 /* the vt window */
1023 vt = XCreateSimpleWindow (dpy, top, 1190 vt = XCreateSimpleWindow (dpy, top,
1024 window_vt_x, window_vt_y, 1191 window_vt_x, window_vt_y,
1025 width, height, 1192 width, height,
1026 0, 1193 0,
… …
1039 1206
1040 vt_select_input (); 1207 vt_select_input ();
1041 1208
1042 vt_ev.start (display, vt); 1209 vt_ev.start (display, vt);
1043 1210
1044#ifdef XPM_BACKGROUND
1045 if (rs[Rs_backgroundPixmap] != NULL)
1046 {
1047 const char *p = rs[Rs_backgroundPixmap];
1048
1049 if ((p = strchr (p, ';')) != NULL)
1050 {
1051 p++;
1052 bgPixmap.handle_geometry (p);
1053 }
1054
1055 set_bgPixmap (rs[Rs_backgroundPixmap]);
1056 scr_touch (true);
1057 }
1058#endif
1059
1060 /* graphics context for the vt window */ 1211 /* graphics context for the vt window */
1061 gcvalue.foreground = pix_colors[Color_fg]; 1212 gcvalue.foreground = pix_colors[Color_fg];
1062 gcvalue.background = pix_colors[Color_bg]; 1213 gcvalue.background = pix_colors[Color_bg];
1063 gcvalue.graphics_exposures = 0; 1214 gcvalue.graphics_exposures = 0;
1064 1215
… …
1066 GCForeground | GCBackground | GCGraphicsExposures, 1217 GCForeground | GCBackground | GCGraphicsExposures,
1067 &gcvalue); 1218 &gcvalue);
1068 1219
1069 drawable = new rxvt_drawable (this, vt); 1220 drawable = new rxvt_drawable (this, vt);
1070 1221
1071#ifdef RXVT_SCROLLBAR
1072 gcvalue.foreground = pix_colors[Color_topShadow];
1073 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1074 gcvalue.foreground = pix_colors[Color_bottomShadow];
1075 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1076 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1077 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1078#endif
1079
1080#ifdef OFF_FOCUS_FADING 1222#ifdef OFF_FOCUS_FADING
1081 // initially we are in unfocused state 1223 // initially we are in unfocused state
1082 if (rs[Rs_fade]) 1224 if (rs[Rs_fade])
1083 pix_colors = pix_colors_unfocused; 1225 pix_colors = pix_colors_unfocused;
1084#endif 1226#endif
… …
1089 1231
1090/* ------------------------------------------------------------------------- * 1232/* ------------------------------------------------------------------------- *
1091 * GET TTY CURRENT STATE * 1233 * GET TTY CURRENT STATE *
1092 * ------------------------------------------------------------------------- */ 1234 * ------------------------------------------------------------------------- */
1093void 1235void
1094rxvt_get_ttymode (ttymode_t *tio, int erase) 1236rxvt_get_ttymode (struct termios *tio, int erase)
1095{ 1237{
1096 /* 1238 /*
1097 * standard System V termios interface 1239 * standard System V termios interface
1098 */ 1240 */
1099 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1241 if (tcgetattr (STDIN_FILENO, tio) < 0)
1100 { 1242 {
1101 // return error - use system defaults, 1243 // return error - use system defaults,
1102 // where possible, and zero elsewhere 1244 // where possible, and zero elsewhere
1103 memset (tio, 0, sizeof (ttymode_t)); 1245 memset (tio, 0, sizeof (struct termios));
1104 1246
1105 tio->c_cc[VINTR] = CINTR; 1247 tio->c_cc[VINTR] = CINTR;
1106 tio->c_cc[VQUIT] = CQUIT; 1248 tio->c_cc[VQUIT] = CQUIT;
1107 tio->c_cc[VERASE] = CERASE; 1249 tio->c_cc[VERASE] = CERASE;
1108#ifdef VERASE2 1250#ifdef VERASE2
… …
1172 1314
1173 /* 1315 /*
1174 * Debugging 1316 * Debugging
1175 */ 1317 */
1176#ifdef DEBUG_TTYMODE 1318#ifdef DEBUG_TTYMODE
1177#ifdef HAVE_TERMIOS_H
1178 /* c_iflag bits */ 1319 /* c_iflag bits */
1179 fprintf (stderr, "Input flags\n"); 1320 fprintf (stderr, "Input flags\n");
1180 1321
1181 /* cpp token stringize doesn't work on all machines <sigh> */ 1322 /* cpp token stringize doesn't work on all machines <sigh> */
1182# define FOO(flag,name) \ 1323# define FOO(flag,name) \
… …
1245 FOO (VLNEXT, "VLNEXT"); 1386 FOO (VLNEXT, "VLNEXT");
1246# endif 1387# endif
1247 1388
1248 fprintf (stderr, "\n"); 1389 fprintf (stderr, "\n");
1249# undef FOO 1390# undef FOO
1250# endif /* HAVE_TERMIOS_H */ 1391#endif /* DEBUG_TTYMODE */
1251#endif /* DEBUG_TTYMODE */
1252} 1392}
1253 1393
1254/*----------------------------------------------------------------------*/ 1394/*----------------------------------------------------------------------*/
1255/* 1395/*
1256 * Run the command in a subprocess and return a file descriptor for the 1396 * Run the command in a subprocess and return a file descriptor for the
… …
1280 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1420 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1281 1421
1282 int er; 1422 int er;
1283 1423
1284#ifndef NO_BACKSPACE_KEY 1424#ifndef NO_BACKSPACE_KEY
1285 if (key_backspace[0] && !key_backspace[1]) 1425 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1286 er = key_backspace[0]; 1426 er = rs[Rs_backspace_key][0];
1287 else if (strcmp (key_backspace, "DEC") == 0) 1427 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1288 er = '\177'; /* the initial state anyway */ 1428 er = '\177'; /* the initial state anyway */
1289 else 1429 else
1290#endif 1430#endif
1291 er = -1; 1431 er = -1;
1292 1432
1293 rxvt_get_ttymode (&tio, er); 1433 rxvt_get_ttymode (&tio, er);
1294 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1434 /* init terminal attributes */
1435 cfsetospeed (&tio, BAUDRATE);
1436 cfsetispeed (&tio, BAUDRATE);
1437 tcsetattr (pty->tty, TCSANOW, &tio);
1295 pty->set_utf8_mode (enc_utf8); 1438 pty->set_utf8_mode (enc_utf8);
1296 1439
1297 /* set initial window size */ 1440 /* set initial window size */
1298 tt_winch (); 1441 tt_winch ();
1299 1442
… …
1359rxvt_term::run_child (const char *const *argv) 1502rxvt_term::run_child (const char *const *argv)
1360{ 1503{
1361 char *login; 1504 char *login;
1362 1505
1363 if (option (Opt_console)) 1506 if (option (Opt_console))
1507 {
1364 { /* be virtual console, fail silently */ 1508 /* be virtual console, fail silently */
1365#ifdef TIOCCONS 1509#ifdef TIOCCONS
1366 unsigned int on = 1; 1510 unsigned int on = 1;
1367 1511
1368 ioctl (STDIN_FILENO, TIOCCONS, &on); 1512 ioctl (STDIN_FILENO, TIOCCONS, &on);
1369#elif defined (SRIOCSREDIR) 1513#elif defined (SRIOCSREDIR)
… …
1371 1515
1372 fd = open (CONSOLE, O_WRONLY, 0); 1516 fd = open (CONSOLE, O_WRONLY, 0);
1373 if (fd >= 0) 1517 if (fd >= 0)
1374 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1518 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1375 close (fd); 1519 close (fd);
1376#endif /* SRIOCSREDIR */ 1520#endif /* SRIOCSREDIR */
1377 } 1521 }
1378 1522
1379 /* reset signals and spin off the command interpreter */ 1523 /* reset signals and spin off the command interpreter */
1380 signal (SIGINT, SIG_DFL); 1524 signal (SIGINT, SIG_DFL);
1381 signal (SIGQUIT, SIG_DFL); 1525 signal (SIGQUIT, SIG_DFL);
… …
1388 */ 1532 */
1389#ifdef SIGTSTP 1533#ifdef SIGTSTP
1390 signal (SIGTSTP, SIG_IGN); 1534 signal (SIGTSTP, SIG_IGN);
1391 signal (SIGTTIN, SIG_IGN); 1535 signal (SIGTTIN, SIG_IGN);
1392 signal (SIGTTOU, SIG_IGN); 1536 signal (SIGTTOU, SIG_IGN);
1393#endif /* SIGTSTP */ 1537#endif /* SIGTSTP */
1394 1538
1395 // unblock signals (signals are blocked by iom.C 1539 // unblock signals (signals are blocked by iom.C
1396 sigset_t ss; 1540 sigset_t ss;
1397 sigemptyset (&ss); 1541 sigemptyset (&ss);
1398 sigprocmask (SIG_SETMASK, &ss, 0); 1542 sigprocmask (SIG_SETMASK, &ss, 0);
1399 1543
1400 /* command interpreter path */ 1544 /* command interpreter path */
1401 if (argv != NULL) 1545 if (argv)
1402 { 1546 {
1403# ifdef DEBUG_CMD 1547# ifdef DEBUG_CMD
1404 int i; 1548 int i;
1405 1549
1406 for (i = 0; argv[i]; i++) 1550 for (i = 0; argv[i]; i++)
… …
1415 const char *argv0, *shell; 1559 const char *argv0, *shell;
1416 1560
1417 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1561 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1418 shell = "/bin/sh"; 1562 shell = "/bin/sh";
1419 1563
1420 argv0 = (const char *)rxvt_r_basename (shell); 1564 argv0 = (const char *)rxvt_basename (shell);
1421 1565
1422 if (option (Opt_loginShell)) 1566 if (option (Opt_loginShell))
1423 { 1567 {
1424 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1568 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1425 1569
1426 login[0] = '-'; 1570 login[0] = '-';
1427 strcpy (&login[1], argv0); 1571 strcpy (&login[1], argv0);
1428 argv0 = login; 1572 argv0 = login;
1429 } 1573 }
1430 1574
1431 execlp (shell, argv0, NULL); 1575 execlp (shell, argv0, (char *)0);
1432 /* no error message: STDERR is closed! */ 1576 /* no error message: STDERR is closed! */
1433 } 1577 }
1434 1578
1435 return -1; 1579 return -1;
1436} 1580}

Diff Legend

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