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.211 by ayin, Sun Sep 9 10:14:40 2007 UTC vs.
Revision 1.259 by root, Sat May 30 08:51:23 2009 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-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
168 COLOR_SCROLLBAR, 272 COLOR_SCROLLBAR,
273#ifdef RXVT_SCROLLBAR
169 COLOR_SCROLLTROUGH, 274 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 275#endif
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;
193 ncol = 80; 293 ncol = 80;
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;
298 letterSpace = LETTERSPACE;
198 saveLines = SAVELINES; 299 saveLines = SAVELINES;
199 numpix_colors = TOTAL_COLORS;
200 300
201 refresh_type = SLOW_REFRESH; 301 refresh_type = SLOW_REFRESH;
202 302
203 oldcursor.row = oldcursor.col = -1; 303 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 304
218 set_option (Opt_scrollBar); 305 set_option (Opt_scrollBar);
219 set_option (Opt_scrollTtyOutput); 306 set_option (Opt_scrollTtyOutput);
220 set_option (Opt_jumpScroll); 307 set_option (Opt_jumpScroll);
221 set_option (Opt_skipScroll); 308 set_option (Opt_skipScroll);
222 set_option (Opt_secondaryScreen); 309 set_option (Opt_secondaryScreen);
223 set_option (Opt_secondaryScroll); 310 set_option (Opt_secondaryScroll);
224 set_option (Opt_pastableTabs); 311 set_option (Opt_pastableTabs);
225 set_option (Opt_intensityStyles); 312 set_option (Opt_intensityStyles);
226 set_option (Opt_iso14755_52); 313 set_option (Opt_iso14755_52);
227 314 set_option (Opt_buffered);
228 return true;
229} 315}
230 316
231void 317static void
232rxvt_term::init_secondary () 318init_secondary ()
233{ 319{
234 int i; 320 int i;
235 321
236 /*
237 * Close all unused file descriptors
238 * We don't want them, we don't need them.
239 */
240 if ((i = open ("/dev/null", O_RDONLY)) < 0) 322 if ((i = open ("/dev/null", O_RDONLY)) < 0)
241 { 323 {
242 /* TODO: BOO HISS */
243 dup2 (STDERR_FILENO, STDIN_FILENO); 324 dup2 (STDERR_FILENO, STDIN_FILENO);
244 } 325 }
245 else if (i > STDIN_FILENO) 326 else if (i != STDIN_FILENO)
246 { 327 {
247 dup2 (i, STDIN_FILENO); 328 dup2 (i, STDIN_FILENO);
248 close (i); 329 close (i);
249 } 330 }
250 331
251 dup2 (STDERR_FILENO, STDOUT_FILENO); 332 dup2 (STDERR_FILENO, STDOUT_FILENO);
252
253#if 0 // schmorp sayz closing filies is murder
254 for (i = STDERR_FILENO + 1; i < num_fds; i++)
255 {
256#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
257 if (i == 4 || i == 7)
258 continue;
259#endif
260 close (i);
261 }
262#endif
263} 333}
264 334
265/*----------------------------------------------------------------------*/ 335/*----------------------------------------------------------------------*/
266const char ** 336const char **
267rxvt_term::init_resources (int argc, const char *const *argv) 337rxvt_term::init_resources (int argc, const char *const *argv)
… …
274 */ 344 */
275 for (r_argc = 0; r_argc < argc; r_argc++) 345 for (r_argc = 0; r_argc < argc; r_argc++)
276 if (!strcmp (argv[r_argc], "-e")) 346 if (!strcmp (argv[r_argc], "-e"))
277 break; 347 break;
278 348
349 if (r_argc == argc)
350 cmd_argv = NULL;
351 else if (!argv[r_argc + 1])
352 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
353 else
354 {
355 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
356
357 for (i = 0; i < argc - r_argc - 1; i++)
358 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
359
360 cmd_argv[i] = NULL;
361 }
362
279 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 363 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
280 364
281 for (i = 0; i < r_argc; i++) 365 for (i = 0; i < r_argc; i++)
282 r_argv[i] = (const char *)argv[i]; 366 r_argv[i] = (const char *)argv[i];
283 367
284 r_argv[i] = NULL; 368 r_argv[i] = NULL;
285
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 369
298 rs[Rs_name] = rxvt_basename (argv[0]); 370 rs[Rs_name] = rxvt_basename (argv[0]);
299 371
300 /* 372 /*
301 * Open display, get options/resources and create the window 373 * Open display, get options/resources and create the window
… …
305 rs[Rs_display_name] = ":0"; 377 rs[Rs_display_name] = ":0";
306 378
307 get_options (r_argc, r_argv); 379 get_options (r_argc, r_argv);
308 380
309 if (!(display = displays.get (rs[Rs_display_name]))) 381 if (!(display = displays.get (rs[Rs_display_name])))
382 {
383 free (r_argv);
310 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 384 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
385 }
311 386
312 // using a local pointer decreases code size a lot 387 // using a local pointer decreases code size a lot
313 xa = display->xa; 388 xa = display->xa;
314 389
315 set (display); 390 set (display);
… …
318#if XFT 393#if XFT
319 if (rs[Rs_depth]) 394 if (rs[Rs_depth])
320 select_visual (strtol (rs[Rs_depth], 0, 0)); 395 select_visual (strtol (rs[Rs_depth], 0, 0));
321#endif 396#endif
322 397
323#ifdef HAVE_AFTERIMAGE
324 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
325#endif
326 free (r_argv); 398 free (r_argv);
327 399
328 for (int i = NUM_RESOURCES; i--; ) 400 for (int i = NUM_RESOURCES; i--; )
329 if (rs [i] == resval_undef) 401 if (rs [i] == resval_undef)
330 rs [i] = 0; 402 rs [i] = 0;
403
404#ifdef HAVE_AFTERIMAGE
405 set_application_name ((char *)rs[Rs_name]);
406 set_output_threshold (OUTPUT_LEVEL_WARNING);
407#endif
331 408
332#if ENABLE_PERL 409#if ENABLE_PERL
333 if (!rs[Rs_perl_ext_1]) 410 if (!rs[Rs_perl_ext_1])
334 rs[Rs_perl_ext_1] = "default"; 411 rs[Rs_perl_ext_1] = "default";
335 412
… …
347 */ 424 */
348 if (cmd_argv && cmd_argv[0]) 425 if (cmd_argv && cmd_argv[0])
349 { 426 {
350 if (!rs[Rs_title]) 427 if (!rs[Rs_title])
351 rs[Rs_title] = rxvt_basename (cmd_argv[0]); 428 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
429
352 if (!rs[Rs_iconName]) 430 if (!rs[Rs_iconName])
353 rs[Rs_iconName] = rs[Rs_title]; 431 rs[Rs_iconName] = rs[Rs_title];
354 } 432 }
355 else 433 else
356 { 434 {
357 if (!rs[Rs_title]) 435 if (!rs[Rs_title])
358 rs[Rs_title] = rs[Rs_name]; 436 rs[Rs_title] = rs[Rs_name];
437
359 if (!rs[Rs_iconName]) 438 if (!rs[Rs_iconName])
360 rs[Rs_iconName] = rs[Rs_name]; 439 rs[Rs_iconName] = rs[Rs_name];
361 } 440 }
362 441
363 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 442 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
370 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 449 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
371 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 450 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
372 451
373 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 452 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
374 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 453 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
454
455 if (rs[Rs_letterSpace])
456 letterSpace = atoi (rs[Rs_letterSpace]);
375#endif 457#endif
376 458
377#ifdef POINTER_BLANK 459#ifdef POINTER_BLANK
378 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 460 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
379 pointerBlankDelay = i; 461 pointerBlankDelay = i;
… …
382#endif 464#endif
383 465
384 /* no point having a scrollbar without having any scrollback! */ 466 /* no point having a scrollbar without having any scrollback! */
385 if (!saveLines) 467 if (!saveLines)
386 set_option (Opt_scrollBar, 0); 468 set_option (Opt_scrollBar, 0);
387
388#ifdef PRINTPIPE
389 if (!rs[Rs_print_pipe])
390 rs[Rs_print_pipe] = PRINTPIPE;
391#endif
392 469
393 if (!rs[Rs_cutchars]) 470 if (!rs[Rs_cutchars])
394 rs[Rs_cutchars] = CUTCHARS; 471 rs[Rs_cutchars] = CUTCHARS;
395 472
396#ifndef NO_BACKSPACE_KEY 473#ifndef NO_BACKSPACE_KEY
… …
409# else 486# else
410 rs[Rs_delete_key] = "\033[3~"; 487 rs[Rs_delete_key] = "\033[3~";
411# endif 488# endif
412#endif 489#endif
413 490
414#ifdef HAVE_SCROLLBARS 491 scrollBar.setup (this);
415 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
416#endif
417 492
418#ifdef XTERM_REVERSE_VIDEO 493#ifdef XTERM_REVERSE_VIDEO
419 /* this is how xterm implements reverseVideo */ 494 /* this is how xterm implements reverseVideo */
420 if (option (Opt_reverseVideo)) 495 if (option (Opt_reverseVideo))
421 { 496 {
… …
441 color_aliases (Color_fg); 516 color_aliases (Color_fg);
442 color_aliases (Color_bg); 517 color_aliases (Color_bg);
443#ifndef NO_CURSORCOLOR 518#ifndef NO_CURSORCOLOR
444 color_aliases (Color_cursor); 519 color_aliases (Color_cursor);
445 color_aliases (Color_cursor2); 520 color_aliases (Color_cursor2);
446#endif /* NO_CURSORCOLOR */ 521#endif /* NO_CURSORCOLOR */
447 color_aliases (Color_pointer_fg); 522 color_aliases (Color_pointer_fg);
448 color_aliases (Color_pointer_bg); 523 color_aliases (Color_pointer_bg);
449 color_aliases (Color_border); 524 color_aliases (Color_border);
450#ifndef NO_BOLD_UNDERLINE_REVERSE 525#ifndef NO_BOLD_UNDERLINE_REVERSE
451 color_aliases (Color_BD); 526 color_aliases (Color_BD);
452 color_aliases (Color_UL); 527 color_aliases (Color_UL);
453 color_aliases (Color_RV); 528 color_aliases (Color_RV);
454#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 529#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
455 530
456 if (!rs[Rs_color + Color_border]) 531 if (!rs[Rs_color + Color_border])
457 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 532 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
458 533
459 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); // a 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 if (const char *path = rs[Rs_chdir])
558 if (*path) // ignored if empty
559 {
560 if (*path != '/')
561 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
562
563 if (chdir (path))
564 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
565 }
566
567 if (option (Opt_scrollBar))
568 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
569
570 pty = ptytty::create ();
571
572 create_windows (argc, argv);
573
574 init_xlocale ();
575
576 scr_poweron (); // initialize screen
577
578#if 0
579 XSynchronize (dpy, True);
580#endif
581
582 if (option (Opt_scrollBar))
583 scrollBar.resize (); /* create and map scrollbar */
584#ifdef HAVE_BG_PIXMAP
585 {
586 bgPixmap.set_target (this);
587 bgPixmap.invalidate ();
588
589#ifdef ENABLE_TRANSPARENCY
590 if (option (Opt_transparent))
591 {
592 bgPixmap.set_transparent ();
593
594#ifdef HAVE_AFTERIMAGE
595 if (rs [Rs_blurradius])
596 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
597#endif
598 if (ISSET_PIXCOLOR (Color_tint))
599 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
600
601 if (rs [Rs_shade])
602 bgPixmap.set_shade (rs [Rs_shade]);
603
604 bgPixmap.set_root_pixmap ();
605 XSelectInput (dpy, display->root, PropertyChangeMask);
606 rootwin_ev.start (display, display->root);
607 }
608#endif
609
610#ifdef BG_IMAGE_FROM_FILE
611 if (rs[Rs_backgroundPixmap])
612 {
613 const char *p = rs[Rs_backgroundPixmap];
614
615 if ((p = strchr (p, ';')) != 0)
616 {
617 p++;
618 bgPixmap.set_geometry (p);
619 }
620 else
621 bgPixmap.set_defaultGeometry ();
622
623 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
624 if (!bgPixmap.window_position_sensitive ())
625 update_background ();
626 }
627#endif
628 }
629#endif
630
631#if ENABLE_PERL
632 rootwin_ev.start (display, display->root);
633#endif
634
635 set_colorfgbg ();
636
637 init_command (cmd_argv);
638
639 free (cmd_argv);
640
641 if (pty->pty >= 0)
642 pty_ev.start (pty->pty, ev::READ);
643
644 HOOK_INVOKE ((this, HOOK_START, DT_END));
645
646#if ENABLE_XEMBED
647 if (rs[Rs_embed])
648 {
649 long info[2] = { 0, XEMBED_MAPPED };
650
651 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
652 32, PropModeReplace, (unsigned char *)&info, 2);
653 }
654#endif
655
656 XMapWindow (dpy, vt);
657 XMapWindow (dpy, parent[0]);
658
659 refresh_check ();
460} 660}
461 661
462/*----------------------------------------------------------------------*/ 662/*----------------------------------------------------------------------*/
463void 663void
464rxvt_term::init_env () 664rxvt_term::init_env ()
… …
479 */ 679 */
480 val = rxvt_network_display (rs[Rs_display_name]); 680 val = rxvt_network_display (rs[Rs_display_name]);
481 rs[Rs_display_name] = (const char *)val; 681 rs[Rs_display_name] = (const char *)val;
482 682
483 if (val == NULL) 683 if (val == NULL)
484#endif /* DISPLAY_IS_IP */ 684#endif /* DISPLAY_IS_IP */
485 val = XDisplayString (dpy); 685 val = XDisplayString (dpy);
486 686
487 if (rs[Rs_display_name] == NULL) 687 if (rs[Rs_display_name] == NULL)
488 rs[Rs_display_name] = val; /* use broken `:0' value */ 688 rs[Rs_display_name] = val; /* use broken `:0' value */
489 689
… …
529#ifdef HAVE_UNSETENV 729#ifdef HAVE_UNSETENV
530 /* avoid passing old settings and confusing term size */ 730 /* avoid passing old settings and confusing term size */
531 unsetenv ("LINES"); 731 unsetenv ("LINES");
532 unsetenv ("COLUMNS"); 732 unsetenv ("COLUMNS");
533 unsetenv ("TERMCAP"); /* terminfo should be okay */ 733 unsetenv ("TERMCAP"); /* terminfo should be okay */
534#endif /* HAVE_UNSETENV */ 734#endif /* HAVE_UNSETENV */
535} 735}
536 736
537/*----------------------------------------------------------------------*/ 737/*----------------------------------------------------------------------*/
538/* 738/*
539 * This is more or less stolen straight from XFree86 xterm. 739 * This is more or less stolen straight from XFree86 xterm.
… …
560 760
561 this->locale = "C"; 761 this->locale = "C";
562 } 762 }
563 763
564 764
565 this->locale = rxvt_strdup (this->locale); 765 this->locale = strdup (this->locale);
566 SET_LOCALE (this->locale); 766 SET_LOCALE (this->locale);
567 mbstate.reset (); 767 mbstate.reset ();
568#endif 768#endif
569 769
570#if HAVE_NL_LANGINFO 770#if HAVE_NL_LANGINFO
… …
643 run_command (argv); 843 run_command (argv);
644} 844}
645 845
646/*----------------------------------------------------------------------*/ 846/*----------------------------------------------------------------------*/
647void 847void
648rxvt_term::Get_Colours () 848rxvt_term::get_colours ()
649{ 849{
650 int i; 850 int i;
651 851
652#ifdef OFF_FOCUS_FADING 852#ifdef OFF_FOCUS_FADING
653 pix_colors = pix_colors_focused; 853 pix_colors = pix_colors_focused;
654#endif 854#endif
655 855
656 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 856 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
657 { 857 {
658 const char *name = rs[Rs_color + i]; 858 const char *name = rs[Rs_color + i];
659 859
660 if (!name) 860 if (!name)
… …
713 * get scrollBar shadow colors 913 * get scrollBar shadow colors
714 * 914 *
715 * The calculations of topShadow/bottomShadow values are adapted 915 * The calculations of topShadow/bottomShadow values are adapted
716 * from the fvwm window manager. 916 * from the fvwm window manager.
717 */ 917 */
718#ifdef KEEP_SCROLLCOLOR 918#ifdef RXVT_SCROLLBAR
719 if (depth <= 2) 919 if (depth <= 2)
720 { 920 {
721 /* Monochrome */ 921 /* Monochrome */
722 alias_color (Color_scroll, Color_fg); 922 alias_color (Color_scroll, Color_fg);
723 alias_color (Color_topShadow, Color_bg); 923 alias_color (Color_topShadow, Color_bg);
… …
738 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 938 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
739 cscroll.a) 939 cscroll.a)
740 )) 940 ))
741 alias_color (Color_topShadow, Color_White); 941 alias_color (Color_topShadow, Color_White);
742 } 942 }
743#endif /* KEEP_SCROLLCOLOR */ 943#endif
744 944
745#ifdef OFF_FOCUS_FADING 945#ifdef OFF_FOCUS_FADING
746 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 946 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
747 update_fade_color (i); 947 update_fade_color (i);
748#endif 948#endif
… …
756 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 956 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
757 { 957 {
758 int i = atoi (rs[Rs_color + idx]); 958 int i = atoi (rs[Rs_color + idx]);
759 959
760 if (i >= 8 && i <= 15) 960 if (i >= 8 && i <= 15)
761 { /* bright colors */ 961 /* bright colors */
762 i -= 8;
763 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 962 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
764 return; 963 else if (i >= 0 && i <= 7)
765 } 964 /* normal colors */
766
767 if (i >= 0 && i <= 7) /* normal colors */
768 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 965 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
769 } 966 }
770} 967}
771 968
772/*----------------------------------------------------------------------*/ 969/*----------------------------------------------------------------------*/
… …
873 Window top, parent; 1070 Window top, parent;
874 1071
875 dLocal (Display *, dpy); 1072 dLocal (Display *, dpy);
876 1073
877 /* grab colors before netscape does */ 1074 /* grab colors before netscape does */
878 Get_Colours (); 1075 get_colours ();
879 1076
880 if (!set_fonts ()) 1077 if (!set_fonts ())
881 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1078 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
882 1079
883 parent = display->root; 1080 parent = display->root;
… …
931 this->parent[0] = top; 1128 this->parent[0] = top;
932 1129
933 old_width = szHint.width; 1130 old_width = szHint.width;
934 old_height = szHint.height; 1131 old_height = szHint.height;
935 1132
936 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1133 set_title (rs [Rs_title]);
937 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1134 set_icon_name (rs [Rs_iconName]);
938 1135
939 classHint.res_name = (char *)rs[Rs_name]; 1136 classHint.res_name = (char *)rs[Rs_name];
940 classHint.res_class = (char *)RESCLASS; 1137 classHint.res_class = (char *)RESCLASS;
941 1138
942 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1139 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
944 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1141 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
945 wmHint.window_group = top; 1142 wmHint.window_group = top;
946 1143
947 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1144 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
948 &szHint, &wmHint, &classHint); 1145 &szHint, &wmHint, &classHint);
1146#if ENABLE_EWMH
1147# ifdef HAVE_AFTERIMAGE
1148 /*
1149 * set up icon hint
1150 * rs [Rs_iconfile] is path to icon, asv has been created in init_resources
1151 */
1152
1153 if (rs [Rs_iconfile])
1154 {
1155 init_asv ();
1156
1157 ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1158 if (asv && im)
1159 {
1160 int w = im->width;
1161 int h = im->height;
1162 long* buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1163 ASImage *result = scale_asimage (asv, im,
1164 w, h, ASA_ARGB32,
1165 100, ASIMAGE_QUALITY_DEFAULT);
1166 destroy_asimage (&im);
1167
1168 if (buffer && result)
1169 {
1170 ARGB32 *asbuf = result->alt.argb32;
1171 buffer [0] = w;
1172 buffer [1] = h;
1173
1174 for (unsigned int i = 0; i < w * h; ++i)
1175 buffer [i + 2] = asbuf [i];
1176
1177 destroy_asimage (&result);
1178 XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1179 PropModeReplace, (const unsigned char*) buffer, 2 + w * h);
1180 free (buffer);
1181 }
1182 else
1183 {
1184 if (!buffer)
1185 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1186
1187 if (!result)
1188 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1189 }
1190 }
1191 else
1192 rxvt_warn ("Loading image icon failed, continuing without.\n");
1193 }
1194# endif
1195#endif
949 1196
950#if ENABLE_FRILLS 1197#if ENABLE_FRILLS
951 if (mwmhints.flags) 1198 if (mwmhints.flags)
952 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1199 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
953 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1200 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
987 1234
988 termwin_ev.start (display, top); 1235 termwin_ev.start (display, top);
989 1236
990 /* vt cursor: Black-on-White is standard, but this is more popular */ 1237 /* vt cursor: Black-on-White is standard, but this is more popular */
991 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1238 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
992
993#ifdef HAVE_SCROLLBARS
994 /* cursor scrollBar: Black-on-White */
995 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
996#endif
997 1239
998 /* the vt window */ 1240 /* the vt window */
999 vt = XCreateSimpleWindow (dpy, top, 1241 vt = XCreateSimpleWindow (dpy, top,
1000 window_vt_x, window_vt_y, 1242 window_vt_x, window_vt_y,
1001 width, height, 1243 width, height,
… …
1026 GCForeground | GCBackground | GCGraphicsExposures, 1268 GCForeground | GCBackground | GCGraphicsExposures,
1027 &gcvalue); 1269 &gcvalue);
1028 1270
1029 drawable = new rxvt_drawable (this, vt); 1271 drawable = new rxvt_drawable (this, vt);
1030 1272
1031#ifdef RXVT_SCROLLBAR
1032 gcvalue.foreground = pix_colors[Color_topShadow];
1033 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1034 gcvalue.foreground = pix_colors[Color_bottomShadow];
1035 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1036 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1037 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1038#endif
1039
1040#ifdef OFF_FOCUS_FADING 1273#ifdef OFF_FOCUS_FADING
1041 // initially we are in unfocused state 1274 // initially we are in unfocused state
1042 if (rs[Rs_fade]) 1275 if (rs[Rs_fade])
1043 pix_colors = pix_colors_unfocused; 1276 pix_colors = pix_colors_unfocused;
1044#endif 1277#endif
… …
1049 1282
1050/* ------------------------------------------------------------------------- * 1283/* ------------------------------------------------------------------------- *
1051 * GET TTY CURRENT STATE * 1284 * GET TTY CURRENT STATE *
1052 * ------------------------------------------------------------------------- */ 1285 * ------------------------------------------------------------------------- */
1053void 1286void
1054rxvt_get_ttymode (ttymode_t *tio, int erase) 1287rxvt_get_ttymode (struct termios *tio, int erase)
1055{ 1288{
1056 /* 1289 /*
1057 * standard System V termios interface 1290 * standard System V termios interface
1058 */ 1291 */
1059 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1292 if (tcgetattr (STDIN_FILENO, tio) < 0)
1060 { 1293 {
1061 // return error - use system defaults, 1294 // return error - use system defaults,
1062 // where possible, and zero elsewhere 1295 // where possible, and zero elsewhere
1063 memset (tio, 0, sizeof (ttymode_t)); 1296 memset (tio, 0, sizeof (struct termios));
1064 1297
1065 tio->c_cc[VINTR] = CINTR; 1298 tio->c_cc[VINTR] = CINTR;
1066 tio->c_cc[VQUIT] = CQUIT; 1299 tio->c_cc[VQUIT] = CQUIT;
1067 tio->c_cc[VERASE] = CERASE; 1300 tio->c_cc[VERASE] = CERASE;
1068#ifdef VERASE2 1301#ifdef VERASE2
… …
1132 1365
1133 /* 1366 /*
1134 * Debugging 1367 * Debugging
1135 */ 1368 */
1136#ifdef DEBUG_TTYMODE 1369#ifdef DEBUG_TTYMODE
1137#ifdef HAVE_TERMIOS_H
1138 /* c_iflag bits */ 1370 /* c_iflag bits */
1139 fprintf (stderr, "Input flags\n"); 1371 fprintf (stderr, "Input flags\n");
1140 1372
1141 /* cpp token stringize doesn't work on all machines <sigh> */ 1373 /* cpp token stringize doesn't work on all machines <sigh> */
1142# define FOO(flag,name) \ 1374# define FOO(flag,name) \
… …
1205 FOO (VLNEXT, "VLNEXT"); 1437 FOO (VLNEXT, "VLNEXT");
1206# endif 1438# endif
1207 1439
1208 fprintf (stderr, "\n"); 1440 fprintf (stderr, "\n");
1209# undef FOO 1441# undef FOO
1210# endif /* HAVE_TERMIOS_H */ 1442#endif /* DEBUG_TTYMODE */
1211#endif /* DEBUG_TTYMODE */
1212} 1443}
1213 1444
1214/*----------------------------------------------------------------------*/ 1445/*----------------------------------------------------------------------*/
1215/* 1446/*
1216 * Run the command in a subprocess and return a file descriptor for the 1447 * Run the command in a subprocess and return a file descriptor for the
… …
1249 else 1480 else
1250#endif 1481#endif
1251 er = -1; 1482 er = -1;
1252 1483
1253 rxvt_get_ttymode (&tio, er); 1484 rxvt_get_ttymode (&tio, er);
1254 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1485 /* init terminal attributes */
1486 cfsetospeed (&tio, BAUDRATE);
1487 cfsetispeed (&tio, BAUDRATE);
1488 tcsetattr (pty->tty, TCSANOW, &tio);
1255 pty->set_utf8_mode (enc_utf8); 1489 pty->set_utf8_mode (enc_utf8);
1256 1490
1257 /* set initial window size */ 1491 /* set initial window size */
1258 tt_winch (); 1492 tt_winch ();
1259 1493
… …
1319rxvt_term::run_child (const char *const *argv) 1553rxvt_term::run_child (const char *const *argv)
1320{ 1554{
1321 char *login; 1555 char *login;
1322 1556
1323 if (option (Opt_console)) 1557 if (option (Opt_console))
1558 {
1324 { /* be virtual console, fail silently */ 1559 /* be virtual console, fail silently */
1325#ifdef TIOCCONS 1560#ifdef TIOCCONS
1326 unsigned int on = 1; 1561 unsigned int on = 1;
1327 1562
1328 ioctl (STDIN_FILENO, TIOCCONS, &on); 1563 ioctl (STDIN_FILENO, TIOCCONS, &on);
1329#elif defined (SRIOCSREDIR) 1564#elif defined (SRIOCSREDIR)
… …
1331 1566
1332 fd = open (CONSOLE, O_WRONLY, 0); 1567 fd = open (CONSOLE, O_WRONLY, 0);
1333 if (fd >= 0) 1568 if (fd >= 0)
1334 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1569 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1335 close (fd); 1570 close (fd);
1336#endif /* SRIOCSREDIR */ 1571#endif /* SRIOCSREDIR */
1337 } 1572 }
1338 1573
1339 /* reset signals and spin off the command interpreter */ 1574 /* reset signals and spin off the command interpreter */
1340 signal (SIGINT, SIG_DFL); 1575 signal (SIGINT, SIG_DFL);
1341 signal (SIGQUIT, SIG_DFL); 1576 signal (SIGQUIT, SIG_DFL);
… …
1348 */ 1583 */
1349#ifdef SIGTSTP 1584#ifdef SIGTSTP
1350 signal (SIGTSTP, SIG_IGN); 1585 signal (SIGTSTP, SIG_IGN);
1351 signal (SIGTTIN, SIG_IGN); 1586 signal (SIGTTIN, SIG_IGN);
1352 signal (SIGTTOU, SIG_IGN); 1587 signal (SIGTTOU, SIG_IGN);
1353#endif /* SIGTSTP */ 1588#endif /* SIGTSTP */
1354
1355 // unblock signals (signals are blocked by iom.C
1356 sigset_t ss;
1357 sigemptyset (&ss);
1358 sigprocmask (SIG_SETMASK, &ss, 0);
1359 1589
1360 /* command interpreter path */ 1590 /* command interpreter path */
1361 if (argv != NULL) 1591 if (argv)
1362 { 1592 {
1363# ifdef DEBUG_CMD 1593# ifdef DEBUG_CMD
1364 int i; 1594 int i;
1365 1595
1366 for (i = 0; argv[i]; i++) 1596 for (i = 0; argv[i]; i++)
… …
1375 const char *argv0, *shell; 1605 const char *argv0, *shell;
1376 1606
1377 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1607 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1378 shell = "/bin/sh"; 1608 shell = "/bin/sh";
1379 1609
1380 argv0 = (const char *)rxvt_basename (shell); 1610 argv0 = rxvt_basename (shell);
1381 1611
1382 if (option (Opt_loginShell)) 1612 if (option (Opt_loginShell))
1383 { 1613 {
1384 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1614 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1385 1615
1386 login[0] = '-'; 1616 login[0] = '-';
1387 strcpy (&login[1], argv0); 1617 strcpy (&login[1], argv0);
1388 argv0 = login; 1618 argv0 = login;
1389 } 1619 }
1390 1620
1391 execlp (shell, argv0, NULL); 1621 execlp (shell, argv0, (char *)0);
1392 /* no error message: STDERR is closed! */ 1622 /* no error message: STDERR is closed! */
1393 } 1623 }
1394 1624
1395 return -1; 1625 return -1;
1396} 1626}

Diff Legend

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