ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/init.C
(Generate patch)

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.148 by root, Wed Jan 18 19:43:51 2006 UTC vs.
Revision 1.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#ifdef OFFIX_DND
209 "DndProtocol",
210 "DndSelection",
211#endif
212#if ENABLE_XEMBED
213 "_XEMBED",
214 "_XEMBED_INFO",
215#endif 282#endif
216 }; 283 };
217 284
218bool 285bool
219rxvt_term::init_vars () 286rxvt_term::init_vars ()
220{ 287{
288 pix_colors = //
221 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 289 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
222#ifdef OFF_FOCUS_FADING 290#ifdef OFF_FOCUS_FADING
223 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 291 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
224#endif 292#endif
225 pix_colors = pix_colors_focused;
226 293
227 if (pix_colors == NULL)
228 return false;
229
230#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
231 pixmap = None;
232#endif
233 294
234 MEvent.time = CurrentTime; 295 MEvent.time = CurrentTime;
235 MEvent.button = AnyButton; 296 MEvent.button = AnyButton;
236 options = DEFAULT_OPTIONS;
237 want_refresh = 1; 297 want_refresh = 1;
238 priv_modes = SavedModes = PrivMode_Default; 298 priv_modes = SavedModes = PrivMode_Default;
239 focus = 0;
240 ncol = 80; 299 ncol = 80;
241 nrow = 24; 300 nrow = 24;
242 int_bwidth = INTERNALBORDERWIDTH; 301 int_bwidth = INTERNALBORDERWIDTH;
243 ext_bwidth = EXTERNALBORDERWIDTH; 302 ext_bwidth = EXTERNALBORDERWIDTH;
244 lineSpace = LINESPACE; 303 lineSpace = LINESPACE;
245 saveLines = SAVELINES; 304 saveLines = SAVELINES;
246 numpix_colors = TOTAL_COLORS; 305 numpix_colors = TOTAL_COLORS;
247 306
248 refresh_limit = 1;
249 refresh_type = SLOW_REFRESH; 307 refresh_type = SLOW_REFRESH;
250 prev_nrow = prev_ncol = 0;
251 308
252 oldcursor.row = oldcursor.col = -1; 309 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; 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);
260 321
261 return true; 322 return true;
262} 323}
263 324
264void 325void
… …
273 if ((i = open ("/dev/null", O_RDONLY)) < 0) 334 if ((i = open ("/dev/null", O_RDONLY)) < 0)
274 { 335 {
275 /* TODO: BOO HISS */ 336 /* TODO: BOO HISS */
276 dup2 (STDERR_FILENO, STDIN_FILENO); 337 dup2 (STDERR_FILENO, STDIN_FILENO);
277 } 338 }
278 else if (i > STDIN_FILENO) 339 else if (i != STDIN_FILENO)
279 { 340 {
280 dup2 (i, STDIN_FILENO); 341 dup2 (i, STDIN_FILENO);
281 close (i); 342 close (i);
282 } 343 }
283 344
… …
298/*----------------------------------------------------------------------*/ 359/*----------------------------------------------------------------------*/
299const char ** 360const char **
300rxvt_term::init_resources (int argc, const char *const *argv) 361rxvt_term::init_resources (int argc, const char *const *argv)
301{ 362{
302 int i, r_argc; 363 int i, r_argc;
303 char *val;
304 const char **cmd_argv, **r_argv; 364 const char **cmd_argv, **r_argv;
305 365
306 /* 366 /*
307 * 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
308 */ 368 */
309 for (r_argc = 0; r_argc < argc; r_argc++) 369 for (r_argc = 0; r_argc < argc; r_argc++)
310 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 370 if (!strcmp (argv[r_argc], "-e"))
311 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 }
312 386
313 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 387 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
314 388
315 for (i = 0; i < r_argc; i++) 389 for (i = 0; i < r_argc; i++)
316 r_argv[i] = (const char *)argv[i]; 390 r_argv[i] = (const char *)argv[i];
317 391
318 r_argv[i] = NULL; 392 r_argv[i] = NULL;
319 393
320 if (r_argc == argc)
321 cmd_argv = NULL;
322 else
323 {
324 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
325
326 for (i = 0; i < argc - r_argc - 1; i++)
327 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
328
329 cmd_argv[i] = NULL;
330 }
331
332 rs[Rs_name] = rxvt_r_basename (argv[0]); 394 rs[Rs_name] = rxvt_basename (argv[0]);
333 395
334 /* 396 /*
335 * Open display, get options/resources and create the window 397 * Open display, get options/resources and create the window
336 */ 398 */
337 399
… …
339 rs[Rs_display_name] = ":0"; 401 rs[Rs_display_name] = ":0";
340 402
341 get_options (r_argc, r_argv); 403 get_options (r_argc, r_argv);
342 404
343 if (!(display = displays.get (rs[Rs_display_name]))) 405 if (!(display = displays.get (rs[Rs_display_name])))
406 {
407 free (r_argv);
344 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 }
345 410
411 // using a local pointer decreases code size a lot
412 xa = display->xa;
413
414 set (display);
346 extract_resources (); 415 extract_resources ();
347 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
348 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;
430
431#if ENABLE_PERL
432 if (!rs[Rs_perl_ext_1])
433 rs[Rs_perl_ext_1] = "default";
434
435 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
436 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
437 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
438 {
439 rxvt_perl.init (this);
440 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
441 }
442#endif
349 443
350 /* 444 /*
351 * set any defaults not already set 445 * set any defaults not already set
352 */ 446 */
353 if (cmd_argv && cmd_argv[0]) 447 if (cmd_argv && cmd_argv[0])
354 { 448 {
355 if (!rs[Rs_title]) 449 if (!rs[Rs_title])
356 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 450 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
357 if (!rs[Rs_iconName]) 451 if (!rs[Rs_iconName])
358 rs[Rs_iconName] = rs[Rs_title]; 452 rs[Rs_iconName] = rs[Rs_title];
359 } 453 }
360 else 454 else
361 { 455 {
… …
399 rs[Rs_cutchars] = CUTCHARS; 493 rs[Rs_cutchars] = CUTCHARS;
400 494
401#ifndef NO_BACKSPACE_KEY 495#ifndef NO_BACKSPACE_KEY
402 if (!rs[Rs_backspace_key]) 496 if (!rs[Rs_backspace_key])
403# ifdef DEFAULT_BACKSPACE 497# ifdef DEFAULT_BACKSPACE
404 key_backspace = DEFAULT_BACKSPACE; 498 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
405# else 499# else
406 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 500 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
407# endif 501# endif
408 else
409 {
410 val = strdup (rs[Rs_backspace_key]);
411 rxvt_Str_trim (val);
412 rxvt_Str_escaped (val);
413 key_backspace = val;
414 }
415#endif 502#endif
416 503
417#ifndef NO_DELETE_KEY 504#ifndef NO_DELETE_KEY
418 if (!rs[Rs_delete_key]) 505 if (!rs[Rs_delete_key])
419# ifdef DEFAULT_DELETE 506# ifdef DEFAULT_DELETE
420 key_delete = DEFAULT_DELETE; 507 rs[Rs_delete_key] = DEFAULT_DELETE;
421# else 508# else
422 key_delete = "\033[3~"; 509 rs[Rs_delete_key] = "\033[3~";
423# endif
424 else
425 {
426 val = strdup (rs[Rs_delete_key]);
427 rxvt_Str_trim (val);
428 rxvt_Str_escaped (val);
429 key_delete = val;
430 }
431#endif 510# endif
432 if (rs[Rs_answerbackstring]) 511#endif
433 {
434 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
435 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
436 }
437 512
438#ifdef HAVE_SCROLLBARS 513#ifdef HAVE_SCROLLBARS
439 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]);
440#endif 515#endif
441 516
442#ifdef XTERM_REVERSE_VIDEO 517#ifdef XTERM_REVERSE_VIDEO
443 /* this is how xterm implements reverseVideo */ 518 /* this is how xterm implements reverseVideo */
444 if (OPTION (Opt_reverseVideo)) 519 if (option (Opt_reverseVideo))
445 { 520 {
446 if (!rs[Rs_color + Color_fg]) 521 if (!rs[Rs_color + Color_fg])
447 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 522 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
523
448 if (!rs[Rs_color + Color_bg]) 524 if (!rs[Rs_color + Color_bg])
449 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 525 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
450 } 526 }
451#endif 527#endif
452 528
… …
454 if (!rs[Rs_color + i]) 530 if (!rs[Rs_color + i])
455 rs[Rs_color + i] = def_colorName[i]; 531 rs[Rs_color + i] = def_colorName[i];
456 532
457#ifndef XTERM_REVERSE_VIDEO 533#ifndef XTERM_REVERSE_VIDEO
458 /* this is how we implement reverseVideo */ 534 /* this is how we implement reverseVideo */
459 if (OPTION (Opt_reverseVideo)) 535 if (option (Opt_reverseVideo))
460 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 536 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
461#endif 537#endif
462 538
463 /* convenient aliases for setting fg/bg to colors */ 539 /* convenient aliases for setting fg/bg to colors */
464 color_aliases (Color_fg); 540 color_aliases (Color_fg);
465 color_aliases (Color_bg); 541 color_aliases (Color_bg);
466#ifndef NO_CURSORCOLOR 542#ifndef NO_CURSORCOLOR
467 color_aliases (Color_cursor); 543 color_aliases (Color_cursor);
468 color_aliases (Color_cursor2); 544 color_aliases (Color_cursor2);
469#endif /* NO_CURSORCOLOR */ 545#endif /* NO_CURSORCOLOR */
470 color_aliases (Color_pointer_fg); 546 color_aliases (Color_pointer_fg);
471 color_aliases (Color_pointer_bg); 547 color_aliases (Color_pointer_bg);
472 color_aliases (Color_border); 548 color_aliases (Color_border);
473#ifndef NO_BOLD_UNDERLINE_REVERSE 549#ifndef NO_BOLD_UNDERLINE_REVERSE
474 color_aliases (Color_BD); 550 color_aliases (Color_BD);
475 color_aliases (Color_UL); 551 color_aliases (Color_UL);
476 color_aliases (Color_RV); 552 color_aliases (Color_RV);
477#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 553#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
478 554
479 if (!rs[Rs_color + Color_border]) 555 if (!rs[Rs_color + Color_border])
480 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 556 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
481 557
482 return cmd_argv; 558 return cmd_argv;
… …
485/*----------------------------------------------------------------------*/ 561/*----------------------------------------------------------------------*/
486void 562void
487rxvt_term::init_env () 563rxvt_term::init_env ()
488{ 564{
489 int i; 565 int i;
490 unsigned int u;
491 char *val; 566 char *val;
492 567
493#ifdef DISPLAY_IS_IP 568#ifdef DISPLAY_IS_IP
494 /* Fixup display_name for export over pty to any interested terminal 569 /* Fixup display_name for export over pty to any interested terminal
495 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 570 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
503 */ 578 */
504 val = rxvt_network_display (rs[Rs_display_name]); 579 val = rxvt_network_display (rs[Rs_display_name]);
505 rs[Rs_display_name] = (const char *)val; 580 rs[Rs_display_name] = (const char *)val;
506 581
507 if (val == NULL) 582 if (val == NULL)
508#endif /* DISPLAY_IS_IP */ 583#endif /* DISPLAY_IS_IP */
509 val = XDisplayString (display->display); 584 val = XDisplayString (dpy);
510 585
511 if (rs[Rs_display_name] == NULL) 586 if (rs[Rs_display_name] == NULL)
512 rs[Rs_display_name] = val; /* use broken `:0' value */ 587 rs[Rs_display_name] = val; /* use broken `:0' value */
513 588
514 i = strlen (val); 589 i = strlen (val);
515 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 590 env_display = (char *)rxvt_malloc (i + 9);
516 591
517 sprintf (env_display, "DISPLAY=%s", val); 592 sprintf (env_display, "DISPLAY=%s", val);
518 593
519 /* avoiding the math library: 594 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
520 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
521 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
522 ;
523 max_it (i, 1);
524 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
525
526 sprintf (env_windowid, "WINDOWID=%u",
527 (unsigned int)parent[0]);
528 595
529 /* add entries to the environment: 596 /* add entries to the environment:
530 * @ DISPLAY: in case we started with -display 597 * @ DISPLAY: in case we started with -display
531 * @ WINDOWID: X window id number of the window 598 * @ WINDOWID: X window id number of the window
532 * @ COLORTERM: terminal sub-name and also indicates its color 599 * @ COLORTERM: terminal sub-name and also indicates its color
… …
534 * @ TERMINFO: path to terminfo directory 601 * @ TERMINFO: path to terminfo directory
535 * @ COLORFGBG: fg;bg color codes 602 * @ COLORFGBG: fg;bg color codes
536 */ 603 */
537 putenv (env_display); 604 putenv (env_display);
538 putenv (env_windowid); 605 putenv (env_windowid);
606
539 if (env_colorfgbg) 607 if (env_colorfgbg)
540 putenv (env_colorfgbg); 608 putenv (env_colorfgbg);
541 609
542#ifdef RXVT_TERMINFO 610#ifdef RXVT_TERMINFO
543 putenv ("TERMINFO=" RXVT_TERMINFO); 611 putenv ("TERMINFO=" RXVT_TERMINFO);
544#endif 612#endif
545 613
546 if (display->depth <= 2) 614 if (depth <= 2)
547 putenv ("COLORTERM=" COLORTERMENV "-mono"); 615 putenv ("COLORTERM=" COLORTERMENV "-mono");
548 else 616 else
549 putenv ("COLORTERM=" COLORTERMENVFULL); 617 putenv ("COLORTERM=" COLORTERMENVFULL);
550 618
551 if (rs[Rs_term_name] != NULL) 619 if (rs[Rs_term_name] != NULL)
552 { 620 {
553 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);
554 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 622 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
555 putenv (env_term); 623 putenv (env_term);
556 } 624 }
557 else 625 else
558 putenv ("TERM=" TERMENV); 626 putenv ("TERM=" TERMENV);
… …
560#ifdef HAVE_UNSETENV 628#ifdef HAVE_UNSETENV
561 /* avoid passing old settings and confusing term size */ 629 /* avoid passing old settings and confusing term size */
562 unsetenv ("LINES"); 630 unsetenv ("LINES");
563 unsetenv ("COLUMNS"); 631 unsetenv ("COLUMNS");
564 unsetenv ("TERMCAP"); /* terminfo should be okay */ 632 unsetenv ("TERMCAP"); /* terminfo should be okay */
565#endif /* HAVE_UNSETENV */ 633#endif /* HAVE_UNSETENV */
566} 634}
567 635
568/*----------------------------------------------------------------------*/ 636/*----------------------------------------------------------------------*/
569/* 637/*
570 * This is more or less stolen straight from XFree86 xterm. 638 * This is more or less stolen straight from XFree86 xterm.
… …
591 659
592 this->locale = "C"; 660 this->locale = "C";
593 } 661 }
594 662
595 663
596 this->locale = rxvt_strdup (this->locale); 664 this->locale = strdup (this->locale);
597 SET_LOCALE (this->locale); 665 SET_LOCALE (this->locale);
598 mbstate.reset (); 666 mbstate.reset ();
599#endif 667#endif
600 668
601#if HAVE_NL_LANGINFO 669#if HAVE_NL_LANGINFO
… …
645 * Initialize the command connection. 713 * Initialize the command connection.
646 * This should be called after the X server connection is established. 714 * This should be called after the X server connection is established.
647 */ 715 */
648 716
649#ifdef META8_OPTION 717#ifdef META8_OPTION
650 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 718 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
651#endif 719#endif
652 720
653 get_ourmods (); 721 get_ourmods ();
654 722
655 if (!OPTION (Opt_scrollTtyOutput)) 723 if (!option (Opt_scrollTtyOutput))
656 priv_modes |= PrivMode_TtyOutputInh; 724 priv_modes |= PrivMode_TtyOutputInh;
657 if (OPTION (Opt_scrollTtyKeypress)) 725 if (option (Opt_scrollTtyKeypress))
658 priv_modes |= PrivMode_Keypress; 726 priv_modes |= PrivMode_Keypress;
659 if (!OPTION (Opt_jumpScroll)) 727 if (!option (Opt_jumpScroll))
660 priv_modes |= PrivMode_smoothScroll; 728 priv_modes |= PrivMode_smoothScroll;
661 729
662#ifndef NO_BACKSPACE_KEY 730#ifndef NO_BACKSPACE_KEY
663 if (strcmp (key_backspace, "DEC") == 0) 731 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
664 priv_modes |= PrivMode_HaveBackSpace; 732 priv_modes |= PrivMode_HaveBackSpace;
665#endif 733#endif
666 734
667 /* add value for scrollBar */ 735 /* add value for scrollBar */
668 if (scrollBar.state) 736 if (scrollBar.state)
… …
681 int i; 749 int i;
682 750
683#ifdef OFF_FOCUS_FADING 751#ifdef OFF_FOCUS_FADING
684 pix_colors = pix_colors_focused; 752 pix_colors = pix_colors_focused;
685#endif 753#endif
686 754
687 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 755 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
688 { 756 {
757 const char *name = rs[Rs_color + i];
758
759 if (!name)
760 continue;
761
689 rxvt_color xcol; 762 rxvt_color xcol;
690 763
691 if (!rs[Rs_color + i]) 764 if (!set_color (xcol, name))
692 continue;
693
694 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
695 { 765 {
696#ifndef XTERM_REVERSE_VIDEO 766#ifndef XTERM_REVERSE_VIDEO
697 if (i < 2 && OPTION (Opt_reverseVideo)) 767 if (i < 2 && option (Opt_reverseVideo))
698 rs[Rs_color + i] = def_colorName[!i]; 768 name = def_colorName [1 - i];
699 else 769 else
700#endif 770#endif
701 rs[Rs_color + i] = def_colorName[i]; 771 name = def_colorName [i];
702 772
703 if (!rs[Rs_color + i]) 773 if (!name)
704 continue; 774 continue;
705 775
706 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 776 if (!set_color (xcol, name))
707 { 777 {
708 switch (i) 778 switch (i)
709 { 779 {
710 case Color_fg: 780 case Color_fg:
711 case Color_bg: 781 case Color_bg:
712 /* fatal: need bg/fg color */
713 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 782 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
714 /* NOTREACHED */ 783 name = "";
715 break; 784 break;
716#ifndef NO_CURSORCOLOR 785#ifndef NO_CURSORCOLOR
717 case Color_cursor2: 786 case Color_cursor2:
718 xcol = pix_colors[Color_fg]; 787#endif
719 break;
720#endif /* ! NO_CURSORCOLOR */
721 case Color_pointer_fg: 788 case Color_pointer_fg:
722 xcol = pix_colors[Color_fg]; 789 name = rs[Rs_color + Color_fg];
790 xcol.set (this, name);
723 break; 791 break;
724 default: 792 default:
725 xcol = pix_colors[Color_bg]; /* None */ 793 name = rs[Rs_color + Color_bg];
794 xcol.set (this, name);
726 break; 795 break;
727 } 796 }
728 } 797 }
729 } 798 }
730 799
731 pix_colors[i] = xcol; 800 pix_colors[i] = xcol;
732 SET_PIXCOLOR (i); 801 rs[Rs_color + i] = name;
733 }
734
735#ifdef OFF_FOCUS_FADING
736 if (rs[Rs_fade])
737 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
738 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
739#endif
740
741 if (display->depth <= 2)
742 { 802 }
803
804 if (depth <= 2)
805 {
743 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);
744 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);
745 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);
746 } 809 }
747 810
748 /* 811 /*
749 * get scrollBar shadow colors 812 * get scrollBar shadow colors
750 * 813 *
751 * The calculations of topShadow/bottomShadow values are adapted 814 * The calculations of topShadow/bottomShadow values are adapted
752 * from the fvwm window manager. 815 * from the fvwm window manager.
753 */ 816 */
754#ifdef KEEP_SCROLLCOLOR 817#ifdef KEEP_SCROLLCOLOR
755
756 if (display->depth <= 2) 818 if (depth <= 2)
757 { 819 {
758 /* Monochrome */ 820 /* Monochrome */
759 pix_colors[Color_scroll] = pix_colors[Color_fg]; 821 alias_color (Color_scroll, Color_fg);
760 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 822 alias_color (Color_topShadow, Color_bg);
761 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 823 alias_color (Color_bottomShadow, Color_bg);
762 } 824 }
763 else 825 else
764 { 826 {
765 rxvt_color xcol[2]; 827 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
766 /* xcol[0] == white
767 * xcol[1] == top shadow
768 * xcol[2] == bot shadow */
769 828
770 xcol[1] = pix_colors[Color_scroll]; 829 rgba cscroll;
771 xcol[0].set (display, 65535, 65535, 65535); 830 pix_colors [Color_scroll].get (cscroll);
772
773 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
774
775 xcol[0].get (display, pr0, pg0, pb0);
776 xcol[1].get (display, pr1, pg1, pb1);
777
778 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
779 831
780 /* topShadowColor */ 832 /* topShadowColor */
781 if (!xcol[1].set (display, 833 if (!pix_colors[Color_topShadow].set (this,
782 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 834 rgba (
783 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 835 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
784 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 836 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
785 xcol[1] = pix_colors[Color_White]; 837 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
786 838 cscroll.a)
787 pix_colors[Color_topShadow] = xcol[1]; 839 ))
840 alias_color (Color_topShadow, Color_White);
788 } 841 }
789#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
790} 848}
791 849
792/*----------------------------------------------------------------------*/ 850/*----------------------------------------------------------------------*/
793/* color aliases, fg/bg bright-bold */ 851/* color aliases, fg/bg bright-bold */
794void 852void
… …
797 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 855 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
798 { 856 {
799 int i = atoi (rs[Rs_color + idx]); 857 int i = atoi (rs[Rs_color + idx]);
800 858
801 if (i >= 8 && i <= 15) 859 if (i >= 8 && i <= 15)
802 { /* bright colors */ 860 /* bright colors */
803 i -= 8;
804 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 861 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
805 return; 862 else if (i >= 0 && i <= 7)
806 } 863 /* normal colors */
807
808 if (i >= 0 && i <= 7) /* normal colors */
809 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 864 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
810 } 865 }
811} 866}
812 867
813/*----------------------------------------------------------------------*/ 868/*----------------------------------------------------------------------*/
… …
833 888
834 if (rsmod 889 if (rsmod
835 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 890 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
836 requestedmeta = rsmod[3] - '0'; 891 requestedmeta = rsmod[3] - '0';
837 892
838 map = XGetModifierMapping (display->display); 893 map = XGetModifierMapping (dpy);
839 kc = map->modifiermap; 894 kc = map->modifiermap;
840 895
841 for (i = 1; i < 6; i++) 896 for (i = 1; i < 6; i++)
842 { 897 {
843 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 898 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
845 for (j = map->max_keypermod; j--; k++) 900 for (j = map->max_keypermod; j--; k++)
846 { 901 {
847 if (kc[k] == 0) 902 if (kc[k] == 0)
848 break; 903 break;
849 904
850 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 905 switch (XKeycodeToKeysym (dpy, kc[k], 0))
851 { 906 {
852 case XK_Num_Lock: 907 case XK_Num_Lock:
853 ModNumLockMask = modmasks[i - 1]; 908 ModNumLockMask = modmasks[i - 1];
854 continue; 909 continue;
855 910
… …
905rxvt_term::create_windows (int argc, const char *const *argv) 960rxvt_term::create_windows (int argc, const char *const *argv)
906{ 961{
907 XClassHint classHint; 962 XClassHint classHint;
908 XWMHints wmHint; 963 XWMHints wmHint;
909#if ENABLE_FRILLS 964#if ENABLE_FRILLS
910 Atom prop = None;
911 MWMHints mwmhints; 965 MWMHints mwmhints = { };
912#endif 966#endif
913 XGCValues gcvalue; 967 XGCValues gcvalue;
914 XSetWindowAttributes attributes; 968 XSetWindowAttributes attributes;
915 XWindowAttributes gattr;
916 Window top, parent; 969 Window top, parent;
917 dDisp;
918 970
919#ifdef USING_W11LIB 971 dLocal (Display *, dpy);
920 /* enable W11 callbacks */
921 W11AddEventHandler (disp, rxvt_W11_process_x_event);
922#endif
923
924 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
925 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
926
927 if (OPTION (Opt_transparent))
928 {
929 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
930 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
931 }
932 972
933 /* grab colors before netscape does */ 973 /* grab colors before netscape does */
934 Get_Colours (); 974 Get_Colours ();
935 975
936 if (!set_fonts ()) 976 if (!set_fonts ())
937 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");
938 978
939 parent = DefaultRootWindow (disp); 979 parent = display->root;
940 980
941 attributes.override_redirect = !!OPTION (Opt_override_redirect); 981 attributes.override_redirect = !!option (Opt_override_redirect);
942 982
943#if ENABLE_FRILLS 983#if ENABLE_FRILLS
944 if (OPTION (Opt_borderLess)) 984 if (option (Opt_borderLess))
945 { 985 {
946 prop = XInternAtom (disp, "_MOTIF_WM_INFO", True); 986 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
947
948 if (prop == None)
949 { 987 {
950 /* 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");
951 attributes.override_redirect = TRUE; 989 attributes.override_redirect = true;
952 mwmhints.flags = 0;
953 } 990 }
954 else 991 else
955 { 992 {
956 mwmhints.flags = MWM_HINTS_DECORATIONS; 993 mwmhints.flags = MWM_HINTS_DECORATIONS;
957 mwmhints.decorations = 0;
958 } 994 }
959 } 995 }
960 else
961 mwmhints.flags = 0;
962#endif 996#endif
963 997
964#if ENABLE_XEMBED 998#if ENABLE_XEMBED
965 if (rs[Rs_embed]) 999 if (rs[Rs_embed])
966 { 1000 {
967 XWindowAttributes wattr; 1001 XWindowAttributes wattr;
968 1002
969 parent = strtol (rs[Rs_embed], 0, 0); 1003 parent = strtol (rs[Rs_embed], 0, 0);
970 1004
971 if (!XGetWindowAttributes (disp, parent, &wattr)) 1005 if (!XGetWindowAttributes (dpy, parent, &wattr))
972 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 1006 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
973 1007
974 window_calc (wattr.width, wattr.height); 1008 window_calc (wattr.width, wattr.height);
975 } 1009 }
976#endif 1010#endif
977 1011
978 window_calc (0, 0); 1012 window_calc (0, 0);
979 1013
980 /* sub-window placement & size in rxvt_resize_subwindows () */ 1014 /* sub-window placement & size in rxvt_resize_subwindows () */
981 attributes.background_pixel = pix_colors_focused[Color_border]; 1015 attributes.background_pixel = pix_colors_focused [Color_border];
982 attributes.border_pixel = pix_colors_focused[Color_border]; 1016 attributes.border_pixel = pix_colors_focused [Color_border];
983 attributes.colormap = display->cmap; 1017 attributes.colormap = cmap;
1018
984 top = XCreateWindow (disp, parent, 1019 top = XCreateWindow (dpy, parent,
985 szHint.x, szHint.y, 1020 szHint.x, szHint.y,
986 szHint.width, szHint.height, 1021 szHint.width, szHint.height,
987 ext_bwidth, 1022 ext_bwidth,
988 display->depth, InputOutput, 1023 depth, InputOutput, visual,
989 display->visual,
990 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1024 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
991 &attributes); 1025 &attributes);
992 1026
993 this->parent[0] = top; 1027 this->parent[0] = top;
994 1028
995 old_width = szHint.width; 1029 old_width = szHint.width;
996 old_height = szHint.height; 1030 old_height = szHint.height;
997 1031
998 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1032 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
999 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1033 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1000 1034
1001 classHint.res_name = (char *)rs[Rs_name]; 1035 classHint.res_name = (char *)rs[Rs_name];
1002 classHint.res_class = (char *)RESCLASS; 1036 classHint.res_class = (char *)RESCLASS;
1003 1037
1004 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1038 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1005 wmHint.input = True; 1039 wmHint.input = True;
1006 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1040 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1007 wmHint.window_group = top; 1041 wmHint.window_group = top;
1008 1042
1009 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 1043 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1010 &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
1011 1051
1012 Atom protocols[] = { 1052 Atom protocols[] = {
1013 xa[XA_WM_DELETE_WINDOW], 1053 xa[XA_WM_DELETE_WINDOW],
1014#if ENABLE_EWMH 1054#if ENABLE_EWMH
1015 xa[XA_NET_WM_PING], 1055 xa[XA_NET_WM_PING],
1016#endif 1056#endif
1017 }; 1057 };
1018 1058
1019 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1059 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1020 1060
1021#if ENABLE_FRILLS 1061#if ENABLE_FRILLS
1022 if (rs[Rs_transient_for]) 1062 if (rs[Rs_transient_for])
1023 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1063 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1024#endif 1064#endif
1025 1065
1026#if ENABLE_EWMH 1066#if ENABLE_EWMH
1027 long pid = getpid (); 1067 long pid = getpid ();
1028 1068
1029 XChangeProperty (disp, top, 1069 XChangeProperty (dpy, top,
1030 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1070 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1031 PropModeReplace, (unsigned char *)&pid, 1); 1071 PropModeReplace, (unsigned char *)&pid, 1);
1032 1072
1033 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1073 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1034#endif 1074#endif
1035 1075
1036 XSelectInput (disp, top, 1076 XSelectInput (dpy, top,
1037 KeyPressMask 1077 KeyPressMask
1038#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1078#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1039 | KeyReleaseMask 1079 | KeyReleaseMask
1040#endif 1080#endif
1041 | FocusChangeMask | VisibilityChangeMask 1081 | FocusChangeMask | VisibilityChangeMask
1042 | ExposureMask | StructureNotifyMask); 1082 | ExposureMask | StructureNotifyMask);
1043 1083
1044 termwin_ev.start (display, top); 1084 termwin_ev.start (display, top);
1045 1085
1046#if ENABLE_FRILLS
1047 if (mwmhints.flags)
1048 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1049 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1050#endif
1051
1052 /* vt cursor: Black-on-White is standard, but this is more popular */ 1086 /* vt cursor: Black-on-White is standard, but this is more popular */
1053 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1087 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1054 1088
1055#ifdef HAVE_SCROLLBARS 1089#ifdef HAVE_SCROLLBARS
1056 /* cursor scrollBar: Black-on-White */ 1090 /* cursor scrollBar: Black-on-White */
1057 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1091 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1058#endif 1092#endif
1059 1093
1060 /* the vt window */ 1094 /* the vt window */
1061 vt = XCreateSimpleWindow (disp, top, 1095 vt = XCreateSimpleWindow (dpy, top,
1062 window_vt_x,
1063 window_vt_y, 1096 window_vt_x, window_vt_y,
1064 width,
1065 height, 1097 width, height,
1066 0, 1098 0,
1067 pix_colors_focused[Color_fg], 1099 pix_colors_focused[Color_fg],
1068 pix_colors_focused[Color_bg]); 1100 pix_colors_focused[Color_bg]);
1069#ifdef DEBUG_X
1070 XStoreName (disp, vt, "vt window");
1071#endif
1072 1101
1073 attributes.bit_gravity = NorthWestGravity; 1102 attributes.bit_gravity = NorthWestGravity;
1074 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1103 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1075 1104
1076 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1105 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1077 1106
1078 if (OPTION (Opt_pointerBlank)) 1107 if (option (Opt_pointerBlank))
1079 vt_emask |= PointerMotionMask; 1108 vt_emask |= PointerMotionMask;
1080 else 1109 else
1081 vt_emask |= Button1MotionMask | Button3MotionMask; 1110 vt_emask |= Button1MotionMask | Button3MotionMask;
1082 1111
1083 vt_select_input (); 1112 vt_select_input ();
1084 1113
1085 vt_ev.start (display, vt); 1114 vt_ev.start (display, vt);
1086 1115
1087#ifdef XPM_BACKGROUND
1088 if (rs[Rs_backgroundPixmap] != NULL
1089 && ! OPTION (Opt_transparent))
1090 {
1091 const char *p = rs[Rs_backgroundPixmap];
1092
1093 if ((p = strchr (p, ';')) != NULL)
1094 {
1095 p++;
1096 scale_pixmap (p);
1097 }
1098
1099 set_bgPixmap (rs[Rs_backgroundPixmap]);
1100 scr_touch (true);
1101 }
1102#endif
1103
1104 /* graphics context for the vt window */ 1116 /* graphics context for the vt window */
1105 gcvalue.foreground = pix_colors[Color_fg]; 1117 gcvalue.foreground = pix_colors[Color_fg];
1106 gcvalue.background = pix_colors[Color_bg]; 1118 gcvalue.background = pix_colors[Color_bg];
1107 gcvalue.graphics_exposures = 1; 1119 gcvalue.graphics_exposures = 0;
1120
1108 gc = XCreateGC (disp, vt, 1121 gc = XCreateGC (dpy, vt,
1109 GCForeground | GCBackground | GCGraphicsExposures, 1122 GCForeground | GCBackground | GCGraphicsExposures,
1110 &gcvalue); 1123 &gcvalue);
1111 1124
1112 drawable = new rxvt_drawable (display, vt); 1125 drawable = new rxvt_drawable (this, vt);
1113 1126
1114#ifdef RXVT_SCROLLBAR 1127#ifdef RXVT_SCROLLBAR
1115 gcvalue.foreground = pix_colors[Color_topShadow]; 1128 gcvalue.foreground = pix_colors[Color_topShadow];
1116 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1129 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1117 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1130 gcvalue.foreground = pix_colors[Color_bottomShadow];
1118 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1131 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1119 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1132 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1120 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1133 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1121#endif 1134#endif
1122 1135
1123#ifdef OFF_FOCUS_FADING 1136#ifdef OFF_FOCUS_FADING
1124 // initially we are in unfocused state 1137 // initially we are in unfocused state
1125 if (rs[Rs_fade]) 1138 if (rs[Rs_fade])
1126 pix_colors = pix_colors_unfocused; 1139 pix_colors = pix_colors_unfocused;
1127#endif 1140#endif
1128 1141
1129 pointer_unblank (); 1142 pointer_unblank ();
1130 scr_recolour (); 1143 scr_recolour ();
1131
1132#if ENABLE_XEMBED
1133 if (rs[Rs_embed])
1134 {
1135 long info[2] = { 0, XEMBED_MAPPED };
1136
1137 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1138 32, PropModeReplace, (unsigned char *)&info, 2);
1139 }
1140#endif
1141} 1144}
1142 1145
1143/* ------------------------------------------------------------------------- * 1146/* ------------------------------------------------------------------------- *
1144 * GET TTY CURRENT STATE * 1147 * GET TTY CURRENT STATE *
1145 * ------------------------------------------------------------------------- */ 1148 * ------------------------------------------------------------------------- */
1146void 1149void
1147rxvt_get_ttymode (ttymode_t *tio, int erase) 1150rxvt_get_ttymode (ttymode_t *tio, int erase)
1148{ 1151{
1149#ifdef HAVE_TERMIOS_H
1150 /* 1152 /*
1151 * standard System V termios interface 1153 * standard System V termios interface
1152 */ 1154 */
1153 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1155 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1154 { 1156 {
… …
1221 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1223 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1222# if defined (ECHOCTL) && defined (ECHOKE) 1224# if defined (ECHOCTL) && defined (ECHOKE)
1223 | ECHOCTL | ECHOKE 1225 | ECHOCTL | ECHOKE
1224# endif 1226# endif
1225 | ECHOE | ECHOK); 1227 | ECHOE | ECHOK);
1226# else /* HAVE_TERMIOS_H */
1227
1228 /*
1229 * sgtty interface
1230 */
1231
1232 /* get parameters -- gtty */
1233 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1234 {
1235 tio->sg.sg_erase = CERASE; /* ^H */
1236 tio->sg.sg_kill = CKILL; /* ^U */
1237 }
1238
1239 if (erase != -1)
1240 tio->sg.sg_erase = (char)erase;
1241
1242 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1243
1244 /* get special characters */
1245 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1246 {
1247 tio->tc.t_intrc = CINTR; /* ^C */
1248 tio->tc.t_quitc = CQUIT; /* ^\ */
1249 tio->tc.t_startc = CSTART; /* ^Q */
1250 tio->tc.t_stopc = CSTOP; /* ^S */
1251 tio->tc.t_eofc = CEOF; /* ^D */
1252 tio->tc.t_brkc = -1;
1253 }
1254
1255 /* get local special chars */
1256 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1257 {
1258 tio->lc.t_suspc = CSUSP; /* ^Z */
1259 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1260 tio->lc.t_rprntc = CRPRNT; /* ^R */
1261 tio->lc.t_flushc = CFLUSH; /* ^O */
1262 tio->lc.t_werasc = CWERASE; /* ^W */
1263 tio->lc.t_lnextc = CLNEXT; /* ^V */
1264 }
1265 /* get line discipline */
1266 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1267# ifdef NTTYDISC
1268 tio->line = NTTYDISC;
1269# endif /* NTTYDISC */
1270
1271 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1272#endif /* HAVE_TERMIOS_H */
1273 1228
1274 /* 1229 /*
1275 * Debugging 1230 * Debugging
1276 */ 1231 */
1277#ifdef DEBUG_TTYMODE 1232#ifdef DEBUG_TTYMODE
1278#ifdef HAVE_TERMIOS_H
1279 /* c_iflag bits */ 1233 /* c_iflag bits */
1280 fprintf (stderr, "Input flags\n"); 1234 fprintf (stderr, "Input flags\n");
1281 1235
1282 /* cpp token stringize doesn't work on all machines <sigh> */ 1236 /* cpp token stringize doesn't work on all machines <sigh> */
1283# define FOO(flag,name) \ 1237# define FOO(flag,name) \
… …
1346 FOO (VLNEXT, "VLNEXT"); 1300 FOO (VLNEXT, "VLNEXT");
1347# endif 1301# endif
1348 1302
1349 fprintf (stderr, "\n"); 1303 fprintf (stderr, "\n");
1350# undef FOO 1304# undef FOO
1351# endif /* HAVE_TERMIOS_H */ 1305#endif /* DEBUG_TTYMODE */
1352#endif /* DEBUG_TTYMODE */
1353} 1306}
1354 1307
1355/*----------------------------------------------------------------------*/ 1308/*----------------------------------------------------------------------*/
1356/* 1309/*
1357 * 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
… …
1378 else 1331 else
1379#endif 1332#endif
1380 if (!pty->get ()) 1333 if (!pty->get ())
1381 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1334 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1382 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 */
1383 pty->set_utf8_mode (enc_utf8); 1349 pty->set_utf8_mode (enc_utf8);
1384 1350
1385 /* set initial window size */ 1351 /* set initial window size */
1386 tt_winch (); 1352 tt_winch ();
1387
1388 int er;
1389
1390#ifndef NO_BACKSPACE_KEY
1391 if (key_backspace[0] && !key_backspace[1])
1392 er = key_backspace[0];
1393 else if (strcmp (key_backspace, "DEC") == 0)
1394 er = '\177'; /* the initial state anyway */
1395 else
1396#endif
1397 er = -1;
1398
1399 rxvt_get_ttymode (&tio, er);
1400 1353
1401#if ENABLE_FRILLS 1354#if ENABLE_FRILLS
1402 if (rs[Rs_pty_fd]) 1355 if (rs[Rs_pty_fd])
1403 return; 1356 return;
1404#endif 1357#endif
… …
1435 } 1388 }
1436 1389
1437 _exit (EXIT_FAILURE); 1390 _exit (EXIT_FAILURE);
1438 1391
1439 default: 1392 default:
1440#if UTMP_SUPPORT
1441 if (!OPTION (Opt_utmpInhibit)) 1393 if (!option (Opt_utmpInhibit))
1442 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1394 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1443#endif
1444 1395
1445 pty->close_tty (); 1396 pty->close_tty ();
1397
1398 child_ev.start (cmd_pid);
1399
1400 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1446 break; 1401 break;
1447 } 1402 }
1448} 1403}
1449 1404
1450/* ------------------------------------------------------------------------- * 1405/* ------------------------------------------------------------------------- *
… …
1457int 1412int
1458rxvt_term::run_child (const char *const *argv) 1413rxvt_term::run_child (const char *const *argv)
1459{ 1414{
1460 char *login; 1415 char *login;
1461 1416
1462 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1463
1464 if (OPTION (Opt_console)) 1417 if (option (Opt_console))
1418 {
1465 { /* be virtual console, fail silently */ 1419 /* be virtual console, fail silently */
1466#ifdef TIOCCONS 1420#ifdef TIOCCONS
1467 unsigned int on = 1; 1421 unsigned int on = 1;
1468 1422
1469 ioctl (STDIN_FILENO, TIOCCONS, &on); 1423 ioctl (STDIN_FILENO, TIOCCONS, &on);
1470#elif defined (SRIOCSREDIR) 1424#elif defined (SRIOCSREDIR)
… …
1472 1426
1473 fd = open (CONSOLE, O_WRONLY, 0); 1427 fd = open (CONSOLE, O_WRONLY, 0);
1474 if (fd >= 0) 1428 if (fd >= 0)
1475 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1429 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1476 close (fd); 1430 close (fd);
1477#endif /* SRIOCSREDIR */ 1431#endif /* SRIOCSREDIR */
1478 } 1432 }
1479 1433
1480 /* reset signals and spin off the command interpreter */ 1434 /* reset signals and spin off the command interpreter */
1481 signal (SIGINT, SIG_DFL); 1435 signal (SIGINT, SIG_DFL);
1482 signal (SIGQUIT, SIG_DFL); 1436 signal (SIGQUIT, SIG_DFL);
… …
1489 */ 1443 */
1490#ifdef SIGTSTP 1444#ifdef SIGTSTP
1491 signal (SIGTSTP, SIG_IGN); 1445 signal (SIGTSTP, SIG_IGN);
1492 signal (SIGTTIN, SIG_IGN); 1446 signal (SIGTTIN, SIG_IGN);
1493 signal (SIGTTOU, SIG_IGN); 1447 signal (SIGTTOU, SIG_IGN);
1494#endif /* SIGTSTP */ 1448#endif /* SIGTSTP */
1495 1449
1496 // unblock signals (signals are blocked by iom.C 1450 // unblock signals (signals are blocked by iom.C
1497 sigset_t ss; 1451 sigset_t ss;
1498 sigemptyset (&ss); 1452 sigemptyset (&ss);
1499 sigprocmask (SIG_SETMASK, &ss, 0); 1453 sigprocmask (SIG_SETMASK, &ss, 0);
1500 1454
1501 /* command interpreter path */ 1455 /* command interpreter path */
1502 if (argv != NULL) 1456 if (argv)
1503 { 1457 {
1504# ifdef DEBUG_CMD 1458# ifdef DEBUG_CMD
1505 int i; 1459 int i;
1506 1460
1507 for (i = 0; argv[i]; i++) 1461 for (i = 0; argv[i]; i++)
… …
1516 const char *argv0, *shell; 1470 const char *argv0, *shell;
1517 1471
1518 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1472 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1519 shell = "/bin/sh"; 1473 shell = "/bin/sh";
1520 1474
1521 argv0 = (const char *)rxvt_r_basename (shell); 1475 argv0 = (const char *)rxvt_basename (shell);
1522 1476
1523 if (OPTION (Opt_loginShell)) 1477 if (option (Opt_loginShell))
1524 { 1478 {
1525 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1479 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1526 1480
1527 login[0] = '-'; 1481 login[0] = '-';
1528 strcpy (&login[1], argv0); 1482 strcpy (&login[1], argv0);
1529 argv0 = login; 1483 argv0 = login;
1530 } 1484 }
1531 1485
1532 execlp (shell, argv0, NULL); 1486 execlp (shell, argv0, (char *)0);
1533 /* no error message: STDERR is closed! */ 1487 /* no error message: STDERR is closed! */
1534 } 1488 }
1535 1489
1536 return -1; 1490 return -1;
1537} 1491}

Diff Legend

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