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.194 by sasha, Thu Jul 26 16:17:50 2007 UTC vs.
Revision 1.243 by root, Fri Jan 25 16:04:57 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-2008 Marc Lehmann <pcg@goof.com>
15 * 16 *
16 * This program is free software; you can redistribute it and/or modify 17 * This program is free software; you can redistribute it and/or modify
17 * it under the terms of the GNU General Public License as published by 18 * it under the terms of the GNU General Public License as published by
18 * the Free Software Foundation; either version 2 of the License, or 19 * the Free Software Foundation; either version 2 of the License, or
19 * (at your option) any later version. 20 * (at your option) any later version.
… …
33 34
34#include "../config.h" /* NECESSARY */ 35#include "../config.h" /* NECESSARY */
35#include "rxvt.h" /* NECESSARY */ 36#include "rxvt.h" /* NECESSARY */
36#include "rxvtutil.h" 37#include "rxvtutil.h"
37#include "init.h" 38#include "init.h"
39#include "keyboard.h"
38 40
39#include <limits> 41#include <limits>
40 42
41#include <csignal> 43#include <csignal>
44
45#include <fcntl.h>
46
47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE
49# include <X11/Xlocale.h>
50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale>
53# endif
54#endif
55
56#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h>
58#endif
59
60#ifdef DISPLAY_IS_IP
61/* On Solaris link with -lsocket and -lnsl */
62#include <sys/types.h>
63#include <sys/socket.h>
64
65/* these next two are probably only on Sun (not Solaris) */
66#ifdef HAVE_SYS_SOCKIO_H
67#include <sys/sockio.h>
68#endif
69#ifdef HAVE_SYS_BYTEORDER_H
70#include <sys/byteorder.h>
71#endif
72
73#include <netinet/in.h>
74#include <arpa/inet.h>
75#include <net/if.h>
76#include <net/if_arp.h>
77
78static char *
79rxvt_network_display (const char *display)
80{
81 char buffer[1024], *rval = NULL;
82 struct ifconf ifc;
83 struct ifreq *ifr;
84 int i, skfd;
85
86 if (display[0] != ':' && strncmp (display, "unix:", 5))
87 return (char *) display; /* nothing to do */
88
89 ifc.ifc_len = sizeof (buffer); /* Get names of all ifaces */
90 ifc.ifc_buf = buffer;
91
92 if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
93 {
94 perror ("socket");
95 return NULL;
96 }
97
98 if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0)
99 {
100 perror ("SIOCGIFCONF");
101 close (skfd);
102 return NULL;
103 }
104
105 for (i = 0, ifr = ifc.ifc_req;
106 i < (ifc.ifc_len / sizeof (struct ifreq));
107 i++, ifr++)
108 {
109 struct ifreq ifr2;
110
111 strcpy (ifr2.ifr_name, ifr->ifr_name);
112
113 if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0)
114 {
115 unsigned long addr;
116 struct sockaddr_in *p_addr;
117
118 p_addr = (struct sockaddr_in *) &ifr2.ifr_addr;
119 addr = htonl ((unsigned long)p_addr->sin_addr.s_addr);
120
121 /*
122 * not "0.0.0.0" or "127.0.0.1" - so format the address
123 */
124 if (addr && addr != 0x7F000001)
125 {
126 char *colon = strchr (display, ':');
127
128 if (colon == NULL)
129 colon = ":0.0";
130
131 rval = rxvt_malloc (strlen (colon) + 16);
132 sprintf (rval, "%d.%d.%d.%d%s",
133 (int) ((addr >> 030) & 0xFF),
134 (int) ((addr >> 020) & 0xFF),
135 (int) ((addr >> 010) & 0xFF),
136 (int) (addr & 0xFF), colon);
137 break;
138 }
139 }
140 }
141
142 close (skfd);
143
144 return rval;
145}
146#endif
42 147
43const char *const def_colorName[] = 148const char *const def_colorName[] =
44 { 149 {
45 COLOR_FOREGROUND, 150 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 151 COLOR_BACKGROUND,
… …
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 315static void
229rxvt_term::init_secondary () 316init_secondary ()
230{ 317{
231 int i; 318 int i;
232 319
233 /*
234 * Close all unused file descriptors
235 * We don't want them, we don't need them.
236 */
237 if ((i = open ("/dev/null", O_RDONLY)) < 0) 320 if ((i = open ("/dev/null", O_RDONLY)) < 0)
238 { 321 {
239 /* TODO: BOO HISS */
240 dup2 (STDERR_FILENO, STDIN_FILENO); 322 dup2 (STDERR_FILENO, STDIN_FILENO);
241 } 323 }
242 else if (i > STDIN_FILENO) 324 else if (i != STDIN_FILENO)
243 { 325 {
244 dup2 (i, STDIN_FILENO); 326 dup2 (i, STDIN_FILENO);
245 close (i); 327 close (i);
246 } 328 }
247 329
248 dup2 (STDERR_FILENO, STDOUT_FILENO); 330 dup2 (STDERR_FILENO, STDOUT_FILENO);
249
250#if 0 // schmorp sayz closing filies is murder
251 for (i = STDERR_FILENO + 1; i < num_fds; i++)
252 {
253#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
254 if (i == 4 || i == 7)
255 continue;
256#endif
257 close (i);
258 }
259#endif
260} 331}
261 332
262/*----------------------------------------------------------------------*/ 333/*----------------------------------------------------------------------*/
263const char ** 334const char **
264rxvt_term::init_resources (int argc, const char *const *argv) 335rxvt_term::init_resources (int argc, const char *const *argv)
265{ 336{
266 int i, r_argc; 337 int i, r_argc;
267 char *val;
268 const char **cmd_argv, **r_argv; 338 const char **cmd_argv, **r_argv;
269 339
270 /* 340 /*
271 * Look for -e option. Find => split and make cmd_argv[] of command args 341 * Look for -e option. Find => split and make cmd_argv[] of command args
272 */ 342 */
273 for (r_argc = 0; r_argc < argc; r_argc++) 343 for (r_argc = 0; r_argc < argc; r_argc++)
274 if (!strcmp (argv[r_argc], "-e")) 344 if (!strcmp (argv[r_argc], "-e"))
275 break; 345 break;
276 346
347 if (r_argc == argc)
348 cmd_argv = NULL;
349 else if (!argv[r_argc + 1])
350 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
351 else
352 {
353 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
354
355 for (i = 0; i < argc - r_argc - 1; i++)
356 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
357
358 cmd_argv[i] = NULL;
359 }
360
277 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 361 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
278 362
279 for (i = 0; i < r_argc; i++) 363 for (i = 0; i < r_argc; i++)
280 r_argv[i] = (const char *)argv[i]; 364 r_argv[i] = (const char *)argv[i];
281 365
282 r_argv[i] = NULL; 366 r_argv[i] = NULL;
283 367
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]); 368 rs[Rs_name] = rxvt_basename (argv[0]);
297 369
298 /* 370 /*
299 * Open display, get options/resources and create the window 371 * Open display, get options/resources and create the window
300 */ 372 */
301 373
… …
303 rs[Rs_display_name] = ":0"; 375 rs[Rs_display_name] = ":0";
304 376
305 get_options (r_argc, r_argv); 377 get_options (r_argc, r_argv);
306 378
307 if (!(display = displays.get (rs[Rs_display_name]))) 379 if (!(display = displays.get (rs[Rs_display_name])))
380 {
381 free (r_argv);
308 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 382 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
383 }
309 384
310 // using a local pointer decreases code size a lot 385 // using a local pointer decreases code size a lot
311 xa = display->xa; 386 xa = display->xa;
312 387
313 set (display); 388 set (display);
… …
317 if (rs[Rs_depth]) 392 if (rs[Rs_depth])
318 select_visual (strtol (rs[Rs_depth], 0, 0)); 393 select_visual (strtol (rs[Rs_depth], 0, 0));
319#endif 394#endif
320 395
321#ifdef HAVE_AFTERIMAGE 396#ifdef HAVE_AFTERIMAGE
397 set_application_name ((char*)rs[Rs_name]);
398 set_output_threshold (OUTPUT_LEVEL_WARNING);
322 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL); 399 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
323#endif 400#endif
324 free (r_argv); 401 free (r_argv);
325 402
326 for (int i = NUM_RESOURCES; i--; ) 403 for (int i = NUM_RESOURCES; i--; )
… …
344 * set any defaults not already set 421 * set any defaults not already set
345 */ 422 */
346 if (cmd_argv && cmd_argv[0]) 423 if (cmd_argv && cmd_argv[0])
347 { 424 {
348 if (!rs[Rs_title]) 425 if (!rs[Rs_title])
349 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 426 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
350 if (!rs[Rs_iconName]) 427 if (!rs[Rs_iconName])
351 rs[Rs_iconName] = rs[Rs_title]; 428 rs[Rs_iconName] = rs[Rs_title];
352 } 429 }
353 else 430 else
354 { 431 {
… …
392 rs[Rs_cutchars] = CUTCHARS; 469 rs[Rs_cutchars] = CUTCHARS;
393 470
394#ifndef NO_BACKSPACE_KEY 471#ifndef NO_BACKSPACE_KEY
395 if (!rs[Rs_backspace_key]) 472 if (!rs[Rs_backspace_key])
396# ifdef DEFAULT_BACKSPACE 473# ifdef DEFAULT_BACKSPACE
397 key_backspace = DEFAULT_BACKSPACE; 474 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
398# else 475# else
399 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 476 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
400# endif 477# endif
401 else
402 {
403 val = strdup (rs[Rs_backspace_key]);
404 rxvt_Str_trim (val);
405 rxvt_Str_escaped (val);
406 key_backspace = val;
407 }
408#endif 478#endif
409 479
410#ifndef NO_DELETE_KEY 480#ifndef NO_DELETE_KEY
411 if (!rs[Rs_delete_key]) 481 if (!rs[Rs_delete_key])
412# ifdef DEFAULT_DELETE 482# ifdef DEFAULT_DELETE
413 key_delete = DEFAULT_DELETE; 483 rs[Rs_delete_key] = DEFAULT_DELETE;
414# else 484# else
415 key_delete = "\033[3~"; 485 rs[Rs_delete_key] = "\033[3~";
416# endif
417 else
418 {
419 val = strdup (rs[Rs_delete_key]);
420 rxvt_Str_trim (val);
421 rxvt_Str_escaped (val);
422 key_delete = val;
423 }
424#endif 486# endif
425 if (rs[Rs_answerbackstring]) 487#endif
426 {
427 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
428 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
429 }
430 488
431#ifdef HAVE_SCROLLBARS 489#ifdef HAVE_SCROLLBARS
432 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 490 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
433#endif 491#endif
434 492
… …
458 color_aliases (Color_fg); 516 color_aliases (Color_fg);
459 color_aliases (Color_bg); 517 color_aliases (Color_bg);
460#ifndef NO_CURSORCOLOR 518#ifndef NO_CURSORCOLOR
461 color_aliases (Color_cursor); 519 color_aliases (Color_cursor);
462 color_aliases (Color_cursor2); 520 color_aliases (Color_cursor2);
463#endif /* NO_CURSORCOLOR */ 521#endif /* NO_CURSORCOLOR */
464 color_aliases (Color_pointer_fg); 522 color_aliases (Color_pointer_fg);
465 color_aliases (Color_pointer_bg); 523 color_aliases (Color_pointer_bg);
466 color_aliases (Color_border); 524 color_aliases (Color_border);
467#ifndef NO_BOLD_UNDERLINE_REVERSE 525#ifndef NO_BOLD_UNDERLINE_REVERSE
468 color_aliases (Color_BD); 526 color_aliases (Color_BD);
469 color_aliases (Color_UL); 527 color_aliases (Color_UL);
470 color_aliases (Color_RV); 528 color_aliases (Color_RV);
471#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 529#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
472 530
473 if (!rs[Rs_color + Color_border]) 531 if (!rs[Rs_color + Color_border])
474 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 532 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
475 533
476 return cmd_argv; 534 return cmd_argv;
535}
536
537/*----------------------------------------------------------------------*/
538void
539rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
540{
541 this->envv = envv;
542
543 SET_R (this);
544 set_locale ("");
545 set_environ (envv); // few things in X do not call setlocale :(
546
547 init_vars ();
548
549 init_secondary ();
550
551 const char **cmd_argv = init_resources (argc, argv);
552
553#ifdef KEYSYM_RESOURCE
554 keyboard->register_done ();
555#endif
556
557#ifdef HAVE_SCROLLBARS
558 if (option (Opt_scrollBar))
559 scrollBar.setIdle (); /* set existence for size calculations */
560#endif
561
562 pty = ptytty::create ();
563
564 create_windows (argc, argv);
565
566 init_xlocale ();
567
568 scr_reset (); // initialize screen
569
570#if 0
571 XSynchronize (dpy, True);
572#endif
573
574#ifdef HAVE_SCROLLBARS
575 if (option (Opt_scrollBar))
576 resize_scrollbar (); /* create and map scrollbar */
577#endif
578#ifdef HAVE_BG_PIXMAP
579 {
580 bgPixmap.set_target (this);
581 bgPixmap.invalidate ();
582
583#ifdef ENABLE_TRANSPARENCY
584 if (option (Opt_transparent))
585 {
586 bgPixmap.set_transparent ();
587
588#ifdef HAVE_AFTERIMAGE
589 if (rs [Rs_blurradius])
590 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
591#endif
592 if (ISSET_PIXCOLOR (Color_tint))
593 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
594
595 if (rs [Rs_shade])
596 bgPixmap.set_shade (rs [Rs_shade]);
597
598 bgPixmap.set_root_pixmap ();
599 XSelectInput (dpy, display->root, PropertyChangeMask);
600 rootwin_ev.start (display, display->root);
601 }
602#endif
603
604#ifdef BG_IMAGE_FROM_FILE
605 if (rs[Rs_backgroundPixmap])
606 {
607 const char *p = rs[Rs_backgroundPixmap];
608
609 if ((p = strchr (p, ';')) != 0)
610 {
611 p++;
612 bgPixmap.set_geometry (p);
613 }
614 else
615 bgPixmap.set_defaultGeometry ();
616
617 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
618 if (!bgPixmap.window_position_sensitive ())
619 update_background ();
620 }
621#endif
622 }
623#endif
624
625#if ENABLE_PERL
626 rootwin_ev.start (display, display->root);
627#endif
628
629 set_colorfgbg ();
630
631 init_command (cmd_argv);
632
633 free (cmd_argv);
634
635 if (pty->pty >= 0)
636 pty_ev.start (pty->pty, ev::READ);
637
638 HOOK_INVOKE ((this, HOOK_START, DT_END));
639
640#if ENABLE_XEMBED
641 if (rs[Rs_embed])
642 {
643 long info[2] = { 0, XEMBED_MAPPED };
644
645 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
646 32, PropModeReplace, (unsigned char *)&info, 2);
647 }
648#endif
649
650 XMapWindow (dpy, vt);
651 XMapWindow (dpy, parent[0]);
652
653 refresh_check ();
477} 654}
478 655
479/*----------------------------------------------------------------------*/ 656/*----------------------------------------------------------------------*/
480void 657void
481rxvt_term::init_env () 658rxvt_term::init_env ()
482{ 659{
483 int i; 660 int i;
484 unsigned int u;
485 char *val; 661 char *val;
486 662
487#ifdef DISPLAY_IS_IP 663#ifdef DISPLAY_IS_IP
488 /* Fixup display_name for export over pty to any interested terminal 664 /* Fixup display_name for export over pty to any interested terminal
489 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 665 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
497 */ 673 */
498 val = rxvt_network_display (rs[Rs_display_name]); 674 val = rxvt_network_display (rs[Rs_display_name]);
499 rs[Rs_display_name] = (const char *)val; 675 rs[Rs_display_name] = (const char *)val;
500 676
501 if (val == NULL) 677 if (val == NULL)
502#endif /* DISPLAY_IS_IP */ 678#endif /* DISPLAY_IS_IP */
503 val = XDisplayString (dpy); 679 val = XDisplayString (dpy);
504 680
505 if (rs[Rs_display_name] == NULL) 681 if (rs[Rs_display_name] == NULL)
506 rs[Rs_display_name] = val; /* use broken `:0' value */ 682 rs[Rs_display_name] = val; /* use broken `:0' value */
507 683
508 i = strlen (val); 684 i = strlen (val);
509 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 685 env_display = (char *)rxvt_malloc (i + 9);
510 686
511 sprintf (env_display, "DISPLAY=%s", val); 687 sprintf (env_display, "DISPLAY=%s", val);
512 688
513 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 689 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
514 690
… …
535 else 711 else
536 putenv ("COLORTERM=" COLORTERMENVFULL); 712 putenv ("COLORTERM=" COLORTERMENVFULL);
537 713
538 if (rs[Rs_term_name] != NULL) 714 if (rs[Rs_term_name] != NULL)
539 { 715 {
540 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 716 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
541 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 717 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
542 putenv (env_term); 718 putenv (env_term);
543 } 719 }
544 else 720 else
545 putenv ("TERM=" TERMENV); 721 putenv ("TERM=" TERMENV);
… …
547#ifdef HAVE_UNSETENV 723#ifdef HAVE_UNSETENV
548 /* avoid passing old settings and confusing term size */ 724 /* avoid passing old settings and confusing term size */
549 unsetenv ("LINES"); 725 unsetenv ("LINES");
550 unsetenv ("COLUMNS"); 726 unsetenv ("COLUMNS");
551 unsetenv ("TERMCAP"); /* terminfo should be okay */ 727 unsetenv ("TERMCAP"); /* terminfo should be okay */
552#endif /* HAVE_UNSETENV */ 728#endif /* HAVE_UNSETENV */
553} 729}
554 730
555/*----------------------------------------------------------------------*/ 731/*----------------------------------------------------------------------*/
556/* 732/*
557 * This is more or less stolen straight from XFree86 xterm. 733 * This is more or less stolen straight from XFree86 xterm.
… …
578 754
579 this->locale = "C"; 755 this->locale = "C";
580 } 756 }
581 757
582 758
583 this->locale = rxvt_strdup (this->locale); 759 this->locale = strdup (this->locale);
584 SET_LOCALE (this->locale); 760 SET_LOCALE (this->locale);
585 mbstate.reset (); 761 mbstate.reset ();
586#endif 762#endif
587 763
588#if HAVE_NL_LANGINFO 764#if HAVE_NL_LANGINFO
… …
645 priv_modes |= PrivMode_Keypress; 821 priv_modes |= PrivMode_Keypress;
646 if (!option (Opt_jumpScroll)) 822 if (!option (Opt_jumpScroll))
647 priv_modes |= PrivMode_smoothScroll; 823 priv_modes |= PrivMode_smoothScroll;
648 824
649#ifndef NO_BACKSPACE_KEY 825#ifndef NO_BACKSPACE_KEY
650 if (strcmp (key_backspace, "DEC") == 0) 826 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
651 priv_modes |= PrivMode_HaveBackSpace; 827 priv_modes |= PrivMode_HaveBackSpace;
652#endif 828#endif
653 829
654 /* add value for scrollBar */ 830 /* add value for scrollBar */
655 if (scrollBar.state) 831 if (scrollBar.state)
… …
668 int i; 844 int i;
669 845
670#ifdef OFF_FOCUS_FADING 846#ifdef OFF_FOCUS_FADING
671 pix_colors = pix_colors_focused; 847 pix_colors = pix_colors_focused;
672#endif 848#endif
673 849
674 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 850 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
675 { 851 {
676 const char *name = rs[Rs_color + i]; 852 const char *name = rs[Rs_color + i];
677 853
678 if (!name) 854 if (!name)
… …
756 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 932 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
757 cscroll.a) 933 cscroll.a)
758 )) 934 ))
759 alias_color (Color_topShadow, Color_White); 935 alias_color (Color_topShadow, Color_White);
760 } 936 }
761#endif /* KEEP_SCROLLCOLOR */ 937#endif /* KEEP_SCROLLCOLOR */
762 938
763#ifdef OFF_FOCUS_FADING 939#ifdef OFF_FOCUS_FADING
764 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 940 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
765 update_fade_color (i); 941 update_fade_color (i);
766#endif 942#endif
… …
774 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 950 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
775 { 951 {
776 int i = atoi (rs[Rs_color + idx]); 952 int i = atoi (rs[Rs_color + idx]);
777 953
778 if (i >= 8 && i <= 15) 954 if (i >= 8 && i <= 15)
779 { /* bright colors */ 955 /* bright colors */
780 i -= 8;
781 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 956 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
782 return; 957 else if (i >= 0 && i <= 7)
783 } 958 /* normal colors */
784
785 if (i >= 0 && i <= 7) /* normal colors */
786 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 959 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
787 } 960 }
788} 961}
789 962
790/*----------------------------------------------------------------------*/ 963/*----------------------------------------------------------------------*/
… …
882rxvt_term::create_windows (int argc, const char *const *argv) 1055rxvt_term::create_windows (int argc, const char *const *argv)
883{ 1056{
884 XClassHint classHint; 1057 XClassHint classHint;
885 XWMHints wmHint; 1058 XWMHints wmHint;
886#if ENABLE_FRILLS 1059#if ENABLE_FRILLS
887 MWMHints mwmhints; 1060 MWMHints mwmhints = { };
888#endif 1061#endif
889 XGCValues gcvalue; 1062 XGCValues gcvalue;
890 XSetWindowAttributes attributes; 1063 XSetWindowAttributes attributes;
891 Window top, parent; 1064 Window top, parent;
892 1065
… …
905#if ENABLE_FRILLS 1078#if ENABLE_FRILLS
906 if (option (Opt_borderLess)) 1079 if (option (Opt_borderLess))
907 { 1080 {
908 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 1081 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
909 { 1082 {
910 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 1083 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
911 attributes.override_redirect = true; 1084 attributes.override_redirect = true;
912 mwmhints.flags = 0;
913 } 1085 }
914 else 1086 else
915 { 1087 {
916 mwmhints.flags = MWM_HINTS_DECORATIONS; 1088 mwmhints.flags = MWM_HINTS_DECORATIONS;
917 mwmhints.decorations = 0;
918 } 1089 }
919 } 1090 }
920 else
921 mwmhints.flags = 0;
922#endif 1091#endif
923 1092
924#if ENABLE_XEMBED 1093#if ENABLE_XEMBED
925 if (rs[Rs_embed]) 1094 if (rs[Rs_embed])
926 { 1095 {
… …
1010 termwin_ev.start (display, top); 1179 termwin_ev.start (display, top);
1011 1180
1012 /* vt cursor: Black-on-White is standard, but this is more popular */ 1181 /* vt cursor: Black-on-White is standard, but this is more popular */
1013 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1182 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1014 1183
1015#ifdef HAVE_SCROLLBARS
1016 /* cursor scrollBar: Black-on-White */
1017 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1018#endif
1019
1020 /* the vt window */ 1184 /* the vt window */
1021 vt = XCreateSimpleWindow (dpy, top, 1185 vt = XCreateSimpleWindow (dpy, top,
1022 window_vt_x, window_vt_y, 1186 window_vt_x, window_vt_y,
1023 width, height, 1187 width, height,
1024 0, 1188 0,
… …
1037 1201
1038 vt_select_input (); 1202 vt_select_input ();
1039 1203
1040 vt_ev.start (display, vt); 1204 vt_ev.start (display, vt);
1041 1205
1042#ifdef XPM_BACKGROUND
1043 if (rs[Rs_backgroundPixmap] != NULL
1044#ifndef HAVE_AFTERIMAGE
1045 && !option (Opt_transparent)
1046#endif
1047 )
1048 {
1049 const char *p = rs[Rs_backgroundPixmap];
1050
1051 if ((p = strchr (p, ';')) != NULL)
1052 {
1053 p++;
1054 scale_pixmap (p);
1055 }
1056
1057 set_bgPixmap (rs[Rs_backgroundPixmap]);
1058 scr_touch (true);
1059 }
1060#endif
1061
1062 /* graphics context for the vt window */ 1206 /* graphics context for the vt window */
1063 gcvalue.foreground = pix_colors[Color_fg]; 1207 gcvalue.foreground = pix_colors[Color_fg];
1064 gcvalue.background = pix_colors[Color_bg]; 1208 gcvalue.background = pix_colors[Color_bg];
1065 gcvalue.graphics_exposures = 0; 1209 gcvalue.graphics_exposures = 0;
1066 1210
… …
1068 GCForeground | GCBackground | GCGraphicsExposures, 1212 GCForeground | GCBackground | GCGraphicsExposures,
1069 &gcvalue); 1213 &gcvalue);
1070 1214
1071 drawable = new rxvt_drawable (this, vt); 1215 drawable = new rxvt_drawable (this, vt);
1072 1216
1073#ifdef RXVT_SCROLLBAR
1074 gcvalue.foreground = pix_colors[Color_topShadow];
1075 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1076 gcvalue.foreground = pix_colors[Color_bottomShadow];
1077 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1078 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1079 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1080#endif
1081
1082#ifdef OFF_FOCUS_FADING 1217#ifdef OFF_FOCUS_FADING
1083 // initially we are in unfocused state 1218 // initially we are in unfocused state
1084 if (rs[Rs_fade]) 1219 if (rs[Rs_fade])
1085 pix_colors = pix_colors_unfocused; 1220 pix_colors = pix_colors_unfocused;
1086#endif 1221#endif
… …
1091 1226
1092/* ------------------------------------------------------------------------- * 1227/* ------------------------------------------------------------------------- *
1093 * GET TTY CURRENT STATE * 1228 * GET TTY CURRENT STATE *
1094 * ------------------------------------------------------------------------- */ 1229 * ------------------------------------------------------------------------- */
1095void 1230void
1096rxvt_get_ttymode (ttymode_t *tio, int erase) 1231rxvt_get_ttymode (struct termios *tio, int erase)
1097{ 1232{
1098 /* 1233 /*
1099 * standard System V termios interface 1234 * standard System V termios interface
1100 */ 1235 */
1101 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1236 if (tcgetattr (STDIN_FILENO, tio) < 0)
1102 { 1237 {
1103 // return error - use system defaults, 1238 // return error - use system defaults,
1104 // where possible, and zero elsewhere 1239 // where possible, and zero elsewhere
1105 memset (tio, 0, sizeof (ttymode_t)); 1240 memset (tio, 0, sizeof (struct termios));
1106 1241
1107 tio->c_cc[VINTR] = CINTR; 1242 tio->c_cc[VINTR] = CINTR;
1108 tio->c_cc[VQUIT] = CQUIT; 1243 tio->c_cc[VQUIT] = CQUIT;
1109 tio->c_cc[VERASE] = CERASE; 1244 tio->c_cc[VERASE] = CERASE;
1110#ifdef VERASE2 1245#ifdef VERASE2
… …
1174 1309
1175 /* 1310 /*
1176 * Debugging 1311 * Debugging
1177 */ 1312 */
1178#ifdef DEBUG_TTYMODE 1313#ifdef DEBUG_TTYMODE
1179#ifdef HAVE_TERMIOS_H
1180 /* c_iflag bits */ 1314 /* c_iflag bits */
1181 fprintf (stderr, "Input flags\n"); 1315 fprintf (stderr, "Input flags\n");
1182 1316
1183 /* cpp token stringize doesn't work on all machines <sigh> */ 1317 /* cpp token stringize doesn't work on all machines <sigh> */
1184# define FOO(flag,name) \ 1318# define FOO(flag,name) \
… …
1247 FOO (VLNEXT, "VLNEXT"); 1381 FOO (VLNEXT, "VLNEXT");
1248# endif 1382# endif
1249 1383
1250 fprintf (stderr, "\n"); 1384 fprintf (stderr, "\n");
1251# undef FOO 1385# undef FOO
1252# endif /* HAVE_TERMIOS_H */ 1386#endif /* DEBUG_TTYMODE */
1253#endif /* DEBUG_TTYMODE */
1254} 1387}
1255 1388
1256/*----------------------------------------------------------------------*/ 1389/*----------------------------------------------------------------------*/
1257/* 1390/*
1258 * Run the command in a subprocess and return a file descriptor for the 1391 * Run the command in a subprocess and return a file descriptor for the
… …
1282 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1415 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1283 1416
1284 int er; 1417 int er;
1285 1418
1286#ifndef NO_BACKSPACE_KEY 1419#ifndef NO_BACKSPACE_KEY
1287 if (key_backspace[0] && !key_backspace[1]) 1420 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1288 er = key_backspace[0]; 1421 er = rs[Rs_backspace_key][0];
1289 else if (strcmp (key_backspace, "DEC") == 0) 1422 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1290 er = '\177'; /* the initial state anyway */ 1423 er = '\177'; /* the initial state anyway */
1291 else 1424 else
1292#endif 1425#endif
1293 er = -1; 1426 er = -1;
1294 1427
1295 rxvt_get_ttymode (&tio, er); 1428 rxvt_get_ttymode (&tio, er);
1296 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1429 /* init terminal attributes */
1430 cfsetospeed (&tio, BAUDRATE);
1431 cfsetispeed (&tio, BAUDRATE);
1432 tcsetattr (pty->tty, TCSANOW, &tio);
1297 pty->set_utf8_mode (enc_utf8); 1433 pty->set_utf8_mode (enc_utf8);
1298 1434
1299 /* set initial window size */ 1435 /* set initial window size */
1300 tt_winch (); 1436 tt_winch ();
1301 1437
… …
1361rxvt_term::run_child (const char *const *argv) 1497rxvt_term::run_child (const char *const *argv)
1362{ 1498{
1363 char *login; 1499 char *login;
1364 1500
1365 if (option (Opt_console)) 1501 if (option (Opt_console))
1502 {
1366 { /* be virtual console, fail silently */ 1503 /* be virtual console, fail silently */
1367#ifdef TIOCCONS 1504#ifdef TIOCCONS
1368 unsigned int on = 1; 1505 unsigned int on = 1;
1369 1506
1370 ioctl (STDIN_FILENO, TIOCCONS, &on); 1507 ioctl (STDIN_FILENO, TIOCCONS, &on);
1371#elif defined (SRIOCSREDIR) 1508#elif defined (SRIOCSREDIR)
… …
1373 1510
1374 fd = open (CONSOLE, O_WRONLY, 0); 1511 fd = open (CONSOLE, O_WRONLY, 0);
1375 if (fd >= 0) 1512 if (fd >= 0)
1376 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1513 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1377 close (fd); 1514 close (fd);
1378#endif /* SRIOCSREDIR */ 1515#endif /* SRIOCSREDIR */
1379 } 1516 }
1380 1517
1381 /* reset signals and spin off the command interpreter */ 1518 /* reset signals and spin off the command interpreter */
1382 signal (SIGINT, SIG_DFL); 1519 signal (SIGINT, SIG_DFL);
1383 signal (SIGQUIT, SIG_DFL); 1520 signal (SIGQUIT, SIG_DFL);
… …
1390 */ 1527 */
1391#ifdef SIGTSTP 1528#ifdef SIGTSTP
1392 signal (SIGTSTP, SIG_IGN); 1529 signal (SIGTSTP, SIG_IGN);
1393 signal (SIGTTIN, SIG_IGN); 1530 signal (SIGTTIN, SIG_IGN);
1394 signal (SIGTTOU, SIG_IGN); 1531 signal (SIGTTOU, SIG_IGN);
1395#endif /* SIGTSTP */ 1532#endif /* SIGTSTP */
1396 1533
1397 // unblock signals (signals are blocked by iom.C 1534 // unblock signals (signals are blocked by iom.C
1398 sigset_t ss; 1535 sigset_t ss;
1399 sigemptyset (&ss); 1536 sigemptyset (&ss);
1400 sigprocmask (SIG_SETMASK, &ss, 0); 1537 sigprocmask (SIG_SETMASK, &ss, 0);
1401 1538
1402 /* command interpreter path */ 1539 /* command interpreter path */
1403 if (argv != NULL) 1540 if (argv)
1404 { 1541 {
1405# ifdef DEBUG_CMD 1542# ifdef DEBUG_CMD
1406 int i; 1543 int i;
1407 1544
1408 for (i = 0; argv[i]; i++) 1545 for (i = 0; argv[i]; i++)
… …
1417 const char *argv0, *shell; 1554 const char *argv0, *shell;
1418 1555
1419 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1556 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1420 shell = "/bin/sh"; 1557 shell = "/bin/sh";
1421 1558
1422 argv0 = (const char *)rxvt_r_basename (shell); 1559 argv0 = (const char *)rxvt_basename (shell);
1423 1560
1424 if (option (Opt_loginShell)) 1561 if (option (Opt_loginShell))
1425 { 1562 {
1426 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1563 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1427 1564
1428 login[0] = '-'; 1565 login[0] = '-';
1429 strcpy (&login[1], argv0); 1566 strcpy (&login[1], argv0);
1430 argv0 = login; 1567 argv0 = login;
1431 } 1568 }
1432 1569
1433 execlp (shell, argv0, NULL); 1570 execlp (shell, argv0, (char *)0);
1434 /* no error message: STDERR is closed! */ 1571 /* no error message: STDERR is closed! */
1435 } 1572 }
1436 1573
1437 return -1; 1574 return -1;
1438} 1575}

Diff Legend

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