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.152 by root, Sat Jan 21 22:38:05 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#if ENABLE_XEMBED
209 "_XEMBED",
210 "_XEMBED_INFO",
211#endif 267#endif
212 }; 268 };
213 269
214bool 270bool
215rxvt_term::init_vars () 271rxvt_term::init_vars ()
216{ 272{
273 pix_colors = //
217 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 274 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
218#ifdef OFF_FOCUS_FADING 275#ifdef OFF_FOCUS_FADING
219 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 276 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
220#endif 277#endif
221 pix_colors = pix_colors_focused;
222 278
223 if (pix_colors == NULL)
224 return false;
225
226#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
227 pixmap = None;
228#endif
229 279
230 MEvent.time = CurrentTime; 280 MEvent.time = CurrentTime;
231 MEvent.button = AnyButton; 281 MEvent.button = AnyButton;
232 options = DEFAULT_OPTIONS;
233 want_refresh = 1; 282 want_refresh = 1;
234 priv_modes = SavedModes = PrivMode_Default; 283 priv_modes = SavedModes = PrivMode_Default;
235 focus = 0;
236 ncol = 80; 284 ncol = 80;
237 nrow = 24; 285 nrow = 24;
238 int_bwidth = INTERNALBORDERWIDTH; 286 int_bwidth = INTERNALBORDERWIDTH;
239 ext_bwidth = EXTERNALBORDERWIDTH; 287 ext_bwidth = EXTERNALBORDERWIDTH;
240 lineSpace = LINESPACE; 288 lineSpace = LINESPACE;
241 saveLines = SAVELINES; 289 saveLines = SAVELINES;
242 numpix_colors = TOTAL_COLORS; 290 numpix_colors = TOTAL_COLORS;
243 291
244 refresh_limit = 1;
245 refresh_type = SLOW_REFRESH; 292 refresh_type = SLOW_REFRESH;
246 prev_nrow = prev_ncol = 0;
247 293
248 oldcursor.row = oldcursor.col = -1; 294 oldcursor.row = oldcursor.col = -1;
249#ifdef XPM_BACKGROUND
250 /* bgPixmap.w = bgPixmap.h = 0; */
251 bgPixmap.x = bgPixmap.y = 50;
252 bgPixmap.pixmap = None;
253#endif
254
255 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);
256 306
257 return true; 307 return true;
258} 308}
259 309
260void 310void
… …
269 if ((i = open ("/dev/null", O_RDONLY)) < 0) 319 if ((i = open ("/dev/null", O_RDONLY)) < 0)
270 { 320 {
271 /* TODO: BOO HISS */ 321 /* TODO: BOO HISS */
272 dup2 (STDERR_FILENO, STDIN_FILENO); 322 dup2 (STDERR_FILENO, STDIN_FILENO);
273 } 323 }
274 else if (i > STDIN_FILENO) 324 else if (i != STDIN_FILENO)
275 { 325 {
276 dup2 (i, STDIN_FILENO); 326 dup2 (i, STDIN_FILENO);
277 close (i); 327 close (i);
278 } 328 }
279 329
… …
294/*----------------------------------------------------------------------*/ 344/*----------------------------------------------------------------------*/
295const char ** 345const char **
296rxvt_term::init_resources (int argc, const char *const *argv) 346rxvt_term::init_resources (int argc, const char *const *argv)
297{ 347{
298 int i, r_argc; 348 int i, r_argc;
299 char *val;
300 const char **cmd_argv, **r_argv; 349 const char **cmd_argv, **r_argv;
301 350
302 /* 351 /*
303 * 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
304 */ 353 */
305 for (r_argc = 0; r_argc < argc; r_argc++) 354 for (r_argc = 0; r_argc < argc; r_argc++)
306 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 355 if (!strcmp (argv[r_argc], "-e"))
307 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 }
308 371
309 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 372 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
310 373
311 for (i = 0; i < r_argc; i++) 374 for (i = 0; i < r_argc; i++)
312 r_argv[i] = (const char *)argv[i]; 375 r_argv[i] = (const char *)argv[i];
313 376
314 r_argv[i] = NULL; 377 r_argv[i] = NULL;
315 378
316 if (r_argc == argc)
317 cmd_argv = NULL;
318 else
319 {
320 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
321
322 for (i = 0; i < argc - r_argc - 1; i++)
323 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
324
325 cmd_argv[i] = NULL;
326 }
327
328 rs[Rs_name] = rxvt_r_basename (argv[0]); 379 rs[Rs_name] = rxvt_basename (argv[0]);
329 380
330 /* 381 /*
331 * Open display, get options/resources and create the window 382 * Open display, get options/resources and create the window
332 */ 383 */
333 384
… …
337 get_options (r_argc, r_argv); 388 get_options (r_argc, r_argv);
338 389
339 if (!(display = displays.get (rs[Rs_display_name]))) 390 if (!(display = displays.get (rs[Rs_display_name])))
340 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]);
341 392
393 // using a local pointer decreases code size a lot
394 xa = display->xa;
395
396 set (display);
342 extract_resources (); 397 extract_resources ();
343 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
344 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;
345 412
346#if ENABLE_PERL 413#if ENABLE_PERL
347 if (!rs[Rs_perl_ext_1]) 414 if (!rs[Rs_perl_ext_1])
348 rs[Rs_perl_ext_1] = "default"; 415 rs[Rs_perl_ext_1] = "default";
349 416
… …
360 * set any defaults not already set 427 * set any defaults not already set
361 */ 428 */
362 if (cmd_argv && cmd_argv[0]) 429 if (cmd_argv && cmd_argv[0])
363 { 430 {
364 if (!rs[Rs_title]) 431 if (!rs[Rs_title])
365 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 432 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
366 if (!rs[Rs_iconName]) 433 if (!rs[Rs_iconName])
367 rs[Rs_iconName] = rs[Rs_title]; 434 rs[Rs_iconName] = rs[Rs_title];
368 } 435 }
369 else 436 else
370 { 437 {
… …
408 rs[Rs_cutchars] = CUTCHARS; 475 rs[Rs_cutchars] = CUTCHARS;
409 476
410#ifndef NO_BACKSPACE_KEY 477#ifndef NO_BACKSPACE_KEY
411 if (!rs[Rs_backspace_key]) 478 if (!rs[Rs_backspace_key])
412# ifdef DEFAULT_BACKSPACE 479# ifdef DEFAULT_BACKSPACE
413 key_backspace = DEFAULT_BACKSPACE; 480 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
414# else 481# else
415 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 482 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
416# endif 483# endif
417 else
418 {
419 val = strdup (rs[Rs_backspace_key]);
420 rxvt_Str_trim (val);
421 rxvt_Str_escaped (val);
422 key_backspace = val;
423 }
424#endif 484#endif
425 485
426#ifndef NO_DELETE_KEY 486#ifndef NO_DELETE_KEY
427 if (!rs[Rs_delete_key]) 487 if (!rs[Rs_delete_key])
428# ifdef DEFAULT_DELETE 488# ifdef DEFAULT_DELETE
429 key_delete = DEFAULT_DELETE; 489 rs[Rs_delete_key] = DEFAULT_DELETE;
430# else 490# else
431 key_delete = "\033[3~"; 491 rs[Rs_delete_key] = "\033[3~";
432# endif
433 else
434 {
435 val = strdup (rs[Rs_delete_key]);
436 rxvt_Str_trim (val);
437 rxvt_Str_escaped (val);
438 key_delete = val;
439 }
440#endif 492# endif
441 if (rs[Rs_answerbackstring]) 493#endif
442 {
443 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
444 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
445 }
446 494
447#ifdef HAVE_SCROLLBARS 495#ifdef HAVE_SCROLLBARS
448 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]);
449#endif 497#endif
450 498
451#ifdef XTERM_REVERSE_VIDEO 499#ifdef XTERM_REVERSE_VIDEO
452 /* this is how xterm implements reverseVideo */ 500 /* this is how xterm implements reverseVideo */
453 if (OPTION (Opt_reverseVideo)) 501 if (option (Opt_reverseVideo))
454 { 502 {
455 if (!rs[Rs_color + Color_fg]) 503 if (!rs[Rs_color + Color_fg])
456 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 504 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
505
457 if (!rs[Rs_color + Color_bg]) 506 if (!rs[Rs_color + Color_bg])
458 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 507 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
459 } 508 }
460#endif 509#endif
461 510
… …
463 if (!rs[Rs_color + i]) 512 if (!rs[Rs_color + i])
464 rs[Rs_color + i] = def_colorName[i]; 513 rs[Rs_color + i] = def_colorName[i];
465 514
466#ifndef XTERM_REVERSE_VIDEO 515#ifndef XTERM_REVERSE_VIDEO
467 /* this is how we implement reverseVideo */ 516 /* this is how we implement reverseVideo */
468 if (OPTION (Opt_reverseVideo)) 517 if (option (Opt_reverseVideo))
469 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 518 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
470#endif 519#endif
471 520
472 /* convenient aliases for setting fg/bg to colors */ 521 /* convenient aliases for setting fg/bg to colors */
473 color_aliases (Color_fg); 522 color_aliases (Color_fg);
… …
494/*----------------------------------------------------------------------*/ 543/*----------------------------------------------------------------------*/
495void 544void
496rxvt_term::init_env () 545rxvt_term::init_env ()
497{ 546{
498 int i; 547 int i;
499 unsigned int u;
500 char *val; 548 char *val;
501 549
502#ifdef DISPLAY_IS_IP 550#ifdef DISPLAY_IS_IP
503 /* Fixup display_name for export over pty to any interested terminal 551 /* Fixup display_name for export over pty to any interested terminal
504 * 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
… …
513 val = rxvt_network_display (rs[Rs_display_name]); 561 val = rxvt_network_display (rs[Rs_display_name]);
514 rs[Rs_display_name] = (const char *)val; 562 rs[Rs_display_name] = (const char *)val;
515 563
516 if (val == NULL) 564 if (val == NULL)
517#endif /* DISPLAY_IS_IP */ 565#endif /* DISPLAY_IS_IP */
518 val = XDisplayString (display->display); 566 val = XDisplayString (dpy);
519 567
520 if (rs[Rs_display_name] == NULL) 568 if (rs[Rs_display_name] == NULL)
521 rs[Rs_display_name] = val; /* use broken `:0' value */ 569 rs[Rs_display_name] = val; /* use broken `:0' value */
522 570
523 i = strlen (val); 571 i = strlen (val);
524 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 572 env_display = (char *)rxvt_malloc (i + 9);
525 573
526 sprintf (env_display, "DISPLAY=%s", val); 574 sprintf (env_display, "DISPLAY=%s", val);
527 575
528 /* avoiding the math library: 576 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
529 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
530 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
531 ;
532 max_it (i, 1);
533 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
534
535 sprintf (env_windowid, "WINDOWID=%u",
536 (unsigned int)parent[0]);
537 577
538 /* add entries to the environment: 578 /* add entries to the environment:
539 * @ DISPLAY: in case we started with -display 579 * @ DISPLAY: in case we started with -display
540 * @ WINDOWID: X window id number of the window 580 * @ WINDOWID: X window id number of the window
541 * @ COLORTERM: terminal sub-name and also indicates its color 581 * @ COLORTERM: terminal sub-name and also indicates its color
… …
543 * @ TERMINFO: path to terminfo directory 583 * @ TERMINFO: path to terminfo directory
544 * @ COLORFGBG: fg;bg color codes 584 * @ COLORFGBG: fg;bg color codes
545 */ 585 */
546 putenv (env_display); 586 putenv (env_display);
547 putenv (env_windowid); 587 putenv (env_windowid);
588
548 if (env_colorfgbg) 589 if (env_colorfgbg)
549 putenv (env_colorfgbg); 590 putenv (env_colorfgbg);
550 591
551#ifdef RXVT_TERMINFO 592#ifdef RXVT_TERMINFO
552 putenv ("TERMINFO=" RXVT_TERMINFO); 593 putenv ("TERMINFO=" RXVT_TERMINFO);
553#endif 594#endif
554 595
555 if (display->depth <= 2) 596 if (depth <= 2)
556 putenv ("COLORTERM=" COLORTERMENV "-mono"); 597 putenv ("COLORTERM=" COLORTERMENV "-mono");
557 else 598 else
558 putenv ("COLORTERM=" COLORTERMENVFULL); 599 putenv ("COLORTERM=" COLORTERMENVFULL);
559 600
560 if (rs[Rs_term_name] != NULL) 601 if (rs[Rs_term_name] != NULL)
561 { 602 {
562 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);
563 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 604 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
564 putenv (env_term); 605 putenv (env_term);
565 } 606 }
566 else 607 else
567 putenv ("TERM=" TERMENV); 608 putenv ("TERM=" TERMENV);
… …
654 * Initialize the command connection. 695 * Initialize the command connection.
655 * This should be called after the X server connection is established. 696 * This should be called after the X server connection is established.
656 */ 697 */
657 698
658#ifdef META8_OPTION 699#ifdef META8_OPTION
659 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 700 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
660#endif 701#endif
661 702
662 get_ourmods (); 703 get_ourmods ();
663 704
664 if (!OPTION (Opt_scrollTtyOutput)) 705 if (!option (Opt_scrollTtyOutput))
665 priv_modes |= PrivMode_TtyOutputInh; 706 priv_modes |= PrivMode_TtyOutputInh;
666 if (OPTION (Opt_scrollTtyKeypress)) 707 if (option (Opt_scrollTtyKeypress))
667 priv_modes |= PrivMode_Keypress; 708 priv_modes |= PrivMode_Keypress;
668 if (!OPTION (Opt_jumpScroll)) 709 if (!option (Opt_jumpScroll))
669 priv_modes |= PrivMode_smoothScroll; 710 priv_modes |= PrivMode_smoothScroll;
670 711
671#ifndef NO_BACKSPACE_KEY 712#ifndef NO_BACKSPACE_KEY
672 if (strcmp (key_backspace, "DEC") == 0) 713 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
673 priv_modes |= PrivMode_HaveBackSpace; 714 priv_modes |= PrivMode_HaveBackSpace;
674#endif 715#endif
675 716
676 /* add value for scrollBar */ 717 /* add value for scrollBar */
677 if (scrollBar.state) 718 if (scrollBar.state)
… …
691 732
692#ifdef OFF_FOCUS_FADING 733#ifdef OFF_FOCUS_FADING
693 pix_colors = pix_colors_focused; 734 pix_colors = pix_colors_focused;
694#endif 735#endif
695 736
696 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 737 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
697 { 738 {
739 const char *name = rs[Rs_color + i];
740
741 if (!name)
742 continue;
743
698 rxvt_color xcol; 744 rxvt_color xcol;
699 745
700 if (!rs[Rs_color + i]) 746 if (!set_color (xcol, name))
701 continue;
702
703 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
704 { 747 {
705#ifndef XTERM_REVERSE_VIDEO 748#ifndef XTERM_REVERSE_VIDEO
706 if (i < 2 && OPTION (Opt_reverseVideo)) 749 if (i < 2 && option (Opt_reverseVideo))
707 rs[Rs_color + i] = def_colorName[!i]; 750 name = def_colorName [1 - i];
708 else 751 else
709#endif 752#endif
710 rs[Rs_color + i] = def_colorName[i]; 753 name = def_colorName [i];
711 754
712 if (!rs[Rs_color + i]) 755 if (!name)
713 continue; 756 continue;
714 757
715 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 758 if (!set_color (xcol, name))
716 { 759 {
717 switch (i) 760 switch (i)
718 { 761 {
719 case Color_fg: 762 case Color_fg:
720 case Color_bg: 763 case Color_bg:
721 /* fatal: need bg/fg color */
722 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 764 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
723 /* NOTREACHED */ 765 name = "";
724 break; 766 break;
725#ifndef NO_CURSORCOLOR 767#ifndef NO_CURSORCOLOR
726 case Color_cursor2: 768 case Color_cursor2:
727 xcol = pix_colors[Color_fg]; 769#endif
728 break;
729#endif /* ! NO_CURSORCOLOR */
730 case Color_pointer_fg: 770 case Color_pointer_fg:
731 xcol = pix_colors[Color_fg]; 771 name = rs[Rs_color + Color_fg];
772 xcol.set (this, name);
732 break; 773 break;
733 default: 774 default:
734 xcol = pix_colors[Color_bg]; /* None */ 775 name = rs[Rs_color + Color_bg];
776 xcol.set (this, name);
735 break; 777 break;
736 } 778 }
737 } 779 }
738 } 780 }
739 781
740 pix_colors[i] = xcol; 782 pix_colors[i] = xcol;
741 SET_PIXCOLOR (i); 783 rs[Rs_color + i] = name;
742 }
743
744#ifdef OFF_FOCUS_FADING
745 if (rs[Rs_fade])
746 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
747 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
748#endif
749
750 if (display->depth <= 2)
751 { 784 }
785
786 if (depth <= 2)
787 {
752 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);
753 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);
754 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);
755 } 791 }
756 792
757 /* 793 /*
758 * get scrollBar shadow colors 794 * get scrollBar shadow colors
759 * 795 *
760 * The calculations of topShadow/bottomShadow values are adapted 796 * The calculations of topShadow/bottomShadow values are adapted
761 * from the fvwm window manager. 797 * from the fvwm window manager.
762 */ 798 */
763#ifdef KEEP_SCROLLCOLOR 799#ifdef KEEP_SCROLLCOLOR
764
765 if (display->depth <= 2) 800 if (depth <= 2)
766 { 801 {
767 /* Monochrome */ 802 /* Monochrome */
768 pix_colors[Color_scroll] = pix_colors[Color_fg]; 803 alias_color (Color_scroll, Color_fg);
769 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 804 alias_color (Color_topShadow, Color_bg);
770 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 805 alias_color (Color_bottomShadow, Color_bg);
771 } 806 }
772 else 807 else
773 { 808 {
774 rxvt_color xcol[2]; 809 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
775 /* xcol[0] == white
776 * xcol[1] == top shadow
777 * xcol[2] == bot shadow */
778 810
779 xcol[1] = pix_colors[Color_scroll]; 811 rgba cscroll;
780 xcol[0].set (display, 65535, 65535, 65535); 812 pix_colors [Color_scroll].get (cscroll);
781
782 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
783
784 xcol[0].get (display, pr0, pg0, pb0);
785 xcol[1].get (display, pr1, pg1, pb1);
786
787 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
788 813
789 /* topShadowColor */ 814 /* topShadowColor */
790 if (!xcol[1].set (display, 815 if (!pix_colors[Color_topShadow].set (this,
791 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 816 rgba (
792 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 817 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
793 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 818 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
794 xcol[1] = pix_colors[Color_White]; 819 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
795 820 cscroll.a)
796 pix_colors[Color_topShadow] = xcol[1]; 821 ))
822 alias_color (Color_topShadow, Color_White);
797 } 823 }
798#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
799} 830}
800 831
801/*----------------------------------------------------------------------*/ 832/*----------------------------------------------------------------------*/
802/* color aliases, fg/bg bright-bold */ 833/* color aliases, fg/bg bright-bold */
803void 834void
… …
842 873
843 if (rsmod 874 if (rsmod
844 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 875 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
845 requestedmeta = rsmod[3] - '0'; 876 requestedmeta = rsmod[3] - '0';
846 877
847 map = XGetModifierMapping (display->display); 878 map = XGetModifierMapping (dpy);
848 kc = map->modifiermap; 879 kc = map->modifiermap;
849 880
850 for (i = 1; i < 6; i++) 881 for (i = 1; i < 6; i++)
851 { 882 {
852 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 883 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
854 for (j = map->max_keypermod; j--; k++) 885 for (j = map->max_keypermod; j--; k++)
855 { 886 {
856 if (kc[k] == 0) 887 if (kc[k] == 0)
857 break; 888 break;
858 889
859 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 890 switch (XKeycodeToKeysym (dpy, kc[k], 0))
860 { 891 {
861 case XK_Num_Lock: 892 case XK_Num_Lock:
862 ModNumLockMask = modmasks[i - 1]; 893 ModNumLockMask = modmasks[i - 1];
863 continue; 894 continue;
864 895
… …
914rxvt_term::create_windows (int argc, const char *const *argv) 945rxvt_term::create_windows (int argc, const char *const *argv)
915{ 946{
916 XClassHint classHint; 947 XClassHint classHint;
917 XWMHints wmHint; 948 XWMHints wmHint;
918#if ENABLE_FRILLS 949#if ENABLE_FRILLS
919 Atom prop = None;
920 MWMHints mwmhints; 950 MWMHints mwmhints = { };
921#endif 951#endif
922 XGCValues gcvalue; 952 XGCValues gcvalue;
923 XSetWindowAttributes attributes; 953 XSetWindowAttributes attributes;
924 XWindowAttributes gattr;
925 Window top, parent; 954 Window top, parent;
926 dDisp;
927 955
928#ifdef USING_W11LIB 956 dLocal (Display *, dpy);
929 /* enable W11 callbacks */
930 W11AddEventHandler (disp, rxvt_W11_process_x_event);
931#endif
932
933 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
934 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
935
936 if (OPTION (Opt_transparent))
937 {
938 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
939 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
940 }
941 957
942 /* grab colors before netscape does */ 958 /* grab colors before netscape does */
943 Get_Colours (); 959 Get_Colours ();
944 960
945 if (!set_fonts ()) 961 if (!set_fonts ())
946 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");
947 963
948 parent = DefaultRootWindow (disp); 964 parent = display->root;
949 965
950 attributes.override_redirect = !!OPTION (Opt_override_redirect); 966 attributes.override_redirect = !!option (Opt_override_redirect);
951 967
952#if ENABLE_FRILLS 968#if ENABLE_FRILLS
953 if (OPTION (Opt_borderLess)) 969 if (option (Opt_borderLess))
954 { 970 {
955 prop = XInternAtom (disp, "_MOTIF_WM_INFO", True); 971 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
956
957 if (prop == None)
958 { 972 {
959 /* 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");
960 attributes.override_redirect = TRUE; 974 attributes.override_redirect = true;
961 mwmhints.flags = 0;
962 } 975 }
963 else 976 else
964 { 977 {
965 mwmhints.flags = MWM_HINTS_DECORATIONS; 978 mwmhints.flags = MWM_HINTS_DECORATIONS;
966 mwmhints.decorations = 0;
967 } 979 }
968 } 980 }
969 else
970 mwmhints.flags = 0;
971#endif 981#endif
972 982
973#if ENABLE_XEMBED 983#if ENABLE_XEMBED
974 if (rs[Rs_embed]) 984 if (rs[Rs_embed])
975 { 985 {
976 XWindowAttributes wattr; 986 XWindowAttributes wattr;
977 987
978 parent = strtol (rs[Rs_embed], 0, 0); 988 parent = strtol (rs[Rs_embed], 0, 0);
979 989
980 if (!XGetWindowAttributes (disp, parent, &wattr)) 990 if (!XGetWindowAttributes (dpy, parent, &wattr))
981 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 991 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
982 992
983 window_calc (wattr.width, wattr.height); 993 window_calc (wattr.width, wattr.height);
984 } 994 }
985#endif 995#endif
986 996
987 window_calc (0, 0); 997 window_calc (0, 0);
988 998
989 /* sub-window placement & size in rxvt_resize_subwindows () */ 999 /* sub-window placement & size in rxvt_resize_subwindows () */
990 attributes.background_pixel = pix_colors_focused[Color_border]; 1000 attributes.background_pixel = pix_colors_focused [Color_border];
991 attributes.border_pixel = pix_colors_focused[Color_border]; 1001 attributes.border_pixel = pix_colors_focused [Color_border];
992 attributes.colormap = display->cmap; 1002 attributes.colormap = cmap;
1003
993 top = XCreateWindow (disp, parent, 1004 top = XCreateWindow (dpy, parent,
994 szHint.x, szHint.y, 1005 szHint.x, szHint.y,
995 szHint.width, szHint.height, 1006 szHint.width, szHint.height,
996 ext_bwidth, 1007 ext_bwidth,
997 display->depth, InputOutput, 1008 depth, InputOutput, visual,
998 display->visual,
999 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1009 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1000 &attributes); 1010 &attributes);
1001 1011
1002 this->parent[0] = top; 1012 this->parent[0] = top;
1003 1013
1004 old_width = szHint.width; 1014 old_width = szHint.width;
1005 old_height = szHint.height; 1015 old_height = szHint.height;
1006 1016
1007 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1017 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1008 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1018 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1009 1019
1010 classHint.res_name = (char *)rs[Rs_name]; 1020 classHint.res_name = (char *)rs[Rs_name];
1011 classHint.res_class = (char *)RESCLASS; 1021 classHint.res_class = (char *)RESCLASS;
1012 1022
1013 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1023 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1014 wmHint.input = True; 1024 wmHint.input = True;
1015 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1025 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1016 wmHint.window_group = top; 1026 wmHint.window_group = top;
1017 1027
1018 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 1028 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1019 &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
1020 1036
1021 Atom protocols[] = { 1037 Atom protocols[] = {
1022 xa[XA_WM_DELETE_WINDOW], 1038 xa[XA_WM_DELETE_WINDOW],
1023#if ENABLE_EWMH 1039#if ENABLE_EWMH
1024 xa[XA_NET_WM_PING], 1040 xa[XA_NET_WM_PING],
1025#endif 1041#endif
1026 }; 1042 };
1027 1043
1028 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1044 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1029 1045
1030#if ENABLE_FRILLS 1046#if ENABLE_FRILLS
1031 if (rs[Rs_transient_for]) 1047 if (rs[Rs_transient_for])
1032 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1048 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1033#endif 1049#endif
1034 1050
1035#if ENABLE_EWMH 1051#if ENABLE_EWMH
1036 long pid = getpid (); 1052 long pid = getpid ();
1037 1053
1038 XChangeProperty (disp, top, 1054 XChangeProperty (dpy, top,
1039 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1055 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1040 PropModeReplace, (unsigned char *)&pid, 1); 1056 PropModeReplace, (unsigned char *)&pid, 1);
1041 1057
1042 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1058 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1043#endif 1059#endif
1044 1060
1045 XSelectInput (disp, top, 1061 XSelectInput (dpy, top,
1046 KeyPressMask 1062 KeyPressMask
1047#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1063#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1048 | KeyReleaseMask 1064 | KeyReleaseMask
1049#endif 1065#endif
1050 | FocusChangeMask | VisibilityChangeMask 1066 | FocusChangeMask | VisibilityChangeMask
1051 | ExposureMask | StructureNotifyMask); 1067 | ExposureMask | StructureNotifyMask);
1052 1068
1053 termwin_ev.start (display, top); 1069 termwin_ev.start (display, top);
1054 1070
1055#if ENABLE_FRILLS
1056 if (mwmhints.flags)
1057 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1058 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1059#endif
1060
1061 /* 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 */
1062 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1072 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1063 1073
1064#ifdef HAVE_SCROLLBARS 1074#ifdef HAVE_SCROLLBARS
1065 /* cursor scrollBar: Black-on-White */ 1075 /* cursor scrollBar: Black-on-White */
1066 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1076 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1067#endif 1077#endif
1068 1078
1069 /* the vt window */ 1079 /* the vt window */
1070 vt = XCreateSimpleWindow (disp, top, 1080 vt = XCreateSimpleWindow (dpy, top,
1071 window_vt_x,
1072 window_vt_y, 1081 window_vt_x, window_vt_y,
1073 width,
1074 height, 1082 width, height,
1075 0, 1083 0,
1076 pix_colors_focused[Color_fg], 1084 pix_colors_focused[Color_fg],
1077 pix_colors_focused[Color_bg]); 1085 pix_colors_focused[Color_bg]);
1078#ifdef DEBUG_X
1079 XStoreName (disp, vt, "vt window");
1080#endif
1081 1086
1082 attributes.bit_gravity = NorthWestGravity; 1087 attributes.bit_gravity = NorthWestGravity;
1083 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1088 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1084 1089
1085 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1090 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1086 1091
1087 if (OPTION (Opt_pointerBlank)) 1092 if (option (Opt_pointerBlank))
1088 vt_emask |= PointerMotionMask; 1093 vt_emask |= PointerMotionMask;
1089 else 1094 else
1090 vt_emask |= Button1MotionMask | Button3MotionMask; 1095 vt_emask |= Button1MotionMask | Button3MotionMask;
1091 1096
1092 vt_select_input (); 1097 vt_select_input ();
1093 1098
1094 vt_ev.start (display, vt); 1099 vt_ev.start (display, vt);
1095 1100
1096#ifdef XPM_BACKGROUND
1097 if (rs[Rs_backgroundPixmap] != NULL
1098 && ! OPTION (Opt_transparent))
1099 {
1100 const char *p = rs[Rs_backgroundPixmap];
1101
1102 if ((p = strchr (p, ';')) != NULL)
1103 {
1104 p++;
1105 scale_pixmap (p);
1106 }
1107
1108 set_bgPixmap (rs[Rs_backgroundPixmap]);
1109 scr_touch (true);
1110 }
1111#endif
1112
1113 /* graphics context for the vt window */ 1101 /* graphics context for the vt window */
1114 gcvalue.foreground = pix_colors[Color_fg]; 1102 gcvalue.foreground = pix_colors[Color_fg];
1115 gcvalue.background = pix_colors[Color_bg]; 1103 gcvalue.background = pix_colors[Color_bg];
1116 gcvalue.graphics_exposures = 1; 1104 gcvalue.graphics_exposures = 0;
1105
1117 gc = XCreateGC (disp, vt, 1106 gc = XCreateGC (dpy, vt,
1118 GCForeground | GCBackground | GCGraphicsExposures, 1107 GCForeground | GCBackground | GCGraphicsExposures,
1119 &gcvalue); 1108 &gcvalue);
1120 1109
1121 drawable = new rxvt_drawable (display, vt); 1110 drawable = new rxvt_drawable (this, vt);
1122 1111
1123#ifdef RXVT_SCROLLBAR 1112#ifdef RXVT_SCROLLBAR
1124 gcvalue.foreground = pix_colors[Color_topShadow]; 1113 gcvalue.foreground = pix_colors[Color_topShadow];
1125 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1114 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1126 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1115 gcvalue.foreground = pix_colors[Color_bottomShadow];
1127 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1116 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1128 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1117 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1129 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1118 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1130#endif 1119#endif
1131 1120
1132#ifdef OFF_FOCUS_FADING 1121#ifdef OFF_FOCUS_FADING
1133 // initially we are in unfocused state 1122 // initially we are in unfocused state
1134 if (rs[Rs_fade]) 1123 if (rs[Rs_fade])
1135 pix_colors = pix_colors_unfocused; 1124 pix_colors = pix_colors_unfocused;
1136#endif 1125#endif
1137 1126
1138 pointer_unblank (); 1127 pointer_unblank ();
1139 scr_recolour (); 1128 scr_recolour ();
1140
1141#if ENABLE_XEMBED
1142 if (rs[Rs_embed])
1143 {
1144 long info[2] = { 0, XEMBED_MAPPED };
1145
1146 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1147 32, PropModeReplace, (unsigned char *)&info, 2);
1148 }
1149#endif
1150} 1129}
1151 1130
1152/* ------------------------------------------------------------------------- * 1131/* ------------------------------------------------------------------------- *
1153 * GET TTY CURRENT STATE * 1132 * GET TTY CURRENT STATE *
1154 * ------------------------------------------------------------------------- */ 1133 * ------------------------------------------------------------------------- */
1155void 1134void
1156rxvt_get_ttymode (ttymode_t *tio, int erase) 1135rxvt_get_ttymode (ttymode_t *tio, int erase)
1157{ 1136{
1158#ifdef HAVE_TERMIOS_H
1159 /* 1137 /*
1160 * standard System V termios interface 1138 * standard System V termios interface
1161 */ 1139 */
1162 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1140 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1163 { 1141 {
… …
1230 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1208 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1231# if defined (ECHOCTL) && defined (ECHOKE) 1209# if defined (ECHOCTL) && defined (ECHOKE)
1232 | ECHOCTL | ECHOKE 1210 | ECHOCTL | ECHOKE
1233# endif 1211# endif
1234 | ECHOE | ECHOK); 1212 | ECHOE | ECHOK);
1235# else /* HAVE_TERMIOS_H */
1236
1237 /*
1238 * sgtty interface
1239 */
1240
1241 /* get parameters -- gtty */
1242 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1243 {
1244 tio->sg.sg_erase = CERASE; /* ^H */
1245 tio->sg.sg_kill = CKILL; /* ^U */
1246 }
1247
1248 if (erase != -1)
1249 tio->sg.sg_erase = (char)erase;
1250
1251 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1252
1253 /* get special characters */
1254 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1255 {
1256 tio->tc.t_intrc = CINTR; /* ^C */
1257 tio->tc.t_quitc = CQUIT; /* ^\ */
1258 tio->tc.t_startc = CSTART; /* ^Q */
1259 tio->tc.t_stopc = CSTOP; /* ^S */
1260 tio->tc.t_eofc = CEOF; /* ^D */
1261 tio->tc.t_brkc = -1;
1262 }
1263
1264 /* get local special chars */
1265 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1266 {
1267 tio->lc.t_suspc = CSUSP; /* ^Z */
1268 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1269 tio->lc.t_rprntc = CRPRNT; /* ^R */
1270 tio->lc.t_flushc = CFLUSH; /* ^O */
1271 tio->lc.t_werasc = CWERASE; /* ^W */
1272 tio->lc.t_lnextc = CLNEXT; /* ^V */
1273 }
1274 /* get line discipline */
1275 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1276# ifdef NTTYDISC
1277 tio->line = NTTYDISC;
1278# endif /* NTTYDISC */
1279
1280 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1281#endif /* HAVE_TERMIOS_H */
1282 1213
1283 /* 1214 /*
1284 * Debugging 1215 * Debugging
1285 */ 1216 */
1286#ifdef DEBUG_TTYMODE 1217#ifdef DEBUG_TTYMODE
… …
1387 else 1318 else
1388#endif 1319#endif
1389 if (!pty->get ()) 1320 if (!pty->get ())
1390 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1321 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1391 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 */
1392 pty->set_utf8_mode (enc_utf8); 1336 pty->set_utf8_mode (enc_utf8);
1393 1337
1394 /* set initial window size */ 1338 /* set initial window size */
1395 tt_winch (); 1339 tt_winch ();
1396
1397 int er;
1398
1399#ifndef NO_BACKSPACE_KEY
1400 if (key_backspace[0] && !key_backspace[1])
1401 er = key_backspace[0];
1402 else if (strcmp (key_backspace, "DEC") == 0)
1403 er = '\177'; /* the initial state anyway */
1404 else
1405#endif
1406 er = -1;
1407
1408 rxvt_get_ttymode (&tio, er);
1409 1340
1410#if ENABLE_FRILLS 1341#if ENABLE_FRILLS
1411 if (rs[Rs_pty_fd]) 1342 if (rs[Rs_pty_fd])
1412 return; 1343 return;
1413#endif 1344#endif
… …
1444 } 1375 }
1445 1376
1446 _exit (EXIT_FAILURE); 1377 _exit (EXIT_FAILURE);
1447 1378
1448 default: 1379 default:
1449 if (!OPTION (Opt_utmpInhibit)) 1380 if (!option (Opt_utmpInhibit))
1450 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1381 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1451 1382
1452 pty->close_tty (); 1383 pty->close_tty ();
1453 1384
1454 child_ev.start (cmd_pid); 1385 child_ev.start (cmd_pid);
1455 1386
… …
1468int 1399int
1469rxvt_term::run_child (const char *const *argv) 1400rxvt_term::run_child (const char *const *argv)
1470{ 1401{
1471 char *login; 1402 char *login;
1472 1403
1473 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1474
1475 if (OPTION (Opt_console)) 1404 if (option (Opt_console))
1476 { /* be virtual console, fail silently */ 1405 { /* be virtual console, fail silently */
1477#ifdef TIOCCONS 1406#ifdef TIOCCONS
1478 unsigned int on = 1; 1407 unsigned int on = 1;
1479 1408
1480 ioctl (STDIN_FILENO, TIOCCONS, &on); 1409 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1508 sigset_t ss; 1437 sigset_t ss;
1509 sigemptyset (&ss); 1438 sigemptyset (&ss);
1510 sigprocmask (SIG_SETMASK, &ss, 0); 1439 sigprocmask (SIG_SETMASK, &ss, 0);
1511 1440
1512 /* command interpreter path */ 1441 /* command interpreter path */
1513 if (argv != NULL) 1442 if (argv)
1514 { 1443 {
1515# ifdef DEBUG_CMD 1444# ifdef DEBUG_CMD
1516 int i; 1445 int i;
1517 1446
1518 for (i = 0; argv[i]; i++) 1447 for (i = 0; argv[i]; i++)
… …
1527 const char *argv0, *shell; 1456 const char *argv0, *shell;
1528 1457
1529 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1458 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1530 shell = "/bin/sh"; 1459 shell = "/bin/sh";
1531 1460
1532 argv0 = (const char *)rxvt_r_basename (shell); 1461 argv0 = (const char *)rxvt_basename (shell);
1533 1462
1534 if (OPTION (Opt_loginShell)) 1463 if (option (Opt_loginShell))
1535 { 1464 {
1536 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1465 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1537 1466
1538 login[0] = '-'; 1467 login[0] = '-';
1539 strcpy (&login[1], argv0); 1468 strcpy (&login[1], argv0);
1540 argv0 = login; 1469 argv0 = login;
1541 } 1470 }
1542 1471
1543 execlp (shell, argv0, NULL); 1472 execlp (shell, argv0, (char *)0);
1544 /* no error message: STDERR is closed! */ 1473 /* no error message: STDERR is closed! */
1545 } 1474 }
1546 1475
1547 return -1; 1476 return -1;
1548} 1477}

Diff Legend

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