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.148 by root, Wed Jan 18 19:43:51 2006 UTC vs.
Revision 1.216 by ayin, Tue Oct 9 13:34:46 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 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> 15 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13 * - QNX support 16 * - QNX support
14 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 17 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
… …
38 41
39#include <limits> 42#include <limits>
40 43
41#include <csignal> 44#include <csignal>
42 45
46#ifdef DISPLAY_IS_IP
47/* On Solaris link with -lsocket and -lnsl */
48#include <sys/types.h>
49#include <sys/socket.h>
50
51/* these next two are probably only on Sun (not Solaris) */
52#ifdef HAVE_SYS_SOCKIO_H
53#include <sys/sockio.h>
54#endif
55#ifdef HAVE_SYS_BYTEORDER_H
56#include <sys/byteorder.h>
57#endif
58
59#include <netinet/in.h>
60#include <arpa/inet.h>
61#include <net/if.h>
62#include <net/if_arp.h>
63
64static char *
65rxvt_network_display (const char *display)
66{
67 char buffer[1024], *rval = NULL;
68 struct ifconf ifc;
69 struct ifreq *ifr;
70 int i, skfd;
71
72 if (display[0] != ':' && strncmp (display, "unix:", 5))
73 return (char *) display; /* nothing to do */
74
75 ifc.ifc_len = sizeof (buffer); /* Get names of all ifaces */
76 ifc.ifc_buf = buffer;
77
78 if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
79 {
80 perror ("socket");
81 return NULL;
82 }
83
84 if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0)
85 {
86 perror ("SIOCGIFCONF");
87 close (skfd);
88 return NULL;
89 }
90
91 for (i = 0, ifr = ifc.ifc_req;
92 i < (ifc.ifc_len / sizeof (struct ifreq));
93 i++, ifr++)
94 {
95 struct ifreq ifr2;
96
97 strcpy (ifr2.ifr_name, ifr->ifr_name);
98
99 if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0)
100 {
101 unsigned long addr;
102 struct sockaddr_in *p_addr;
103
104 p_addr = (struct sockaddr_in *) &ifr2.ifr_addr;
105 addr = htonl ((unsigned long)p_addr->sin_addr.s_addr);
106
107 /*
108 * not "0.0.0.0" or "127.0.0.1" - so format the address
109 */
110 if (addr && addr != 0x7F000001)
111 {
112 char *colon = strchr (display, ':');
113
114 if (colon == NULL)
115 colon = ":0.0";
116
117 rval = rxvt_malloc (strlen (colon) + 16);
118 sprintf (rval, "%d.%d.%d.%d%s",
119 (int) ((addr >> 030) & 0xFF),
120 (int) ((addr >> 020) & 0xFF),
121 (int) ((addr >> 010) & 0xFF),
122 (int) (addr & 0xFF), colon);
123 break;
124 }
125 }
126 }
127
128 close (skfd);
129
130 return rval;
131}
132#endif
133
43const char *const def_colorName[] = 134const char *const def_colorName[] =
44 { 135 {
45 COLOR_FOREGROUND, 136 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 137 COLOR_BACKGROUND,
47 /* low-intensity colors */ 138 /* low-intensity colors */
48 "Black", /* 0: black (#000000) */ 139 "rgb:00/00/00", // 0: black (Black)
49 "Red3", /* 1: red (#CD0000) */ 140 "rgb:cd/00/00", // 1: red (Red3)
50 "Green3", /* 2: green (#00CD00) */ 141 "rgb:00/cd/00", // 2: green (Green3)
51 "Yellow3", /* 3: yellow (#CDCD00) */ 142 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "Blue3", /* 4: blue (#0000CD) */ 143 "rgb:00/00/cd", // 4: blue (Blue3)
53 "Magenta3", /* 5: magenta (#CD00CD) */ 144 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "Cyan3", /* 6: cyan (#00CDCD) */ 145 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 146# ifdef XTERM_COLORS
56 "Grey90", /* 7: white (#E5E5E5) */ 147 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 148# else
58 "AntiqueWhite", /* 7: white (#FAEBD7) */ 149 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59# endif 150# endif
60 /* high-intensity colors */ 151 /* high-intensity colors */
61# ifdef XTERM_COLORS 152# ifdef XTERM_COLORS
62 "Grey30", /* 8: bright black (#4D4D4D) */ 153 "rgb:4d/4d/4d", // 8: bright black (Grey30)
63# else 154# else
64 "Grey25", /* 8: bright black (#404040) */ 155 "rgb:40/40/40", // 8: bright black (Grey25)
65# endif 156# endif
66 "Red", /* 1/9: bright red (#FF0000) */ 157 "rgb:ff/00/00", // 1/9: bright red (Reed)
67 "Green", /* 2/10: bright green (#00FF00) */ 158 "rgb:00/ff/00", // 2/10: bright green (Green)
68 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 159 "rgb:ff/ff/00", // 3/11: bright yellow (Yellow)
69 "Blue", /* 4/12: bright blue (#0000FF) */ 160 "rgb:00/00/ff", // 4/12: bright blue (Blue)
70 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 161 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
71 "Cyan", /* 6/14: bright cyan (#00FFFF) */ 162 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
72 "White", /* 7/15: bright white (#FFFFFF) */ 163 "rgb:ff/ff/ff", // 7/15: bright white (White)
73 164
74 // 88 xterm colours 165 // 88 xterm colours
75 "rgb:00/00/00", 166 "rgb:00/00/00",
76 "rgb:00/00/8b", 167 "rgb:00/00/8b",
77 "rgb:00/00/cd", 168 "rgb:00/00/cd",
… …
166#endif 257#endif
167#ifdef KEEP_SCROLLCOLOR 258#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 259 COLOR_SCROLLBAR,
169 COLOR_SCROLLTROUGH, 260 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 261#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 262#if ENABLE_TRANSPARENCY
172 NULL, 263 NULL,
173#endif 264#endif
174#if OFF_FOCUS_FADING 265#if OFF_FOCUS_FADING
175 "black", 266 "rgb:00/00/00",
176#endif
177 };
178
179const char *const xa_names[] =
180 {
181 "TEXT",
182 "COMPOUND_TEXT",
183 "UTF8_STRING",
184 "MULTIPLE",
185 "TARGETS",
186 "TIMESTAMP",
187 "VT_SELECTION",
188 "INCR",
189 "WM_PROTOCOLS",
190 "WM_DELETE_WINDOW",
191 "CLIPBOARD",
192#if ENABLE_FRILLS
193 "_MOTIF_WM_HINTS",
194#endif
195#if ENABLE_EWMH
196 "_NET_WM_PID",
197 "_NET_WM_NAME",
198 "_NET_WM_ICON_NAME",
199 "_NET_WM_PING",
200#endif
201#if USE_XIM
202 "WM_LOCALE_NAME",
203#endif
204#ifdef TRANSPARENT
205 "_XROOTPMAP_ID",
206 "ESETROOT_PMAP_ID",
207#endif
208#ifdef OFFIX_DND
209 "DndProtocol",
210 "DndSelection",
211#endif
212#if ENABLE_XEMBED
213 "_XEMBED",
214 "_XEMBED_INFO",
215#endif 267#endif
216 }; 268 };
217 269
218bool 270bool
219rxvt_term::init_vars () 271rxvt_term::init_vars ()
220{ 272{
273 pix_colors = //
221 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 274 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
222#ifdef OFF_FOCUS_FADING 275#ifdef OFF_FOCUS_FADING
223 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 276 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
224#endif 277#endif
225 pix_colors = pix_colors_focused;
226 278
227 if (pix_colors == NULL)
228 return false;
229
230#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
231 pixmap = None;
232#endif
233 279
234 MEvent.time = CurrentTime; 280 MEvent.time = CurrentTime;
235 MEvent.button = AnyButton; 281 MEvent.button = AnyButton;
236 options = DEFAULT_OPTIONS;
237 want_refresh = 1; 282 want_refresh = 1;
238 priv_modes = SavedModes = PrivMode_Default; 283 priv_modes = SavedModes = PrivMode_Default;
239 focus = 0;
240 ncol = 80; 284 ncol = 80;
241 nrow = 24; 285 nrow = 24;
242 int_bwidth = INTERNALBORDERWIDTH; 286 int_bwidth = INTERNALBORDERWIDTH;
243 ext_bwidth = EXTERNALBORDERWIDTH; 287 ext_bwidth = EXTERNALBORDERWIDTH;
244 lineSpace = LINESPACE; 288 lineSpace = LINESPACE;
245 saveLines = SAVELINES; 289 saveLines = SAVELINES;
246 numpix_colors = TOTAL_COLORS; 290 numpix_colors = TOTAL_COLORS;
247 291
248 refresh_limit = 1;
249 refresh_type = SLOW_REFRESH; 292 refresh_type = SLOW_REFRESH;
250 prev_nrow = prev_ncol = 0;
251 293
252 oldcursor.row = oldcursor.col = -1; 294 oldcursor.row = oldcursor.col = -1;
253#ifdef XPM_BACKGROUND
254 /* bgPixmap.w = bgPixmap.h = 0; */
255 bgPixmap.x = bgPixmap.y = 50;
256 bgPixmap.pixmap = None;
257#endif
258
259 last_bot = last_state = -1; 295 last_bot = last_state = -1;
296
297 set_option (Opt_scrollBar);
298 set_option (Opt_scrollTtyOutput);
299 set_option (Opt_jumpScroll);
300 set_option (Opt_skipScroll);
301 set_option (Opt_secondaryScreen);
302 set_option (Opt_secondaryScroll);
303 set_option (Opt_pastableTabs);
304 set_option (Opt_intensityStyles);
305 set_option (Opt_iso14755_52);
260 306
261 return true; 307 return true;
262} 308}
263 309
264void 310void
… …
273 if ((i = open ("/dev/null", O_RDONLY)) < 0) 319 if ((i = open ("/dev/null", O_RDONLY)) < 0)
274 { 320 {
275 /* TODO: BOO HISS */ 321 /* TODO: BOO HISS */
276 dup2 (STDERR_FILENO, STDIN_FILENO); 322 dup2 (STDERR_FILENO, STDIN_FILENO);
277 } 323 }
278 else if (i > STDIN_FILENO) 324 else if (i != STDIN_FILENO)
279 { 325 {
280 dup2 (i, STDIN_FILENO); 326 dup2 (i, STDIN_FILENO);
281 close (i); 327 close (i);
282 } 328 }
283 329
… …
298/*----------------------------------------------------------------------*/ 344/*----------------------------------------------------------------------*/
299const char ** 345const char **
300rxvt_term::init_resources (int argc, const char *const *argv) 346rxvt_term::init_resources (int argc, const char *const *argv)
301{ 347{
302 int i, r_argc; 348 int i, r_argc;
303 char *val;
304 const char **cmd_argv, **r_argv; 349 const char **cmd_argv, **r_argv;
305 350
306 /* 351 /*
307 * Look for -exec option. Find => split and make cmd_argv[] of command args 352 * Look for -e option. Find => split and make cmd_argv[] of command args
308 */ 353 */
309 for (r_argc = 0; r_argc < argc; r_argc++) 354 for (r_argc = 0; r_argc < argc; r_argc++)
310 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 355 if (!strcmp (argv[r_argc], "-e"))
311 break; 356 break;
357
358 if (r_argc == argc)
359 cmd_argv = NULL;
360 else if (!argv[r_argc + 1])
361 rxvt_fatal ("-e requires an argument\n");
362 else
363 {
364 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
365
366 for (i = 0; i < argc - r_argc - 1; i++)
367 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
368
369 cmd_argv[i] = NULL;
370 }
312 371
313 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 372 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
314 373
315 for (i = 0; i < r_argc; i++) 374 for (i = 0; i < r_argc; i++)
316 r_argv[i] = (const char *)argv[i]; 375 r_argv[i] = (const char *)argv[i];
317 376
318 r_argv[i] = NULL; 377 r_argv[i] = NULL;
319 378
320 if (r_argc == argc)
321 cmd_argv = NULL;
322 else
323 {
324 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
325
326 for (i = 0; i < argc - r_argc - 1; i++)
327 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
328
329 cmd_argv[i] = NULL;
330 }
331
332 rs[Rs_name] = rxvt_r_basename (argv[0]); 379 rs[Rs_name] = rxvt_basename (argv[0]);
333 380
334 /* 381 /*
335 * Open display, get options/resources and create the window 382 * Open display, get options/resources and create the window
336 */ 383 */
337 384
… …
341 get_options (r_argc, r_argv); 388 get_options (r_argc, r_argv);
342 389
343 if (!(display = displays.get (rs[Rs_display_name]))) 390 if (!(display = displays.get (rs[Rs_display_name])))
344 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 391 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
345 392
393 // using a local pointer decreases code size a lot
394 xa = display->xa;
395
396 set (display);
346 extract_resources (); 397 extract_resources ();
347 398
399#if XFT
400 if (rs[Rs_depth])
401 select_visual (strtol (rs[Rs_depth], 0, 0));
402#endif
403
404#ifdef HAVE_AFTERIMAGE
405 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
406#endif
348 free (r_argv); 407 free (r_argv);
408
409 for (int i = NUM_RESOURCES; i--; )
410 if (rs [i] == resval_undef)
411 rs [i] = 0;
412
413#if ENABLE_PERL
414 if (!rs[Rs_perl_ext_1])
415 rs[Rs_perl_ext_1] = "default";
416
417 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
418 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
419 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
420 {
421 rxvt_perl.init (this);
422 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
423 }
424#endif
349 425
350 /* 426 /*
351 * set any defaults not already set 427 * set any defaults not already set
352 */ 428 */
353 if (cmd_argv && cmd_argv[0]) 429 if (cmd_argv && cmd_argv[0])
354 { 430 {
355 if (!rs[Rs_title]) 431 if (!rs[Rs_title])
356 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 432 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
357 if (!rs[Rs_iconName]) 433 if (!rs[Rs_iconName])
358 rs[Rs_iconName] = rs[Rs_title]; 434 rs[Rs_iconName] = rs[Rs_title];
359 } 435 }
360 else 436 else
361 { 437 {
… …
399 rs[Rs_cutchars] = CUTCHARS; 475 rs[Rs_cutchars] = CUTCHARS;
400 476
401#ifndef NO_BACKSPACE_KEY 477#ifndef NO_BACKSPACE_KEY
402 if (!rs[Rs_backspace_key]) 478 if (!rs[Rs_backspace_key])
403# ifdef DEFAULT_BACKSPACE 479# ifdef DEFAULT_BACKSPACE
404 key_backspace = DEFAULT_BACKSPACE; 480 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
405# else 481# else
406 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 482 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
407# endif 483# endif
408 else
409 {
410 val = strdup (rs[Rs_backspace_key]);
411 rxvt_Str_trim (val);
412 rxvt_Str_escaped (val);
413 key_backspace = val;
414 }
415#endif 484#endif
416 485
417#ifndef NO_DELETE_KEY 486#ifndef NO_DELETE_KEY
418 if (!rs[Rs_delete_key]) 487 if (!rs[Rs_delete_key])
419# ifdef DEFAULT_DELETE 488# ifdef DEFAULT_DELETE
420 key_delete = DEFAULT_DELETE; 489 rs[Rs_delete_key] = DEFAULT_DELETE;
421# else 490# else
422 key_delete = "\033[3~"; 491 rs[Rs_delete_key] = "\033[3~";
423# endif
424 else
425 {
426 val = strdup (rs[Rs_delete_key]);
427 rxvt_Str_trim (val);
428 rxvt_Str_escaped (val);
429 key_delete = val;
430 }
431#endif 492# endif
432 if (rs[Rs_answerbackstring]) 493#endif
433 {
434 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
435 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
436 }
437 494
438#ifdef HAVE_SCROLLBARS 495#ifdef HAVE_SCROLLBARS
439 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 496 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
440#endif 497#endif
441 498
442#ifdef XTERM_REVERSE_VIDEO 499#ifdef XTERM_REVERSE_VIDEO
443 /* this is how xterm implements reverseVideo */ 500 /* this is how xterm implements reverseVideo */
444 if (OPTION (Opt_reverseVideo)) 501 if (option (Opt_reverseVideo))
445 { 502 {
446 if (!rs[Rs_color + Color_fg]) 503 if (!rs[Rs_color + Color_fg])
447 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 504 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
505
448 if (!rs[Rs_color + Color_bg]) 506 if (!rs[Rs_color + Color_bg])
449 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 507 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
450 } 508 }
451#endif 509#endif
452 510
… …
454 if (!rs[Rs_color + i]) 512 if (!rs[Rs_color + i])
455 rs[Rs_color + i] = def_colorName[i]; 513 rs[Rs_color + i] = def_colorName[i];
456 514
457#ifndef XTERM_REVERSE_VIDEO 515#ifndef XTERM_REVERSE_VIDEO
458 /* this is how we implement reverseVideo */ 516 /* this is how we implement reverseVideo */
459 if (OPTION (Opt_reverseVideo)) 517 if (option (Opt_reverseVideo))
460 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 518 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
461#endif 519#endif
462 520
463 /* convenient aliases for setting fg/bg to colors */ 521 /* convenient aliases for setting fg/bg to colors */
464 color_aliases (Color_fg); 522 color_aliases (Color_fg);
… …
485/*----------------------------------------------------------------------*/ 543/*----------------------------------------------------------------------*/
486void 544void
487rxvt_term::init_env () 545rxvt_term::init_env ()
488{ 546{
489 int i; 547 int i;
490 unsigned int u;
491 char *val; 548 char *val;
492 549
493#ifdef DISPLAY_IS_IP 550#ifdef DISPLAY_IS_IP
494 /* Fixup display_name for export over pty to any interested terminal 551 /* Fixup display_name for export over pty to any interested terminal
495 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 552 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
504 val = rxvt_network_display (rs[Rs_display_name]); 561 val = rxvt_network_display (rs[Rs_display_name]);
505 rs[Rs_display_name] = (const char *)val; 562 rs[Rs_display_name] = (const char *)val;
506 563
507 if (val == NULL) 564 if (val == NULL)
508#endif /* DISPLAY_IS_IP */ 565#endif /* DISPLAY_IS_IP */
509 val = XDisplayString (display->display); 566 val = XDisplayString (dpy);
510 567
511 if (rs[Rs_display_name] == NULL) 568 if (rs[Rs_display_name] == NULL)
512 rs[Rs_display_name] = val; /* use broken `:0' value */ 569 rs[Rs_display_name] = val; /* use broken `:0' value */
513 570
514 i = strlen (val); 571 i = strlen (val);
515 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 572 env_display = (char *)rxvt_malloc (i + 9);
516 573
517 sprintf (env_display, "DISPLAY=%s", val); 574 sprintf (env_display, "DISPLAY=%s", val);
518 575
519 /* avoiding the math library: 576 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
520 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
521 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
522 ;
523 max_it (i, 1);
524 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
525
526 sprintf (env_windowid, "WINDOWID=%u",
527 (unsigned int)parent[0]);
528 577
529 /* add entries to the environment: 578 /* add entries to the environment:
530 * @ DISPLAY: in case we started with -display 579 * @ DISPLAY: in case we started with -display
531 * @ WINDOWID: X window id number of the window 580 * @ WINDOWID: X window id number of the window
532 * @ COLORTERM: terminal sub-name and also indicates its color 581 * @ COLORTERM: terminal sub-name and also indicates its color
… …
534 * @ TERMINFO: path to terminfo directory 583 * @ TERMINFO: path to terminfo directory
535 * @ COLORFGBG: fg;bg color codes 584 * @ COLORFGBG: fg;bg color codes
536 */ 585 */
537 putenv (env_display); 586 putenv (env_display);
538 putenv (env_windowid); 587 putenv (env_windowid);
588
539 if (env_colorfgbg) 589 if (env_colorfgbg)
540 putenv (env_colorfgbg); 590 putenv (env_colorfgbg);
541 591
542#ifdef RXVT_TERMINFO 592#ifdef RXVT_TERMINFO
543 putenv ("TERMINFO=" RXVT_TERMINFO); 593 putenv ("TERMINFO=" RXVT_TERMINFO);
544#endif 594#endif
545 595
546 if (display->depth <= 2) 596 if (depth <= 2)
547 putenv ("COLORTERM=" COLORTERMENV "-mono"); 597 putenv ("COLORTERM=" COLORTERMENV "-mono");
548 else 598 else
549 putenv ("COLORTERM=" COLORTERMENVFULL); 599 putenv ("COLORTERM=" COLORTERMENVFULL);
550 600
551 if (rs[Rs_term_name] != NULL) 601 if (rs[Rs_term_name] != NULL)
552 { 602 {
553 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 603 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
554 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 604 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
555 putenv (env_term); 605 putenv (env_term);
556 } 606 }
557 else 607 else
558 putenv ("TERM=" TERMENV); 608 putenv ("TERM=" TERMENV);
… …
645 * Initialize the command connection. 695 * Initialize the command connection.
646 * This should be called after the X server connection is established. 696 * This should be called after the X server connection is established.
647 */ 697 */
648 698
649#ifdef META8_OPTION 699#ifdef META8_OPTION
650 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 700 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
651#endif 701#endif
652 702
653 get_ourmods (); 703 get_ourmods ();
654 704
655 if (!OPTION (Opt_scrollTtyOutput)) 705 if (!option (Opt_scrollTtyOutput))
656 priv_modes |= PrivMode_TtyOutputInh; 706 priv_modes |= PrivMode_TtyOutputInh;
657 if (OPTION (Opt_scrollTtyKeypress)) 707 if (option (Opt_scrollTtyKeypress))
658 priv_modes |= PrivMode_Keypress; 708 priv_modes |= PrivMode_Keypress;
659 if (!OPTION (Opt_jumpScroll)) 709 if (!option (Opt_jumpScroll))
660 priv_modes |= PrivMode_smoothScroll; 710 priv_modes |= PrivMode_smoothScroll;
661 711
662#ifndef NO_BACKSPACE_KEY 712#ifndef NO_BACKSPACE_KEY
663 if (strcmp (key_backspace, "DEC") == 0) 713 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
664 priv_modes |= PrivMode_HaveBackSpace; 714 priv_modes |= PrivMode_HaveBackSpace;
665#endif 715#endif
666 716
667 /* add value for scrollBar */ 717 /* add value for scrollBar */
668 if (scrollBar.state) 718 if (scrollBar.state)
… …
682 732
683#ifdef OFF_FOCUS_FADING 733#ifdef OFF_FOCUS_FADING
684 pix_colors = pix_colors_focused; 734 pix_colors = pix_colors_focused;
685#endif 735#endif
686 736
687 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 737 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
688 { 738 {
739 const char *name = rs[Rs_color + i];
740
741 if (!name)
742 continue;
743
689 rxvt_color xcol; 744 rxvt_color xcol;
690 745
691 if (!rs[Rs_color + i]) 746 if (!set_color (xcol, name))
692 continue;
693
694 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
695 { 747 {
696#ifndef XTERM_REVERSE_VIDEO 748#ifndef XTERM_REVERSE_VIDEO
697 if (i < 2 && OPTION (Opt_reverseVideo)) 749 if (i < 2 && option (Opt_reverseVideo))
698 rs[Rs_color + i] = def_colorName[!i]; 750 name = def_colorName [1 - i];
699 else 751 else
700#endif 752#endif
701 rs[Rs_color + i] = def_colorName[i]; 753 name = def_colorName [i];
702 754
703 if (!rs[Rs_color + i]) 755 if (!name)
704 continue; 756 continue;
705 757
706 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 758 if (!set_color (xcol, name))
707 { 759 {
708 switch (i) 760 switch (i)
709 { 761 {
710 case Color_fg: 762 case Color_fg:
711 case Color_bg: 763 case Color_bg:
712 /* fatal: need bg/fg color */
713 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 764 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
714 /* NOTREACHED */ 765 name = "";
715 break; 766 break;
716#ifndef NO_CURSORCOLOR 767#ifndef NO_CURSORCOLOR
717 case Color_cursor2: 768 case Color_cursor2:
718 xcol = pix_colors[Color_fg]; 769#endif
719 break;
720#endif /* ! NO_CURSORCOLOR */
721 case Color_pointer_fg: 770 case Color_pointer_fg:
722 xcol = pix_colors[Color_fg]; 771 name = rs[Rs_color + Color_fg];
772 xcol.set (this, name);
723 break; 773 break;
724 default: 774 default:
725 xcol = pix_colors[Color_bg]; /* None */ 775 name = rs[Rs_color + Color_bg];
776 xcol.set (this, name);
726 break; 777 break;
727 } 778 }
728 } 779 }
729 } 780 }
730 781
731 pix_colors[i] = xcol; 782 pix_colors[i] = xcol;
732 SET_PIXCOLOR (i); 783 rs[Rs_color + i] = name;
733 }
734
735#ifdef OFF_FOCUS_FADING
736 if (rs[Rs_fade])
737 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
738 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
739#endif
740
741 if (display->depth <= 2)
742 { 784 }
785
786 if (depth <= 2)
787 {
743 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 788 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
744 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 789 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
745 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 790 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
746 } 791 }
747 792
748 /* 793 /*
749 * get scrollBar shadow colors 794 * get scrollBar shadow colors
750 * 795 *
751 * The calculations of topShadow/bottomShadow values are adapted 796 * The calculations of topShadow/bottomShadow values are adapted
752 * from the fvwm window manager. 797 * from the fvwm window manager.
753 */ 798 */
754#ifdef KEEP_SCROLLCOLOR 799#ifdef KEEP_SCROLLCOLOR
755
756 if (display->depth <= 2) 800 if (depth <= 2)
757 { 801 {
758 /* Monochrome */ 802 /* Monochrome */
759 pix_colors[Color_scroll] = pix_colors[Color_fg]; 803 alias_color (Color_scroll, Color_fg);
760 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 804 alias_color (Color_topShadow, Color_bg);
761 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 805 alias_color (Color_bottomShadow, Color_bg);
762 } 806 }
763 else 807 else
764 { 808 {
765 rxvt_color xcol[2]; 809 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
766 /* xcol[0] == white
767 * xcol[1] == top shadow
768 * xcol[2] == bot shadow */
769 810
770 xcol[1] = pix_colors[Color_scroll]; 811 rgba cscroll;
771 xcol[0].set (display, 65535, 65535, 65535); 812 pix_colors [Color_scroll].get (cscroll);
772
773 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
774
775 xcol[0].get (display, pr0, pg0, pb0);
776 xcol[1].get (display, pr1, pg1, pb1);
777
778 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
779 813
780 /* topShadowColor */ 814 /* topShadowColor */
781 if (!xcol[1].set (display, 815 if (!pix_colors[Color_topShadow].set (this,
782 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 816 rgba (
783 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 817 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
784 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 818 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
785 xcol[1] = pix_colors[Color_White]; 819 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
786 820 cscroll.a)
787 pix_colors[Color_topShadow] = xcol[1]; 821 ))
822 alias_color (Color_topShadow, Color_White);
788 } 823 }
789#endif /* KEEP_SCROLLCOLOR */ 824#endif /* KEEP_SCROLLCOLOR */
825
826#ifdef OFF_FOCUS_FADING
827 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
828 update_fade_color (i);
829#endif
790} 830}
791 831
792/*----------------------------------------------------------------------*/ 832/*----------------------------------------------------------------------*/
793/* color aliases, fg/bg bright-bold */ 833/* color aliases, fg/bg bright-bold */
794void 834void
… …
833 873
834 if (rsmod 874 if (rsmod
835 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 875 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
836 requestedmeta = rsmod[3] - '0'; 876 requestedmeta = rsmod[3] - '0';
837 877
838 map = XGetModifierMapping (display->display); 878 map = XGetModifierMapping (dpy);
839 kc = map->modifiermap; 879 kc = map->modifiermap;
840 880
841 for (i = 1; i < 6; i++) 881 for (i = 1; i < 6; i++)
842 { 882 {
843 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 883 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
845 for (j = map->max_keypermod; j--; k++) 885 for (j = map->max_keypermod; j--; k++)
846 { 886 {
847 if (kc[k] == 0) 887 if (kc[k] == 0)
848 break; 888 break;
849 889
850 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 890 switch (XKeycodeToKeysym (dpy, kc[k], 0))
851 { 891 {
852 case XK_Num_Lock: 892 case XK_Num_Lock:
853 ModNumLockMask = modmasks[i - 1]; 893 ModNumLockMask = modmasks[i - 1];
854 continue; 894 continue;
855 895
… …
905rxvt_term::create_windows (int argc, const char *const *argv) 945rxvt_term::create_windows (int argc, const char *const *argv)
906{ 946{
907 XClassHint classHint; 947 XClassHint classHint;
908 XWMHints wmHint; 948 XWMHints wmHint;
909#if ENABLE_FRILLS 949#if ENABLE_FRILLS
910 Atom prop = None;
911 MWMHints mwmhints; 950 MWMHints mwmhints = { };
912#endif 951#endif
913 XGCValues gcvalue; 952 XGCValues gcvalue;
914 XSetWindowAttributes attributes; 953 XSetWindowAttributes attributes;
915 XWindowAttributes gattr;
916 Window top, parent; 954 Window top, parent;
917 dDisp;
918 955
919#ifdef USING_W11LIB 956 dLocal (Display *, dpy);
920 /* enable W11 callbacks */
921 W11AddEventHandler (disp, rxvt_W11_process_x_event);
922#endif
923
924 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
925 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
926
927 if (OPTION (Opt_transparent))
928 {
929 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
930 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
931 }
932 957
933 /* grab colors before netscape does */ 958 /* grab colors before netscape does */
934 Get_Colours (); 959 Get_Colours ();
935 960
936 if (!set_fonts ()) 961 if (!set_fonts ())
937 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 962 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
938 963
939 parent = DefaultRootWindow (disp); 964 parent = display->root;
940 965
941 attributes.override_redirect = !!OPTION (Opt_override_redirect); 966 attributes.override_redirect = !!option (Opt_override_redirect);
942 967
943#if ENABLE_FRILLS 968#if ENABLE_FRILLS
944 if (OPTION (Opt_borderLess)) 969 if (option (Opt_borderLess))
945 { 970 {
946 prop = XInternAtom (disp, "_MOTIF_WM_INFO", True); 971 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
947
948 if (prop == None)
949 { 972 {
950 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 973 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
951 attributes.override_redirect = TRUE; 974 attributes.override_redirect = true;
952 mwmhints.flags = 0;
953 } 975 }
954 else 976 else
955 { 977 {
956 mwmhints.flags = MWM_HINTS_DECORATIONS; 978 mwmhints.flags = MWM_HINTS_DECORATIONS;
957 mwmhints.decorations = 0;
958 } 979 }
959 } 980 }
960 else
961 mwmhints.flags = 0;
962#endif 981#endif
963 982
964#if ENABLE_XEMBED 983#if ENABLE_XEMBED
965 if (rs[Rs_embed]) 984 if (rs[Rs_embed])
966 { 985 {
967 XWindowAttributes wattr; 986 XWindowAttributes wattr;
968 987
969 parent = strtol (rs[Rs_embed], 0, 0); 988 parent = strtol (rs[Rs_embed], 0, 0);
970 989
971 if (!XGetWindowAttributes (disp, parent, &wattr)) 990 if (!XGetWindowAttributes (dpy, parent, &wattr))
972 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 991 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
973 992
974 window_calc (wattr.width, wattr.height); 993 window_calc (wattr.width, wattr.height);
975 } 994 }
976#endif 995#endif
977 996
978 window_calc (0, 0); 997 window_calc (0, 0);
979 998
980 /* sub-window placement & size in rxvt_resize_subwindows () */ 999 /* sub-window placement & size in rxvt_resize_subwindows () */
981 attributes.background_pixel = pix_colors_focused[Color_border]; 1000 attributes.background_pixel = pix_colors_focused [Color_border];
982 attributes.border_pixel = pix_colors_focused[Color_border]; 1001 attributes.border_pixel = pix_colors_focused [Color_border];
983 attributes.colormap = display->cmap; 1002 attributes.colormap = cmap;
1003
984 top = XCreateWindow (disp, parent, 1004 top = XCreateWindow (dpy, parent,
985 szHint.x, szHint.y, 1005 szHint.x, szHint.y,
986 szHint.width, szHint.height, 1006 szHint.width, szHint.height,
987 ext_bwidth, 1007 ext_bwidth,
988 display->depth, InputOutput, 1008 depth, InputOutput, visual,
989 display->visual,
990 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1009 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
991 &attributes); 1010 &attributes);
992 1011
993 this->parent[0] = top; 1012 this->parent[0] = top;
994 1013
995 old_width = szHint.width; 1014 old_width = szHint.width;
996 old_height = szHint.height; 1015 old_height = szHint.height;
997 1016
998 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1017 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
999 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1018 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1000 1019
1001 classHint.res_name = (char *)rs[Rs_name]; 1020 classHint.res_name = (char *)rs[Rs_name];
1002 classHint.res_class = (char *)RESCLASS; 1021 classHint.res_class = (char *)RESCLASS;
1003 1022
1004 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1023 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1005 wmHint.input = True; 1024 wmHint.input = True;
1006 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1025 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1007 wmHint.window_group = top; 1026 wmHint.window_group = top;
1008 1027
1009 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 1028 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1010 &szHint, &wmHint, &classHint); 1029 &szHint, &wmHint, &classHint);
1030
1031#if ENABLE_FRILLS
1032 if (mwmhints.flags)
1033 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1034 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1035#endif
1011 1036
1012 Atom protocols[] = { 1037 Atom protocols[] = {
1013 xa[XA_WM_DELETE_WINDOW], 1038 xa[XA_WM_DELETE_WINDOW],
1014#if ENABLE_EWMH 1039#if ENABLE_EWMH
1015 xa[XA_NET_WM_PING], 1040 xa[XA_NET_WM_PING],
1016#endif 1041#endif
1017 }; 1042 };
1018 1043
1019 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1044 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1020 1045
1021#if ENABLE_FRILLS 1046#if ENABLE_FRILLS
1022 if (rs[Rs_transient_for]) 1047 if (rs[Rs_transient_for])
1023 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1048 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1024#endif 1049#endif
1025 1050
1026#if ENABLE_EWMH 1051#if ENABLE_EWMH
1027 long pid = getpid (); 1052 long pid = getpid ();
1028 1053
1029 XChangeProperty (disp, top, 1054 XChangeProperty (dpy, top,
1030 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1055 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1031 PropModeReplace, (unsigned char *)&pid, 1); 1056 PropModeReplace, (unsigned char *)&pid, 1);
1032 1057
1033 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1058 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1034#endif 1059#endif
1035 1060
1036 XSelectInput (disp, top, 1061 XSelectInput (dpy, top,
1037 KeyPressMask 1062 KeyPressMask
1038#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1063#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1039 | KeyReleaseMask 1064 | KeyReleaseMask
1040#endif 1065#endif
1041 | FocusChangeMask | VisibilityChangeMask 1066 | FocusChangeMask | VisibilityChangeMask
1042 | ExposureMask | StructureNotifyMask); 1067 | ExposureMask | StructureNotifyMask);
1043 1068
1044 termwin_ev.start (display, top); 1069 termwin_ev.start (display, top);
1045 1070
1046#if ENABLE_FRILLS
1047 if (mwmhints.flags)
1048 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1049 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1050#endif
1051
1052 /* vt cursor: Black-on-White is standard, but this is more popular */ 1071 /* vt cursor: Black-on-White is standard, but this is more popular */
1053 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1072 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1054 1073
1055#ifdef HAVE_SCROLLBARS 1074#ifdef HAVE_SCROLLBARS
1056 /* cursor scrollBar: Black-on-White */ 1075 /* cursor scrollBar: Black-on-White */
1057 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1076 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1058#endif 1077#endif
1059 1078
1060 /* the vt window */ 1079 /* the vt window */
1061 vt = XCreateSimpleWindow (disp, top, 1080 vt = XCreateSimpleWindow (dpy, top,
1062 window_vt_x,
1063 window_vt_y, 1081 window_vt_x, window_vt_y,
1064 width,
1065 height, 1082 width, height,
1066 0, 1083 0,
1067 pix_colors_focused[Color_fg], 1084 pix_colors_focused[Color_fg],
1068 pix_colors_focused[Color_bg]); 1085 pix_colors_focused[Color_bg]);
1069#ifdef DEBUG_X
1070 XStoreName (disp, vt, "vt window");
1071#endif
1072 1086
1073 attributes.bit_gravity = NorthWestGravity; 1087 attributes.bit_gravity = NorthWestGravity;
1074 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1088 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1075 1089
1076 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1090 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1077 1091
1078 if (OPTION (Opt_pointerBlank)) 1092 if (option (Opt_pointerBlank))
1079 vt_emask |= PointerMotionMask; 1093 vt_emask |= PointerMotionMask;
1080 else 1094 else
1081 vt_emask |= Button1MotionMask | Button3MotionMask; 1095 vt_emask |= Button1MotionMask | Button3MotionMask;
1082 1096
1083 vt_select_input (); 1097 vt_select_input ();
1084 1098
1085 vt_ev.start (display, vt); 1099 vt_ev.start (display, vt);
1086 1100
1087#ifdef XPM_BACKGROUND
1088 if (rs[Rs_backgroundPixmap] != NULL
1089 && ! OPTION (Opt_transparent))
1090 {
1091 const char *p = rs[Rs_backgroundPixmap];
1092
1093 if ((p = strchr (p, ';')) != NULL)
1094 {
1095 p++;
1096 scale_pixmap (p);
1097 }
1098
1099 set_bgPixmap (rs[Rs_backgroundPixmap]);
1100 scr_touch (true);
1101 }
1102#endif
1103
1104 /* graphics context for the vt window */ 1101 /* graphics context for the vt window */
1105 gcvalue.foreground = pix_colors[Color_fg]; 1102 gcvalue.foreground = pix_colors[Color_fg];
1106 gcvalue.background = pix_colors[Color_bg]; 1103 gcvalue.background = pix_colors[Color_bg];
1107 gcvalue.graphics_exposures = 1; 1104 gcvalue.graphics_exposures = 0;
1105
1108 gc = XCreateGC (disp, vt, 1106 gc = XCreateGC (dpy, vt,
1109 GCForeground | GCBackground | GCGraphicsExposures, 1107 GCForeground | GCBackground | GCGraphicsExposures,
1110 &gcvalue); 1108 &gcvalue);
1111 1109
1112 drawable = new rxvt_drawable (display, vt); 1110 drawable = new rxvt_drawable (this, vt);
1113 1111
1114#ifdef RXVT_SCROLLBAR 1112#ifdef RXVT_SCROLLBAR
1115 gcvalue.foreground = pix_colors[Color_topShadow]; 1113 gcvalue.foreground = pix_colors[Color_topShadow];
1116 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1114 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1117 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1115 gcvalue.foreground = pix_colors[Color_bottomShadow];
1118 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1116 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1119 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1117 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1120 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1118 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1121#endif 1119#endif
1122 1120
1123#ifdef OFF_FOCUS_FADING 1121#ifdef OFF_FOCUS_FADING
1124 // initially we are in unfocused state 1122 // initially we are in unfocused state
1125 if (rs[Rs_fade]) 1123 if (rs[Rs_fade])
1126 pix_colors = pix_colors_unfocused; 1124 pix_colors = pix_colors_unfocused;
1127#endif 1125#endif
1128 1126
1129 pointer_unblank (); 1127 pointer_unblank ();
1130 scr_recolour (); 1128 scr_recolour ();
1131
1132#if ENABLE_XEMBED
1133 if (rs[Rs_embed])
1134 {
1135 long info[2] = { 0, XEMBED_MAPPED };
1136
1137 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1138 32, PropModeReplace, (unsigned char *)&info, 2);
1139 }
1140#endif
1141} 1129}
1142 1130
1143/* ------------------------------------------------------------------------- * 1131/* ------------------------------------------------------------------------- *
1144 * GET TTY CURRENT STATE * 1132 * GET TTY CURRENT STATE *
1145 * ------------------------------------------------------------------------- */ 1133 * ------------------------------------------------------------------------- */
1146void 1134void
1147rxvt_get_ttymode (ttymode_t *tio, int erase) 1135rxvt_get_ttymode (ttymode_t *tio, int erase)
1148{ 1136{
1149#ifdef HAVE_TERMIOS_H
1150 /* 1137 /*
1151 * standard System V termios interface 1138 * standard System V termios interface
1152 */ 1139 */
1153 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1140 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1154 { 1141 {
… …
1221 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1208 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1222# if defined (ECHOCTL) && defined (ECHOKE) 1209# if defined (ECHOCTL) && defined (ECHOKE)
1223 | ECHOCTL | ECHOKE 1210 | ECHOCTL | ECHOKE
1224# endif 1211# endif
1225 | ECHOE | ECHOK); 1212 | ECHOE | ECHOK);
1226# else /* HAVE_TERMIOS_H */
1227
1228 /*
1229 * sgtty interface
1230 */
1231
1232 /* get parameters -- gtty */
1233 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1234 {
1235 tio->sg.sg_erase = CERASE; /* ^H */
1236 tio->sg.sg_kill = CKILL; /* ^U */
1237 }
1238
1239 if (erase != -1)
1240 tio->sg.sg_erase = (char)erase;
1241
1242 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1243
1244 /* get special characters */
1245 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1246 {
1247 tio->tc.t_intrc = CINTR; /* ^C */
1248 tio->tc.t_quitc = CQUIT; /* ^\ */
1249 tio->tc.t_startc = CSTART; /* ^Q */
1250 tio->tc.t_stopc = CSTOP; /* ^S */
1251 tio->tc.t_eofc = CEOF; /* ^D */
1252 tio->tc.t_brkc = -1;
1253 }
1254
1255 /* get local special chars */
1256 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1257 {
1258 tio->lc.t_suspc = CSUSP; /* ^Z */
1259 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1260 tio->lc.t_rprntc = CRPRNT; /* ^R */
1261 tio->lc.t_flushc = CFLUSH; /* ^O */
1262 tio->lc.t_werasc = CWERASE; /* ^W */
1263 tio->lc.t_lnextc = CLNEXT; /* ^V */
1264 }
1265 /* get line discipline */
1266 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1267# ifdef NTTYDISC
1268 tio->line = NTTYDISC;
1269# endif /* NTTYDISC */
1270
1271 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1272#endif /* HAVE_TERMIOS_H */
1273 1213
1274 /* 1214 /*
1275 * Debugging 1215 * Debugging
1276 */ 1216 */
1277#ifdef DEBUG_TTYMODE 1217#ifdef DEBUG_TTYMODE
… …
1378 else 1318 else
1379#endif 1319#endif
1380 if (!pty->get ()) 1320 if (!pty->get ())
1381 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1321 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1382 1322
1323 int er;
1324
1325#ifndef NO_BACKSPACE_KEY
1326 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1327 er = rs[Rs_backspace_key][0];
1328 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1329 er = '\177'; /* the initial state anyway */
1330 else
1331#endif
1332 er = -1;
1333
1334 rxvt_get_ttymode (&tio, er);
1335 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1383 pty->set_utf8_mode (enc_utf8); 1336 pty->set_utf8_mode (enc_utf8);
1384 1337
1385 /* set initial window size */ 1338 /* set initial window size */
1386 tt_winch (); 1339 tt_winch ();
1387
1388 int er;
1389
1390#ifndef NO_BACKSPACE_KEY
1391 if (key_backspace[0] && !key_backspace[1])
1392 er = key_backspace[0];
1393 else if (strcmp (key_backspace, "DEC") == 0)
1394 er = '\177'; /* the initial state anyway */
1395 else
1396#endif
1397 er = -1;
1398
1399 rxvt_get_ttymode (&tio, er);
1400 1340
1401#if ENABLE_FRILLS 1341#if ENABLE_FRILLS
1402 if (rs[Rs_pty_fd]) 1342 if (rs[Rs_pty_fd])
1403 return; 1343 return;
1404#endif 1344#endif
… …
1435 } 1375 }
1436 1376
1437 _exit (EXIT_FAILURE); 1377 _exit (EXIT_FAILURE);
1438 1378
1439 default: 1379 default:
1440#if UTMP_SUPPORT
1441 if (!OPTION (Opt_utmpInhibit)) 1380 if (!option (Opt_utmpInhibit))
1442 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1381 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1443#endif
1444 1382
1445 pty->close_tty (); 1383 pty->close_tty ();
1384
1385 child_ev.start (cmd_pid);
1386
1387 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1446 break; 1388 break;
1447 } 1389 }
1448} 1390}
1449 1391
1450/* ------------------------------------------------------------------------- * 1392/* ------------------------------------------------------------------------- *
… …
1457int 1399int
1458rxvt_term::run_child (const char *const *argv) 1400rxvt_term::run_child (const char *const *argv)
1459{ 1401{
1460 char *login; 1402 char *login;
1461 1403
1462 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1463
1464 if (OPTION (Opt_console)) 1404 if (option (Opt_console))
1465 { /* be virtual console, fail silently */ 1405 { /* be virtual console, fail silently */
1466#ifdef TIOCCONS 1406#ifdef TIOCCONS
1467 unsigned int on = 1; 1407 unsigned int on = 1;
1468 1408
1469 ioctl (STDIN_FILENO, TIOCCONS, &on); 1409 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1497 sigset_t ss; 1437 sigset_t ss;
1498 sigemptyset (&ss); 1438 sigemptyset (&ss);
1499 sigprocmask (SIG_SETMASK, &ss, 0); 1439 sigprocmask (SIG_SETMASK, &ss, 0);
1500 1440
1501 /* command interpreter path */ 1441 /* command interpreter path */
1502 if (argv != NULL) 1442 if (argv)
1503 { 1443 {
1504# ifdef DEBUG_CMD 1444# ifdef DEBUG_CMD
1505 int i; 1445 int i;
1506 1446
1507 for (i = 0; argv[i]; i++) 1447 for (i = 0; argv[i]; i++)
… …
1516 const char *argv0, *shell; 1456 const char *argv0, *shell;
1517 1457
1518 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1458 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1519 shell = "/bin/sh"; 1459 shell = "/bin/sh";
1520 1460
1521 argv0 = (const char *)rxvt_r_basename (shell); 1461 argv0 = (const char *)rxvt_basename (shell);
1522 1462
1523 if (OPTION (Opt_loginShell)) 1463 if (option (Opt_loginShell))
1524 { 1464 {
1525 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1465 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1526 1466
1527 login[0] = '-'; 1467 login[0] = '-';
1528 strcpy (&login[1], argv0); 1468 strcpy (&login[1], argv0);
1529 argv0 = login; 1469 argv0 = login;
1530 } 1470 }
1531 1471
1532 execlp (shell, argv0, NULL); 1472 execlp (shell, argv0, (char *)0);
1533 /* no error message: STDERR is closed! */ 1473 /* no error message: STDERR is closed! */
1534 } 1474 }
1535 1475
1536 return -1; 1476 return -1;
1537} 1477}

Diff Legend

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