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.138 by root, Wed Jan 11 02:24:12 2006 UTC vs.
Revision 1.218 by ayin, Thu Oct 18 09:11:42 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 HAVE_XSETLOCALE
47# define X_LOCALE
48# include <X11/Xlocale.h>
49#else
50# ifdef HAVE_SETLOCALE
51# include <clocale>
52# endif
53#endif
54
55#ifdef HAVE_NL_LANGINFO
56# include <langinfo.h>
57#endif
58
59#ifdef DISPLAY_IS_IP
60/* On Solaris link with -lsocket and -lnsl */
61#include <sys/types.h>
62#include <sys/socket.h>
63
64/* these next two are probably only on Sun (not Solaris) */
65#ifdef HAVE_SYS_SOCKIO_H
66#include <sys/sockio.h>
67#endif
68#ifdef HAVE_SYS_BYTEORDER_H
69#include <sys/byteorder.h>
70#endif
71
72#include <netinet/in.h>
73#include <arpa/inet.h>
74#include <net/if.h>
75#include <net/if_arp.h>
76
77static char *
78rxvt_network_display (const char *display)
79{
80 char buffer[1024], *rval = NULL;
81 struct ifconf ifc;
82 struct ifreq *ifr;
83 int i, skfd;
84
85 if (display[0] != ':' && strncmp (display, "unix:", 5))
86 return (char *) display; /* nothing to do */
87
88 ifc.ifc_len = sizeof (buffer); /* Get names of all ifaces */
89 ifc.ifc_buf = buffer;
90
91 if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
92 {
93 perror ("socket");
94 return NULL;
95 }
96
97 if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0)
98 {
99 perror ("SIOCGIFCONF");
100 close (skfd);
101 return NULL;
102 }
103
104 for (i = 0, ifr = ifc.ifc_req;
105 i < (ifc.ifc_len / sizeof (struct ifreq));
106 i++, ifr++)
107 {
108 struct ifreq ifr2;
109
110 strcpy (ifr2.ifr_name, ifr->ifr_name);
111
112 if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0)
113 {
114 unsigned long addr;
115 struct sockaddr_in *p_addr;
116
117 p_addr = (struct sockaddr_in *) &ifr2.ifr_addr;
118 addr = htonl ((unsigned long)p_addr->sin_addr.s_addr);
119
120 /*
121 * not "0.0.0.0" or "127.0.0.1" - so format the address
122 */
123 if (addr && addr != 0x7F000001)
124 {
125 char *colon = strchr (display, ':');
126
127 if (colon == NULL)
128 colon = ":0.0";
129
130 rval = rxvt_malloc (strlen (colon) + 16);
131 sprintf (rval, "%d.%d.%d.%d%s",
132 (int) ((addr >> 030) & 0xFF),
133 (int) ((addr >> 020) & 0xFF),
134 (int) ((addr >> 010) & 0xFF),
135 (int) (addr & 0xFF), colon);
136 break;
137 }
138 }
139 }
140
141 close (skfd);
142
143 return rval;
144}
145#endif
146
43const char *const def_colorName[] = 147const char *const def_colorName[] =
44 { 148 {
45 COLOR_FOREGROUND, 149 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 150 COLOR_BACKGROUND,
47 /* low-intensity colors */ 151 /* low-intensity colors */
48 "Black", /* 0: black (#000000) */ 152 "rgb:00/00/00", // 0: black (Black)
49 "Red3", /* 1: red (#CD0000) */ 153 "rgb:cd/00/00", // 1: red (Red3)
50 "Green3", /* 2: green (#00CD00) */ 154 "rgb:00/cd/00", // 2: green (Green3)
51 "Yellow3", /* 3: yellow (#CDCD00) */ 155 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "Blue3", /* 4: blue (#0000CD) */ 156 "rgb:00/00/cd", // 4: blue (Blue3)
53 "Magenta3", /* 5: magenta (#CD00CD) */ 157 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "Cyan3", /* 6: cyan (#00CDCD) */ 158 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 159# ifdef XTERM_COLORS
56 "Grey90", /* 7: white (#E5E5E5) */ 160 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 161# else
58 "AntiqueWhite", /* 7: white (#FAEBD7) */ 162 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59# endif 163# endif
60 /* high-intensity colors */ 164 /* high-intensity colors */
61# ifdef XTERM_COLORS 165# ifdef XTERM_COLORS
62 "Grey30", /* 8: bright black (#4D4D4D) */ 166 "rgb:4d/4d/4d", // 8: bright black (Grey30)
63# else 167# else
64 "Grey25", /* 8: bright black (#404040) */ 168 "rgb:40/40/40", // 8: bright black (Grey25)
65# endif 169# endif
66 "Red", /* 1/9: bright red (#FF0000) */ 170 "rgb:ff/00/00", // 1/9: bright red (Reed)
67 "Green", /* 2/10: bright green (#00FF00) */ 171 "rgb:00/ff/00", // 2/10: bright green (Green)
68 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 172 "rgb:ff/ff/00", // 3/11: bright yellow (Yellow)
69 "Blue", /* 4/12: bright blue (#0000FF) */ 173 "rgb:00/00/ff", // 4/12: bright blue (Blue)
70 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 174 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
71 "Cyan", /* 6/14: bright cyan (#00FFFF) */ 175 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
72 "White", /* 7/15: bright white (#FFFFFF) */ 176 "rgb:ff/ff/ff", // 7/15: bright white (White)
73 177
74 // 88 xterm colours 178 // 88 xterm colours
75 "rgb:00/00/00", 179 "rgb:00/00/00",
76 "rgb:00/00/8b", 180 "rgb:00/00/8b",
77 "rgb:00/00/cd", 181 "rgb:00/00/cd",
… …
166#endif 270#endif
167#ifdef KEEP_SCROLLCOLOR 271#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 272 COLOR_SCROLLBAR,
169 COLOR_SCROLLTROUGH, 273 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 274#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 275#if ENABLE_TRANSPARENCY
172 NULL, 276 NULL,
173#endif 277#endif
174#if OFF_FOCUS_FADING 278#if OFF_FOCUS_FADING
175 "black", 279 "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 280#endif
216 }; 281 };
217 282
218bool 283bool
219rxvt_term::init_vars () 284rxvt_term::init_vars ()
220{ 285{
286 pix_colors = //
221 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 287 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
222#ifdef OFF_FOCUS_FADING 288#ifdef OFF_FOCUS_FADING
223 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 289 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
224#endif 290#endif
225 pix_colors = pix_colors_focused;
226 291
227 if (pix_colors == NULL)
228 return false;
229
230#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
231 pixmap = None;
232#endif
233 292
234 MEvent.time = CurrentTime; 293 MEvent.time = CurrentTime;
235 MEvent.button = AnyButton; 294 MEvent.button = AnyButton;
236 options = DEFAULT_OPTIONS;
237 want_refresh = 1; 295 want_refresh = 1;
238 priv_modes = SavedModes = PrivMode_Default; 296 priv_modes = SavedModes = PrivMode_Default;
239 focus = 0;
240 ncol = 80; 297 ncol = 80;
241 nrow = 24; 298 nrow = 24;
242 int_bwidth = INTERNALBORDERWIDTH; 299 int_bwidth = INTERNALBORDERWIDTH;
243 ext_bwidth = EXTERNALBORDERWIDTH; 300 ext_bwidth = EXTERNALBORDERWIDTH;
244 lineSpace = LINESPACE; 301 lineSpace = LINESPACE;
245 saveLines = SAVELINES; 302 saveLines = SAVELINES;
246 numpix_colors = TOTAL_COLORS; 303 numpix_colors = TOTAL_COLORS;
247 304
248 refresh_limit = 1;
249 refresh_type = SLOW_REFRESH; 305 refresh_type = SLOW_REFRESH;
250 prev_nrow = prev_ncol = 0;
251 306
252 oldcursor.row = oldcursor.col = -1; 307 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; 308 last_bot = last_state = -1;
260 309
261#ifdef MENUBAR 310 set_option (Opt_scrollBar);
262 menu_readonly = 1; 311 set_option (Opt_scrollTtyOutput);
263# if ! (MENUBAR_MAX > 1) 312 set_option (Opt_jumpScroll);
264 CurrentBar = &BarList; 313 set_option (Opt_skipScroll);
265# endif /* (MENUBAR_MAX > 1) */ 314 set_option (Opt_secondaryScreen);
266#endif 315 set_option (Opt_secondaryScroll);
316 set_option (Opt_pastableTabs);
317 set_option (Opt_intensityStyles);
318 set_option (Opt_iso14755_52);
267 319
268 return true; 320 return true;
269} 321}
270 322
271void 323void
… …
280 if ((i = open ("/dev/null", O_RDONLY)) < 0) 332 if ((i = open ("/dev/null", O_RDONLY)) < 0)
281 { 333 {
282 /* TODO: BOO HISS */ 334 /* TODO: BOO HISS */
283 dup2 (STDERR_FILENO, STDIN_FILENO); 335 dup2 (STDERR_FILENO, STDIN_FILENO);
284 } 336 }
285 else if (i > STDIN_FILENO) 337 else if (i != STDIN_FILENO)
286 { 338 {
287 dup2 (i, STDIN_FILENO); 339 dup2 (i, STDIN_FILENO);
288 close (i); 340 close (i);
289 } 341 }
290 342
… …
305/*----------------------------------------------------------------------*/ 357/*----------------------------------------------------------------------*/
306const char ** 358const char **
307rxvt_term::init_resources (int argc, const char *const *argv) 359rxvt_term::init_resources (int argc, const char *const *argv)
308{ 360{
309 int i, r_argc; 361 int i, r_argc;
310 char *val;
311 const char **cmd_argv, **r_argv; 362 const char **cmd_argv, **r_argv;
312 363
313 /* 364 /*
314 * Look for -exec option. Find => split and make cmd_argv[] of command args 365 * Look for -e option. Find => split and make cmd_argv[] of command args
315 */ 366 */
316 for (r_argc = 0; r_argc < argc; r_argc++) 367 for (r_argc = 0; r_argc < argc; r_argc++)
317 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 368 if (!strcmp (argv[r_argc], "-e"))
318 break; 369 break;
370
371 if (r_argc == argc)
372 cmd_argv = NULL;
373 else if (!argv[r_argc + 1])
374 rxvt_fatal ("-e requires an argument\n");
375 else
376 {
377 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
378
379 for (i = 0; i < argc - r_argc - 1; i++)
380 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
381
382 cmd_argv[i] = NULL;
383 }
319 384
320 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 385 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
321 386
322 for (i = 0; i < r_argc; i++) 387 for (i = 0; i < r_argc; i++)
323 r_argv[i] = (const char *)argv[i]; 388 r_argv[i] = (const char *)argv[i];
324 389
325 r_argv[i] = NULL; 390 r_argv[i] = NULL;
326 391
327 if (r_argc == argc)
328 cmd_argv = NULL;
329 else
330 {
331 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
332
333 for (i = 0; i < argc - r_argc - 1; i++)
334 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
335
336 cmd_argv[i] = NULL;
337 }
338
339 rs[Rs_name] = rxvt_r_basename (argv[0]); 392 rs[Rs_name] = rxvt_basename (argv[0]);
340 393
341 /* 394 /*
342 * Open display, get options/resources and create the window 395 * Open display, get options/resources and create the window
343 */ 396 */
344 {
345 TEMP_ENV;
346 397
347 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 398 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
348 rs[Rs_display_name] = ":0"; 399 rs[Rs_display_name] = ":0";
349 400
350 get_options (r_argc, r_argv); 401 get_options (r_argc, r_argv);
351 402
352 if (!(display = displays.get (rs[Rs_display_name]))) 403 if (!(display = displays.get (rs[Rs_display_name])))
404 {
405 free (r_argv);
353 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 406 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
354 } 407 }
355 408
409 // using a local pointer decreases code size a lot
410 xa = display->xa;
411
412 set (display);
356 extract_resources (); 413 extract_resources ();
414
415#if XFT
416 if (rs[Rs_depth])
417 select_visual (strtol (rs[Rs_depth], 0, 0));
418#endif
419
420#ifdef HAVE_AFTERIMAGE
421 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
422#endif
357 free (r_argv); 423 free (r_argv);
424
425 for (int i = NUM_RESOURCES; i--; )
426 if (rs [i] == resval_undef)
427 rs [i] = 0;
428
429#if ENABLE_PERL
430 if (!rs[Rs_perl_ext_1])
431 rs[Rs_perl_ext_1] = "default";
432
433 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
434 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
435 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
436 {
437 rxvt_perl.init (this);
438 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
439 }
440#endif
358 441
359 /* 442 /*
360 * set any defaults not already set 443 * set any defaults not already set
361 */ 444 */
362 if (cmd_argv && cmd_argv[0]) 445 if (cmd_argv && cmd_argv[0])
363 { 446 {
364 if (!rs[Rs_title]) 447 if (!rs[Rs_title])
365 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 448 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
366 if (!rs[Rs_iconName]) 449 if (!rs[Rs_iconName])
367 rs[Rs_iconName] = rs[Rs_title]; 450 rs[Rs_iconName] = rs[Rs_title];
368 } 451 }
369 else 452 else
370 { 453 {
… …
408 rs[Rs_cutchars] = CUTCHARS; 491 rs[Rs_cutchars] = CUTCHARS;
409 492
410#ifndef NO_BACKSPACE_KEY 493#ifndef NO_BACKSPACE_KEY
411 if (!rs[Rs_backspace_key]) 494 if (!rs[Rs_backspace_key])
412# ifdef DEFAULT_BACKSPACE 495# ifdef DEFAULT_BACKSPACE
413 key_backspace = DEFAULT_BACKSPACE; 496 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
414# else 497# else
415 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 498 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
416# endif 499# 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 500#endif
425 501
426#ifndef NO_DELETE_KEY 502#ifndef NO_DELETE_KEY
427 if (!rs[Rs_delete_key]) 503 if (!rs[Rs_delete_key])
428# ifdef DEFAULT_DELETE 504# ifdef DEFAULT_DELETE
429 key_delete = DEFAULT_DELETE; 505 rs[Rs_delete_key] = DEFAULT_DELETE;
430# else 506# else
431 key_delete = "\033[3~"; 507 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 508# endif
441 if (rs[Rs_answerbackstring]) 509#endif
442 {
443 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
444 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
445 }
446 510
447#ifdef HAVE_SCROLLBARS 511#ifdef HAVE_SCROLLBARS
448 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 512 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
449#endif 513#endif
450 514
451#ifdef XTERM_REVERSE_VIDEO 515#ifdef XTERM_REVERSE_VIDEO
452 /* this is how xterm implements reverseVideo */ 516 /* this is how xterm implements reverseVideo */
453 if (OPTION (Opt_reverseVideo)) 517 if (option (Opt_reverseVideo))
454 { 518 {
455 if (!rs[Rs_color + Color_fg]) 519 if (!rs[Rs_color + Color_fg])
456 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 520 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
521
457 if (!rs[Rs_color + Color_bg]) 522 if (!rs[Rs_color + Color_bg])
458 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 523 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
459 } 524 }
460#endif 525#endif
461 526
… …
463 if (!rs[Rs_color + i]) 528 if (!rs[Rs_color + i])
464 rs[Rs_color + i] = def_colorName[i]; 529 rs[Rs_color + i] = def_colorName[i];
465 530
466#ifndef XTERM_REVERSE_VIDEO 531#ifndef XTERM_REVERSE_VIDEO
467 /* this is how we implement reverseVideo */ 532 /* this is how we implement reverseVideo */
468 if (OPTION (Opt_reverseVideo)) 533 if (option (Opt_reverseVideo))
469 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 534 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
470#endif 535#endif
471 536
472 /* convenient aliases for setting fg/bg to colors */ 537 /* convenient aliases for setting fg/bg to colors */
473 color_aliases (Color_fg); 538 color_aliases (Color_fg);
… …
494/*----------------------------------------------------------------------*/ 559/*----------------------------------------------------------------------*/
495void 560void
496rxvt_term::init_env () 561rxvt_term::init_env ()
497{ 562{
498 int i; 563 int i;
499 unsigned int u;
500 char *val; 564 char *val;
501 565
502#ifdef DISPLAY_IS_IP 566#ifdef DISPLAY_IS_IP
503 /* Fixup display_name for export over pty to any interested terminal 567 /* 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 568 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
513 val = rxvt_network_display (rs[Rs_display_name]); 577 val = rxvt_network_display (rs[Rs_display_name]);
514 rs[Rs_display_name] = (const char *)val; 578 rs[Rs_display_name] = (const char *)val;
515 579
516 if (val == NULL) 580 if (val == NULL)
517#endif /* DISPLAY_IS_IP */ 581#endif /* DISPLAY_IS_IP */
518 val = XDisplayString (display->display); 582 val = XDisplayString (dpy);
519 583
520 if (rs[Rs_display_name] == NULL) 584 if (rs[Rs_display_name] == NULL)
521 rs[Rs_display_name] = val; /* use broken `:0' value */ 585 rs[Rs_display_name] = val; /* use broken `:0' value */
522 586
523 i = strlen (val); 587 i = strlen (val);
524 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 588 env_display = (char *)rxvt_malloc (i + 9);
525 589
526 sprintf (env_display, "DISPLAY=%s", val); 590 sprintf (env_display, "DISPLAY=%s", val);
527 591
528 /* avoiding the math library: 592 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 593
538 /* add entries to the environment: 594 /* add entries to the environment:
539 * @ DISPLAY: in case we started with -display 595 * @ DISPLAY: in case we started with -display
540 * @ WINDOWID: X window id number of the window 596 * @ WINDOWID: X window id number of the window
541 * @ COLORTERM: terminal sub-name and also indicates its color 597 * @ COLORTERM: terminal sub-name and also indicates its color
… …
543 * @ TERMINFO: path to terminfo directory 599 * @ TERMINFO: path to terminfo directory
544 * @ COLORFGBG: fg;bg color codes 600 * @ COLORFGBG: fg;bg color codes
545 */ 601 */
546 putenv (env_display); 602 putenv (env_display);
547 putenv (env_windowid); 603 putenv (env_windowid);
604
548 if (env_colorfgbg) 605 if (env_colorfgbg)
549 putenv (env_colorfgbg); 606 putenv (env_colorfgbg);
550 607
551#ifdef RXVT_TERMINFO 608#ifdef RXVT_TERMINFO
552 putenv ("TERMINFO=" RXVT_TERMINFO); 609 putenv ("TERMINFO=" RXVT_TERMINFO);
553#endif 610#endif
554 611
555 if (display->depth <= 2) 612 if (depth <= 2)
556 putenv ("COLORTERM=" COLORTERMENV "-mono"); 613 putenv ("COLORTERM=" COLORTERMENV "-mono");
557 else 614 else
558 putenv ("COLORTERM=" COLORTERMENVFULL); 615 putenv ("COLORTERM=" COLORTERMENVFULL);
559 616
560 if (rs[Rs_term_name] != NULL) 617 if (rs[Rs_term_name] != NULL)
561 { 618 {
562 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 619 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
563 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 620 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
564 putenv (env_term); 621 putenv (env_term);
565 } 622 }
566 else 623 else
567 putenv ("TERM=" TERMENV); 624 putenv ("TERM=" TERMENV);
… …
580 * This should support all European type languages. 637 * This should support all European type languages.
581 */ 638 */
582void 639void
583rxvt_term::set_locale (const char *locale) 640rxvt_term::set_locale (const char *locale)
584{ 641{
585 TEMP_ENV; 642 set_environ (envv);
586 643
587#if HAVE_XSETLOCALE || HAVE_SETLOCALE 644#if HAVE_XSETLOCALE || HAVE_SETLOCALE
588 free (this->locale); 645 free (this->locale);
589 this->locale = setlocale (LC_CTYPE, locale); 646 this->locale = setlocale (LC_CTYPE, locale);
590 647
… …
621} 678}
622 679
623void 680void
624rxvt_term::init_xlocale () 681rxvt_term::init_xlocale ()
625{ 682{
626 TEMP_ENV; 683 set_environ (envv);
627 684
628#ifdef USE_XIM 685#ifdef USE_XIM
629 if (!locale) 686 if (!locale)
630 rxvt_warn ("setting locale failed, working without locale support.\n"); 687 rxvt_warn ("setting locale failed, working without locale support.\n");
631 else 688 else
… …
654 * Initialize the command connection. 711 * Initialize the command connection.
655 * This should be called after the X server connection is established. 712 * This should be called after the X server connection is established.
656 */ 713 */
657 714
658#ifdef META8_OPTION 715#ifdef META8_OPTION
659 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 716 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
660#endif 717#endif
661 718
662 get_ourmods (); 719 get_ourmods ();
663 720
664 if (!OPTION (Opt_scrollTtyOutput)) 721 if (!option (Opt_scrollTtyOutput))
665 priv_modes |= PrivMode_TtyOutputInh; 722 priv_modes |= PrivMode_TtyOutputInh;
666 if (OPTION (Opt_scrollTtyKeypress)) 723 if (option (Opt_scrollTtyKeypress))
667 priv_modes |= PrivMode_Keypress; 724 priv_modes |= PrivMode_Keypress;
668 if (!OPTION (Opt_jumpScroll)) 725 if (!option (Opt_jumpScroll))
669 priv_modes |= PrivMode_smoothScroll; 726 priv_modes |= PrivMode_smoothScroll;
670 727
671#ifndef NO_BACKSPACE_KEY 728#ifndef NO_BACKSPACE_KEY
672 if (strcmp (key_backspace, "DEC") == 0) 729 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
673 priv_modes |= PrivMode_HaveBackSpace; 730 priv_modes |= PrivMode_HaveBackSpace;
674#endif 731#endif
675 732
676 /* add value for scrollBar */ 733 /* add value for scrollBar */
677 if (scrollbar_visible ()) 734 if (scrollBar.state)
678 { 735 {
679 priv_modes |= PrivMode_scrollBar; 736 priv_modes |= PrivMode_scrollBar;
680 SavedModes |= PrivMode_scrollBar; 737 SavedModes |= PrivMode_scrollBar;
681 }
682
683 if (menubar_visible ())
684 {
685 priv_modes |= PrivMode_menuBar;
686 SavedModes |= PrivMode_menuBar;
687 } 738 }
688 739
689 run_command (argv); 740 run_command (argv);
690} 741}
691 742
… …
697 748
698#ifdef OFF_FOCUS_FADING 749#ifdef OFF_FOCUS_FADING
699 pix_colors = pix_colors_focused; 750 pix_colors = pix_colors_focused;
700#endif 751#endif
701 752
702 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 753 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
703 { 754 {
755 const char *name = rs[Rs_color + i];
756
757 if (!name)
758 continue;
759
704 rxvt_color xcol; 760 rxvt_color xcol;
705 761
706 if (!rs[Rs_color + i]) 762 if (!set_color (xcol, name))
707 continue;
708
709 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
710 { 763 {
711#ifndef XTERM_REVERSE_VIDEO 764#ifndef XTERM_REVERSE_VIDEO
712 if (i < 2 && OPTION (Opt_reverseVideo)) 765 if (i < 2 && option (Opt_reverseVideo))
713 rs[Rs_color + i] = def_colorName[!i]; 766 name = def_colorName [1 - i];
714 else 767 else
715#endif 768#endif
716 rs[Rs_color + i] = def_colorName[i]; 769 name = def_colorName [i];
717 770
718 if (!rs[Rs_color + i]) 771 if (!name)
719 continue; 772 continue;
720 773
721 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 774 if (!set_color (xcol, name))
722 { 775 {
723 switch (i) 776 switch (i)
724 { 777 {
725 case Color_fg: 778 case Color_fg:
726 case Color_bg: 779 case Color_bg:
727 /* fatal: need bg/fg color */
728 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 780 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
729 /* NOTREACHED */ 781 name = "";
730 break; 782 break;
731#ifndef NO_CURSORCOLOR 783#ifndef NO_CURSORCOLOR
732 case Color_cursor2: 784 case Color_cursor2:
733 xcol = pix_colors[Color_fg]; 785#endif
734 break;
735#endif /* ! NO_CURSORCOLOR */
736 case Color_pointer_fg: 786 case Color_pointer_fg:
737 xcol = pix_colors[Color_fg]; 787 name = rs[Rs_color + Color_fg];
788 xcol.set (this, name);
738 break; 789 break;
739 default: 790 default:
740 xcol = pix_colors[Color_bg]; /* None */ 791 name = rs[Rs_color + Color_bg];
792 xcol.set (this, name);
741 break; 793 break;
742 } 794 }
743 } 795 }
744 } 796 }
745 797
746 pix_colors[i] = xcol; 798 pix_colors[i] = xcol;
747 SET_PIXCOLOR (i); 799 rs[Rs_color + i] = name;
748 }
749
750#ifdef OFF_FOCUS_FADING
751 if (rs[Rs_fade])
752 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
753 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
754#endif
755
756 if (display->depth <= 2)
757 { 800 }
801
802 if (depth <= 2)
803 {
758 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 804 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
759 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 805 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
760 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 806 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
761 } 807 }
762 808
763 /* 809 /*
764 * get scrollBar/menuBar shadow colors 810 * get scrollBar shadow colors
765 * 811 *
766 * The calculations of topShadow/bottomShadow values are adapted 812 * The calculations of topShadow/bottomShadow values are adapted
767 * from the fvwm window manager. 813 * from the fvwm window manager.
768 */ 814 */
769#ifdef KEEP_SCROLLCOLOR 815#ifdef KEEP_SCROLLCOLOR
770
771 if (display->depth <= 2) 816 if (depth <= 2)
772 { 817 {
773 /* Monochrome */ 818 /* Monochrome */
774 pix_colors[Color_scroll] = pix_colors[Color_fg]; 819 alias_color (Color_scroll, Color_fg);
775 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 820 alias_color (Color_topShadow, Color_bg);
776 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 821 alias_color (Color_bottomShadow, Color_bg);
777 } 822 }
778 else 823 else
779 { 824 {
780 rxvt_color xcol[2]; 825 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
781 /* xcol[0] == white
782 * xcol[1] == top shadow
783 * xcol[2] == bot shadow */
784 826
785 xcol[1] = pix_colors[Color_scroll]; 827 rgba cscroll;
786 xcol[0].set (display, 65535, 65535, 65535); 828 pix_colors [Color_scroll].get (cscroll);
787
788 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
789
790 xcol[0].get (display, pr0, pg0, pb0);
791 xcol[1].get (display, pr1, pg1, pb1);
792
793 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
794 829
795 /* topShadowColor */ 830 /* topShadowColor */
796 if (!xcol[1].set (display, 831 if (!pix_colors[Color_topShadow].set (this,
797 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 832 rgba (
798 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 833 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
799 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 834 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
800 xcol[1] = pix_colors[Color_White]; 835 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
801 836 cscroll.a)
802 pix_colors[Color_topShadow] = xcol[1]; 837 ))
838 alias_color (Color_topShadow, Color_White);
803 } 839 }
804#endif /* KEEP_SCROLLCOLOR */ 840#endif /* KEEP_SCROLLCOLOR */
841
842#ifdef OFF_FOCUS_FADING
843 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
844 update_fade_color (i);
845#endif
805} 846}
806 847
807/*----------------------------------------------------------------------*/ 848/*----------------------------------------------------------------------*/
808/* color aliases, fg/bg bright-bold */ 849/* color aliases, fg/bg bright-bold */
809void 850void
… …
848 889
849 if (rsmod 890 if (rsmod
850 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 891 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
851 requestedmeta = rsmod[3] - '0'; 892 requestedmeta = rsmod[3] - '0';
852 893
853 map = XGetModifierMapping (display->display); 894 map = XGetModifierMapping (dpy);
854 kc = map->modifiermap; 895 kc = map->modifiermap;
855 896
856 for (i = 1; i < 6; i++) 897 for (i = 1; i < 6; i++)
857 { 898 {
858 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 899 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
860 for (j = map->max_keypermod; j--; k++) 901 for (j = map->max_keypermod; j--; k++)
861 { 902 {
862 if (kc[k] == 0) 903 if (kc[k] == 0)
863 break; 904 break;
864 905
865 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 906 switch (XKeycodeToKeysym (dpy, kc[k], 0))
866 { 907 {
867 case XK_Num_Lock: 908 case XK_Num_Lock:
868 ModNumLockMask = modmasks[i - 1]; 909 ModNumLockMask = modmasks[i - 1];
869 continue; 910 continue;
870 911
… …
920rxvt_term::create_windows (int argc, const char *const *argv) 961rxvt_term::create_windows (int argc, const char *const *argv)
921{ 962{
922 XClassHint classHint; 963 XClassHint classHint;
923 XWMHints wmHint; 964 XWMHints wmHint;
924#if ENABLE_FRILLS 965#if ENABLE_FRILLS
925 Atom prop = None;
926 MWMHints mwmhints; 966 MWMHints mwmhints = { };
927#endif 967#endif
928 XGCValues gcvalue; 968 XGCValues gcvalue;
929 long vt_emask;
930 XSetWindowAttributes attributes; 969 XSetWindowAttributes attributes;
931 XWindowAttributes gattr;
932 Window top, parent; 970 Window top, parent;
933 dDisp;
934 971
935#ifdef USING_W11LIB 972 dLocal (Display *, dpy);
936 /* enable W11 callbacks */
937 W11AddEventHandler (disp, rxvt_W11_process_x_event);
938#endif
939 973
940 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 974 /* grab colors before netscape does */
941 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 975 Get_Colours ();
942 976
943 if (OPTION (Opt_transparent)) 977 if (!set_fonts ())
944 { 978 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
945 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 979
946 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 980 parent = display->root;
947 } 981
982 attributes.override_redirect = !!option (Opt_override_redirect);
948 983
949#if ENABLE_FRILLS 984#if ENABLE_FRILLS
950 if (OPTION (Opt_borderLess)) 985 if (option (Opt_borderLess))
951 { 986 {
952 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 987 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
953
954 if (prop == None)
955 { 988 {
956 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 989 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
957#ifdef PREFER_24BIT
958 attributes.override_redirect = TRUE; 990 attributes.override_redirect = true;
959#endif
960 mwmhints.flags = 0;
961 } 991 }
962 else 992 else
963 { 993 {
964 mwmhints.flags = MWM_HINTS_DECORATIONS; 994 mwmhints.flags = MWM_HINTS_DECORATIONS;
965 mwmhints.decorations = 0;
966 } 995 }
967 } 996 }
968 else
969 mwmhints.flags = 0;
970#endif 997#endif
971
972 /* grab colors before netscape does */
973 Get_Colours ();
974
975 if (!set_fonts ())
976 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
977
978 parent = DefaultRootWindow (disp);
979 998
980#if ENABLE_XEMBED 999#if ENABLE_XEMBED
981 if (rs[Rs_embed]) 1000 if (rs[Rs_embed])
982 { 1001 {
983 XWindowAttributes wattr; 1002 XWindowAttributes wattr;
984 1003
985 parent = strtol (rs[Rs_embed], 0, 0); 1004 parent = strtol (rs[Rs_embed], 0, 0);
986 1005
987 if (!XGetWindowAttributes (disp, parent, &wattr)) 1006 if (!XGetWindowAttributes (dpy, parent, &wattr))
988 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 1007 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
989 1008
990 window_calc (wattr.width, wattr.height); 1009 window_calc (wattr.width, wattr.height);
991 } 1010 }
992#endif 1011#endif
993 1012
994 window_calc (0, 0); 1013 window_calc (0, 0);
995 1014
996 /* sub-window placement & size in rxvt_resize_subwindows () */ 1015 /* sub-window placement & size in rxvt_resize_subwindows () */
997#ifdef PREFER_24BIT
998 attributes.background_pixel = pix_colors_focused[Color_border]; 1016 attributes.background_pixel = pix_colors_focused [Color_border];
999 attributes.border_pixel = pix_colors_focused[Color_border]; 1017 attributes.border_pixel = pix_colors_focused [Color_border];
1000 attributes.colormap = display->cmap; 1018 attributes.colormap = cmap;
1019
1001 top = XCreateWindow (disp, parent, 1020 top = XCreateWindow (dpy, parent,
1002 szHint.x, szHint.y, 1021 szHint.x, szHint.y,
1003 szHint.width, szHint.height, 1022 szHint.width, szHint.height,
1004 ext_bwidth, 1023 ext_bwidth,
1005 display->depth, InputOutput, 1024 depth, InputOutput, visual,
1006 display->visual,
1007 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 1025 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1008#else 1026 &attributes);
1009 top = XCreateSimpleWindow (disp, parent,
1010 szHint.x, szHint.y,
1011 szHint.width, szHint.height,
1012 ext_bwidth,
1013 pix_colors_focused[Color_border],
1014 pix_colors_focused[Color_border]);
1015#endif
1016 1027
1017 this->parent[0] = top; 1028 this->parent[0] = top;
1018 1029
1019 old_width = szHint.width; 1030 old_width = szHint.width;
1020 old_height = szHint.height; 1031 old_height = szHint.height;
1021 1032
1022 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1033 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1023 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1034 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1024 1035
1025 classHint.res_name = (char *)rs[Rs_name]; 1036 classHint.res_name = (char *)rs[Rs_name];
1026 classHint.res_class = (char *)RESCLASS; 1037 classHint.res_class = (char *)RESCLASS;
1027 1038
1028 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1039 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1029 wmHint.input = True; 1040 wmHint.input = True;
1030 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1041 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1031 wmHint.window_group = top; 1042 wmHint.window_group = top;
1032 1043
1033 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 1044 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1034 &szHint, &wmHint, &classHint); 1045 &szHint, &wmHint, &classHint);
1046
1047#if ENABLE_FRILLS
1048 if (mwmhints.flags)
1049 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1050 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1051#endif
1035 1052
1036 Atom protocols[] = { 1053 Atom protocols[] = {
1037 xa[XA_WM_DELETE_WINDOW], 1054 xa[XA_WM_DELETE_WINDOW],
1038#if ENABLE_EWMH 1055#if ENABLE_EWMH
1039 xa[XA_NET_WM_PING], 1056 xa[XA_NET_WM_PING],
1040#endif 1057#endif
1041 }; 1058 };
1042 1059
1043 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1060 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1044 1061
1045#if ENABLE_FRILLS 1062#if ENABLE_FRILLS
1046 if (rs[Rs_transient_for]) 1063 if (rs[Rs_transient_for])
1047 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1064 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1048#endif 1065#endif
1049 1066
1050#if ENABLE_EWMH 1067#if ENABLE_EWMH
1051 long pid = getpid (); 1068 long pid = getpid ();
1052 1069
1053 XChangeProperty (disp, top, 1070 XChangeProperty (dpy, top,
1054 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1071 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1055 PropModeReplace, (unsigned char *)&pid, 1); 1072 PropModeReplace, (unsigned char *)&pid, 1);
1056 1073
1057 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1074 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1058#endif 1075#endif
1059 1076
1060 XSelectInput (disp, top, 1077 XSelectInput (dpy, top,
1061 KeyPressMask 1078 KeyPressMask
1062#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1079#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1063 | KeyReleaseMask 1080 | KeyReleaseMask
1064#endif 1081#endif
1065 | FocusChangeMask | VisibilityChangeMask 1082 | FocusChangeMask | VisibilityChangeMask
1066 | ExposureMask | StructureNotifyMask); 1083 | ExposureMask | StructureNotifyMask);
1067 1084
1068 termwin_ev.start (display, top); 1085 termwin_ev.start (display, top);
1069 1086
1070#if ENABLE_FRILLS
1071 if (mwmhints.flags)
1072 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1073 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1074#endif
1075
1076 /* vt cursor: Black-on-White is standard, but this is more popular */ 1087 /* vt cursor: Black-on-White is standard, but this is more popular */
1077 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1088 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1078 1089
1079#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1090#ifdef HAVE_SCROLLBARS
1080 /* cursor (menuBar/scrollBar): Black-on-White */ 1091 /* cursor scrollBar: Black-on-White */
1081 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1092 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1082#endif 1093#endif
1083 1094
1084 /* the vt window */ 1095 /* the vt window */
1085 vt = XCreateSimpleWindow (disp, top, 1096 vt = XCreateSimpleWindow (dpy, top,
1086 window_vt_x,
1087 window_vt_y, 1097 window_vt_x, window_vt_y,
1088 width,
1089 height, 1098 width, height,
1090 0, 1099 0,
1091 pix_colors_focused[Color_fg], 1100 pix_colors_focused[Color_fg],
1092 pix_colors_focused[Color_bg]); 1101 pix_colors_focused[Color_bg]);
1093#ifdef DEBUG_X
1094 XStoreName (disp, vt, "vt window");
1095#endif
1096 1102
1097 attributes.bit_gravity = NorthWestGravity; 1103 attributes.bit_gravity = NorthWestGravity;
1098 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1104 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1099 1105
1100 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1106 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1101 1107
1102 if (OPTION (Opt_pointerBlank) 1108 if (option (Opt_pointerBlank))
1103#ifdef ENABLE_PERL
1104 || perl.self
1105#endif
1106 )
1107 vt_emask |= PointerMotionMask; 1109 vt_emask |= PointerMotionMask;
1108 else 1110 else
1109 vt_emask |= Button1MotionMask | Button3MotionMask; 1111 vt_emask |= Button1MotionMask | Button3MotionMask;
1110 1112
1111 XSelectInput (disp, vt, vt_emask); 1113 vt_select_input ();
1114
1112 vt_ev.start (display, vt); 1115 vt_ev.start (display, vt);
1113 1116
1114#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1115 if (menuBar_height ())
1116 {
1117 menuBar.win = XCreateSimpleWindow (disp, top,
1118 window_vt_x, 0,
1119 width,
1120 menuBar_TotalHeight (),
1121 0,
1122 pix_colors_focused[Color_fg],
1123 pix_colors_focused[Color_scroll]);
1124
1125#ifdef DEBUG_X
1126 XStoreName (disp, menuBar.win, "menubar");
1127#endif
1128
1129 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1130
1131 XDefineCursor (disp, menuBar.win,
1132 XCreateFontCursor (disp, XC_left_ptr));
1133
1134 XSelectInput (disp, menuBar.win,
1135 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1136 menubar_ev.start (display, menuBar.win);
1137 }
1138#endif
1139
1140#ifdef XPM_BACKGROUND
1141 if (rs[Rs_backgroundPixmap] != NULL
1142 && ! OPTION (Opt_transparent))
1143 {
1144 const char *p = rs[Rs_backgroundPixmap];
1145
1146 if ((p = strchr (p, ';')) != NULL)
1147 {
1148 p++;
1149 scale_pixmap (p);
1150 }
1151
1152 set_bgPixmap (rs[Rs_backgroundPixmap]);
1153 scr_touch (true);
1154 }
1155#endif
1156
1157 /* graphics context for the vt window */ 1117 /* graphics context for the vt window */
1158 gcvalue.foreground = pix_colors[Color_fg]; 1118 gcvalue.foreground = pix_colors[Color_fg];
1159 gcvalue.background = pix_colors[Color_bg]; 1119 gcvalue.background = pix_colors[Color_bg];
1160 gcvalue.graphics_exposures = 1; 1120 gcvalue.graphics_exposures = 0;
1121
1161 gc = XCreateGC (disp, vt, 1122 gc = XCreateGC (dpy, vt,
1162 GCForeground | GCBackground | GCGraphicsExposures, 1123 GCForeground | GCBackground | GCGraphicsExposures,
1163 &gcvalue); 1124 &gcvalue);
1164 1125
1165 drawable = new rxvt_drawable (display, vt); 1126 drawable = new rxvt_drawable (this, vt);
1166 1127
1167#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1128#ifdef RXVT_SCROLLBAR
1168 gcvalue.foreground = pix_colors[Color_topShadow]; 1129 gcvalue.foreground = pix_colors[Color_topShadow];
1169 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1130 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1170 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1131 gcvalue.foreground = pix_colors[Color_bottomShadow];
1171 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1132 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1172 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1133 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1173 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1134 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1174#endif 1135#endif
1175 1136
1176#ifdef OFF_FOCUS_FADING 1137#ifdef OFF_FOCUS_FADING
1177 // initially we are in unfocused state 1138 // initially we are in unfocused state
1178 if (rs[Rs_fade]) 1139 if (rs[Rs_fade])
1179 pix_colors = pix_colors_unfocused; 1140 pix_colors = pix_colors_unfocused;
1180#endif 1141#endif
1181 1142
1182 pointer_unblank (); 1143 pointer_unblank ();
1183 scr_recolour (); 1144 scr_recolour ();
1184
1185#if ENABLE_XEMBED
1186 if (rs[Rs_embed])
1187 {
1188 long info[2] = { 0, XEMBED_MAPPED };
1189
1190 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1191 32, PropModeReplace, (unsigned char *)&info, 2);
1192 }
1193#endif
1194} 1145}
1195 1146
1196/* ------------------------------------------------------------------------- * 1147/* ------------------------------------------------------------------------- *
1197 * GET TTY CURRENT STATE * 1148 * GET TTY CURRENT STATE *
1198 * ------------------------------------------------------------------------- */ 1149 * ------------------------------------------------------------------------- */
1199void 1150void
1200rxvt_get_ttymode (ttymode_t *tio, int erase) 1151rxvt_get_ttymode (ttymode_t *tio, int erase)
1201{ 1152{
1202#ifdef HAVE_TERMIOS_H
1203 /* 1153 /*
1204 * standard System V termios interface 1154 * standard System V termios interface
1205 */ 1155 */
1206 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1156 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1207 { 1157 {
… …
1274 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1224 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1275# if defined (ECHOCTL) && defined (ECHOKE) 1225# if defined (ECHOCTL) && defined (ECHOKE)
1276 | ECHOCTL | ECHOKE 1226 | ECHOCTL | ECHOKE
1277# endif 1227# endif
1278 | ECHOE | ECHOK); 1228 | ECHOE | ECHOK);
1279# else /* HAVE_TERMIOS_H */
1280
1281 /*
1282 * sgtty interface
1283 */
1284
1285 /* get parameters -- gtty */
1286 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1287 {
1288 tio->sg.sg_erase = CERASE; /* ^H */
1289 tio->sg.sg_kill = CKILL; /* ^U */
1290 }
1291
1292 if (erase != -1)
1293 tio->sg.sg_erase = (char)erase;
1294
1295 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1296
1297 /* get special characters */
1298 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1299 {
1300 tio->tc.t_intrc = CINTR; /* ^C */
1301 tio->tc.t_quitc = CQUIT; /* ^\ */
1302 tio->tc.t_startc = CSTART; /* ^Q */
1303 tio->tc.t_stopc = CSTOP; /* ^S */
1304 tio->tc.t_eofc = CEOF; /* ^D */
1305 tio->tc.t_brkc = -1;
1306 }
1307
1308 /* get local special chars */
1309 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1310 {
1311 tio->lc.t_suspc = CSUSP; /* ^Z */
1312 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1313 tio->lc.t_rprntc = CRPRNT; /* ^R */
1314 tio->lc.t_flushc = CFLUSH; /* ^O */
1315 tio->lc.t_werasc = CWERASE; /* ^W */
1316 tio->lc.t_lnextc = CLNEXT; /* ^V */
1317 }
1318 /* get line discipline */
1319 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1320# ifdef NTTYDISC
1321 tio->line = NTTYDISC;
1322# endif /* NTTYDISC */
1323
1324 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1325#endif /* HAVE_TERMIOS_H */
1326 1229
1327 /* 1230 /*
1328 * Debugging 1231 * Debugging
1329 */ 1232 */
1330#ifdef DEBUG_TTYMODE 1233#ifdef DEBUG_TTYMODE
… …
1412 * the slave. 1315 * the slave.
1413 */ 1316 */
1414void 1317void
1415rxvt_term::run_command (const char *const *argv) 1318rxvt_term::run_command (const char *const *argv)
1416{ 1319{
1417 TEMP_ENV; // not very temporary...
1418
1419#if ENABLE_FRILLS 1320#if ENABLE_FRILLS
1420 if (rs[Rs_pty_fd]) 1321 if (rs[Rs_pty_fd])
1421 { 1322 {
1422 pty.pty = atoi (rs[Rs_pty_fd]); 1323 pty->pty = atoi (rs[Rs_pty_fd]);
1423 1324
1424 if (pty.pty >= 0) 1325 if (pty->pty >= 0)
1425 { 1326 {
1426 if (getfd_hook) 1327 if (getfd_hook)
1427 pty.pty = (*getfd_hook) (pty.pty); 1328 pty->pty = (*getfd_hook) (pty->pty);
1428 1329
1429 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK)) 1330 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1430 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1331 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1431 } 1332 }
1432 } 1333 }
1433 else 1334 else
1434#endif 1335#endif
1435 if (!pty.get ()) 1336 if (!pty->get ())
1436 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1337 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1437 1338
1339 int er;
1340
1341#ifndef NO_BACKSPACE_KEY
1342 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1343 er = rs[Rs_backspace_key][0];
1344 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1345 er = '\177'; /* the initial state anyway */
1346 else
1347#endif
1348 er = -1;
1349
1350 rxvt_get_ttymode (&tio, er);
1351 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1438 pty.set_utf8_mode (enc_utf8); 1352 pty->set_utf8_mode (enc_utf8);
1439 1353
1440 /* set initial window size */ 1354 /* set initial window size */
1441 tt_winch (); 1355 tt_winch ();
1442
1443 int er;
1444
1445#ifndef NO_BACKSPACE_KEY
1446 if (key_backspace[0] && !key_backspace[1])
1447 er = key_backspace[0];
1448 else if (strcmp (key_backspace, "DEC") == 0)
1449 er = '\177'; /* the initial state anyway */
1450 else
1451#endif
1452 er = -1;
1453
1454 rxvt_get_ttymode (&tio, er);
1455 1356
1456#if ENABLE_FRILLS 1357#if ENABLE_FRILLS
1457 if (rs[Rs_pty_fd]) 1358 if (rs[Rs_pty_fd])
1458 return; 1359 return;
1459#endif 1360#endif
1460 1361
1461#ifndef __QNX__
1462 /* spin off the command interpreter */ 1362 /* spin off the command interpreter */
1463 switch (cmd_pid = fork ()) 1363 switch (cmd_pid = fork ())
1464 { 1364 {
1465 case -1: 1365 case -1:
1466 { 1366 {
… …
1468 rxvt_fatal ("can't fork, aborting.\n"); 1368 rxvt_fatal ("can't fork, aborting.\n");
1469 } 1369 }
1470 case 0: 1370 case 0:
1471 init_env (); 1371 init_env ();
1472 1372
1473 if (!pty.make_controlling_tty ()) 1373 if (!pty->make_controlling_tty ())
1474 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1374 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1475 else 1375 else
1476 { 1376 {
1477 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1377 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1478 dup2 (pty.tty, STDIN_FILENO); 1378 dup2 (pty->tty, STDIN_FILENO);
1479 dup2 (pty.tty, STDOUT_FILENO); 1379 dup2 (pty->tty, STDOUT_FILENO);
1480 dup2 (pty.tty, STDERR_FILENO); 1380 dup2 (pty->tty, STDERR_FILENO);
1481 1381
1482 // close all our file handles that we do no longer need 1382 // close all our file handles that we do no longer need
1483 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1383 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1484 { 1384 {
1485 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1385 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1486 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1386 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1487 } 1387 }
1488 1388
1489 run_child (argv); 1389 run_child (argv);
1490 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1390 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1491 } 1391 }
1492 1392
1493 _exit (EXIT_FAILURE); 1393 _exit (EXIT_FAILURE);
1494 1394
1495 default: 1395 default:
1496 { 1396 if (!option (Opt_utmpInhibit))
1497#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1397 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1498 int fdstdin;
1499 1398
1500 fdstdin = dup (STDIN_FILENO); 1399 pty->close_tty ();
1501 dup2 (pty.tty, STDIN_FILENO);
1502#endif
1503 1400
1504#ifdef UTMP_SUPPORT 1401 child_ev.start (cmd_pid);
1505 privileged_utmp (SAVE);
1506#endif
1507 1402
1508#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1403 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1509
1510 dup2 (fdstdin, STDIN_FILENO);
1511 close (fdstdin);
1512#endif
1513 }
1514
1515 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1516 break; 1404 break;
1517 } 1405 }
1518#else /* __QNX__ uses qnxspawn () */
1519 fchmod (pty.tty, 0622);
1520 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1521 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1522
1523 if (run_child (argv) == -1)
1524 exit (EXIT_FAILURE);
1525#endif
1526} 1406}
1527 1407
1528/* ------------------------------------------------------------------------- * 1408/* ------------------------------------------------------------------------- *
1529 * CHILD PROCESS OPERATIONS * 1409 * CHILD PROCESS OPERATIONS *
1530 * ------------------------------------------------------------------------- */ 1410 * ------------------------------------------------------------------------- */
… …
1535int 1415int
1536rxvt_term::run_child (const char *const *argv) 1416rxvt_term::run_child (const char *const *argv)
1537{ 1417{
1538 char *login; 1418 char *login;
1539 1419
1540 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1541
1542 if (OPTION (Opt_console)) 1420 if (option (Opt_console))
1543 { /* be virtual console, fail silently */ 1421 { /* be virtual console, fail silently */
1544#ifdef TIOCCONS 1422#ifdef TIOCCONS
1545 unsigned int on = 1; 1423 unsigned int on = 1;
1546 1424
1547 ioctl (STDIN_FILENO, TIOCCONS, &on); 1425 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1574 // unblock signals (signals are blocked by iom.C 1452 // unblock signals (signals are blocked by iom.C
1575 sigset_t ss; 1453 sigset_t ss;
1576 sigemptyset (&ss); 1454 sigemptyset (&ss);
1577 sigprocmask (SIG_SETMASK, &ss, 0); 1455 sigprocmask (SIG_SETMASK, &ss, 0);
1578 1456
1579#ifndef __QNX__
1580 /* command interpreter path */ 1457 /* command interpreter path */
1581 if (argv != NULL) 1458 if (argv)
1582 { 1459 {
1583# ifdef DEBUG_CMD 1460# ifdef DEBUG_CMD
1584 int i; 1461 int i;
1585 1462
1586 for (i = 0; argv[i]; i++) 1463 for (i = 0; argv[i]; i++)
… …
1595 const char *argv0, *shell; 1472 const char *argv0, *shell;
1596 1473
1597 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1474 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1598 shell = "/bin/sh"; 1475 shell = "/bin/sh";
1599 1476
1600 argv0 = (const char *)rxvt_r_basename (shell); 1477 argv0 = (const char *)rxvt_basename (shell);
1601 1478
1602 if (OPTION (Opt_loginShell)) 1479 if (option (Opt_loginShell))
1603 { 1480 {
1604 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1481 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1605 1482
1606 login[0] = '-'; 1483 login[0] = '-';
1607 strcpy (&login[1], argv0); 1484 strcpy (&login[1], argv0);
1608 argv0 = login; 1485 argv0 = login;
1609 } 1486 }
1610 1487
1611 execlp (shell, argv0, NULL); 1488 execlp (shell, argv0, (char *)0);
1612 /* no error message: STDERR is closed! */ 1489 /* no error message: STDERR is closed! */
1613 } 1490 }
1614
1615#else /* __QNX__ uses qnxspawn () */
1616
1617 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1618 char *command = NULL, fullcommand[_MAX_PATH];
1619 char **arg_v, *arg_a[2] = { NULL, NULL };
1620
1621 if (argv != NULL)
1622 {
1623 if (access (argv[0], X_OK) == -1)
1624 {
1625 if (strchr (argv[0], '/') == NULL)
1626 {
1627 searchenv (argv[0], "PATH", fullcommand);
1628
1629 if (fullcommand[0] != '\0')
1630 command = fullcommand;
1631 }
1632
1633 if (access (command, X_OK) == -1)
1634 return -1;
1635 }
1636 else
1637 command = argv[0];
1638
1639 arg_v = argv;
1640 }
1641 else
1642 {
1643 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1644 command = "/bin/sh";
1645
1646 arg_a[0] = my_basename (command);
1647
1648 if (OPTION (Opt_loginShell))
1649 {
1650 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1651
1652 login[0] = '-';
1653 strcpy (&login[1], arg_a[0]);
1654 arg_a[0] = login;
1655 }
1656
1657 arg_v = arg_a;
1658 }
1659
1660 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1661 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1662 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1663 command, arg_v, environ, iov_a, 0);
1664 if (login)
1665 free (login);
1666
1667 pty.close_tty ();
1668 return pty.pty;
1669#endif
1670 1491
1671 return -1; 1492 return -1;
1672} 1493}
1673 1494
1674/*----------------------- end-of-file (C source) -----------------------*/ 1495/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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