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.217 by root, Tue Oct 9 13:36:10 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
… …
339 rs[Rs_display_name] = ":0"; 386 rs[Rs_display_name] = ":0";
340 387
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])))
391 {
392 free (r_argv);
344 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 393 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
394 }
345 395
396 // using a local pointer decreases code size a lot
397 xa = display->xa;
398
399 set (display);
346 extract_resources (); 400 extract_resources ();
347 401
402#if XFT
403 if (rs[Rs_depth])
404 select_visual (strtol (rs[Rs_depth], 0, 0));
405#endif
406
407#ifdef HAVE_AFTERIMAGE
408 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
409#endif
348 free (r_argv); 410 free (r_argv);
411
412 for (int i = NUM_RESOURCES; i--; )
413 if (rs [i] == resval_undef)
414 rs [i] = 0;
415
416#if ENABLE_PERL
417 if (!rs[Rs_perl_ext_1])
418 rs[Rs_perl_ext_1] = "default";
419
420 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
421 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
422 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
423 {
424 rxvt_perl.init (this);
425 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
426 }
427#endif
349 428
350 /* 429 /*
351 * set any defaults not already set 430 * set any defaults not already set
352 */ 431 */
353 if (cmd_argv && cmd_argv[0]) 432 if (cmd_argv && cmd_argv[0])
354 { 433 {
355 if (!rs[Rs_title]) 434 if (!rs[Rs_title])
356 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 435 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
357 if (!rs[Rs_iconName]) 436 if (!rs[Rs_iconName])
358 rs[Rs_iconName] = rs[Rs_title]; 437 rs[Rs_iconName] = rs[Rs_title];
359 } 438 }
360 else 439 else
361 { 440 {
… …
399 rs[Rs_cutchars] = CUTCHARS; 478 rs[Rs_cutchars] = CUTCHARS;
400 479
401#ifndef NO_BACKSPACE_KEY 480#ifndef NO_BACKSPACE_KEY
402 if (!rs[Rs_backspace_key]) 481 if (!rs[Rs_backspace_key])
403# ifdef DEFAULT_BACKSPACE 482# ifdef DEFAULT_BACKSPACE
404 key_backspace = DEFAULT_BACKSPACE; 483 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
405# else 484# else
406 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 485 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
407# endif 486# 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 487#endif
416 488
417#ifndef NO_DELETE_KEY 489#ifndef NO_DELETE_KEY
418 if (!rs[Rs_delete_key]) 490 if (!rs[Rs_delete_key])
419# ifdef DEFAULT_DELETE 491# ifdef DEFAULT_DELETE
420 key_delete = DEFAULT_DELETE; 492 rs[Rs_delete_key] = DEFAULT_DELETE;
421# else 493# else
422 key_delete = "\033[3~"; 494 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 495# endif
432 if (rs[Rs_answerbackstring]) 496#endif
433 {
434 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
435 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
436 }
437 497
438#ifdef HAVE_SCROLLBARS 498#ifdef HAVE_SCROLLBARS
439 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 499 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
440#endif 500#endif
441 501
442#ifdef XTERM_REVERSE_VIDEO 502#ifdef XTERM_REVERSE_VIDEO
443 /* this is how xterm implements reverseVideo */ 503 /* this is how xterm implements reverseVideo */
444 if (OPTION (Opt_reverseVideo)) 504 if (option (Opt_reverseVideo))
445 { 505 {
446 if (!rs[Rs_color + Color_fg]) 506 if (!rs[Rs_color + Color_fg])
447 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 507 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
508
448 if (!rs[Rs_color + Color_bg]) 509 if (!rs[Rs_color + Color_bg])
449 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 510 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
450 } 511 }
451#endif 512#endif
452 513
… …
454 if (!rs[Rs_color + i]) 515 if (!rs[Rs_color + i])
455 rs[Rs_color + i] = def_colorName[i]; 516 rs[Rs_color + i] = def_colorName[i];
456 517
457#ifndef XTERM_REVERSE_VIDEO 518#ifndef XTERM_REVERSE_VIDEO
458 /* this is how we implement reverseVideo */ 519 /* this is how we implement reverseVideo */
459 if (OPTION (Opt_reverseVideo)) 520 if (option (Opt_reverseVideo))
460 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 521 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
461#endif 522#endif
462 523
463 /* convenient aliases for setting fg/bg to colors */ 524 /* convenient aliases for setting fg/bg to colors */
464 color_aliases (Color_fg); 525 color_aliases (Color_fg);
… …
485/*----------------------------------------------------------------------*/ 546/*----------------------------------------------------------------------*/
486void 547void
487rxvt_term::init_env () 548rxvt_term::init_env ()
488{ 549{
489 int i; 550 int i;
490 unsigned int u;
491 char *val; 551 char *val;
492 552
493#ifdef DISPLAY_IS_IP 553#ifdef DISPLAY_IS_IP
494 /* Fixup display_name for export over pty to any interested terminal 554 /* 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 555 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
504 val = rxvt_network_display (rs[Rs_display_name]); 564 val = rxvt_network_display (rs[Rs_display_name]);
505 rs[Rs_display_name] = (const char *)val; 565 rs[Rs_display_name] = (const char *)val;
506 566
507 if (val == NULL) 567 if (val == NULL)
508#endif /* DISPLAY_IS_IP */ 568#endif /* DISPLAY_IS_IP */
509 val = XDisplayString (display->display); 569 val = XDisplayString (dpy);
510 570
511 if (rs[Rs_display_name] == NULL) 571 if (rs[Rs_display_name] == NULL)
512 rs[Rs_display_name] = val; /* use broken `:0' value */ 572 rs[Rs_display_name] = val; /* use broken `:0' value */
513 573
514 i = strlen (val); 574 i = strlen (val);
515 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 575 env_display = (char *)rxvt_malloc (i + 9);
516 576
517 sprintf (env_display, "DISPLAY=%s", val); 577 sprintf (env_display, "DISPLAY=%s", val);
518 578
519 /* avoiding the math library: 579 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 580
529 /* add entries to the environment: 581 /* add entries to the environment:
530 * @ DISPLAY: in case we started with -display 582 * @ DISPLAY: in case we started with -display
531 * @ WINDOWID: X window id number of the window 583 * @ WINDOWID: X window id number of the window
532 * @ COLORTERM: terminal sub-name and also indicates its color 584 * @ COLORTERM: terminal sub-name and also indicates its color
… …
534 * @ TERMINFO: path to terminfo directory 586 * @ TERMINFO: path to terminfo directory
535 * @ COLORFGBG: fg;bg color codes 587 * @ COLORFGBG: fg;bg color codes
536 */ 588 */
537 putenv (env_display); 589 putenv (env_display);
538 putenv (env_windowid); 590 putenv (env_windowid);
591
539 if (env_colorfgbg) 592 if (env_colorfgbg)
540 putenv (env_colorfgbg); 593 putenv (env_colorfgbg);
541 594
542#ifdef RXVT_TERMINFO 595#ifdef RXVT_TERMINFO
543 putenv ("TERMINFO=" RXVT_TERMINFO); 596 putenv ("TERMINFO=" RXVT_TERMINFO);
544#endif 597#endif
545 598
546 if (display->depth <= 2) 599 if (depth <= 2)
547 putenv ("COLORTERM=" COLORTERMENV "-mono"); 600 putenv ("COLORTERM=" COLORTERMENV "-mono");
548 else 601 else
549 putenv ("COLORTERM=" COLORTERMENVFULL); 602 putenv ("COLORTERM=" COLORTERMENVFULL);
550 603
551 if (rs[Rs_term_name] != NULL) 604 if (rs[Rs_term_name] != NULL)
552 { 605 {
553 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 606 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
554 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 607 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
555 putenv (env_term); 608 putenv (env_term);
556 } 609 }
557 else 610 else
558 putenv ("TERM=" TERMENV); 611 putenv ("TERM=" TERMENV);
… …
645 * Initialize the command connection. 698 * Initialize the command connection.
646 * This should be called after the X server connection is established. 699 * This should be called after the X server connection is established.
647 */ 700 */
648 701
649#ifdef META8_OPTION 702#ifdef META8_OPTION
650 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 703 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
651#endif 704#endif
652 705
653 get_ourmods (); 706 get_ourmods ();
654 707
655 if (!OPTION (Opt_scrollTtyOutput)) 708 if (!option (Opt_scrollTtyOutput))
656 priv_modes |= PrivMode_TtyOutputInh; 709 priv_modes |= PrivMode_TtyOutputInh;
657 if (OPTION (Opt_scrollTtyKeypress)) 710 if (option (Opt_scrollTtyKeypress))
658 priv_modes |= PrivMode_Keypress; 711 priv_modes |= PrivMode_Keypress;
659 if (!OPTION (Opt_jumpScroll)) 712 if (!option (Opt_jumpScroll))
660 priv_modes |= PrivMode_smoothScroll; 713 priv_modes |= PrivMode_smoothScroll;
661 714
662#ifndef NO_BACKSPACE_KEY 715#ifndef NO_BACKSPACE_KEY
663 if (strcmp (key_backspace, "DEC") == 0) 716 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
664 priv_modes |= PrivMode_HaveBackSpace; 717 priv_modes |= PrivMode_HaveBackSpace;
665#endif 718#endif
666 719
667 /* add value for scrollBar */ 720 /* add value for scrollBar */
668 if (scrollBar.state) 721 if (scrollBar.state)
… …
682 735
683#ifdef OFF_FOCUS_FADING 736#ifdef OFF_FOCUS_FADING
684 pix_colors = pix_colors_focused; 737 pix_colors = pix_colors_focused;
685#endif 738#endif
686 739
687 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 740 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
688 { 741 {
742 const char *name = rs[Rs_color + i];
743
744 if (!name)
745 continue;
746
689 rxvt_color xcol; 747 rxvt_color xcol;
690 748
691 if (!rs[Rs_color + i]) 749 if (!set_color (xcol, name))
692 continue;
693
694 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
695 { 750 {
696#ifndef XTERM_REVERSE_VIDEO 751#ifndef XTERM_REVERSE_VIDEO
697 if (i < 2 && OPTION (Opt_reverseVideo)) 752 if (i < 2 && option (Opt_reverseVideo))
698 rs[Rs_color + i] = def_colorName[!i]; 753 name = def_colorName [1 - i];
699 else 754 else
700#endif 755#endif
701 rs[Rs_color + i] = def_colorName[i]; 756 name = def_colorName [i];
702 757
703 if (!rs[Rs_color + i]) 758 if (!name)
704 continue; 759 continue;
705 760
706 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 761 if (!set_color (xcol, name))
707 { 762 {
708 switch (i) 763 switch (i)
709 { 764 {
710 case Color_fg: 765 case Color_fg:
711 case Color_bg: 766 case Color_bg:
712 /* fatal: need bg/fg color */
713 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 767 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
714 /* NOTREACHED */ 768 name = "";
715 break; 769 break;
716#ifndef NO_CURSORCOLOR 770#ifndef NO_CURSORCOLOR
717 case Color_cursor2: 771 case Color_cursor2:
718 xcol = pix_colors[Color_fg]; 772#endif
719 break;
720#endif /* ! NO_CURSORCOLOR */
721 case Color_pointer_fg: 773 case Color_pointer_fg:
722 xcol = pix_colors[Color_fg]; 774 name = rs[Rs_color + Color_fg];
775 xcol.set (this, name);
723 break; 776 break;
724 default: 777 default:
725 xcol = pix_colors[Color_bg]; /* None */ 778 name = rs[Rs_color + Color_bg];
779 xcol.set (this, name);
726 break; 780 break;
727 } 781 }
728 } 782 }
729 } 783 }
730 784
731 pix_colors[i] = xcol; 785 pix_colors[i] = xcol;
732 SET_PIXCOLOR (i); 786 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 { 787 }
788
789 if (depth <= 2)
790 {
743 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 791 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]; 792 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]; 793 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
746 } 794 }
747 795
748 /* 796 /*
749 * get scrollBar shadow colors 797 * get scrollBar shadow colors
750 * 798 *
751 * The calculations of topShadow/bottomShadow values are adapted 799 * The calculations of topShadow/bottomShadow values are adapted
752 * from the fvwm window manager. 800 * from the fvwm window manager.
753 */ 801 */
754#ifdef KEEP_SCROLLCOLOR 802#ifdef KEEP_SCROLLCOLOR
755
756 if (display->depth <= 2) 803 if (depth <= 2)
757 { 804 {
758 /* Monochrome */ 805 /* Monochrome */
759 pix_colors[Color_scroll] = pix_colors[Color_fg]; 806 alias_color (Color_scroll, Color_fg);
760 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 807 alias_color (Color_topShadow, Color_bg);
761 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 808 alias_color (Color_bottomShadow, Color_bg);
762 } 809 }
763 else 810 else
764 { 811 {
765 rxvt_color xcol[2]; 812 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 813
770 xcol[1] = pix_colors[Color_scroll]; 814 rgba cscroll;
771 xcol[0].set (display, 65535, 65535, 65535); 815 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 816
780 /* topShadowColor */ 817 /* topShadowColor */
781 if (!xcol[1].set (display, 818 if (!pix_colors[Color_topShadow].set (this,
782 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 819 rgba (
783 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 820 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
784 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 821 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
785 xcol[1] = pix_colors[Color_White]; 822 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
786 823 cscroll.a)
787 pix_colors[Color_topShadow] = xcol[1]; 824 ))
825 alias_color (Color_topShadow, Color_White);
788 } 826 }
789#endif /* KEEP_SCROLLCOLOR */ 827#endif /* KEEP_SCROLLCOLOR */
828
829#ifdef OFF_FOCUS_FADING
830 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
831 update_fade_color (i);
832#endif
790} 833}
791 834
792/*----------------------------------------------------------------------*/ 835/*----------------------------------------------------------------------*/
793/* color aliases, fg/bg bright-bold */ 836/* color aliases, fg/bg bright-bold */
794void 837void
… …
833 876
834 if (rsmod 877 if (rsmod
835 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 878 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
836 requestedmeta = rsmod[3] - '0'; 879 requestedmeta = rsmod[3] - '0';
837 880
838 map = XGetModifierMapping (display->display); 881 map = XGetModifierMapping (dpy);
839 kc = map->modifiermap; 882 kc = map->modifiermap;
840 883
841 for (i = 1; i < 6; i++) 884 for (i = 1; i < 6; i++)
842 { 885 {
843 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 886 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
845 for (j = map->max_keypermod; j--; k++) 888 for (j = map->max_keypermod; j--; k++)
846 { 889 {
847 if (kc[k] == 0) 890 if (kc[k] == 0)
848 break; 891 break;
849 892
850 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 893 switch (XKeycodeToKeysym (dpy, kc[k], 0))
851 { 894 {
852 case XK_Num_Lock: 895 case XK_Num_Lock:
853 ModNumLockMask = modmasks[i - 1]; 896 ModNumLockMask = modmasks[i - 1];
854 continue; 897 continue;
855 898
… …
905rxvt_term::create_windows (int argc, const char *const *argv) 948rxvt_term::create_windows (int argc, const char *const *argv)
906{ 949{
907 XClassHint classHint; 950 XClassHint classHint;
908 XWMHints wmHint; 951 XWMHints wmHint;
909#if ENABLE_FRILLS 952#if ENABLE_FRILLS
910 Atom prop = None;
911 MWMHints mwmhints; 953 MWMHints mwmhints = { };
912#endif 954#endif
913 XGCValues gcvalue; 955 XGCValues gcvalue;
914 XSetWindowAttributes attributes; 956 XSetWindowAttributes attributes;
915 XWindowAttributes gattr;
916 Window top, parent; 957 Window top, parent;
917 dDisp;
918 958
919#ifdef USING_W11LIB 959 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 960
933 /* grab colors before netscape does */ 961 /* grab colors before netscape does */
934 Get_Colours (); 962 Get_Colours ();
935 963
936 if (!set_fonts ()) 964 if (!set_fonts ())
937 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 965 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
938 966
939 parent = DefaultRootWindow (disp); 967 parent = display->root;
940 968
941 attributes.override_redirect = !!OPTION (Opt_override_redirect); 969 attributes.override_redirect = !!option (Opt_override_redirect);
942 970
943#if ENABLE_FRILLS 971#if ENABLE_FRILLS
944 if (OPTION (Opt_borderLess)) 972 if (option (Opt_borderLess))
945 { 973 {
946 prop = XInternAtom (disp, "_MOTIF_WM_INFO", True); 974 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
947
948 if (prop == None)
949 { 975 {
950 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 976 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
951 attributes.override_redirect = TRUE; 977 attributes.override_redirect = true;
952 mwmhints.flags = 0;
953 } 978 }
954 else 979 else
955 { 980 {
956 mwmhints.flags = MWM_HINTS_DECORATIONS; 981 mwmhints.flags = MWM_HINTS_DECORATIONS;
957 mwmhints.decorations = 0;
958 } 982 }
959 } 983 }
960 else
961 mwmhints.flags = 0;
962#endif 984#endif
963 985
964#if ENABLE_XEMBED 986#if ENABLE_XEMBED
965 if (rs[Rs_embed]) 987 if (rs[Rs_embed])
966 { 988 {
967 XWindowAttributes wattr; 989 XWindowAttributes wattr;
968 990
969 parent = strtol (rs[Rs_embed], 0, 0); 991 parent = strtol (rs[Rs_embed], 0, 0);
970 992
971 if (!XGetWindowAttributes (disp, parent, &wattr)) 993 if (!XGetWindowAttributes (dpy, parent, &wattr))
972 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 994 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
973 995
974 window_calc (wattr.width, wattr.height); 996 window_calc (wattr.width, wattr.height);
975 } 997 }
976#endif 998#endif
977 999
978 window_calc (0, 0); 1000 window_calc (0, 0);
979 1001
980 /* sub-window placement & size in rxvt_resize_subwindows () */ 1002 /* sub-window placement & size in rxvt_resize_subwindows () */
981 attributes.background_pixel = pix_colors_focused[Color_border]; 1003 attributes.background_pixel = pix_colors_focused [Color_border];
982 attributes.border_pixel = pix_colors_focused[Color_border]; 1004 attributes.border_pixel = pix_colors_focused [Color_border];
983 attributes.colormap = display->cmap; 1005 attributes.colormap = cmap;
1006
984 top = XCreateWindow (disp, parent, 1007 top = XCreateWindow (dpy, parent,
985 szHint.x, szHint.y, 1008 szHint.x, szHint.y,
986 szHint.width, szHint.height, 1009 szHint.width, szHint.height,
987 ext_bwidth, 1010 ext_bwidth,
988 display->depth, InputOutput, 1011 depth, InputOutput, visual,
989 display->visual,
990 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1012 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
991 &attributes); 1013 &attributes);
992 1014
993 this->parent[0] = top; 1015 this->parent[0] = top;
994 1016
995 old_width = szHint.width; 1017 old_width = szHint.width;
996 old_height = szHint.height; 1018 old_height = szHint.height;
997 1019
998 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1020 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
999 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1021 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1000 1022
1001 classHint.res_name = (char *)rs[Rs_name]; 1023 classHint.res_name = (char *)rs[Rs_name];
1002 classHint.res_class = (char *)RESCLASS; 1024 classHint.res_class = (char *)RESCLASS;
1003 1025
1004 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1026 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1005 wmHint.input = True; 1027 wmHint.input = True;
1006 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1028 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1007 wmHint.window_group = top; 1029 wmHint.window_group = top;
1008 1030
1009 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 1031 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1010 &szHint, &wmHint, &classHint); 1032 &szHint, &wmHint, &classHint);
1033
1034#if ENABLE_FRILLS
1035 if (mwmhints.flags)
1036 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1037 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1038#endif
1011 1039
1012 Atom protocols[] = { 1040 Atom protocols[] = {
1013 xa[XA_WM_DELETE_WINDOW], 1041 xa[XA_WM_DELETE_WINDOW],
1014#if ENABLE_EWMH 1042#if ENABLE_EWMH
1015 xa[XA_NET_WM_PING], 1043 xa[XA_NET_WM_PING],
1016#endif 1044#endif
1017 }; 1045 };
1018 1046
1019 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1047 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1020 1048
1021#if ENABLE_FRILLS 1049#if ENABLE_FRILLS
1022 if (rs[Rs_transient_for]) 1050 if (rs[Rs_transient_for])
1023 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1051 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1024#endif 1052#endif
1025 1053
1026#if ENABLE_EWMH 1054#if ENABLE_EWMH
1027 long pid = getpid (); 1055 long pid = getpid ();
1028 1056
1029 XChangeProperty (disp, top, 1057 XChangeProperty (dpy, top,
1030 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1058 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1031 PropModeReplace, (unsigned char *)&pid, 1); 1059 PropModeReplace, (unsigned char *)&pid, 1);
1032 1060
1033 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1061 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1034#endif 1062#endif
1035 1063
1036 XSelectInput (disp, top, 1064 XSelectInput (dpy, top,
1037 KeyPressMask 1065 KeyPressMask
1038#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1066#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1039 | KeyReleaseMask 1067 | KeyReleaseMask
1040#endif 1068#endif
1041 | FocusChangeMask | VisibilityChangeMask 1069 | FocusChangeMask | VisibilityChangeMask
1042 | ExposureMask | StructureNotifyMask); 1070 | ExposureMask | StructureNotifyMask);
1043 1071
1044 termwin_ev.start (display, top); 1072 termwin_ev.start (display, top);
1045 1073
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 */ 1074 /* vt cursor: Black-on-White is standard, but this is more popular */
1053 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1075 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1054 1076
1055#ifdef HAVE_SCROLLBARS 1077#ifdef HAVE_SCROLLBARS
1056 /* cursor scrollBar: Black-on-White */ 1078 /* cursor scrollBar: Black-on-White */
1057 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1079 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1058#endif 1080#endif
1059 1081
1060 /* the vt window */ 1082 /* the vt window */
1061 vt = XCreateSimpleWindow (disp, top, 1083 vt = XCreateSimpleWindow (dpy, top,
1062 window_vt_x,
1063 window_vt_y, 1084 window_vt_x, window_vt_y,
1064 width,
1065 height, 1085 width, height,
1066 0, 1086 0,
1067 pix_colors_focused[Color_fg], 1087 pix_colors_focused[Color_fg],
1068 pix_colors_focused[Color_bg]); 1088 pix_colors_focused[Color_bg]);
1069#ifdef DEBUG_X
1070 XStoreName (disp, vt, "vt window");
1071#endif
1072 1089
1073 attributes.bit_gravity = NorthWestGravity; 1090 attributes.bit_gravity = NorthWestGravity;
1074 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1091 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1075 1092
1076 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1093 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1077 1094
1078 if (OPTION (Opt_pointerBlank)) 1095 if (option (Opt_pointerBlank))
1079 vt_emask |= PointerMotionMask; 1096 vt_emask |= PointerMotionMask;
1080 else 1097 else
1081 vt_emask |= Button1MotionMask | Button3MotionMask; 1098 vt_emask |= Button1MotionMask | Button3MotionMask;
1082 1099
1083 vt_select_input (); 1100 vt_select_input ();
1084 1101
1085 vt_ev.start (display, vt); 1102 vt_ev.start (display, vt);
1086 1103
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 */ 1104 /* graphics context for the vt window */
1105 gcvalue.foreground = pix_colors[Color_fg]; 1105 gcvalue.foreground = pix_colors[Color_fg];
1106 gcvalue.background = pix_colors[Color_bg]; 1106 gcvalue.background = pix_colors[Color_bg];
1107 gcvalue.graphics_exposures = 1; 1107 gcvalue.graphics_exposures = 0;
1108
1108 gc = XCreateGC (disp, vt, 1109 gc = XCreateGC (dpy, vt,
1109 GCForeground | GCBackground | GCGraphicsExposures, 1110 GCForeground | GCBackground | GCGraphicsExposures,
1110 &gcvalue); 1111 &gcvalue);
1111 1112
1112 drawable = new rxvt_drawable (display, vt); 1113 drawable = new rxvt_drawable (this, vt);
1113 1114
1114#ifdef RXVT_SCROLLBAR 1115#ifdef RXVT_SCROLLBAR
1115 gcvalue.foreground = pix_colors[Color_topShadow]; 1116 gcvalue.foreground = pix_colors[Color_topShadow];
1116 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1117 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1117 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1118 gcvalue.foreground = pix_colors[Color_bottomShadow];
1118 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1119 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1119 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1120 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1120 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1121 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1121#endif 1122#endif
1122 1123
1123#ifdef OFF_FOCUS_FADING 1124#ifdef OFF_FOCUS_FADING
1124 // initially we are in unfocused state 1125 // initially we are in unfocused state
1125 if (rs[Rs_fade]) 1126 if (rs[Rs_fade])
1126 pix_colors = pix_colors_unfocused; 1127 pix_colors = pix_colors_unfocused;
1127#endif 1128#endif
1128 1129
1129 pointer_unblank (); 1130 pointer_unblank ();
1130 scr_recolour (); 1131 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} 1132}
1142 1133
1143/* ------------------------------------------------------------------------- * 1134/* ------------------------------------------------------------------------- *
1144 * GET TTY CURRENT STATE * 1135 * GET TTY CURRENT STATE *
1145 * ------------------------------------------------------------------------- */ 1136 * ------------------------------------------------------------------------- */
1146void 1137void
1147rxvt_get_ttymode (ttymode_t *tio, int erase) 1138rxvt_get_ttymode (ttymode_t *tio, int erase)
1148{ 1139{
1149#ifdef HAVE_TERMIOS_H
1150 /* 1140 /*
1151 * standard System V termios interface 1141 * standard System V termios interface
1152 */ 1142 */
1153 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1143 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1154 { 1144 {
… …
1221 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1211 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1222# if defined (ECHOCTL) && defined (ECHOKE) 1212# if defined (ECHOCTL) && defined (ECHOKE)
1223 | ECHOCTL | ECHOKE 1213 | ECHOCTL | ECHOKE
1224# endif 1214# endif
1225 | ECHOE | ECHOK); 1215 | 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 1216
1274 /* 1217 /*
1275 * Debugging 1218 * Debugging
1276 */ 1219 */
1277#ifdef DEBUG_TTYMODE 1220#ifdef DEBUG_TTYMODE
… …
1378 else 1321 else
1379#endif 1322#endif
1380 if (!pty->get ()) 1323 if (!pty->get ())
1381 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1324 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1382 1325
1326 int er;
1327
1328#ifndef NO_BACKSPACE_KEY
1329 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1330 er = rs[Rs_backspace_key][0];
1331 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1332 er = '\177'; /* the initial state anyway */
1333 else
1334#endif
1335 er = -1;
1336
1337 rxvt_get_ttymode (&tio, er);
1338 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1383 pty->set_utf8_mode (enc_utf8); 1339 pty->set_utf8_mode (enc_utf8);
1384 1340
1385 /* set initial window size */ 1341 /* set initial window size */
1386 tt_winch (); 1342 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 1343
1401#if ENABLE_FRILLS 1344#if ENABLE_FRILLS
1402 if (rs[Rs_pty_fd]) 1345 if (rs[Rs_pty_fd])
1403 return; 1346 return;
1404#endif 1347#endif
… …
1435 } 1378 }
1436 1379
1437 _exit (EXIT_FAILURE); 1380 _exit (EXIT_FAILURE);
1438 1381
1439 default: 1382 default:
1440#if UTMP_SUPPORT
1441 if (!OPTION (Opt_utmpInhibit)) 1383 if (!option (Opt_utmpInhibit))
1442 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1384 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1443#endif
1444 1385
1445 pty->close_tty (); 1386 pty->close_tty ();
1387
1388 child_ev.start (cmd_pid);
1389
1390 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1446 break; 1391 break;
1447 } 1392 }
1448} 1393}
1449 1394
1450/* ------------------------------------------------------------------------- * 1395/* ------------------------------------------------------------------------- *
… …
1457int 1402int
1458rxvt_term::run_child (const char *const *argv) 1403rxvt_term::run_child (const char *const *argv)
1459{ 1404{
1460 char *login; 1405 char *login;
1461 1406
1462 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1463
1464 if (OPTION (Opt_console)) 1407 if (option (Opt_console))
1465 { /* be virtual console, fail silently */ 1408 { /* be virtual console, fail silently */
1466#ifdef TIOCCONS 1409#ifdef TIOCCONS
1467 unsigned int on = 1; 1410 unsigned int on = 1;
1468 1411
1469 ioctl (STDIN_FILENO, TIOCCONS, &on); 1412 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1497 sigset_t ss; 1440 sigset_t ss;
1498 sigemptyset (&ss); 1441 sigemptyset (&ss);
1499 sigprocmask (SIG_SETMASK, &ss, 0); 1442 sigprocmask (SIG_SETMASK, &ss, 0);
1500 1443
1501 /* command interpreter path */ 1444 /* command interpreter path */
1502 if (argv != NULL) 1445 if (argv)
1503 { 1446 {
1504# ifdef DEBUG_CMD 1447# ifdef DEBUG_CMD
1505 int i; 1448 int i;
1506 1449
1507 for (i = 0; argv[i]; i++) 1450 for (i = 0; argv[i]; i++)
… …
1516 const char *argv0, *shell; 1459 const char *argv0, *shell;
1517 1460
1518 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1461 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1519 shell = "/bin/sh"; 1462 shell = "/bin/sh";
1520 1463
1521 argv0 = (const char *)rxvt_r_basename (shell); 1464 argv0 = (const char *)rxvt_basename (shell);
1522 1465
1523 if (OPTION (Opt_loginShell)) 1466 if (option (Opt_loginShell))
1524 { 1467 {
1525 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1468 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1526 1469
1527 login[0] = '-'; 1470 login[0] = '-';
1528 strcpy (&login[1], argv0); 1471 strcpy (&login[1], argv0);
1529 argv0 = login; 1472 argv0 = login;
1530 } 1473 }
1531 1474
1532 execlp (shell, argv0, NULL); 1475 execlp (shell, argv0, (char *)0);
1533 /* no error message: STDERR is closed! */ 1476 /* no error message: STDERR is closed! */
1534 } 1477 }
1535 1478
1536 return -1; 1479 return -1;
1537} 1480}

Diff Legend

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