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

Diff Legend

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