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.226 by ayin, Tue Dec 11 17:42:04 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#include <fcntl.h>
47
48#ifdef HAVE_XSETLOCALE
49# define X_LOCALE
50# include <X11/Xlocale.h>
51#else
52# ifdef HAVE_SETLOCALE
53# include <clocale>
54# endif
55#endif
56
57#ifdef HAVE_NL_LANGINFO
58# include <langinfo.h>
59#endif
60
61#ifdef DISPLAY_IS_IP
62/* On Solaris link with -lsocket and -lnsl */
63#include <sys/types.h>
64#include <sys/socket.h>
65
66/* these next two are probably only on Sun (not Solaris) */
67#ifdef HAVE_SYS_SOCKIO_H
68#include <sys/sockio.h>
69#endif
70#ifdef HAVE_SYS_BYTEORDER_H
71#include <sys/byteorder.h>
72#endif
73
74#include <netinet/in.h>
75#include <arpa/inet.h>
76#include <net/if.h>
77#include <net/if_arp.h>
78
79static char *
80rxvt_network_display (const char *display)
81{
82 char buffer[1024], *rval = NULL;
83 struct ifconf ifc;
84 struct ifreq *ifr;
85 int i, skfd;
86
87 if (display[0] != ':' && strncmp (display, "unix:", 5))
88 return (char *) display; /* nothing to do */
89
90 ifc.ifc_len = sizeof (buffer); /* Get names of all ifaces */
91 ifc.ifc_buf = buffer;
92
93 if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
94 {
95 perror ("socket");
96 return NULL;
97 }
98
99 if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0)
100 {
101 perror ("SIOCGIFCONF");
102 close (skfd);
103 return NULL;
104 }
105
106 for (i = 0, ifr = ifc.ifc_req;
107 i < (ifc.ifc_len / sizeof (struct ifreq));
108 i++, ifr++)
109 {
110 struct ifreq ifr2;
111
112 strcpy (ifr2.ifr_name, ifr->ifr_name);
113
114 if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0)
115 {
116 unsigned long addr;
117 struct sockaddr_in *p_addr;
118
119 p_addr = (struct sockaddr_in *) &ifr2.ifr_addr;
120 addr = htonl ((unsigned long)p_addr->sin_addr.s_addr);
121
122 /*
123 * not "0.0.0.0" or "127.0.0.1" - so format the address
124 */
125 if (addr && addr != 0x7F000001)
126 {
127 char *colon = strchr (display, ':');
128
129 if (colon == NULL)
130 colon = ":0.0";
131
132 rval = rxvt_malloc (strlen (colon) + 16);
133 sprintf (rval, "%d.%d.%d.%d%s",
134 (int) ((addr >> 030) & 0xFF),
135 (int) ((addr >> 020) & 0xFF),
136 (int) ((addr >> 010) & 0xFF),
137 (int) (addr & 0xFF), colon);
138 break;
139 }
140 }
141 }
142
143 close (skfd);
144
145 return rval;
146}
147#endif
148
43const char *const def_colorName[] = 149const char *const def_colorName[] =
44 { 150 {
45 COLOR_FOREGROUND, 151 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 152 COLOR_BACKGROUND,
47 /* low-intensity colors */ 153 /* low-intensity colors */
48 "Black", /* 0: black (#000000) */ 154 "rgb:00/00/00", // 0: black (Black)
49 "Red3", /* 1: red (#CD0000) */ 155 "rgb:cd/00/00", // 1: red (Red3)
50 "Green3", /* 2: green (#00CD00) */ 156 "rgb:00/cd/00", // 2: green (Green3)
51 "Yellow3", /* 3: yellow (#CDCD00) */ 157 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "Blue3", /* 4: blue (#0000CD) */ 158 "rgb:00/00/cd", // 4: blue (Blue3)
53 "Magenta3", /* 5: magenta (#CD00CD) */ 159 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "Cyan3", /* 6: cyan (#00CDCD) */ 160 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 161# ifdef XTERM_COLORS
56 "Grey90", /* 7: white (#E5E5E5) */ 162 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 163# else
58 "AntiqueWhite", /* 7: white (#FAEBD7) */ 164 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59# endif 165# endif
60 /* high-intensity colors */ 166 /* high-intensity colors */
61# ifdef XTERM_COLORS 167# ifdef XTERM_COLORS
62 "Grey30", /* 8: bright black (#4D4D4D) */ 168 "rgb:4d/4d/4d", // 8: bright black (Grey30)
63# else 169# else
64 "Grey25", /* 8: bright black (#404040) */ 170 "rgb:40/40/40", // 8: bright black (Grey25)
65# endif 171# endif
66 "Red", /* 1/9: bright red (#FF0000) */ 172 "rgb:ff/00/00", // 1/9: bright red (Reed)
67 "Green", /* 2/10: bright green (#00FF00) */ 173 "rgb:00/ff/00", // 2/10: bright green (Green)
68 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 174 "rgb:ff/ff/00", // 3/11: bright yellow (Yellow)
69 "Blue", /* 4/12: bright blue (#0000FF) */ 175 "rgb:00/00/ff", // 4/12: bright blue (Blue)
70 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 176 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
71 "Cyan", /* 6/14: bright cyan (#00FFFF) */ 177 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
72 "White", /* 7/15: bright white (#FFFFFF) */ 178 "rgb:ff/ff/ff", // 7/15: bright white (White)
73 179
74 // 88 xterm colours 180 // 88 xterm colours
75 "rgb:00/00/00", 181 "rgb:00/00/00",
76 "rgb:00/00/8b", 182 "rgb:00/00/8b",
77 "rgb:00/00/cd", 183 "rgb:00/00/cd",
… …
146 "rgb:e7/e7/e7", 252 "rgb:e7/e7/e7",
147 253
148#ifndef NO_CURSORCOLOR 254#ifndef NO_CURSORCOLOR
149 COLOR_CURSOR_BACKGROUND, 255 COLOR_CURSOR_BACKGROUND,
150 COLOR_CURSOR_FOREGROUND, 256 COLOR_CURSOR_FOREGROUND,
151#endif /* ! NO_CURSORCOLOR */ 257#endif /* ! NO_CURSORCOLOR */
152 NULL, /* Color_pointer_fg */ 258 NULL, /* Color_pointer_fg */
153 NULL, /* Color_pointer_bg */ 259 NULL, /* Color_pointer_bg */
154 NULL, /* Color_border */ 260 NULL, /* Color_border */
155#ifndef NO_BOLD_UNDERLINE_REVERSE 261#ifndef NO_BOLD_UNDERLINE_REVERSE
156 NULL, /* Color_BD */ 262 NULL, /* Color_BD */
157 NULL, /* Color_IT */ 263 NULL, /* Color_IT */
158 NULL, /* Color_UL */ 264 NULL, /* Color_UL */
159 NULL, /* Color_RV */ 265 NULL, /* Color_RV */
160#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 266#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
161#if ENABLE_FRILLS 267#if ENABLE_FRILLS
162 NULL, // Color_underline 268 NULL, // Color_underline
163#endif 269#endif
164#ifdef OPTION_HC 270#ifdef OPTION_HC
165 NULL, 271 NULL,
166#endif 272#endif
167#ifdef KEEP_SCROLLCOLOR 273#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 274 COLOR_SCROLLBAR,
169 COLOR_SCROLLTROUGH, 275 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 276#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 277#if ENABLE_TRANSPARENCY
172 NULL, 278 NULL,
173#endif 279#endif
174#if OFF_FOCUS_FADING 280#if OFF_FOCUS_FADING
175 "black", 281 "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 282#endif
212 }; 283 };
213 284
214bool 285bool
215rxvt_term::init_vars () 286rxvt_term::init_vars ()
216{ 287{
288 pix_colors = //
217 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 289 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
218#ifdef OFF_FOCUS_FADING 290#ifdef OFF_FOCUS_FADING
219 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 291 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
220#endif 292#endif
221 pix_colors = pix_colors_focused;
222 293
223 if (pix_colors == NULL)
224 return false;
225
226#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
227 pixmap = None;
228#endif
229 294
230 MEvent.time = CurrentTime; 295 MEvent.time = CurrentTime;
231 MEvent.button = AnyButton; 296 MEvent.button = AnyButton;
232 options = DEFAULT_OPTIONS;
233 want_refresh = 1; 297 want_refresh = 1;
234 priv_modes = SavedModes = PrivMode_Default; 298 priv_modes = SavedModes = PrivMode_Default;
235 focus = 0;
236 ncol = 80; 299 ncol = 80;
237 nrow = 24; 300 nrow = 24;
238 int_bwidth = INTERNALBORDERWIDTH; 301 int_bwidth = INTERNALBORDERWIDTH;
239 ext_bwidth = EXTERNALBORDERWIDTH; 302 ext_bwidth = EXTERNALBORDERWIDTH;
240 lineSpace = LINESPACE; 303 lineSpace = LINESPACE;
241 saveLines = SAVELINES; 304 saveLines = SAVELINES;
242 numpix_colors = TOTAL_COLORS; 305 numpix_colors = TOTAL_COLORS;
243 306
244 refresh_limit = 1;
245 refresh_type = SLOW_REFRESH; 307 refresh_type = SLOW_REFRESH;
246 prev_nrow = prev_ncol = 0;
247 308
248 oldcursor.row = oldcursor.col = -1; 309 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; 310 last_bot = last_state = -1;
311
312 set_option (Opt_scrollBar);
313 set_option (Opt_scrollTtyOutput);
314 set_option (Opt_jumpScroll);
315 set_option (Opt_skipScroll);
316 set_option (Opt_secondaryScreen);
317 set_option (Opt_secondaryScroll);
318 set_option (Opt_pastableTabs);
319 set_option (Opt_intensityStyles);
320 set_option (Opt_iso14755_52);
256 321
257 return true; 322 return true;
258} 323}
259 324
260void 325void
… …
269 if ((i = open ("/dev/null", O_RDONLY)) < 0) 334 if ((i = open ("/dev/null", O_RDONLY)) < 0)
270 { 335 {
271 /* TODO: BOO HISS */ 336 /* TODO: BOO HISS */
272 dup2 (STDERR_FILENO, STDIN_FILENO); 337 dup2 (STDERR_FILENO, STDIN_FILENO);
273 } 338 }
274 else if (i > STDIN_FILENO) 339 else if (i != STDIN_FILENO)
275 { 340 {
276 dup2 (i, STDIN_FILENO); 341 dup2 (i, STDIN_FILENO);
277 close (i); 342 close (i);
278 } 343 }
279 344
… …
294/*----------------------------------------------------------------------*/ 359/*----------------------------------------------------------------------*/
295const char ** 360const char **
296rxvt_term::init_resources (int argc, const char *const *argv) 361rxvt_term::init_resources (int argc, const char *const *argv)
297{ 362{
298 int i, r_argc; 363 int i, r_argc;
299 char *val;
300 const char **cmd_argv, **r_argv; 364 const char **cmd_argv, **r_argv;
301 365
302 /* 366 /*
303 * Look for -exec option. Find => split and make cmd_argv[] of command args 367 * Look for -e option. Find => split and make cmd_argv[] of command args
304 */ 368 */
305 for (r_argc = 0; r_argc < argc; r_argc++) 369 for (r_argc = 0; r_argc < argc; r_argc++)
306 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 370 if (!strcmp (argv[r_argc], "-e"))
307 break; 371 break;
372
373 if (r_argc == argc)
374 cmd_argv = NULL;
375 else if (!argv[r_argc + 1])
376 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
377 else
378 {
379 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
380
381 for (i = 0; i < argc - r_argc - 1; i++)
382 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
383
384 cmd_argv[i] = NULL;
385 }
308 386
309 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 387 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
310 388
311 for (i = 0; i < r_argc; i++) 389 for (i = 0; i < r_argc; i++)
312 r_argv[i] = (const char *)argv[i]; 390 r_argv[i] = (const char *)argv[i];
313 391
314 r_argv[i] = NULL; 392 r_argv[i] = NULL;
315 393
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]); 394 rs[Rs_name] = rxvt_basename (argv[0]);
329 395
330 /* 396 /*
331 * Open display, get options/resources and create the window 397 * Open display, get options/resources and create the window
332 */ 398 */
333 399
… …
335 rs[Rs_display_name] = ":0"; 401 rs[Rs_display_name] = ":0";
336 402
337 get_options (r_argc, r_argv); 403 get_options (r_argc, r_argv);
338 404
339 if (!(display = displays.get (rs[Rs_display_name]))) 405 if (!(display = displays.get (rs[Rs_display_name])))
406 {
407 free (r_argv);
340 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 408 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
409 }
341 410
411 // using a local pointer decreases code size a lot
412 xa = display->xa;
413
414 set (display);
342 extract_resources (); 415 extract_resources ();
343 416
417#if XFT
418 if (rs[Rs_depth])
419 select_visual (strtol (rs[Rs_depth], 0, 0));
420#endif
421
422#ifdef HAVE_AFTERIMAGE
423 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
424#endif
344 free (r_argv); 425 free (r_argv);
426
427 for (int i = NUM_RESOURCES; i--; )
428 if (rs [i] == resval_undef)
429 rs [i] = 0;
345 430
346#if ENABLE_PERL 431#if ENABLE_PERL
347 if (!rs[Rs_perl_ext_1]) 432 if (!rs[Rs_perl_ext_1])
348 rs[Rs_perl_ext_1] = "default"; 433 rs[Rs_perl_ext_1] = "default";
349 434
… …
360 * set any defaults not already set 445 * set any defaults not already set
361 */ 446 */
362 if (cmd_argv && cmd_argv[0]) 447 if (cmd_argv && cmd_argv[0])
363 { 448 {
364 if (!rs[Rs_title]) 449 if (!rs[Rs_title])
365 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 450 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
366 if (!rs[Rs_iconName]) 451 if (!rs[Rs_iconName])
367 rs[Rs_iconName] = rs[Rs_title]; 452 rs[Rs_iconName] = rs[Rs_title];
368 } 453 }
369 else 454 else
370 { 455 {
… …
408 rs[Rs_cutchars] = CUTCHARS; 493 rs[Rs_cutchars] = CUTCHARS;
409 494
410#ifndef NO_BACKSPACE_KEY 495#ifndef NO_BACKSPACE_KEY
411 if (!rs[Rs_backspace_key]) 496 if (!rs[Rs_backspace_key])
412# ifdef DEFAULT_BACKSPACE 497# ifdef DEFAULT_BACKSPACE
413 key_backspace = DEFAULT_BACKSPACE; 498 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
414# else 499# else
415 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 500 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
416# endif 501# 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 502#endif
425 503
426#ifndef NO_DELETE_KEY 504#ifndef NO_DELETE_KEY
427 if (!rs[Rs_delete_key]) 505 if (!rs[Rs_delete_key])
428# ifdef DEFAULT_DELETE 506# ifdef DEFAULT_DELETE
429 key_delete = DEFAULT_DELETE; 507 rs[Rs_delete_key] = DEFAULT_DELETE;
430# else 508# else
431 key_delete = "\033[3~"; 509 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 510# endif
441 if (rs[Rs_answerbackstring]) 511#endif
442 {
443 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
444 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
445 }
446 512
447#ifdef HAVE_SCROLLBARS 513#ifdef HAVE_SCROLLBARS
448 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 514 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
449#endif 515#endif
450 516
451#ifdef XTERM_REVERSE_VIDEO 517#ifdef XTERM_REVERSE_VIDEO
452 /* this is how xterm implements reverseVideo */ 518 /* this is how xterm implements reverseVideo */
453 if (OPTION (Opt_reverseVideo)) 519 if (option (Opt_reverseVideo))
454 { 520 {
455 if (!rs[Rs_color + Color_fg]) 521 if (!rs[Rs_color + Color_fg])
456 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 522 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
523
457 if (!rs[Rs_color + Color_bg]) 524 if (!rs[Rs_color + Color_bg])
458 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 525 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
459 } 526 }
460#endif 527#endif
461 528
… …
463 if (!rs[Rs_color + i]) 530 if (!rs[Rs_color + i])
464 rs[Rs_color + i] = def_colorName[i]; 531 rs[Rs_color + i] = def_colorName[i];
465 532
466#ifndef XTERM_REVERSE_VIDEO 533#ifndef XTERM_REVERSE_VIDEO
467 /* this is how we implement reverseVideo */ 534 /* this is how we implement reverseVideo */
468 if (OPTION (Opt_reverseVideo)) 535 if (option (Opt_reverseVideo))
469 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 536 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
470#endif 537#endif
471 538
472 /* convenient aliases for setting fg/bg to colors */ 539 /* convenient aliases for setting fg/bg to colors */
473 color_aliases (Color_fg); 540 color_aliases (Color_fg);
474 color_aliases (Color_bg); 541 color_aliases (Color_bg);
475#ifndef NO_CURSORCOLOR 542#ifndef NO_CURSORCOLOR
476 color_aliases (Color_cursor); 543 color_aliases (Color_cursor);
477 color_aliases (Color_cursor2); 544 color_aliases (Color_cursor2);
478#endif /* NO_CURSORCOLOR */ 545#endif /* NO_CURSORCOLOR */
479 color_aliases (Color_pointer_fg); 546 color_aliases (Color_pointer_fg);
480 color_aliases (Color_pointer_bg); 547 color_aliases (Color_pointer_bg);
481 color_aliases (Color_border); 548 color_aliases (Color_border);
482#ifndef NO_BOLD_UNDERLINE_REVERSE 549#ifndef NO_BOLD_UNDERLINE_REVERSE
483 color_aliases (Color_BD); 550 color_aliases (Color_BD);
484 color_aliases (Color_UL); 551 color_aliases (Color_UL);
485 color_aliases (Color_RV); 552 color_aliases (Color_RV);
486#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 553#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
487 554
488 if (!rs[Rs_color + Color_border]) 555 if (!rs[Rs_color + Color_border])
489 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 556 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
490 557
491 return cmd_argv; 558 return cmd_argv;
… …
494/*----------------------------------------------------------------------*/ 561/*----------------------------------------------------------------------*/
495void 562void
496rxvt_term::init_env () 563rxvt_term::init_env ()
497{ 564{
498 int i; 565 int i;
499 unsigned int u;
500 char *val; 566 char *val;
501 567
502#ifdef DISPLAY_IS_IP 568#ifdef DISPLAY_IS_IP
503 /* Fixup display_name for export over pty to any interested terminal 569 /* 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 570 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
512 */ 578 */
513 val = rxvt_network_display (rs[Rs_display_name]); 579 val = rxvt_network_display (rs[Rs_display_name]);
514 rs[Rs_display_name] = (const char *)val; 580 rs[Rs_display_name] = (const char *)val;
515 581
516 if (val == NULL) 582 if (val == NULL)
517#endif /* DISPLAY_IS_IP */ 583#endif /* DISPLAY_IS_IP */
518 val = XDisplayString (display->display); 584 val = XDisplayString (dpy);
519 585
520 if (rs[Rs_display_name] == NULL) 586 if (rs[Rs_display_name] == NULL)
521 rs[Rs_display_name] = val; /* use broken `:0' value */ 587 rs[Rs_display_name] = val; /* use broken `:0' value */
522 588
523 i = strlen (val); 589 i = strlen (val);
524 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 590 env_display = (char *)rxvt_malloc (i + 9);
525 591
526 sprintf (env_display, "DISPLAY=%s", val); 592 sprintf (env_display, "DISPLAY=%s", val);
527 593
528 /* avoiding the math library: 594 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 595
538 /* add entries to the environment: 596 /* add entries to the environment:
539 * @ DISPLAY: in case we started with -display 597 * @ DISPLAY: in case we started with -display
540 * @ WINDOWID: X window id number of the window 598 * @ WINDOWID: X window id number of the window
541 * @ COLORTERM: terminal sub-name and also indicates its color 599 * @ COLORTERM: terminal sub-name and also indicates its color
… …
543 * @ TERMINFO: path to terminfo directory 601 * @ TERMINFO: path to terminfo directory
544 * @ COLORFGBG: fg;bg color codes 602 * @ COLORFGBG: fg;bg color codes
545 */ 603 */
546 putenv (env_display); 604 putenv (env_display);
547 putenv (env_windowid); 605 putenv (env_windowid);
606
548 if (env_colorfgbg) 607 if (env_colorfgbg)
549 putenv (env_colorfgbg); 608 putenv (env_colorfgbg);
550 609
551#ifdef RXVT_TERMINFO 610#ifdef RXVT_TERMINFO
552 putenv ("TERMINFO=" RXVT_TERMINFO); 611 putenv ("TERMINFO=" RXVT_TERMINFO);
553#endif 612#endif
554 613
555 if (display->depth <= 2) 614 if (depth <= 2)
556 putenv ("COLORTERM=" COLORTERMENV "-mono"); 615 putenv ("COLORTERM=" COLORTERMENV "-mono");
557 else 616 else
558 putenv ("COLORTERM=" COLORTERMENVFULL); 617 putenv ("COLORTERM=" COLORTERMENVFULL);
559 618
560 if (rs[Rs_term_name] != NULL) 619 if (rs[Rs_term_name] != NULL)
561 { 620 {
562 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 621 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
563 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 622 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
564 putenv (env_term); 623 putenv (env_term);
565 } 624 }
566 else 625 else
567 putenv ("TERM=" TERMENV); 626 putenv ("TERM=" TERMENV);
… …
569#ifdef HAVE_UNSETENV 628#ifdef HAVE_UNSETENV
570 /* avoid passing old settings and confusing term size */ 629 /* avoid passing old settings and confusing term size */
571 unsetenv ("LINES"); 630 unsetenv ("LINES");
572 unsetenv ("COLUMNS"); 631 unsetenv ("COLUMNS");
573 unsetenv ("TERMCAP"); /* terminfo should be okay */ 632 unsetenv ("TERMCAP"); /* terminfo should be okay */
574#endif /* HAVE_UNSETENV */ 633#endif /* HAVE_UNSETENV */
575} 634}
576 635
577/*----------------------------------------------------------------------*/ 636/*----------------------------------------------------------------------*/
578/* 637/*
579 * This is more or less stolen straight from XFree86 xterm. 638 * This is more or less stolen straight from XFree86 xterm.
… …
600 659
601 this->locale = "C"; 660 this->locale = "C";
602 } 661 }
603 662
604 663
605 this->locale = rxvt_strdup (this->locale); 664 this->locale = strdup (this->locale);
606 SET_LOCALE (this->locale); 665 SET_LOCALE (this->locale);
607 mbstate.reset (); 666 mbstate.reset ();
608#endif 667#endif
609 668
610#if HAVE_NL_LANGINFO 669#if HAVE_NL_LANGINFO
… …
654 * Initialize the command connection. 713 * Initialize the command connection.
655 * This should be called after the X server connection is established. 714 * This should be called after the X server connection is established.
656 */ 715 */
657 716
658#ifdef META8_OPTION 717#ifdef META8_OPTION
659 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 718 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
660#endif 719#endif
661 720
662 get_ourmods (); 721 get_ourmods ();
663 722
664 if (!OPTION (Opt_scrollTtyOutput)) 723 if (!option (Opt_scrollTtyOutput))
665 priv_modes |= PrivMode_TtyOutputInh; 724 priv_modes |= PrivMode_TtyOutputInh;
666 if (OPTION (Opt_scrollTtyKeypress)) 725 if (option (Opt_scrollTtyKeypress))
667 priv_modes |= PrivMode_Keypress; 726 priv_modes |= PrivMode_Keypress;
668 if (!OPTION (Opt_jumpScroll)) 727 if (!option (Opt_jumpScroll))
669 priv_modes |= PrivMode_smoothScroll; 728 priv_modes |= PrivMode_smoothScroll;
670 729
671#ifndef NO_BACKSPACE_KEY 730#ifndef NO_BACKSPACE_KEY
672 if (strcmp (key_backspace, "DEC") == 0) 731 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
673 priv_modes |= PrivMode_HaveBackSpace; 732 priv_modes |= PrivMode_HaveBackSpace;
674#endif 733#endif
675 734
676 /* add value for scrollBar */ 735 /* add value for scrollBar */
677 if (scrollBar.state) 736 if (scrollBar.state)
… …
690 int i; 749 int i;
691 750
692#ifdef OFF_FOCUS_FADING 751#ifdef OFF_FOCUS_FADING
693 pix_colors = pix_colors_focused; 752 pix_colors = pix_colors_focused;
694#endif 753#endif
695 754
696 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 755 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
697 { 756 {
757 const char *name = rs[Rs_color + i];
758
759 if (!name)
760 continue;
761
698 rxvt_color xcol; 762 rxvt_color xcol;
699 763
700 if (!rs[Rs_color + i]) 764 if (!set_color (xcol, name))
701 continue;
702
703 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
704 { 765 {
705#ifndef XTERM_REVERSE_VIDEO 766#ifndef XTERM_REVERSE_VIDEO
706 if (i < 2 && OPTION (Opt_reverseVideo)) 767 if (i < 2 && option (Opt_reverseVideo))
707 rs[Rs_color + i] = def_colorName[!i]; 768 name = def_colorName [1 - i];
708 else 769 else
709#endif 770#endif
710 rs[Rs_color + i] = def_colorName[i]; 771 name = def_colorName [i];
711 772
712 if (!rs[Rs_color + i]) 773 if (!name)
713 continue; 774 continue;
714 775
715 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 776 if (!set_color (xcol, name))
716 { 777 {
717 switch (i) 778 switch (i)
718 { 779 {
719 case Color_fg: 780 case Color_fg:
720 case Color_bg: 781 case Color_bg:
721 /* fatal: need bg/fg color */
722 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 782 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
723 /* NOTREACHED */ 783 name = "";
724 break; 784 break;
725#ifndef NO_CURSORCOLOR 785#ifndef NO_CURSORCOLOR
726 case Color_cursor2: 786 case Color_cursor2:
727 xcol = pix_colors[Color_fg]; 787#endif
728 break;
729#endif /* ! NO_CURSORCOLOR */
730 case Color_pointer_fg: 788 case Color_pointer_fg:
731 xcol = pix_colors[Color_fg]; 789 name = rs[Rs_color + Color_fg];
790 xcol.set (this, name);
732 break; 791 break;
733 default: 792 default:
734 xcol = pix_colors[Color_bg]; /* None */ 793 name = rs[Rs_color + Color_bg];
794 xcol.set (this, name);
735 break; 795 break;
736 } 796 }
737 } 797 }
738 } 798 }
739 799
740 pix_colors[i] = xcol; 800 pix_colors[i] = xcol;
741 SET_PIXCOLOR (i); 801 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 { 802 }
803
804 if (depth <= 2)
805 {
752 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 806 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]; 807 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]; 808 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
755 } 809 }
756 810
757 /* 811 /*
758 * get scrollBar shadow colors 812 * get scrollBar shadow colors
759 * 813 *
760 * The calculations of topShadow/bottomShadow values are adapted 814 * The calculations of topShadow/bottomShadow values are adapted
761 * from the fvwm window manager. 815 * from the fvwm window manager.
762 */ 816 */
763#ifdef KEEP_SCROLLCOLOR 817#ifdef KEEP_SCROLLCOLOR
764
765 if (display->depth <= 2) 818 if (depth <= 2)
766 { 819 {
767 /* Monochrome */ 820 /* Monochrome */
768 pix_colors[Color_scroll] = pix_colors[Color_fg]; 821 alias_color (Color_scroll, Color_fg);
769 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 822 alias_color (Color_topShadow, Color_bg);
770 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 823 alias_color (Color_bottomShadow, Color_bg);
771 } 824 }
772 else 825 else
773 { 826 {
774 rxvt_color xcol[2]; 827 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 828
779 xcol[1] = pix_colors[Color_scroll]; 829 rgba cscroll;
780 xcol[0].set (display, 65535, 65535, 65535); 830 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 831
789 /* topShadowColor */ 832 /* topShadowColor */
790 if (!xcol[1].set (display, 833 if (!pix_colors[Color_topShadow].set (this,
791 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 834 rgba (
792 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 835 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
793 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 836 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
794 xcol[1] = pix_colors[Color_White]; 837 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
795 838 cscroll.a)
796 pix_colors[Color_topShadow] = xcol[1]; 839 ))
840 alias_color (Color_topShadow, Color_White);
797 } 841 }
798#endif /* KEEP_SCROLLCOLOR */ 842#endif /* KEEP_SCROLLCOLOR */
843
844#ifdef OFF_FOCUS_FADING
845 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
846 update_fade_color (i);
847#endif
799} 848}
800 849
801/*----------------------------------------------------------------------*/ 850/*----------------------------------------------------------------------*/
802/* color aliases, fg/bg bright-bold */ 851/* color aliases, fg/bg bright-bold */
803void 852void
… …
806 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 855 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
807 { 856 {
808 int i = atoi (rs[Rs_color + idx]); 857 int i = atoi (rs[Rs_color + idx]);
809 858
810 if (i >= 8 && i <= 15) 859 if (i >= 8 && i <= 15)
811 { /* bright colors */ 860 /* bright colors */
812 i -= 8;
813 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 861 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
814 return; 862 else if (i >= 0 && i <= 7)
815 } 863 /* normal colors */
816
817 if (i >= 0 && i <= 7) /* normal colors */
818 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 864 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
819 } 865 }
820} 866}
821 867
822/*----------------------------------------------------------------------*/ 868/*----------------------------------------------------------------------*/
… …
842 888
843 if (rsmod 889 if (rsmod
844 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 890 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
845 requestedmeta = rsmod[3] - '0'; 891 requestedmeta = rsmod[3] - '0';
846 892
847 map = XGetModifierMapping (display->display); 893 map = XGetModifierMapping (dpy);
848 kc = map->modifiermap; 894 kc = map->modifiermap;
849 895
850 for (i = 1; i < 6; i++) 896 for (i = 1; i < 6; i++)
851 { 897 {
852 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 898 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
854 for (j = map->max_keypermod; j--; k++) 900 for (j = map->max_keypermod; j--; k++)
855 { 901 {
856 if (kc[k] == 0) 902 if (kc[k] == 0)
857 break; 903 break;
858 904
859 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 905 switch (XKeycodeToKeysym (dpy, kc[k], 0))
860 { 906 {
861 case XK_Num_Lock: 907 case XK_Num_Lock:
862 ModNumLockMask = modmasks[i - 1]; 908 ModNumLockMask = modmasks[i - 1];
863 continue; 909 continue;
864 910
… …
914rxvt_term::create_windows (int argc, const char *const *argv) 960rxvt_term::create_windows (int argc, const char *const *argv)
915{ 961{
916 XClassHint classHint; 962 XClassHint classHint;
917 XWMHints wmHint; 963 XWMHints wmHint;
918#if ENABLE_FRILLS 964#if ENABLE_FRILLS
919 Atom prop = None;
920 MWMHints mwmhints; 965 MWMHints mwmhints = { };
921#endif 966#endif
922 XGCValues gcvalue; 967 XGCValues gcvalue;
923 XSetWindowAttributes attributes; 968 XSetWindowAttributes attributes;
924 XWindowAttributes gattr;
925 Window top, parent; 969 Window top, parent;
926 dDisp;
927 970
928#ifdef USING_W11LIB 971 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 972
942 /* grab colors before netscape does */ 973 /* grab colors before netscape does */
943 Get_Colours (); 974 Get_Colours ();
944 975
945 if (!set_fonts ()) 976 if (!set_fonts ())
946 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 977 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
947 978
948 parent = DefaultRootWindow (disp); 979 parent = display->root;
949 980
950 attributes.override_redirect = !!OPTION (Opt_override_redirect); 981 attributes.override_redirect = !!option (Opt_override_redirect);
951 982
952#if ENABLE_FRILLS 983#if ENABLE_FRILLS
953 if (OPTION (Opt_borderLess)) 984 if (option (Opt_borderLess))
954 { 985 {
955 prop = XInternAtom (disp, "_MOTIF_WM_INFO", True); 986 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
956
957 if (prop == None)
958 { 987 {
959 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 988 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
960 attributes.override_redirect = TRUE; 989 attributes.override_redirect = true;
961 mwmhints.flags = 0;
962 } 990 }
963 else 991 else
964 { 992 {
965 mwmhints.flags = MWM_HINTS_DECORATIONS; 993 mwmhints.flags = MWM_HINTS_DECORATIONS;
966 mwmhints.decorations = 0;
967 } 994 }
968 } 995 }
969 else
970 mwmhints.flags = 0;
971#endif 996#endif
972 997
973#if ENABLE_XEMBED 998#if ENABLE_XEMBED
974 if (rs[Rs_embed]) 999 if (rs[Rs_embed])
975 { 1000 {
976 XWindowAttributes wattr; 1001 XWindowAttributes wattr;
977 1002
978 parent = strtol (rs[Rs_embed], 0, 0); 1003 parent = strtol (rs[Rs_embed], 0, 0);
979 1004
980 if (!XGetWindowAttributes (disp, parent, &wattr)) 1005 if (!XGetWindowAttributes (dpy, parent, &wattr))
981 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 1006 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
982 1007
983 window_calc (wattr.width, wattr.height); 1008 window_calc (wattr.width, wattr.height);
984 } 1009 }
985#endif 1010#endif
986 1011
987 window_calc (0, 0); 1012 window_calc (0, 0);
988 1013
989 /* sub-window placement & size in rxvt_resize_subwindows () */ 1014 /* sub-window placement & size in rxvt_resize_subwindows () */
990 attributes.background_pixel = pix_colors_focused[Color_border]; 1015 attributes.background_pixel = pix_colors_focused [Color_border];
991 attributes.border_pixel = pix_colors_focused[Color_border]; 1016 attributes.border_pixel = pix_colors_focused [Color_border];
992 attributes.colormap = display->cmap; 1017 attributes.colormap = cmap;
1018
993 top = XCreateWindow (disp, parent, 1019 top = XCreateWindow (dpy, parent,
994 szHint.x, szHint.y, 1020 szHint.x, szHint.y,
995 szHint.width, szHint.height, 1021 szHint.width, szHint.height,
996 ext_bwidth, 1022 ext_bwidth,
997 display->depth, InputOutput, 1023 depth, InputOutput, visual,
998 display->visual,
999 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1024 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1000 &attributes); 1025 &attributes);
1001 1026
1002 this->parent[0] = top; 1027 this->parent[0] = top;
1003 1028
1004 old_width = szHint.width; 1029 old_width = szHint.width;
1005 old_height = szHint.height; 1030 old_height = szHint.height;
1006 1031
1007 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1032 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1008 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1033 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1009 1034
1010 classHint.res_name = (char *)rs[Rs_name]; 1035 classHint.res_name = (char *)rs[Rs_name];
1011 classHint.res_class = (char *)RESCLASS; 1036 classHint.res_class = (char *)RESCLASS;
1012 1037
1013 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1038 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1014 wmHint.input = True; 1039 wmHint.input = True;
1015 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1040 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1016 wmHint.window_group = top; 1041 wmHint.window_group = top;
1017 1042
1018 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 1043 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1019 &szHint, &wmHint, &classHint); 1044 &szHint, &wmHint, &classHint);
1045
1046#if ENABLE_FRILLS
1047 if (mwmhints.flags)
1048 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1049 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1050#endif
1020 1051
1021 Atom protocols[] = { 1052 Atom protocols[] = {
1022 xa[XA_WM_DELETE_WINDOW], 1053 xa[XA_WM_DELETE_WINDOW],
1023#if ENABLE_EWMH 1054#if ENABLE_EWMH
1024 xa[XA_NET_WM_PING], 1055 xa[XA_NET_WM_PING],
1025#endif 1056#endif
1026 }; 1057 };
1027 1058
1028 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1059 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1029 1060
1030#if ENABLE_FRILLS 1061#if ENABLE_FRILLS
1031 if (rs[Rs_transient_for]) 1062 if (rs[Rs_transient_for])
1032 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1063 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1033#endif 1064#endif
1034 1065
1035#if ENABLE_EWMH 1066#if ENABLE_EWMH
1036 long pid = getpid (); 1067 long pid = getpid ();
1037 1068
1038 XChangeProperty (disp, top, 1069 XChangeProperty (dpy, top,
1039 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1070 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1040 PropModeReplace, (unsigned char *)&pid, 1); 1071 PropModeReplace, (unsigned char *)&pid, 1);
1041 1072
1042 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1073 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1043#endif 1074#endif
1044 1075
1045 XSelectInput (disp, top, 1076 XSelectInput (dpy, top,
1046 KeyPressMask 1077 KeyPressMask
1047#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1078#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1048 | KeyReleaseMask 1079 | KeyReleaseMask
1049#endif 1080#endif
1050 | FocusChangeMask | VisibilityChangeMask 1081 | FocusChangeMask | VisibilityChangeMask
1051 | ExposureMask | StructureNotifyMask); 1082 | ExposureMask | StructureNotifyMask);
1052 1083
1053 termwin_ev.start (display, top); 1084 termwin_ev.start (display, top);
1054 1085
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 */ 1086 /* vt cursor: Black-on-White is standard, but this is more popular */
1062 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1087 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1063 1088
1064#ifdef HAVE_SCROLLBARS 1089#ifdef HAVE_SCROLLBARS
1065 /* cursor scrollBar: Black-on-White */ 1090 /* cursor scrollBar: Black-on-White */
1066 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1091 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1067#endif 1092#endif
1068 1093
1069 /* the vt window */ 1094 /* the vt window */
1070 vt = XCreateSimpleWindow (disp, top, 1095 vt = XCreateSimpleWindow (dpy, top,
1071 window_vt_x,
1072 window_vt_y, 1096 window_vt_x, window_vt_y,
1073 width,
1074 height, 1097 width, height,
1075 0, 1098 0,
1076 pix_colors_focused[Color_fg], 1099 pix_colors_focused[Color_fg],
1077 pix_colors_focused[Color_bg]); 1100 pix_colors_focused[Color_bg]);
1078#ifdef DEBUG_X
1079 XStoreName (disp, vt, "vt window");
1080#endif
1081 1101
1082 attributes.bit_gravity = NorthWestGravity; 1102 attributes.bit_gravity = NorthWestGravity;
1083 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1103 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1084 1104
1085 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1105 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1086 1106
1087 if (OPTION (Opt_pointerBlank)) 1107 if (option (Opt_pointerBlank))
1088 vt_emask |= PointerMotionMask; 1108 vt_emask |= PointerMotionMask;
1089 else 1109 else
1090 vt_emask |= Button1MotionMask | Button3MotionMask; 1110 vt_emask |= Button1MotionMask | Button3MotionMask;
1091 1111
1092 vt_select_input (); 1112 vt_select_input ();
1093 1113
1094 vt_ev.start (display, vt); 1114 vt_ev.start (display, vt);
1095 1115
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 */ 1116 /* graphics context for the vt window */
1114 gcvalue.foreground = pix_colors[Color_fg]; 1117 gcvalue.foreground = pix_colors[Color_fg];
1115 gcvalue.background = pix_colors[Color_bg]; 1118 gcvalue.background = pix_colors[Color_bg];
1116 gcvalue.graphics_exposures = 1; 1119 gcvalue.graphics_exposures = 0;
1120
1117 gc = XCreateGC (disp, vt, 1121 gc = XCreateGC (dpy, vt,
1118 GCForeground | GCBackground | GCGraphicsExposures, 1122 GCForeground | GCBackground | GCGraphicsExposures,
1119 &gcvalue); 1123 &gcvalue);
1120 1124
1121 drawable = new rxvt_drawable (display, vt); 1125 drawable = new rxvt_drawable (this, vt);
1122 1126
1123#ifdef RXVT_SCROLLBAR 1127#ifdef RXVT_SCROLLBAR
1124 gcvalue.foreground = pix_colors[Color_topShadow]; 1128 gcvalue.foreground = pix_colors[Color_topShadow];
1125 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1129 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1126 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1130 gcvalue.foreground = pix_colors[Color_bottomShadow];
1127 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1131 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1128 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1132 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1129 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1133 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1130#endif 1134#endif
1131 1135
1132#ifdef OFF_FOCUS_FADING 1136#ifdef OFF_FOCUS_FADING
1133 // initially we are in unfocused state 1137 // initially we are in unfocused state
1134 if (rs[Rs_fade]) 1138 if (rs[Rs_fade])
1135 pix_colors = pix_colors_unfocused; 1139 pix_colors = pix_colors_unfocused;
1136#endif 1140#endif
1137 1141
1138 pointer_unblank (); 1142 pointer_unblank ();
1139 scr_recolour (); 1143 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} 1144}
1151 1145
1152/* ------------------------------------------------------------------------- * 1146/* ------------------------------------------------------------------------- *
1153 * GET TTY CURRENT STATE * 1147 * GET TTY CURRENT STATE *
1154 * ------------------------------------------------------------------------- */ 1148 * ------------------------------------------------------------------------- */
1155void 1149void
1156rxvt_get_ttymode (ttymode_t *tio, int erase) 1150rxvt_get_ttymode (ttymode_t *tio, int erase)
1157{ 1151{
1158#ifdef HAVE_TERMIOS_H
1159 /* 1152 /*
1160 * standard System V termios interface 1153 * standard System V termios interface
1161 */ 1154 */
1162 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1155 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1163 { 1156 {
… …
1230 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1223 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1231# if defined (ECHOCTL) && defined (ECHOKE) 1224# if defined (ECHOCTL) && defined (ECHOKE)
1232 | ECHOCTL | ECHOKE 1225 | ECHOCTL | ECHOKE
1233# endif 1226# endif
1234 | ECHOE | ECHOK); 1227 | 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 1228
1283 /* 1229 /*
1284 * Debugging 1230 * Debugging
1285 */ 1231 */
1286#ifdef DEBUG_TTYMODE 1232#ifdef DEBUG_TTYMODE
1287#ifdef HAVE_TERMIOS_H
1288 /* c_iflag bits */ 1233 /* c_iflag bits */
1289 fprintf (stderr, "Input flags\n"); 1234 fprintf (stderr, "Input flags\n");
1290 1235
1291 /* cpp token stringize doesn't work on all machines <sigh> */ 1236 /* cpp token stringize doesn't work on all machines <sigh> */
1292# define FOO(flag,name) \ 1237# define FOO(flag,name) \
… …
1355 FOO (VLNEXT, "VLNEXT"); 1300 FOO (VLNEXT, "VLNEXT");
1356# endif 1301# endif
1357 1302
1358 fprintf (stderr, "\n"); 1303 fprintf (stderr, "\n");
1359# undef FOO 1304# undef FOO
1360# endif /* HAVE_TERMIOS_H */ 1305#endif /* DEBUG_TTYMODE */
1361#endif /* DEBUG_TTYMODE */
1362} 1306}
1363 1307
1364/*----------------------------------------------------------------------*/ 1308/*----------------------------------------------------------------------*/
1365/* 1309/*
1366 * Run the command in a subprocess and return a file descriptor for the 1310 * Run the command in a subprocess and return a file descriptor for the
… …
1387 else 1331 else
1388#endif 1332#endif
1389 if (!pty->get ()) 1333 if (!pty->get ())
1390 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1334 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1391 1335
1336 int er;
1337
1338#ifndef NO_BACKSPACE_KEY
1339 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1340 er = rs[Rs_backspace_key][0];
1341 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1342 er = '\177'; /* the initial state anyway */
1343 else
1344#endif
1345 er = -1;
1346
1347 rxvt_get_ttymode (&tio, er);
1348 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1392 pty->set_utf8_mode (enc_utf8); 1349 pty->set_utf8_mode (enc_utf8);
1393 1350
1394 /* set initial window size */ 1351 /* set initial window size */
1395 tt_winch (); 1352 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 1353
1410#if ENABLE_FRILLS 1354#if ENABLE_FRILLS
1411 if (rs[Rs_pty_fd]) 1355 if (rs[Rs_pty_fd])
1412 return; 1356 return;
1413#endif 1357#endif
… …
1444 } 1388 }
1445 1389
1446 _exit (EXIT_FAILURE); 1390 _exit (EXIT_FAILURE);
1447 1391
1448 default: 1392 default:
1449 if (!OPTION (Opt_utmpInhibit)) 1393 if (!option (Opt_utmpInhibit))
1450 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1394 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1451 1395
1452 pty->close_tty (); 1396 pty->close_tty ();
1453 1397
1454 child_ev.start (cmd_pid); 1398 child_ev.start (cmd_pid);
1455 1399
… …
1468int 1412int
1469rxvt_term::run_child (const char *const *argv) 1413rxvt_term::run_child (const char *const *argv)
1470{ 1414{
1471 char *login; 1415 char *login;
1472 1416
1473 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1474
1475 if (OPTION (Opt_console)) 1417 if (option (Opt_console))
1418 {
1476 { /* be virtual console, fail silently */ 1419 /* be virtual console, fail silently */
1477#ifdef TIOCCONS 1420#ifdef TIOCCONS
1478 unsigned int on = 1; 1421 unsigned int on = 1;
1479 1422
1480 ioctl (STDIN_FILENO, TIOCCONS, &on); 1423 ioctl (STDIN_FILENO, TIOCCONS, &on);
1481#elif defined (SRIOCSREDIR) 1424#elif defined (SRIOCSREDIR)
… …
1483 1426
1484 fd = open (CONSOLE, O_WRONLY, 0); 1427 fd = open (CONSOLE, O_WRONLY, 0);
1485 if (fd >= 0) 1428 if (fd >= 0)
1486 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1429 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1487 close (fd); 1430 close (fd);
1488#endif /* SRIOCSREDIR */ 1431#endif /* SRIOCSREDIR */
1489 } 1432 }
1490 1433
1491 /* reset signals and spin off the command interpreter */ 1434 /* reset signals and spin off the command interpreter */
1492 signal (SIGINT, SIG_DFL); 1435 signal (SIGINT, SIG_DFL);
1493 signal (SIGQUIT, SIG_DFL); 1436 signal (SIGQUIT, SIG_DFL);
… …
1500 */ 1443 */
1501#ifdef SIGTSTP 1444#ifdef SIGTSTP
1502 signal (SIGTSTP, SIG_IGN); 1445 signal (SIGTSTP, SIG_IGN);
1503 signal (SIGTTIN, SIG_IGN); 1446 signal (SIGTTIN, SIG_IGN);
1504 signal (SIGTTOU, SIG_IGN); 1447 signal (SIGTTOU, SIG_IGN);
1505#endif /* SIGTSTP */ 1448#endif /* SIGTSTP */
1506 1449
1507 // unblock signals (signals are blocked by iom.C 1450 // unblock signals (signals are blocked by iom.C
1508 sigset_t ss; 1451 sigset_t ss;
1509 sigemptyset (&ss); 1452 sigemptyset (&ss);
1510 sigprocmask (SIG_SETMASK, &ss, 0); 1453 sigprocmask (SIG_SETMASK, &ss, 0);
1511 1454
1512 /* command interpreter path */ 1455 /* command interpreter path */
1513 if (argv != NULL) 1456 if (argv)
1514 { 1457 {
1515# ifdef DEBUG_CMD 1458# ifdef DEBUG_CMD
1516 int i; 1459 int i;
1517 1460
1518 for (i = 0; argv[i]; i++) 1461 for (i = 0; argv[i]; i++)
… …
1527 const char *argv0, *shell; 1470 const char *argv0, *shell;
1528 1471
1529 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1472 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1530 shell = "/bin/sh"; 1473 shell = "/bin/sh";
1531 1474
1532 argv0 = (const char *)rxvt_r_basename (shell); 1475 argv0 = (const char *)rxvt_basename (shell);
1533 1476
1534 if (OPTION (Opt_loginShell)) 1477 if (option (Opt_loginShell))
1535 { 1478 {
1536 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1479 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1537 1480
1538 login[0] = '-'; 1481 login[0] = '-';
1539 strcpy (&login[1], argv0); 1482 strcpy (&login[1], argv0);
1540 argv0 = login; 1483 argv0 = login;
1541 } 1484 }
1542 1485
1543 execlp (shell, argv0, NULL); 1486 execlp (shell, argv0, (char *)0);
1544 /* no error message: STDERR is closed! */ 1487 /* no error message: STDERR is closed! */
1545 } 1488 }
1546 1489
1547 return -1; 1490 return -1;
1548} 1491}

Diff Legend

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