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.155 by root, Wed Jan 25 02:53:13 2006 UTC vs.
Revision 1.253 by root, Tue Jul 15 16:41:22 2008 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-2008 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.
… …
33 34
34#include "../config.h" /* NECESSARY */ 35#include "../config.h" /* NECESSARY */
35#include "rxvt.h" /* NECESSARY */ 36#include "rxvt.h" /* NECESSARY */
36#include "rxvtutil.h" 37#include "rxvtutil.h"
37#include "init.h" 38#include "init.h"
39#include "keyboard.h"
38 40
39#include <limits> 41#include <limits>
40 42
41#include <csignal> 43#include <csignal>
44
45#include <fcntl.h>
46
47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE
49# include <X11/Xlocale.h>
50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale>
53# endif
54#endif
55
56#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h>
58#endif
59
60#ifdef DISPLAY_IS_IP
61/* On Solaris link with -lsocket and -lnsl */
62#include <sys/types.h>
63#include <sys/socket.h>
64
65/* these next two are probably only on Sun (not Solaris) */
66#ifdef HAVE_SYS_SOCKIO_H
67#include <sys/sockio.h>
68#endif
69#ifdef HAVE_SYS_BYTEORDER_H
70#include <sys/byteorder.h>
71#endif
72
73#include <netinet/in.h>
74#include <arpa/inet.h>
75#include <net/if.h>
76#include <net/if_arp.h>
77
78static char *
79rxvt_network_display (const char *display)
80{
81 char buffer[1024], *rval = NULL;
82 struct ifconf ifc;
83 struct ifreq *ifr;
84 int i, skfd;
85
86 if (display[0] != ':' && strncmp (display, "unix:", 5))
87 return (char *) display; /* nothing to do */
88
89 ifc.ifc_len = sizeof (buffer); /* Get names of all ifaces */
90 ifc.ifc_buf = buffer;
91
92 if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
93 {
94 perror ("socket");
95 return NULL;
96 }
97
98 if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0)
99 {
100 perror ("SIOCGIFCONF");
101 close (skfd);
102 return NULL;
103 }
104
105 for (i = 0, ifr = ifc.ifc_req;
106 i < (ifc.ifc_len / sizeof (struct ifreq));
107 i++, ifr++)
108 {
109 struct ifreq ifr2;
110
111 strcpy (ifr2.ifr_name, ifr->ifr_name);
112
113 if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0)
114 {
115 unsigned long addr;
116 struct sockaddr_in *p_addr;
117
118 p_addr = (struct sockaddr_in *) &ifr2.ifr_addr;
119 addr = htonl ((unsigned long)p_addr->sin_addr.s_addr);
120
121 /*
122 * not "0.0.0.0" or "127.0.0.1" - so format the address
123 */
124 if (addr && addr != 0x7F000001)
125 {
126 char *colon = strchr (display, ':');
127
128 if (colon == NULL)
129 colon = ":0.0";
130
131 rval = rxvt_malloc (strlen (colon) + 16);
132 sprintf (rval, "%d.%d.%d.%d%s",
133 (int) ((addr >> 030) & 0xFF),
134 (int) ((addr >> 020) & 0xFF),
135 (int) ((addr >> 010) & 0xFF),
136 (int) (addr & 0xFF), colon);
137 break;
138 }
139 }
140 }
141
142 close (skfd);
143
144 return rval;
145}
146#endif
42 147
43const char *const def_colorName[] = 148const char *const def_colorName[] =
44 { 149 {
45 COLOR_FOREGROUND, 150 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 151 COLOR_BACKGROUND,
47 /* low-intensity colors */ 152 /* low-intensity colors */
48 "Black", /* 0: black (#000000) */ 153 "rgb:00/00/00", // 0: black (Black)
49 "Red3", /* 1: red (#CD0000) */ 154 "rgb:cd/00/00", // 1: red (Red3)
50 "Green3", /* 2: green (#00CD00) */ 155 "rgb:00/cd/00", // 2: green (Green3)
51 "Yellow3", /* 3: yellow (#CDCD00) */ 156 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "Blue3", /* 4: blue (#0000CD) */ 157 "rgb:00/00/cd", // 4: blue (Blue3)
53 "Magenta3", /* 5: magenta (#CD00CD) */ 158 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "Cyan3", /* 6: cyan (#00CDCD) */ 159 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 160# ifdef XTERM_COLORS
56 "Grey90", /* 7: white (#E5E5E5) */ 161 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 162# else
58 "AntiqueWhite", /* 7: white (#FAEBD7) */ 163 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59# endif 164# endif
60 /* high-intensity colors */ 165 /* high-intensity colors */
61# ifdef XTERM_COLORS 166# ifdef XTERM_COLORS
62 "Grey30", /* 8: bright black (#4D4D4D) */ 167 "rgb:4d/4d/4d", // 8: bright black (Grey30)
63# else 168# else
64 "Grey25", /* 8: bright black (#404040) */ 169 "rgb:40/40/40", // 8: bright black (Grey25)
65# endif 170# endif
66 "Red", /* 1/9: bright red (#FF0000) */ 171 "rgb:ff/00/00", // 1/9: bright red (Reed)
67 "Green", /* 2/10: bright green (#00FF00) */ 172 "rgb:00/ff/00", // 2/10: bright green (Green)
68 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 173 "rgb:ff/ff/00", // 3/11: bright yellow (Yellow)
69 "Blue", /* 4/12: bright blue (#0000FF) */ 174 "rgb:00/00/ff", // 4/12: bright blue (Blue)
70 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 175 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
71 "Cyan", /* 6/14: bright cyan (#00FFFF) */ 176 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
72 "White", /* 7/15: bright white (#FFFFFF) */ 177 "rgb:ff/ff/ff", // 7/15: bright white (White)
73 178
74 // 88 xterm colours 179 // 88 xterm colours
75 "rgb:00/00/00", 180 "rgb:00/00/00",
76 "rgb:00/00/8b", 181 "rgb:00/00/8b",
77 "rgb:00/00/cd", 182 "rgb:00/00/cd",
… …
146 "rgb:e7/e7/e7", 251 "rgb:e7/e7/e7",
147 252
148#ifndef NO_CURSORCOLOR 253#ifndef NO_CURSORCOLOR
149 COLOR_CURSOR_BACKGROUND, 254 COLOR_CURSOR_BACKGROUND,
150 COLOR_CURSOR_FOREGROUND, 255 COLOR_CURSOR_FOREGROUND,
151#endif /* ! NO_CURSORCOLOR */ 256#endif /* ! NO_CURSORCOLOR */
152 NULL, /* Color_pointer_fg */ 257 NULL, /* Color_pointer_fg */
153 NULL, /* Color_pointer_bg */ 258 NULL, /* Color_pointer_bg */
154 NULL, /* Color_border */ 259 NULL, /* Color_border */
155#ifndef NO_BOLD_UNDERLINE_REVERSE 260#ifndef NO_BOLD_UNDERLINE_REVERSE
156 NULL, /* Color_BD */ 261 NULL, /* Color_BD */
157 NULL, /* Color_IT */ 262 NULL, /* Color_IT */
158 NULL, /* Color_UL */ 263 NULL, /* Color_UL */
159 NULL, /* Color_RV */ 264 NULL, /* Color_RV */
160#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 265#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
161#if ENABLE_FRILLS 266#if ENABLE_FRILLS
162 NULL, // Color_underline 267 NULL, // Color_underline
163#endif 268#endif
164#ifdef OPTION_HC 269#ifdef OPTION_HC
165 NULL, 270 NULL,
166#endif 271#endif
167#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 272 COLOR_SCROLLBAR,
273#ifdef RXVT_SCROLLBAR
169 COLOR_SCROLLTROUGH, 274 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 275#endif
171#if TINTING 276#if ENABLE_TRANSPARENCY
172 NULL, 277 NULL,
173#endif 278#endif
174#if OFF_FOCUS_FADING 279#if OFF_FOCUS_FADING
175 "black", 280 "rgb:00/00/00",
176#endif 281#endif
177 }; 282 };
178 283
179bool 284void
180rxvt_term::init_vars () 285rxvt_term::init_vars ()
181{ 286{
182 pix_colors = // 287 pix_colors = pix_colors_focused;
183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
184#ifdef OFF_FOCUS_FADING
185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
186#endif
187
188#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
189 pixmap = None;
190#endif
191 288
192 MEvent.time = CurrentTime; 289 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 290 MEvent.button = AnyButton;
194 options = DEFAULT_OPTIONS;
195 want_refresh = 1; 291 want_refresh = 1;
196 priv_modes = SavedModes = PrivMode_Default; 292 priv_modes = SavedModes = PrivMode_Default;
197 ncol = 80; 293 ncol = 80;
198 nrow = 24; 294 nrow = 24;
199 int_bwidth = INTERNALBORDERWIDTH; 295 int_bwidth = INTERNALBORDERWIDTH;
200 ext_bwidth = EXTERNALBORDERWIDTH; 296 ext_bwidth = EXTERNALBORDERWIDTH;
201 lineSpace = LINESPACE; 297 lineSpace = LINESPACE;
202 saveLines = SAVELINES; 298 saveLines = SAVELINES;
203 numpix_colors = TOTAL_COLORS;
204 299
205 refresh_limit = 1;
206 refresh_type = SLOW_REFRESH; 300 refresh_type = SLOW_REFRESH;
207 301
208 oldcursor.row = oldcursor.col = -1; 302 oldcursor.row = oldcursor.col = -1;
209#ifdef XPM_BACKGROUND
210 /* bgPixmap.w = bgPixmap.h = 0; */
211 bgPixmap.x = bgPixmap.y = 50;
212 bgPixmap.pixmap = None;
213#endif
214 303
215 last_bot = last_state = -1; 304 set_option (Opt_scrollBar);
216 305 set_option (Opt_scrollTtyOutput);
217 return true; 306 set_option (Opt_jumpScroll);
307 set_option (Opt_skipScroll);
308 set_option (Opt_secondaryScreen);
309 set_option (Opt_secondaryScroll);
310 set_option (Opt_pastableTabs);
311 set_option (Opt_intensityStyles);
312 set_option (Opt_iso14755_52);
313 set_option (Opt_buffered);
218} 314}
219 315
220void 316static void
221rxvt_term::init_secondary () 317init_secondary ()
222{ 318{
223 int i; 319 int i;
224 320
225 /*
226 * Close all unused file descriptors
227 * We don't want them, we don't need them.
228 */
229 if ((i = open ("/dev/null", O_RDONLY)) < 0) 321 if ((i = open ("/dev/null", O_RDONLY)) < 0)
230 { 322 {
231 /* TODO: BOO HISS */
232 dup2 (STDERR_FILENO, STDIN_FILENO); 323 dup2 (STDERR_FILENO, STDIN_FILENO);
233 } 324 }
234 else if (i > STDIN_FILENO) 325 else if (i != STDIN_FILENO)
235 { 326 {
236 dup2 (i, STDIN_FILENO); 327 dup2 (i, STDIN_FILENO);
237 close (i); 328 close (i);
238 } 329 }
239 330
240 dup2 (STDERR_FILENO, STDOUT_FILENO); 331 dup2 (STDERR_FILENO, STDOUT_FILENO);
241
242#if 0 // schmorp sayz closing filies is murder
243 for (i = STDERR_FILENO + 1; i < num_fds; i++)
244 {
245#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
246 if (i == 4 || i == 7)
247 continue;
248#endif
249 close (i);
250 }
251#endif
252} 332}
253 333
254/*----------------------------------------------------------------------*/ 334/*----------------------------------------------------------------------*/
255const char ** 335const char **
256rxvt_term::init_resources (int argc, const char *const *argv) 336rxvt_term::init_resources (int argc, const char *const *argv)
257{ 337{
258 int i, r_argc; 338 int i, r_argc;
259 char *val;
260 const char **cmd_argv, **r_argv; 339 const char **cmd_argv, **r_argv;
261 340
262 /* 341 /*
263 * Look for -exec option. Find => split and make cmd_argv[] of command args 342 * Look for -e option. Find => split and make cmd_argv[] of command args
264 */ 343 */
265 for (r_argc = 0; r_argc < argc; r_argc++) 344 for (r_argc = 0; r_argc < argc; r_argc++)
266 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 345 if (!strcmp (argv[r_argc], "-e"))
267 break; 346 break;
347
348 if (r_argc == argc)
349 cmd_argv = NULL;
350 else if (!argv[r_argc + 1])
351 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
352 else
353 {
354 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
355
356 for (i = 0; i < argc - r_argc - 1; i++)
357 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
358
359 cmd_argv[i] = NULL;
360 }
268 361
269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 362 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
270 363
271 for (i = 0; i < r_argc; i++) 364 for (i = 0; i < r_argc; i++)
272 r_argv[i] = (const char *)argv[i]; 365 r_argv[i] = (const char *)argv[i];
273 366
274 r_argv[i] = NULL; 367 r_argv[i] = NULL;
275 368
276 if (r_argc == argc)
277 cmd_argv = NULL;
278 else
279 {
280 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
281
282 for (i = 0; i < argc - r_argc - 1; i++)
283 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
284
285 cmd_argv[i] = NULL;
286 }
287
288 rs[Rs_name] = rxvt_r_basename (argv[0]); 369 rs[Rs_name] = rxvt_basename (argv[0]);
289 370
290 /* 371 /*
291 * Open display, get options/resources and create the window 372 * Open display, get options/resources and create the window
292 */ 373 */
293 374
… …
295 rs[Rs_display_name] = ":0"; 376 rs[Rs_display_name] = ":0";
296 377
297 get_options (r_argc, r_argv); 378 get_options (r_argc, r_argv);
298 379
299 if (!(display = displays.get (rs[Rs_display_name]))) 380 if (!(display = displays.get (rs[Rs_display_name])))
381 {
382 free (r_argv);
300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 383 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
384 }
301 385
386 // using a local pointer decreases code size a lot
387 xa = display->xa;
388
389 set (display);
302 extract_resources (); 390 extract_resources ();
303 391
392#if XFT
393 if (rs[Rs_depth])
394 select_visual (strtol (rs[Rs_depth], 0, 0));
395#endif
396
397#ifdef HAVE_AFTERIMAGE
398 set_application_name ((char*)rs[Rs_name]);
399 set_output_threshold (OUTPUT_LEVEL_WARNING);
400 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
401#endif
304 free (r_argv); 402 free (r_argv);
403
404 for (int i = NUM_RESOURCES; i--; )
405 if (rs [i] == resval_undef)
406 rs [i] = 0;
305 407
306#if ENABLE_PERL 408#if ENABLE_PERL
307 if (!rs[Rs_perl_ext_1]) 409 if (!rs[Rs_perl_ext_1])
308 rs[Rs_perl_ext_1] = "default"; 410 rs[Rs_perl_ext_1] = "default";
309 411
… …
320 * set any defaults not already set 422 * set any defaults not already set
321 */ 423 */
322 if (cmd_argv && cmd_argv[0]) 424 if (cmd_argv && cmd_argv[0])
323 { 425 {
324 if (!rs[Rs_title]) 426 if (!rs[Rs_title])
325 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 427 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
326 if (!rs[Rs_iconName]) 428 if (!rs[Rs_iconName])
327 rs[Rs_iconName] = rs[Rs_title]; 429 rs[Rs_iconName] = rs[Rs_title];
328 } 430 }
329 else 431 else
330 { 432 {
… …
357 459
358 /* no point having a scrollbar without having any scrollback! */ 460 /* no point having a scrollbar without having any scrollback! */
359 if (!saveLines) 461 if (!saveLines)
360 set_option (Opt_scrollBar, 0); 462 set_option (Opt_scrollBar, 0);
361 463
362#ifdef PRINTPIPE
363 if (!rs[Rs_print_pipe])
364 rs[Rs_print_pipe] = PRINTPIPE;
365#endif
366
367 if (!rs[Rs_cutchars]) 464 if (!rs[Rs_cutchars])
368 rs[Rs_cutchars] = CUTCHARS; 465 rs[Rs_cutchars] = CUTCHARS;
369 466
370#ifndef NO_BACKSPACE_KEY 467#ifndef NO_BACKSPACE_KEY
371 if (!rs[Rs_backspace_key]) 468 if (!rs[Rs_backspace_key])
372# ifdef DEFAULT_BACKSPACE 469# ifdef DEFAULT_BACKSPACE
373 key_backspace = DEFAULT_BACKSPACE; 470 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
374# else 471# else
375 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 472 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
376# endif 473# endif
377 else
378 {
379 val = strdup (rs[Rs_backspace_key]);
380 rxvt_Str_trim (val);
381 rxvt_Str_escaped (val);
382 key_backspace = val;
383 }
384#endif 474#endif
385 475
386#ifndef NO_DELETE_KEY 476#ifndef NO_DELETE_KEY
387 if (!rs[Rs_delete_key]) 477 if (!rs[Rs_delete_key])
388# ifdef DEFAULT_DELETE 478# ifdef DEFAULT_DELETE
389 key_delete = DEFAULT_DELETE; 479 rs[Rs_delete_key] = DEFAULT_DELETE;
390# else 480# else
391 key_delete = "\033[3~"; 481 rs[Rs_delete_key] = "\033[3~";
392# endif
393 else
394 {
395 val = strdup (rs[Rs_delete_key]);
396 rxvt_Str_trim (val);
397 rxvt_Str_escaped (val);
398 key_delete = val;
399 }
400#endif 482# endif
401 if (rs[Rs_answerbackstring])
402 {
403 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
404 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
405 }
406
407#ifdef HAVE_SCROLLBARS
408 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
409#endif 483#endif
484
485 scrollBar.setup (this);
410 486
411#ifdef XTERM_REVERSE_VIDEO 487#ifdef XTERM_REVERSE_VIDEO
412 /* this is how xterm implements reverseVideo */ 488 /* this is how xterm implements reverseVideo */
413 if (OPTION (Opt_reverseVideo)) 489 if (option (Opt_reverseVideo))
414 { 490 {
415 if (!rs[Rs_color + Color_fg]) 491 if (!rs[Rs_color + Color_fg])
416 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 492 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
493
417 if (!rs[Rs_color + Color_bg]) 494 if (!rs[Rs_color + Color_bg])
418 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 495 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
419 } 496 }
420#endif 497#endif
421 498
… …
423 if (!rs[Rs_color + i]) 500 if (!rs[Rs_color + i])
424 rs[Rs_color + i] = def_colorName[i]; 501 rs[Rs_color + i] = def_colorName[i];
425 502
426#ifndef XTERM_REVERSE_VIDEO 503#ifndef XTERM_REVERSE_VIDEO
427 /* this is how we implement reverseVideo */ 504 /* this is how we implement reverseVideo */
428 if (OPTION (Opt_reverseVideo)) 505 if (option (Opt_reverseVideo))
429 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 506 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
430#endif 507#endif
431 508
432 /* convenient aliases for setting fg/bg to colors */ 509 /* convenient aliases for setting fg/bg to colors */
433 color_aliases (Color_fg); 510 color_aliases (Color_fg);
434 color_aliases (Color_bg); 511 color_aliases (Color_bg);
435#ifndef NO_CURSORCOLOR 512#ifndef NO_CURSORCOLOR
436 color_aliases (Color_cursor); 513 color_aliases (Color_cursor);
437 color_aliases (Color_cursor2); 514 color_aliases (Color_cursor2);
438#endif /* NO_CURSORCOLOR */ 515#endif /* NO_CURSORCOLOR */
439 color_aliases (Color_pointer_fg); 516 color_aliases (Color_pointer_fg);
440 color_aliases (Color_pointer_bg); 517 color_aliases (Color_pointer_bg);
441 color_aliases (Color_border); 518 color_aliases (Color_border);
442#ifndef NO_BOLD_UNDERLINE_REVERSE 519#ifndef NO_BOLD_UNDERLINE_REVERSE
443 color_aliases (Color_BD); 520 color_aliases (Color_BD);
444 color_aliases (Color_UL); 521 color_aliases (Color_UL);
445 color_aliases (Color_RV); 522 color_aliases (Color_RV);
446#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 523#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
447 524
448 if (!rs[Rs_color + Color_border]) 525 if (!rs[Rs_color + Color_border])
449 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 526 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
450 527
451 return cmd_argv; 528 return cmd_argv;
529}
530
531/*----------------------------------------------------------------------*/
532void
533rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
534{
535 this->envv = envv;
536
537 SET_R (this);
538 set_locale ("");
539 set_environ (envv); // a few things in X do not call setlocale :(
540
541 init_vars ();
542
543 init_secondary ();
544
545 const char **cmd_argv = init_resources (argc, argv);
546
547#ifdef KEYSYM_RESOURCE
548 keyboard->register_done ();
549#endif
550
551 if (const char *path = rs[Rs_chdir])
552 if (*path) // ignored if empty
553 {
554 if (*path != '/')
555 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
556
557 if (chdir (path))
558 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
559 }
560
561 if (option (Opt_scrollBar))
562 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
563
564 pty = ptytty::create ();
565
566 create_windows (argc, argv);
567
568 init_xlocale ();
569
570 scr_reset (); // initialize screen
571
572#if 0
573 XSynchronize (dpy, True);
574#endif
575
576 if (option (Opt_scrollBar))
577 scrollBar.resize (); /* create and map scrollbar */
578#ifdef HAVE_BG_PIXMAP
579 {
580 bgPixmap.set_target (this);
581 bgPixmap.invalidate ();
582
583#ifdef ENABLE_TRANSPARENCY
584 if (option (Opt_transparent))
585 {
586 bgPixmap.set_transparent ();
587
588#ifdef HAVE_AFTERIMAGE
589 if (rs [Rs_blurradius])
590 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
591#endif
592 if (ISSET_PIXCOLOR (Color_tint))
593 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
594
595 if (rs [Rs_shade])
596 bgPixmap.set_shade (rs [Rs_shade]);
597
598 bgPixmap.set_root_pixmap ();
599 XSelectInput (dpy, display->root, PropertyChangeMask);
600 rootwin_ev.start (display, display->root);
601 }
602#endif
603
604#ifdef BG_IMAGE_FROM_FILE
605 if (rs[Rs_backgroundPixmap])
606 {
607 const char *p = rs[Rs_backgroundPixmap];
608
609 if ((p = strchr (p, ';')) != 0)
610 {
611 p++;
612 bgPixmap.set_geometry (p);
613 }
614 else
615 bgPixmap.set_defaultGeometry ();
616
617 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
618 if (!bgPixmap.window_position_sensitive ())
619 update_background ();
620 }
621#endif
622 }
623#endif
624
625#if ENABLE_PERL
626 rootwin_ev.start (display, display->root);
627#endif
628
629 set_colorfgbg ();
630
631 init_command (cmd_argv);
632
633 free (cmd_argv);
634
635 if (pty->pty >= 0)
636 pty_ev.start (pty->pty, ev::READ);
637
638 HOOK_INVOKE ((this, HOOK_START, DT_END));
639
640#if ENABLE_XEMBED
641 if (rs[Rs_embed])
642 {
643 long info[2] = { 0, XEMBED_MAPPED };
644
645 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
646 32, PropModeReplace, (unsigned char *)&info, 2);
647 }
648#endif
649
650 XMapWindow (dpy, vt);
651 XMapWindow (dpy, parent[0]);
652
653 refresh_check ();
452} 654}
453 655
454/*----------------------------------------------------------------------*/ 656/*----------------------------------------------------------------------*/
455void 657void
456rxvt_term::init_env () 658rxvt_term::init_env ()
457{ 659{
458 int i; 660 int i;
459 unsigned int u;
460 char *val; 661 char *val;
461 662
462#ifdef DISPLAY_IS_IP 663#ifdef DISPLAY_IS_IP
463 /* Fixup display_name for export over pty to any interested terminal 664 /* Fixup display_name for export over pty to any interested terminal
464 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 665 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
472 */ 673 */
473 val = rxvt_network_display (rs[Rs_display_name]); 674 val = rxvt_network_display (rs[Rs_display_name]);
474 rs[Rs_display_name] = (const char *)val; 675 rs[Rs_display_name] = (const char *)val;
475 676
476 if (val == NULL) 677 if (val == NULL)
477#endif /* DISPLAY_IS_IP */ 678#endif /* DISPLAY_IS_IP */
478 val = XDisplayString (display->display); 679 val = XDisplayString (dpy);
479 680
480 if (rs[Rs_display_name] == NULL) 681 if (rs[Rs_display_name] == NULL)
481 rs[Rs_display_name] = val; /* use broken `:0' value */ 682 rs[Rs_display_name] = val; /* use broken `:0' value */
482 683
483 i = strlen (val); 684 i = strlen (val);
484 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 685 env_display = (char *)rxvt_malloc (i + 9);
485 686
486 sprintf (env_display, "DISPLAY=%s", val); 687 sprintf (env_display, "DISPLAY=%s", val);
487 688
488 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 689 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
489 690
… …
503 704
504#ifdef RXVT_TERMINFO 705#ifdef RXVT_TERMINFO
505 putenv ("TERMINFO=" RXVT_TERMINFO); 706 putenv ("TERMINFO=" RXVT_TERMINFO);
506#endif 707#endif
507 708
508 if (display->depth <= 2) 709 if (depth <= 2)
509 putenv ("COLORTERM=" COLORTERMENV "-mono"); 710 putenv ("COLORTERM=" COLORTERMENV "-mono");
510 else 711 else
511 putenv ("COLORTERM=" COLORTERMENVFULL); 712 putenv ("COLORTERM=" COLORTERMENVFULL);
512 713
513 if (rs[Rs_term_name] != NULL) 714 if (rs[Rs_term_name] != NULL)
514 { 715 {
515 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 716 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
516 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 717 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
517 putenv (env_term); 718 putenv (env_term);
518 } 719 }
519 else 720 else
520 putenv ("TERM=" TERMENV); 721 putenv ("TERM=" TERMENV);
… …
522#ifdef HAVE_UNSETENV 723#ifdef HAVE_UNSETENV
523 /* avoid passing old settings and confusing term size */ 724 /* avoid passing old settings and confusing term size */
524 unsetenv ("LINES"); 725 unsetenv ("LINES");
525 unsetenv ("COLUMNS"); 726 unsetenv ("COLUMNS");
526 unsetenv ("TERMCAP"); /* terminfo should be okay */ 727 unsetenv ("TERMCAP"); /* terminfo should be okay */
527#endif /* HAVE_UNSETENV */ 728#endif /* HAVE_UNSETENV */
528} 729}
529 730
530/*----------------------------------------------------------------------*/ 731/*----------------------------------------------------------------------*/
531/* 732/*
532 * This is more or less stolen straight from XFree86 xterm. 733 * This is more or less stolen straight from XFree86 xterm.
… …
553 754
554 this->locale = "C"; 755 this->locale = "C";
555 } 756 }
556 757
557 758
558 this->locale = rxvt_strdup (this->locale); 759 this->locale = strdup (this->locale);
559 SET_LOCALE (this->locale); 760 SET_LOCALE (this->locale);
560 mbstate.reset (); 761 mbstate.reset ();
561#endif 762#endif
562 763
563#if HAVE_NL_LANGINFO 764#if HAVE_NL_LANGINFO
… …
607 * Initialize the command connection. 808 * Initialize the command connection.
608 * This should be called after the X server connection is established. 809 * This should be called after the X server connection is established.
609 */ 810 */
610 811
611#ifdef META8_OPTION 812#ifdef META8_OPTION
612 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 813 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
613#endif 814#endif
614 815
615 get_ourmods (); 816 get_ourmods ();
616 817
617 if (!OPTION (Opt_scrollTtyOutput)) 818 if (!option (Opt_scrollTtyOutput))
618 priv_modes |= PrivMode_TtyOutputInh; 819 priv_modes |= PrivMode_TtyOutputInh;
619 if (OPTION (Opt_scrollTtyKeypress)) 820 if (option (Opt_scrollTtyKeypress))
620 priv_modes |= PrivMode_Keypress; 821 priv_modes |= PrivMode_Keypress;
621 if (!OPTION (Opt_jumpScroll)) 822 if (!option (Opt_jumpScroll))
622 priv_modes |= PrivMode_smoothScroll; 823 priv_modes |= PrivMode_smoothScroll;
623 824
624#ifndef NO_BACKSPACE_KEY 825#ifndef NO_BACKSPACE_KEY
625 if (strcmp (key_backspace, "DEC") == 0) 826 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
626 priv_modes |= PrivMode_HaveBackSpace; 827 priv_modes |= PrivMode_HaveBackSpace;
627#endif 828#endif
628 829
629 /* add value for scrollBar */ 830 /* add value for scrollBar */
630 if (scrollBar.state) 831 if (scrollBar.state)
… …
636 run_command (argv); 837 run_command (argv);
637} 838}
638 839
639/*----------------------------------------------------------------------*/ 840/*----------------------------------------------------------------------*/
640void 841void
641rxvt_term::Get_Colours () 842rxvt_term::get_colours ()
642{ 843{
643 int i; 844 int i;
644 845
645#ifdef OFF_FOCUS_FADING 846#ifdef OFF_FOCUS_FADING
646 pix_colors = pix_colors_focused; 847 pix_colors = pix_colors_focused;
647#endif 848#endif
648 849
649 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 850 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
650 { 851 {
852 const char *name = rs[Rs_color + i];
853
854 if (!name)
855 continue;
856
651 rxvt_color xcol; 857 rxvt_color xcol;
652 858
653 if (!rs[Rs_color + i]) 859 if (!set_color (xcol, name))
654 continue;
655
656 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
657 { 860 {
658#ifndef XTERM_REVERSE_VIDEO 861#ifndef XTERM_REVERSE_VIDEO
659 if (i < 2 && OPTION (Opt_reverseVideo)) 862 if (i < 2 && option (Opt_reverseVideo))
660 rs[Rs_color + i] = def_colorName[!i]; 863 name = def_colorName [1 - i];
661 else 864 else
662#endif 865#endif
663 rs[Rs_color + i] = def_colorName[i]; 866 name = def_colorName [i];
664 867
665 if (!rs[Rs_color + i]) 868 if (!name)
666 continue; 869 continue;
667 870
668 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 871 if (!set_color (xcol, name))
669 { 872 {
670 switch (i) 873 switch (i)
671 { 874 {
672 case Color_fg: 875 case Color_fg:
673 case Color_bg: 876 case Color_bg:
674 /* fatal: need bg/fg color */
675 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 877 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
676 /* NOTREACHED */ 878 name = "";
677 break; 879 break;
678#ifndef NO_CURSORCOLOR 880#ifndef NO_CURSORCOLOR
679 case Color_cursor2: 881 case Color_cursor2:
680 xcol = pix_colors[Color_fg]; 882#endif
681 break;
682#endif /* ! NO_CURSORCOLOR */
683 case Color_pointer_fg: 883 case Color_pointer_fg:
684 xcol = pix_colors[Color_fg]; 884 name = rs[Rs_color + Color_fg];
885 xcol.set (this, name);
685 break; 886 break;
686 default: 887 default:
687 xcol = pix_colors[Color_bg]; /* None */ 888 name = rs[Rs_color + Color_bg];
889 xcol.set (this, name);
688 break; 890 break;
689 } 891 }
690 } 892 }
691 } 893 }
692 894
693 pix_colors[i] = xcol; 895 pix_colors[i] = xcol;
694 SET_PIXCOLOR (i); 896 rs[Rs_color + i] = name;
695 }
696
697#ifdef OFF_FOCUS_FADING
698 if (rs[Rs_fade])
699 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
700 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
701#endif
702
703 if (display->depth <= 2)
704 { 897 }
898
899 if (depth <= 2)
900 {
705 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 901 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
706 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 902 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
707 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 903 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
708 } 904 }
709 905
710 /* 906 /*
711 * get scrollBar shadow colors 907 * get scrollBar shadow colors
712 * 908 *
713 * The calculations of topShadow/bottomShadow values are adapted 909 * The calculations of topShadow/bottomShadow values are adapted
714 * from the fvwm window manager. 910 * from the fvwm window manager.
715 */ 911 */
716#ifdef KEEP_SCROLLCOLOR 912#ifdef RXVT_SCROLLBAR
717
718 if (display->depth <= 2) 913 if (depth <= 2)
719 { 914 {
720 /* Monochrome */ 915 /* Monochrome */
721 pix_colors[Color_scroll] = pix_colors[Color_fg]; 916 alias_color (Color_scroll, Color_fg);
722 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 917 alias_color (Color_topShadow, Color_bg);
723 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 918 alias_color (Color_bottomShadow, Color_bg);
724 } 919 }
725 else 920 else
726 { 921 {
727 rxvt_color xcol[2]; 922 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
728 /* xcol[0] == white
729 * xcol[1] == top shadow
730 * xcol[2] == bot shadow */
731 923
732 xcol[1] = pix_colors[Color_scroll]; 924 rgba cscroll;
733 xcol[0].set (display, 65535, 65535, 65535); 925 pix_colors [Color_scroll].get (cscroll);
734
735 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
736
737 xcol[0].get (display, pr0, pg0, pb0);
738 xcol[1].get (display, pr1, pg1, pb1);
739
740 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
741 926
742 /* topShadowColor */ 927 /* topShadowColor */
743 if (!xcol[1].set (display, 928 if (!pix_colors[Color_topShadow].set (this,
744 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 929 rgba (
745 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 930 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
746 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 931 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
747 xcol[1] = pix_colors[Color_White]; 932 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
748 933 cscroll.a)
749 pix_colors[Color_topShadow] = xcol[1]; 934 ))
935 alias_color (Color_topShadow, Color_White);
750 } 936 }
751#endif /* KEEP_SCROLLCOLOR */ 937#endif
938
939#ifdef OFF_FOCUS_FADING
940 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
941 update_fade_color (i);
942#endif
752} 943}
753 944
754/*----------------------------------------------------------------------*/ 945/*----------------------------------------------------------------------*/
755/* color aliases, fg/bg bright-bold */ 946/* color aliases, fg/bg bright-bold */
756void 947void
… …
759 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 950 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
760 { 951 {
761 int i = atoi (rs[Rs_color + idx]); 952 int i = atoi (rs[Rs_color + idx]);
762 953
763 if (i >= 8 && i <= 15) 954 if (i >= 8 && i <= 15)
764 { /* bright colors */ 955 /* bright colors */
765 i -= 8;
766 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 956 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
767 return; 957 else if (i >= 0 && i <= 7)
768 } 958 /* normal colors */
769
770 if (i >= 0 && i <= 7) /* normal colors */
771 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 959 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
772 } 960 }
773} 961}
774 962
775/*----------------------------------------------------------------------*/ 963/*----------------------------------------------------------------------*/
… …
795 983
796 if (rsmod 984 if (rsmod
797 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 985 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
798 requestedmeta = rsmod[3] - '0'; 986 requestedmeta = rsmod[3] - '0';
799 987
800 map = XGetModifierMapping (display->display); 988 map = XGetModifierMapping (dpy);
801 kc = map->modifiermap; 989 kc = map->modifiermap;
802 990
803 for (i = 1; i < 6; i++) 991 for (i = 1; i < 6; i++)
804 { 992 {
805 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 993 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
807 for (j = map->max_keypermod; j--; k++) 995 for (j = map->max_keypermod; j--; k++)
808 { 996 {
809 if (kc[k] == 0) 997 if (kc[k] == 0)
810 break; 998 break;
811 999
812 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 1000 switch (XKeycodeToKeysym (dpy, kc[k], 0))
813 { 1001 {
814 case XK_Num_Lock: 1002 case XK_Num_Lock:
815 ModNumLockMask = modmasks[i - 1]; 1003 ModNumLockMask = modmasks[i - 1];
816 continue; 1004 continue;
817 1005
… …
867rxvt_term::create_windows (int argc, const char *const *argv) 1055rxvt_term::create_windows (int argc, const char *const *argv)
868{ 1056{
869 XClassHint classHint; 1057 XClassHint classHint;
870 XWMHints wmHint; 1058 XWMHints wmHint;
871#if ENABLE_FRILLS 1059#if ENABLE_FRILLS
872 MWMHints mwmhints; 1060 MWMHints mwmhints = { };
873#endif 1061#endif
874 XGCValues gcvalue; 1062 XGCValues gcvalue;
875 XSetWindowAttributes attributes; 1063 XSetWindowAttributes attributes;
876 Window top, parent; 1064 Window top, parent;
877 dDisp;
878 1065
879 xa = display->xa; 1066 dLocal (Display *, dpy);
880 1067
881 /* grab colors before netscape does */ 1068 /* grab colors before netscape does */
882 Get_Colours (); 1069 get_colours ();
883 1070
884 if (!set_fonts ()) 1071 if (!set_fonts ())
885 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1072 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
886 1073
887 parent = display->root; 1074 parent = display->root;
888 1075
889 attributes.override_redirect = !!OPTION (Opt_override_redirect); 1076 attributes.override_redirect = !!option (Opt_override_redirect);
890 1077
891#if ENABLE_FRILLS 1078#if ENABLE_FRILLS
892 if (OPTION (Opt_borderLess)) 1079 if (option (Opt_borderLess))
893 { 1080 {
894 if (XInternAtom (disp, "_MOTIF_WM_INFO", True) == None) 1081 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
895 { 1082 {
896 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 1083 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
897 attributes.override_redirect = TRUE; 1084 attributes.override_redirect = true;
898 mwmhints.flags = 0;
899 } 1085 }
900 else 1086 else
901 { 1087 {
902 mwmhints.flags = MWM_HINTS_DECORATIONS; 1088 mwmhints.flags = MWM_HINTS_DECORATIONS;
903 mwmhints.decorations = 0;
904 } 1089 }
905 } 1090 }
906 else
907 mwmhints.flags = 0;
908#endif 1091#endif
909 1092
910#if ENABLE_XEMBED 1093#if ENABLE_XEMBED
911 if (rs[Rs_embed]) 1094 if (rs[Rs_embed])
912 { 1095 {
913 XWindowAttributes wattr; 1096 XWindowAttributes wattr;
914 1097
915 parent = strtol (rs[Rs_embed], 0, 0); 1098 parent = strtol (rs[Rs_embed], 0, 0);
916 1099
917 if (!XGetWindowAttributes (disp, parent, &wattr)) 1100 if (!XGetWindowAttributes (dpy, parent, &wattr))
918 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 1101 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
919 1102
920 window_calc (wattr.width, wattr.height); 1103 window_calc (wattr.width, wattr.height);
921 } 1104 }
922#endif 1105#endif
923 1106
924 window_calc (0, 0); 1107 window_calc (0, 0);
925 1108
926 /* sub-window placement & size in rxvt_resize_subwindows () */ 1109 /* sub-window placement & size in rxvt_resize_subwindows () */
927 attributes.background_pixel = pix_colors_focused[Color_border]; 1110 attributes.background_pixel = pix_colors_focused [Color_border];
928 attributes.border_pixel = pix_colors_focused[Color_border]; 1111 attributes.border_pixel = pix_colors_focused [Color_border];
929 attributes.colormap = display->cmap; 1112 attributes.colormap = cmap;
930 1113
931 top = XCreateWindow (disp, parent, 1114 top = XCreateWindow (dpy, parent,
932 szHint.x, szHint.y, 1115 szHint.x, szHint.y,
933 szHint.width, szHint.height, 1116 szHint.width, szHint.height,
934 ext_bwidth, 1117 ext_bwidth,
935 display->depth, InputOutput, 1118 depth, InputOutput, visual,
936 display->visual,
937 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1119 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
938 &attributes); 1120 &attributes);
939 1121
940 this->parent[0] = top; 1122 this->parent[0] = top;
941 1123
… …
948 classHint.res_name = (char *)rs[Rs_name]; 1130 classHint.res_name = (char *)rs[Rs_name];
949 classHint.res_class = (char *)RESCLASS; 1131 classHint.res_class = (char *)RESCLASS;
950 1132
951 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1133 wmHint.flags = InputHint | StateHint | WindowGroupHint;
952 wmHint.input = True; 1134 wmHint.input = True;
953 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1135 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
954 wmHint.window_group = top; 1136 wmHint.window_group = top;
955 1137
956 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 1138 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
957 &szHint, &wmHint, &classHint); 1139 &szHint, &wmHint, &classHint);
958 1140
959#if ENABLE_FRILLS 1141#if ENABLE_FRILLS
960 if (mwmhints.flags) 1142 if (mwmhints.flags)
961 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1143 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
962 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1144 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
963#endif 1145#endif
964 1146
965 Atom protocols[] = { 1147 Atom protocols[] = {
966 xa[XA_WM_DELETE_WINDOW], 1148 xa[XA_WM_DELETE_WINDOW],
967#if ENABLE_EWMH 1149#if ENABLE_EWMH
968 xa[XA_NET_WM_PING], 1150 xa[XA_NET_WM_PING],
969#endif 1151#endif
970 }; 1152 };
971 1153
972 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1154 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
973 1155
974#if ENABLE_FRILLS 1156#if ENABLE_FRILLS
975 if (rs[Rs_transient_for]) 1157 if (rs[Rs_transient_for])
976 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1158 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
977#endif 1159#endif
978 1160
979#if ENABLE_EWMH 1161#if ENABLE_EWMH
980 long pid = getpid (); 1162 long pid = getpid ();
981 1163
982 XChangeProperty (disp, top, 1164 XChangeProperty (dpy, top,
983 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1165 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
984 PropModeReplace, (unsigned char *)&pid, 1); 1166 PropModeReplace, (unsigned char *)&pid, 1);
985 1167
986 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1168 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
987#endif 1169#endif
988 1170
989 XSelectInput (disp, top, 1171 XSelectInput (dpy, top,
990 KeyPressMask 1172 KeyPressMask
991#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1173#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
992 | KeyReleaseMask 1174 | KeyReleaseMask
993#endif 1175#endif
994 | FocusChangeMask | VisibilityChangeMask 1176 | FocusChangeMask | VisibilityChangeMask
995 | ExposureMask | StructureNotifyMask); 1177 | ExposureMask | StructureNotifyMask);
996 1178
997 termwin_ev.start (display, top); 1179 termwin_ev.start (display, top);
998 1180
999 /* vt cursor: Black-on-White is standard, but this is more popular */ 1181 /* vt cursor: Black-on-White is standard, but this is more popular */
1000 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1182 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1001
1002#ifdef HAVE_SCROLLBARS
1003 /* cursor scrollBar: Black-on-White */
1004 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1005#endif
1006 1183
1007 /* the vt window */ 1184 /* the vt window */
1008 vt = XCreateSimpleWindow (disp, top, 1185 vt = XCreateSimpleWindow (dpy, top,
1009 window_vt_x, window_vt_y, 1186 window_vt_x, window_vt_y,
1010 width, height, 1187 width, height,
1011 0, 1188 0,
1012 pix_colors_focused[Color_fg], 1189 pix_colors_focused[Color_fg],
1013 pix_colors_focused[Color_bg]); 1190 pix_colors_focused[Color_bg]);
1014 1191
1015 attributes.bit_gravity = NorthWestGravity; 1192 attributes.bit_gravity = NorthWestGravity;
1016 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1193 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1017 1194
1018 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1195 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1019 1196
1020 if (OPTION (Opt_pointerBlank)) 1197 if (option (Opt_pointerBlank))
1021 vt_emask |= PointerMotionMask; 1198 vt_emask |= PointerMotionMask;
1022 else 1199 else
1023 vt_emask |= Button1MotionMask | Button3MotionMask; 1200 vt_emask |= Button1MotionMask | Button3MotionMask;
1024 1201
1025 vt_select_input (); 1202 vt_select_input ();
1026 1203
1027 vt_ev.start (display, vt); 1204 vt_ev.start (display, vt);
1028 1205
1029#ifdef XPM_BACKGROUND
1030 if (rs[Rs_backgroundPixmap] != NULL
1031 && !OPTION (Opt_transparent))
1032 {
1033 const char *p = rs[Rs_backgroundPixmap];
1034
1035 if ((p = strchr (p, ';')) != NULL)
1036 {
1037 p++;
1038 scale_pixmap (p);
1039 }
1040
1041 set_bgPixmap (rs[Rs_backgroundPixmap]);
1042 scr_touch (true);
1043 }
1044#endif
1045
1046 /* graphics context for the vt window */ 1206 /* graphics context for the vt window */
1047 gcvalue.foreground = pix_colors[Color_fg]; 1207 gcvalue.foreground = pix_colors[Color_fg];
1048 gcvalue.background = pix_colors[Color_bg]; 1208 gcvalue.background = pix_colors[Color_bg];
1049 gcvalue.graphics_exposures = 1; 1209 gcvalue.graphics_exposures = 0;
1050 1210
1051 gc = XCreateGC (disp, vt, 1211 gc = XCreateGC (dpy, vt,
1052 GCForeground | GCBackground | GCGraphicsExposures, 1212 GCForeground | GCBackground | GCGraphicsExposures,
1053 &gcvalue); 1213 &gcvalue);
1054 1214
1055 drawable = new rxvt_drawable (display, vt); 1215 drawable = new rxvt_drawable (this, vt);
1056
1057#ifdef RXVT_SCROLLBAR
1058 gcvalue.foreground = pix_colors[Color_topShadow];
1059 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1060 gcvalue.foreground = pix_colors[Color_bottomShadow];
1061 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1062 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1063 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1064#endif
1065 1216
1066#ifdef OFF_FOCUS_FADING 1217#ifdef OFF_FOCUS_FADING
1067 // initially we are in unfocused state 1218 // initially we are in unfocused state
1068 if (rs[Rs_fade]) 1219 if (rs[Rs_fade])
1069 pix_colors = pix_colors_unfocused; 1220 pix_colors = pix_colors_unfocused;
… …
1075 1226
1076/* ------------------------------------------------------------------------- * 1227/* ------------------------------------------------------------------------- *
1077 * GET TTY CURRENT STATE * 1228 * GET TTY CURRENT STATE *
1078 * ------------------------------------------------------------------------- */ 1229 * ------------------------------------------------------------------------- */
1079void 1230void
1080rxvt_get_ttymode (ttymode_t *tio, int erase) 1231rxvt_get_ttymode (struct termios *tio, int erase)
1081{ 1232{
1082#ifdef HAVE_TERMIOS_H
1083 /* 1233 /*
1084 * standard System V termios interface 1234 * standard System V termios interface
1085 */ 1235 */
1086 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1236 if (tcgetattr (STDIN_FILENO, tio) < 0)
1087 { 1237 {
1088 // return error - use system defaults, 1238 // return error - use system defaults,
1089 // where possible, and zero elsewhere 1239 // where possible, and zero elsewhere
1090 memset (tio, 0, sizeof (ttymode_t)); 1240 memset (tio, 0, sizeof (struct termios));
1091 1241
1092 tio->c_cc[VINTR] = CINTR; 1242 tio->c_cc[VINTR] = CINTR;
1093 tio->c_cc[VQUIT] = CQUIT; 1243 tio->c_cc[VQUIT] = CQUIT;
1094 tio->c_cc[VERASE] = CERASE; 1244 tio->c_cc[VERASE] = CERASE;
1095#ifdef VERASE2 1245#ifdef VERASE2
… …
1154 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1304 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1155# if defined (ECHOCTL) && defined (ECHOKE) 1305# if defined (ECHOCTL) && defined (ECHOKE)
1156 | ECHOCTL | ECHOKE 1306 | ECHOCTL | ECHOKE
1157# endif 1307# endif
1158 | ECHOE | ECHOK); 1308 | ECHOE | ECHOK);
1159# else /* HAVE_TERMIOS_H */
1160
1161 /*
1162 * sgtty interface
1163 */
1164
1165 /* get parameters -- gtty */
1166 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1167 {
1168 tio->sg.sg_erase = CERASE; /* ^H */
1169 tio->sg.sg_kill = CKILL; /* ^U */
1170 }
1171
1172 if (erase != -1)
1173 tio->sg.sg_erase = (char)erase;
1174
1175 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1176
1177 /* get special characters */
1178 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1179 {
1180 tio->tc.t_intrc = CINTR; /* ^C */
1181 tio->tc.t_quitc = CQUIT; /* ^\ */
1182 tio->tc.t_startc = CSTART; /* ^Q */
1183 tio->tc.t_stopc = CSTOP; /* ^S */
1184 tio->tc.t_eofc = CEOF; /* ^D */
1185 tio->tc.t_brkc = -1;
1186 }
1187
1188 /* get local special chars */
1189 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1190 {
1191 tio->lc.t_suspc = CSUSP; /* ^Z */
1192 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1193 tio->lc.t_rprntc = CRPRNT; /* ^R */
1194 tio->lc.t_flushc = CFLUSH; /* ^O */
1195 tio->lc.t_werasc = CWERASE; /* ^W */
1196 tio->lc.t_lnextc = CLNEXT; /* ^V */
1197 }
1198 /* get line discipline */
1199 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1200# ifdef NTTYDISC
1201 tio->line = NTTYDISC;
1202# endif /* NTTYDISC */
1203
1204 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1205#endif /* HAVE_TERMIOS_H */
1206 1309
1207 /* 1310 /*
1208 * Debugging 1311 * Debugging
1209 */ 1312 */
1210#ifdef DEBUG_TTYMODE 1313#ifdef DEBUG_TTYMODE
1211#ifdef HAVE_TERMIOS_H
1212 /* c_iflag bits */ 1314 /* c_iflag bits */
1213 fprintf (stderr, "Input flags\n"); 1315 fprintf (stderr, "Input flags\n");
1214 1316
1215 /* cpp token stringize doesn't work on all machines <sigh> */ 1317 /* cpp token stringize doesn't work on all machines <sigh> */
1216# define FOO(flag,name) \ 1318# define FOO(flag,name) \
… …
1279 FOO (VLNEXT, "VLNEXT"); 1381 FOO (VLNEXT, "VLNEXT");
1280# endif 1382# endif
1281 1383
1282 fprintf (stderr, "\n"); 1384 fprintf (stderr, "\n");
1283# undef FOO 1385# undef FOO
1284# endif /* HAVE_TERMIOS_H */ 1386#endif /* DEBUG_TTYMODE */
1285#endif /* DEBUG_TTYMODE */
1286} 1387}
1287 1388
1288/*----------------------------------------------------------------------*/ 1389/*----------------------------------------------------------------------*/
1289/* 1390/*
1290 * Run the command in a subprocess and return a file descriptor for the 1391 * Run the command in a subprocess and return a file descriptor for the
… …
1311 else 1412 else
1312#endif 1413#endif
1313 if (!pty->get ()) 1414 if (!pty->get ())
1314 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1415 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1315 1416
1417 int er;
1418
1419#ifndef NO_BACKSPACE_KEY
1420 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1421 er = rs[Rs_backspace_key][0];
1422 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1423 er = '\177'; /* the initial state anyway */
1424 else
1425#endif
1426 er = -1;
1427
1428 rxvt_get_ttymode (&tio, er);
1429 /* init terminal attributes */
1430 cfsetospeed (&tio, BAUDRATE);
1431 cfsetispeed (&tio, BAUDRATE);
1432 tcsetattr (pty->tty, TCSANOW, &tio);
1316 pty->set_utf8_mode (enc_utf8); 1433 pty->set_utf8_mode (enc_utf8);
1317 1434
1318 /* set initial window size */ 1435 /* set initial window size */
1319 tt_winch (); 1436 tt_winch ();
1320
1321 int er;
1322
1323#ifndef NO_BACKSPACE_KEY
1324 if (key_backspace[0] && !key_backspace[1])
1325 er = key_backspace[0];
1326 else if (strcmp (key_backspace, "DEC") == 0)
1327 er = '\177'; /* the initial state anyway */
1328 else
1329#endif
1330 er = -1;
1331
1332 rxvt_get_ttymode (&tio, er);
1333 1437
1334#if ENABLE_FRILLS 1438#if ENABLE_FRILLS
1335 if (rs[Rs_pty_fd]) 1439 if (rs[Rs_pty_fd])
1336 return; 1440 return;
1337#endif 1441#endif
… …
1368 } 1472 }
1369 1473
1370 _exit (EXIT_FAILURE); 1474 _exit (EXIT_FAILURE);
1371 1475
1372 default: 1476 default:
1373 if (!OPTION (Opt_utmpInhibit)) 1477 if (!option (Opt_utmpInhibit))
1374 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1478 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1375 1479
1376 pty->close_tty (); 1480 pty->close_tty ();
1377 1481
1378 child_ev.start (cmd_pid); 1482 child_ev.start (cmd_pid);
1379 1483
… …
1392int 1496int
1393rxvt_term::run_child (const char *const *argv) 1497rxvt_term::run_child (const char *const *argv)
1394{ 1498{
1395 char *login; 1499 char *login;
1396 1500
1397 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1398
1399 if (OPTION (Opt_console)) 1501 if (option (Opt_console))
1502 {
1400 { /* be virtual console, fail silently */ 1503 /* be virtual console, fail silently */
1401#ifdef TIOCCONS 1504#ifdef TIOCCONS
1402 unsigned int on = 1; 1505 unsigned int on = 1;
1403 1506
1404 ioctl (STDIN_FILENO, TIOCCONS, &on); 1507 ioctl (STDIN_FILENO, TIOCCONS, &on);
1405#elif defined (SRIOCSREDIR) 1508#elif defined (SRIOCSREDIR)
… …
1407 1510
1408 fd = open (CONSOLE, O_WRONLY, 0); 1511 fd = open (CONSOLE, O_WRONLY, 0);
1409 if (fd >= 0) 1512 if (fd >= 0)
1410 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1513 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1411 close (fd); 1514 close (fd);
1412#endif /* SRIOCSREDIR */ 1515#endif /* SRIOCSREDIR */
1413 } 1516 }
1414 1517
1415 /* reset signals and spin off the command interpreter */ 1518 /* reset signals and spin off the command interpreter */
1416 signal (SIGINT, SIG_DFL); 1519 signal (SIGINT, SIG_DFL);
1417 signal (SIGQUIT, SIG_DFL); 1520 signal (SIGQUIT, SIG_DFL);
… …
1424 */ 1527 */
1425#ifdef SIGTSTP 1528#ifdef SIGTSTP
1426 signal (SIGTSTP, SIG_IGN); 1529 signal (SIGTSTP, SIG_IGN);
1427 signal (SIGTTIN, SIG_IGN); 1530 signal (SIGTTIN, SIG_IGN);
1428 signal (SIGTTOU, SIG_IGN); 1531 signal (SIGTTOU, SIG_IGN);
1429#endif /* SIGTSTP */ 1532#endif /* SIGTSTP */
1430
1431 // unblock signals (signals are blocked by iom.C
1432 sigset_t ss;
1433 sigemptyset (&ss);
1434 sigprocmask (SIG_SETMASK, &ss, 0);
1435 1533
1436 /* command interpreter path */ 1534 /* command interpreter path */
1437 if (argv != NULL) 1535 if (argv)
1438 { 1536 {
1439# ifdef DEBUG_CMD 1537# ifdef DEBUG_CMD
1440 int i; 1538 int i;
1441 1539
1442 for (i = 0; argv[i]; i++) 1540 for (i = 0; argv[i]; i++)
… …
1451 const char *argv0, *shell; 1549 const char *argv0, *shell;
1452 1550
1453 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1551 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1454 shell = "/bin/sh"; 1552 shell = "/bin/sh";
1455 1553
1456 argv0 = (const char *)rxvt_r_basename (shell); 1554 argv0 = (const char *)rxvt_basename (shell);
1457 1555
1458 if (OPTION (Opt_loginShell)) 1556 if (option (Opt_loginShell))
1459 { 1557 {
1460 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1558 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1461 1559
1462 login[0] = '-'; 1560 login[0] = '-';
1463 strcpy (&login[1], argv0); 1561 strcpy (&login[1], argv0);
1464 argv0 = login; 1562 argv0 = login;
1465 } 1563 }
1466 1564
1467 execlp (shell, argv0, NULL); 1565 execlp (shell, argv0, (char *)0);
1468 /* no error message: STDERR is closed! */ 1566 /* no error message: STDERR is closed! */
1469 } 1567 }
1470 1568
1471 return -1; 1569 return -1;
1472} 1570}

Diff Legend

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