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.51 by pcg, Sun May 9 18:19:49 2004 UTC vs.
Revision 1.107 by root, Wed Feb 2 08:09:23 2005 UTC

… …
31 * Initialisation routines. 31 * Initialisation routines.
32 */ 32 */
33 33
34#include "../config.h" /* NECESSARY */ 34#include "../config.h" /* NECESSARY */
35#include "rxvt.h" /* NECESSARY */ 35#include "rxvt.h" /* NECESSARY */
36#include "rxvtutil.h"
36#include "init.h" 37#include "init.h"
37 38
38#include <signal.h> 39#include <csignal>
39 40
40const char *const def_colorName[] = 41const char *const def_colorName[] =
41 { 42 {
42 COLOR_FOREGROUND, 43 COLOR_FOREGROUND,
43 COLOR_BACKGROUND, 44 COLOR_BACKGROUND,
… …
67 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 68 "Yellow", /* 3/11: bright yellow (#FFFF00) */
68 "Blue", /* 4/12: bright blue (#0000FF) */ 69 "Blue", /* 4/12: bright blue (#0000FF) */
69 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 70 "Magenta", /* 5/13: bright magenta (#FF00FF) */
70 "Cyan", /* 6/14: bright cyan (#00FFFF) */ 71 "Cyan", /* 6/14: bright cyan (#00FFFF) */
71 "White", /* 7/15: bright white (#FFFFFF) */ 72 "White", /* 7/15: bright white (#FFFFFF) */
72#ifdef TTY_256COLOR 73
73 "rgb:00/00/00", /* default 16-255 color table */ 74 // 88 xterm colours
74 "rgb:00/00/2a", 75 "rgb:00/00/00",
75 "rgb:00/00/55", 76 "rgb:00/00/8b",
76 "rgb:00/00/7f",
77 "rgb:00/00/aa",
78 "rgb:00/00/d4", 77 "rgb:00/00/cd",
78 "rgb:00/00/ff",
79 "rgb:00/2a/00", 79 "rgb:00/8b/00",
80 "rgb:00/2a/2a", 80 "rgb:00/8b/8b",
81 "rgb:00/2a/55",
82 "rgb:00/2a/7f",
83 "rgb:00/2a/aa",
84 "rgb:00/2a/d4", 81 "rgb:00/8b/cd",
85 "rgb:00/55/00",
86 "rgb:00/55/2a",
87 "rgb:00/55/55",
88 "rgb:00/55/7f", 82 "rgb:00/8b/ff",
89 "rgb:00/55/aa",
90 "rgb:00/55/d4",
91 "rgb:00/7f/00",
92 "rgb:00/7f/2a",
93 "rgb:00/7f/55",
94 "rgb:00/7f/7f",
95 "rgb:00/7f/aa",
96 "rgb:00/7f/d4",
97 "rgb:00/aa/00",
98 "rgb:00/aa/2a",
99 "rgb:00/aa/55",
100 "rgb:00/aa/7f",
101 "rgb:00/aa/aa",
102 "rgb:00/aa/d4",
103 "rgb:00/d4/00", 83 "rgb:00/cd/00",
104 "rgb:00/d4/2a", 84 "rgb:00/cd/8b",
105 "rgb:00/d4/55",
106 "rgb:00/d4/7f",
107 "rgb:00/d4/aa",
108 "rgb:00/d4/d4", 85 "rgb:00/cd/cd",
86 "rgb:00/cd/ff",
87 "rgb:00/ff/00",
88 "rgb:00/ff/8b",
89 "rgb:00/ff/cd",
90 "rgb:00/ff/ff",
109 "rgb:2a/00/00", 91 "rgb:8b/00/00",
110 "rgb:2a/00/2a", 92 "rgb:8b/00/8b",
111 "rgb:2a/00/55",
112 "rgb:2a/00/7f",
113 "rgb:2a/00/aa",
114 "rgb:2a/00/d4", 93 "rgb:8b/00/cd",
115 "rgb:2a/2a/00",
116 "rgb:2a/2a/2a",
117 "rgb:2a/2a/55",
118 "rgb:2a/2a/7f",
119 "rgb:2a/2a/aa",
120 "rgb:2a/2a/d4",
121 "rgb:2a/55/00",
122 "rgb:2a/55/2a",
123 "rgb:2a/55/55",
124 "rgb:2a/55/7f",
125 "rgb:2a/55/aa",
126 "rgb:2a/55/d4",
127 "rgb:2a/7f/00",
128 "rgb:2a/7f/2a",
129 "rgb:2a/7f/55",
130 "rgb:2a/7f/7f",
131 "rgb:2a/7f/aa",
132 "rgb:2a/7f/d4",
133 "rgb:2a/aa/00",
134 "rgb:2a/aa/2a",
135 "rgb:2a/aa/55",
136 "rgb:2a/aa/7f",
137 "rgb:2a/aa/aa",
138 "rgb:2a/aa/d4",
139 "rgb:2a/d4/00",
140 "rgb:2a/d4/2a",
141 "rgb:2a/d4/55",
142 "rgb:2a/d4/7f",
143 "rgb:2a/d4/aa",
144 "rgb:2a/d4/d4",
145 "rgb:55/00/00",
146 "rgb:55/00/2a",
147 "rgb:55/00/55",
148 "rgb:55/00/7f", 94 "rgb:8b/00/ff",
149 "rgb:55/00/aa",
150 "rgb:55/00/d4",
151 "rgb:55/2a/00", 95 "rgb:8b/8b/00",
152 "rgb:55/2a/2a", 96 "rgb:8b/8b/8b",
153 "rgb:55/2a/55", 97 "rgb:8b/8b/cd",
154 "rgb:55/2a/7f", 98 "rgb:8b/8b/ff",
155 "rgb:55/2a/aa",
156 "rgb:55/2a/d4",
157 "rgb:55/55/00",
158 "rgb:55/55/2a",
159 "rgb:55/55/55",
160 "rgb:55/55/7f",
161 "rgb:55/55/aa",
162 "rgb:55/55/d4",
163 "rgb:55/7f/00",
164 "rgb:55/7f/2a",
165 "rgb:55/7f/55",
166 "rgb:55/7f/7f",
167 "rgb:55/7f/aa",
168 "rgb:55/7f/d4",
169 "rgb:55/aa/00",
170 "rgb:55/aa/2a",
171 "rgb:55/aa/55",
172 "rgb:55/aa/7f",
173 "rgb:55/aa/aa",
174 "rgb:55/aa/d4",
175 "rgb:55/d4/00", 99 "rgb:8b/cd/00",
176 "rgb:55/d4/2a", 100 "rgb:8b/cd/8b",
177 "rgb:55/d4/55",
178 "rgb:55/d4/7f",
179 "rgb:55/d4/aa",
180 "rgb:55/d4/d4", 101 "rgb:8b/cd/cd",
181 "rgb:7f/00/00", 102 "rgb:8b/cd/ff",
182 "rgb:7f/00/2a",
183 "rgb:7f/00/55",
184 "rgb:7f/00/7f",
185 "rgb:7f/00/aa",
186 "rgb:7f/00/d4",
187 "rgb:7f/2a/00",
188 "rgb:7f/2a/2a",
189 "rgb:7f/2a/55",
190 "rgb:7f/2a/7f",
191 "rgb:7f/2a/aa",
192 "rgb:7f/2a/d4",
193 "rgb:7f/55/00",
194 "rgb:7f/55/2a",
195 "rgb:7f/55/55",
196 "rgb:7f/55/7f",
197 "rgb:7f/55/aa",
198 "rgb:7f/55/d4",
199 "rgb:7f/7f/00", 103 "rgb:8b/ff/00",
200 "rgb:7f/7f/2a", 104 "rgb:8b/ff/8b",
201 "rgb:7f/7f/55",
202 "rgb:7f/7f/7f",
203 "rgb:7f/7f/aa",
204 "rgb:7f/7f/d4",
205 "rgb:7f/aa/00",
206 "rgb:7f/aa/2a",
207 "rgb:7f/aa/55",
208 "rgb:7f/aa/7f",
209 "rgb:7f/aa/aa",
210 "rgb:7f/aa/d4",
211 "rgb:7f/d4/00",
212 "rgb:7f/d4/2a",
213 "rgb:7f/d4/55",
214 "rgb:7f/d4/7f",
215 "rgb:7f/d4/aa",
216 "rgb:7f/d4/d4",
217 "rgb:aa/00/00",
218 "rgb:aa/00/2a",
219 "rgb:aa/00/55",
220 "rgb:aa/00/7f",
221 "rgb:aa/00/aa",
222 "rgb:aa/00/d4",
223 "rgb:aa/2a/00",
224 "rgb:aa/2a/2a",
225 "rgb:aa/2a/55",
226 "rgb:aa/2a/7f",
227 "rgb:aa/2a/aa",
228 "rgb:aa/2a/d4",
229 "rgb:aa/55/00",
230 "rgb:aa/55/2a",
231 "rgb:aa/55/55",
232 "rgb:aa/55/7f",
233 "rgb:aa/55/aa",
234 "rgb:aa/55/d4",
235 "rgb:aa/7f/00",
236 "rgb:aa/7f/2a",
237 "rgb:aa/7f/55",
238 "rgb:aa/7f/7f",
239 "rgb:aa/7f/aa",
240 "rgb:aa/7f/d4", 105 "rgb:8b/ff/cd",
241 "rgb:aa/aa/00", 106 "rgb:8b/ff/ff",
242 "rgb:aa/aa/2a",
243 "rgb:aa/aa/55",
244 "rgb:aa/aa/7f",
245 "rgb:aa/aa/aa",
246 "rgb:aa/aa/d4",
247 "rgb:aa/d4/00",
248 "rgb:aa/d4/2a",
249 "rgb:aa/d4/55",
250 "rgb:aa/d4/7f",
251 "rgb:aa/d4/aa",
252 "rgb:aa/d4/d4",
253 "rgb:d4/00/00", 107 "rgb:cd/00/00",
254 "rgb:d4/00/2a", 108 "rgb:cd/00/8b",
255 "rgb:d4/00/55",
256 "rgb:d4/00/7f",
257 "rgb:d4/00/aa",
258 "rgb:d4/00/d4", 109 "rgb:cd/00/cd",
110 "rgb:cd/00/ff",
259 "rgb:d4/2a/00", 111 "rgb:cd/8b/00",
260 "rgb:d4/2a/2a", 112 "rgb:cd/8b/8b",
261 "rgb:d4/2a/55",
262 "rgb:d4/2a/7f",
263 "rgb:d4/2a/aa",
264 "rgb:d4/2a/d4", 113 "rgb:cd/8b/cd",
265 "rgb:d4/55/00",
266 "rgb:d4/55/2a",
267 "rgb:d4/55/55",
268 "rgb:d4/55/7f", 114 "rgb:cd/8b/ff",
269 "rgb:d4/55/aa",
270 "rgb:d4/55/d4",
271 "rgb:d4/7f/00",
272 "rgb:d4/7f/2a",
273 "rgb:d4/7f/55",
274 "rgb:d4/7f/7f",
275 "rgb:d4/7f/aa",
276 "rgb:d4/7f/d4",
277 "rgb:d4/aa/00",
278 "rgb:d4/aa/2a",
279 "rgb:d4/aa/55",
280 "rgb:d4/aa/7f",
281 "rgb:d4/aa/aa",
282 "rgb:d4/aa/d4",
283 "rgb:d4/d4/00", 115 "rgb:cd/cd/00",
284 "rgb:d4/d4/2a", 116 "rgb:cd/cd/8b",
285 "rgb:d4/d4/55",
286 "rgb:d4/d4/7f",
287 "rgb:d4/d4/aa",
288 "rgb:d4/d4/d4", 117 "rgb:cd/cd/cd",
118 "rgb:cd/cd/ff",
119 "rgb:cd/ff/00",
120 "rgb:cd/ff/8b",
121 "rgb:cd/ff/cd",
122 "rgb:cd/ff/ff",
289 "rgb:08/08/08", 123 "rgb:ff/00/00",
124 "rgb:ff/00/8b",
125 "rgb:ff/00/cd",
126 "rgb:ff/00/ff",
127 "rgb:ff/8b/00",
128 "rgb:ff/8b/8b",
129 "rgb:ff/8b/cd",
130 "rgb:ff/8b/ff",
131 "rgb:ff/cd/00",
132 "rgb:ff/cd/8b",
133 "rgb:ff/cd/cd",
134 "rgb:ff/cd/ff",
135 "rgb:ff/ff/00",
136 "rgb:ff/ff/8b",
137 "rgb:ff/ff/cd",
138 "rgb:ff/ff/ff",
290 "rgb:12/12/12", 139 "rgb:2e/2e/2e",
291 "rgb:1c/1c/1c", 140 "rgb:5c/5c/5c",
292 "rgb:26/26/26",
293 "rgb:30/30/30", 141 "rgb:73/73/73",
294 "rgb:3a/3a/3a",
295 "rgb:44/44/44",
296 "rgb:4e/4e/4e",
297 "rgb:58/58/58", 142 "rgb:8b/8b/8b",
298 "rgb:62/62/62", 143 "rgb:a2/a2/a2",
299 "rgb:6c/6c/6c",
300 "rgb:76/76/76",
301 "rgb:80/80/80",
302 "rgb:8a/8a/8a",
303 "rgb:94/94/94", 144 "rgb:b9/b9/b9",
304 "rgb:9e/9e/9e",
305 "rgb:a8/a8/a8",
306 "rgb:b2/b2/b2",
307 "rgb:bc/bc/bc",
308 "rgb:c6/c6/c6",
309 "rgb:d0/d0/d0", 145 "rgb:d0/d0/d0",
310 "rgb:da/da/da",
311 "rgb:e4/e4/e4", 146 "rgb:e7/e7/e7",
312 "rgb:ee/ee/ee", 147
313#endif
314#ifndef NO_CURSORCOLOR 148#ifndef NO_CURSORCOLOR
315 COLOR_CURSOR_BACKGROUND, 149 COLOR_CURSOR_BACKGROUND,
316 COLOR_CURSOR_FOREGROUND, 150 COLOR_CURSOR_FOREGROUND,
317#endif /* ! NO_CURSORCOLOR */ 151#endif /* ! NO_CURSORCOLOR */
318 NULL, /* Color_pointer_fg */ 152 NULL, /* Color_pointer_fg */
319 NULL, /* Color_pointer_bg */ 153 NULL, /* Color_pointer_bg */
320 NULL, /* Color_border */ 154 NULL, /* Color_border */
321#ifndef NO_BOLD_UNDERLINE_REVERSE 155#ifndef NO_BOLD_UNDERLINE_REVERSE
322 NULL, /* Color_BD */ 156 NULL, /* Color_BD */
157 NULL, /* Color_IT */
323 NULL, /* Color_UL */ 158 NULL, /* Color_UL */
324 NULL, /* Color_RV */ 159 NULL, /* Color_RV */
325#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 160#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
161#if ENABLE_FRILLS
162 NULL, // Color_underline
163#endif
326#ifdef OPTION_HC 164#ifdef OPTION_HC
327 NULL,
328#endif
329#if TINTING
330 NULL, 165 NULL,
331#endif 166#endif
332#ifdef KEEP_SCROLLCOLOR 167#ifdef KEEP_SCROLLCOLOR
333 COLOR_SCROLLBAR, 168 COLOR_SCROLLBAR,
334 COLOR_SCROLLTROUGH, 169 COLOR_SCROLLTROUGH,
335#endif /* KEEP_SCROLLCOLOR */ 170#endif /* KEEP_SCROLLCOLOR */
336 171#if TINTING
172 NULL,
173#endif
337 }; 174 };
338 175
339const char *const xa_names[NUM_XA] = 176const char *const xa_names[] =
340 { 177 {
341 "TEXT", 178 "TEXT",
342 "COMPOUND_TEXT", 179 "COMPOUND_TEXT",
343 "UTF8_STRING", 180 "UTF8_STRING",
344 "MULTIPLE", 181 "MULTIPLE",
345 "TARGETS", 182 "TARGETS",
346 "TIMESTAMP", 183 "TIMESTAMP",
347 "VT_SELECTION", 184 "VT_SELECTION",
348 "INCR", 185 "INCR",
349 "WM_DELETE_WINDOW", 186 "WM_DELETE_WINDOW",
187 "CLIPBOARD",
188#if ENABLE_FRILLS
189 "_NET_WM_PID",
190 "_MOTIF_WM_HINTS",
191 "_NET_WM_NAME",
192 "_NET_WM_ICON_NAME",
193#endif
194#if USE_XIM
195 "WM_LOCALE_NAME",
196#endif
350#ifdef TRANSPARENT 197#ifdef TRANSPARENT
351 "_XROOTPMAP_ID", 198 "_XROOTPMAP_ID",
199 "ESETROOT_PMAP_ID",
352#endif 200#endif
353#ifdef OFFIX_DND 201#ifdef OFFIX_DND
354 "DndProtocol", 202 "DndProtocol",
355 "DndSelection", 203 "DndSelection",
356#endif 204#endif
357 "CLIPBOARD"
358 }; 205 };
359 206
360bool 207bool
361rxvt_term::init_vars () 208rxvt_term::init_vars ()
362{ 209{
210 sw_term.start (SIGTERM);
211 sw_int.start (SIGINT);
212
363 PixColors = new rxvt_color [TOTAL_COLORS]; 213 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
214#ifdef OFF_FOCUS_FADING
215 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
216#endif
217 pix_colors = pix_colors_focused;
218
364 if (PixColors == NULL) 219 if (pix_colors == NULL)
365 return false; 220 return false;
366 221
367#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 222#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
368 TermWin.pixmap = None; 223 TermWin.pixmap = None;
369#endif 224#endif
370#ifdef UTMP_SUPPORT
371 next_utmp_action = SAVE;
372#endif
373#ifndef NO_SETOWNER_TTYDEV
374 next_tty_action = SAVE;
375#endif
376 225
377 MEvent.time = CurrentTime; 226 MEvent.time = CurrentTime;
378 MEvent.button = AnyButton; 227 MEvent.button = AnyButton;
379 Options = DEFAULT_OPTIONS; 228 options = DEFAULT_OPTIONS;
380 want_refresh = 1; 229 want_refresh = 1;
381 cmd_pid = -1; 230 cmd_pid = -1;
382 cmd_fd = tty_fd = -1; 231 pty.pty = pty.tty = -1;
383 PrivateModes = SavedModes = PrivMode_Default; 232 priv_modes = SavedModes = PrivMode_Default;
384 TermWin.focus = 0; 233 TermWin.focus = 0;
385 TermWin.ncol = 80; 234 TermWin.ncol = 80;
386 TermWin.nrow = 24; 235 TermWin.nrow = 24;
387 TermWin.int_bwidth = INTERNALBORDERWIDTH; 236 TermWin.int_bwidth = INTERNALBORDERWIDTH;
388 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 237 TermWin.ext_bwidth = EXTERNALBORDERWIDTH;
389 TermWin.lineSpace = LINESPACE; 238 TermWin.lineSpace = LINESPACE;
390 TermWin.saveLines = SAVELINES; 239 TermWin.saveLines = SAVELINES;
391 numPixColors = TOTAL_COLORS; 240 numpix_colors = TOTAL_COLORS;
392
393#ifndef NO_BRIGHTCOLOR
394 colorfgbg = DEFAULT_RSTYLE;
395#endif
396 241
397 refresh_limit = 1; 242 refresh_limit = 1;
398 refresh_type = SLOW_REFRESH; 243 refresh_type = SLOW_REFRESH;
399 prev_nrow = prev_ncol = 0; 244 prev_nrow = prev_ncol = 0;
400 245
… …
408 last_bot = last_state = -1; 253 last_bot = last_state = -1;
409 254
410#ifdef MENUBAR 255#ifdef MENUBAR
411 menu_readonly = 1; 256 menu_readonly = 1;
412# if ! (MENUBAR_MAX > 1) 257# if ! (MENUBAR_MAX > 1)
413 CurrentBar = & (BarList); 258 CurrentBar = &BarList;
414# endif /* (MENUBAR_MAX > 1) */ 259# endif /* (MENUBAR_MAX > 1) */
415#endif 260#endif
416 261
417 return true; 262 return true;
418} 263}
419 264
420void 265void
421rxvt_term::init_secondary () 266rxvt_term::init_secondary ()
422{ 267{
423 int i; 268 int i;
424#ifdef TTY_GID_SUPPORT
425 struct group *gr = getgrnam ("tty");
426
427 if (gr)
428 { /* change group ownership of tty to "tty" */
429 ttymode = S_IRUSR | S_IWUSR | S_IWGRP;
430 ttygid = gr->gr_gid;
431 }
432 else
433#endif /* TTY_GID_SUPPORT */
434
435 {
436 ttymode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH;
437 ttygid = getgid ();
438 }
439 269
440 /* 270 /*
441 * Close all unused file descriptors 271 * Close all unused file descriptors
442 * We don't want them, we don't need them. 272 * We don't want them, we don't need them.
443 */ 273 */
… …
476 306
477 /* 307 /*
478 * Look for -exec option. Find => split and make cmd_argv[] of command args 308 * Look for -exec option. Find => split and make cmd_argv[] of command args
479 */ 309 */
480 for (r_argc = 0; r_argc < argc; r_argc++) 310 for (r_argc = 0; r_argc < argc; r_argc++)
481 if (!STRCMP (argv[r_argc], "-e") || !STRCMP (argv[r_argc], "-exec")) 311 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec"))
482 break; 312 break;
483 313
484 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 314 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
485 315
486 for (i = 0; i < r_argc; i++) 316 for (i = 0; i < r_argc; i++)
… …
512 free (r_argv); 342 free (r_argv);
513 343
514#ifdef LOCAL_X_IS_UNIX 344#ifdef LOCAL_X_IS_UNIX
515 if (rs[Rs_display_name][0] == ':') 345 if (rs[Rs_display_name][0] == ':')
516 { 346 {
517 val = rxvt_malloc (5 + STRLEN (rs[Rs_display_name])); 347 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
518 STRCPY (val, "unix"); 348 strcpy (val, "unix");
519 STRCAT (val, rs[Rs_display_name]); 349 strcat (val, rs[Rs_display_name]);
520 display = displays.get (val); 350 display = displays.get (val);
521 free (val); 351 free (val);
522 } 352 }
523#endif 353#endif
524 354
525 if (!display 355 if (!display
526 && ! (display = displays.get (rs[Rs_display_name]))) 356 && ! (display = displays.get (rs[Rs_display_name])))
527 rxvt_fatal ("can't open display %s", rs[Rs_display_name]); 357 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
528 358
529 extract_resources (display->display, rs[Rs_name]); 359 extract_resources (display->display, rs[Rs_name]);
530 360
531 /* 361 /*
532 * set any defaults not already set 362 * set any defaults not already set
… …
547 } 377 }
548 378
549 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 379 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
550 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 380 TermWin.saveLines = BOUND_POSITIVE_INT16 (i);
551 381
552#ifndef NO_FRILLS 382#if ENABLE_FRILLS
553 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 383 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
554 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 384 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */
555 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 385 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
556 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 386 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */
557#endif
558
559#ifndef NO_LINESPACE
560 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 387 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
561 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 388 TermWin.lineSpace = min (i, 100); /* arbitrary limit */
562#endif 389#endif
563 390
564#ifdef POINTER_BLANK 391#ifdef POINTER_BLANK
… …
568 pointerBlankDelay = 2; 395 pointerBlankDelay = 2;
569#endif 396#endif
570 397
571 /* no point having a scrollbar without having any scrollback! */ 398 /* no point having a scrollbar without having any scrollback! */
572 if (!TermWin.saveLines) 399 if (!TermWin.saveLines)
573 Options &= ~Opt_scrollBar; 400 options &= ~Opt_scrollBar;
574 401
575#ifdef PRINTPIPE 402#ifdef PRINTPIPE
576 if (!rs[Rs_print_pipe]) 403 if (!rs[Rs_print_pipe])
577 rs[Rs_print_pipe] = PRINTPIPE; 404 rs[Rs_print_pipe] = PRINTPIPE;
578#endif 405#endif
… …
587# else 414# else
588 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 415 key_backspace = "DEC"; /* can toggle between \010 or \177 */
589# endif 416# endif
590 else 417 else
591 { 418 {
592 val = STRDUP (rs[Rs_backspace_key]); 419 val = strdup (rs[Rs_backspace_key]);
593 rxvt_Str_trim (val); 420 rxvt_Str_trim (val);
594 rxvt_Str_escaped (val); 421 rxvt_Str_escaped (val);
595 key_backspace = val; 422 key_backspace = val;
596 } 423 }
597#endif 424#endif
… …
603# else 430# else
604 key_delete = "\033[3~"; 431 key_delete = "\033[3~";
605# endif 432# endif
606 else 433 else
607 { 434 {
608 val = STRDUP (rs[Rs_delete_key]); 435 val = strdup (rs[Rs_delete_key]);
609 rxvt_Str_trim (val); 436 rxvt_Str_trim (val);
610 rxvt_Str_escaped (val); 437 rxvt_Str_escaped (val);
611 key_delete = val; 438 key_delete = val;
612 } 439 }
613#endif 440#endif
… …
616 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]); 443 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
617 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]); 444 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
618 } 445 }
619 446
620#ifdef HAVE_SCROLLBARS 447#ifdef HAVE_SCROLLBARS
621 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], 448 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
622 rs[Rs_scrollBar_thickness]);
623#endif 449#endif
624 450
625#ifdef XTERM_REVERSE_VIDEO 451#ifdef XTERM_REVERSE_VIDEO
626 /* this is how xterm implements reverseVideo */ 452 /* this is how xterm implements reverseVideo */
627 if (Options & Opt_reverseVideo) 453 if (options & Opt_reverseVideo)
628 { 454 {
629 if (!rs[Rs_color + Color_fg]) 455 if (!rs[Rs_color + Color_fg])
630 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 456 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
631 if (!rs[Rs_color + Color_bg]) 457 if (!rs[Rs_color + Color_bg])
632 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 458 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
637 if (!rs[Rs_color + i]) 463 if (!rs[Rs_color + i])
638 rs[Rs_color + i] = def_colorName[i]; 464 rs[Rs_color + i] = def_colorName[i];
639 465
640#ifndef XTERM_REVERSE_VIDEO 466#ifndef XTERM_REVERSE_VIDEO
641 /* this is how we implement reverseVideo */ 467 /* this is how we implement reverseVideo */
642 if (Options & Opt_reverseVideo) 468 if (options & Opt_reverseVideo)
643 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 469 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *);
644#endif 470#endif
645 471
646 /* convenient aliases for setting fg/bg to colors */ 472 /* convenient aliases for setting fg/bg to colors */
647 color_aliases (Color_fg); 473 color_aliases (Color_fg);
… …
657 color_aliases (Color_BD); 483 color_aliases (Color_BD);
658 color_aliases (Color_UL); 484 color_aliases (Color_UL);
659 color_aliases (Color_RV); 485 color_aliases (Color_RV);
660#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 486#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
661 487
488 if (!rs[Rs_color + Color_border])
489 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
490
662 return cmd_argv; 491 return cmd_argv;
663} 492}
664 493
665/*----------------------------------------------------------------------*/ 494/*----------------------------------------------------------------------*/
666void 495void
… …
689 val = XDisplayString (display->display); 518 val = XDisplayString (display->display);
690 519
691 if (rs[Rs_display_name] == NULL) 520 if (rs[Rs_display_name] == NULL)
692 rs[Rs_display_name] = val; /* use broken `:0' value */ 521 rs[Rs_display_name] = val; /* use broken `:0' value */
693 522
694 i = STRLEN (val); 523 i = strlen (val);
695 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 524 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
696 525
697 sprintf (env_display, "DISPLAY=%s", val); 526 sprintf (env_display, "DISPLAY=%s", val);
698 527
699 /* avoiding the math library: 528 /* avoiding the math library:
… …
728 else 557 else
729 putenv ("COLORTERM=" COLORTERMENVFULL); 558 putenv ("COLORTERM=" COLORTERMENVFULL);
730 559
731 if (rs[Rs_term_name] != NULL) 560 if (rs[Rs_term_name] != NULL)
732 { 561 {
733 env_term = (char *)rxvt_malloc ((STRLEN (rs[Rs_term_name]) + 6) * sizeof (char)); 562 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char));
734 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 563 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
735 putenv (env_term); 564 putenv (env_term);
736 } 565 }
737 else 566 else
738 putenv ("TERM=" TERMENV); 567 putenv ("TERM=" TERMENV);
… …
753void 582void
754rxvt_term::set_locale (const char *locale) 583rxvt_term::set_locale (const char *locale)
755{ 584{
756#if HAVE_XSETLOCALE || HAVE_SETLOCALE 585#if HAVE_XSETLOCALE || HAVE_SETLOCALE
757 free (this->locale); 586 free (this->locale);
758 this->locale = rxvt_strdup (setlocale (LC_CTYPE, locale)); 587 this->locale = setlocale (LC_CTYPE, locale);
588
589 if (!this->locale)
590 {
591 if (*locale)
592 {
593 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale);
594 setlocale (LC_CTYPE, "");
595 }
596 else
597 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
598
599 this->locale = "";
600 }
601
602
603 this->locale = rxvt_strdup (this->locale);
759 SET_LOCALE (this->locale); 604 SET_LOCALE (this->locale);
760 mbstate.reset (); 605 mbstate.reset ();
761#endif 606#endif
762#if 0 607
763#if HAVE_NL_LANGINFO 608#if HAVE_NL_LANGINFO
609 char *codeset = strdup (nl_langinfo (CODESET));
610 // /^UTF.?8/i
611 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
612 && (codeset[1] == 'T' || codeset[1] == 't')
613 && (codeset[2] == 'F' || codeset[2] == 'f')
614 && (codeset[3] == '8' || codeset[4] == '8');
764 free (codeset); 615 free (codeset);
765 codeset = strdup (nl_langinfo (CODESET));
766 enc_utf8 = !STRCASECMP (codeset, "UTF-8")
767 || !STRCASECMP (codeset, "UTF8");
768#else 616#else
769 enc_utf8 = 1; 617 enc_utf8 = 0;
770#endif
771#endif 618#endif
772} 619}
773 620
774void 621void
775rxvt_term::init_xlocale () 622rxvt_term::init_xlocale ()
… …
777#ifdef USE_XIM 624#ifdef USE_XIM
778 if (!locale) 625 if (!locale)
779 rxvt_warn ("setting locale failed, working without locale support.\n"); 626 rxvt_warn ("setting locale failed, working without locale support.\n");
780 else 627 else
781 { 628 {
782 Atom wmlocale; 629 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
783
784 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
785 XChangeProperty (display->display, TermWin.parent[0], wmlocale,
786 XA_STRING, 8, PropModeReplace,
787 (unsigned char *)locale, STRLEN (locale));
788 630
789 if (!XSupportsLocale ()) 631 if (!XSupportsLocale ())
790 { 632 {
791 rxvt_warn ("the locale is not supported by Xlib, working withotu locale support.\n"); 633 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n");
792 return; 634 return;
793 } 635 }
794 636
795 im_ev.start (display); 637 im_ev.start (display);
796 638
… …
806{ 648{
807 /* 649 /*
808 * Initialize the command connection. 650 * Initialize the command connection.
809 * This should be called after the X server connection is established. 651 * This should be called after the X server connection is established.
810 */ 652 */
811 int i;
812
813 for (i = 0; i < NUM_XA; i++)
814 xa[i] = XInternAtom (display->display, xa_names[i], False);
815
816 /* Enable delete window protocol */
817 XSetWMProtocols (display->display, TermWin.parent[0],
818 & (xa[XA_WMDELETEWINDOW]), 1);
819
820#ifdef USING_W11LIB
821 /* enable W11 callbacks */
822 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
823#endif
824 653
825#ifdef META8_OPTION 654#ifdef META8_OPTION
826 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC); 655 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC);
827#endif 656#endif
828 657
829 get_ourmods (); 658 get_ourmods ();
830 659
831 if (! (Options & Opt_scrollTtyOutput)) 660 if (!(options & Opt_scrollTtyOutput))
832 PrivateModes |= PrivMode_TtyOutputInh; 661 priv_modes |= PrivMode_TtyOutputInh;
833 if (Options & Opt_scrollTtyKeypress) 662 if (options & Opt_scrollTtyKeypress)
834 PrivateModes |= PrivMode_Keypress; 663 priv_modes |= PrivMode_Keypress;
835 if (! (Options & Opt_jumpScroll)) 664 if (!(options & Opt_jumpScroll))
836 PrivateModes |= PrivMode_smoothScroll; 665 priv_modes |= PrivMode_smoothScroll;
837 666
838#ifndef NO_BACKSPACE_KEY 667#ifndef NO_BACKSPACE_KEY
839 if (STRCMP (key_backspace, "DEC") == 0) 668 if (strcmp (key_backspace, "DEC") == 0)
840 PrivateModes |= PrivMode_HaveBackSpace; 669 priv_modes |= PrivMode_HaveBackSpace;
841#endif 670#endif
842 671
843 /* add value for scrollBar */ 672 /* add value for scrollBar */
844 if (scrollbar_visible ()) 673 if (scrollbar_visible ())
845 { 674 {
846 PrivateModes |= PrivMode_scrollBar; 675 priv_modes |= PrivMode_scrollBar;
847 SavedModes |= PrivMode_scrollBar; 676 SavedModes |= PrivMode_scrollBar;
848 } 677 }
849 if (menubar_visible ()) 678 if (menubar_visible ())
850 { 679 {
851 PrivateModes |= PrivMode_menuBar; 680 priv_modes |= PrivMode_menuBar;
852 SavedModes |= PrivMode_menuBar; 681 SavedModes |= PrivMode_menuBar;
853 } 682 }
854 683
855#ifdef CURSOR_BLINK 684#ifdef CURSOR_BLINK
856 if (Options & Opt_cursorBlink) 685 if (options & Opt_cursorBlink)
857 (void)gettimeofday (&lastcursorchange, NULL); 686 (void)gettimeofday (&lastcursorchange, NULL);
858#endif 687#endif
859 688
860 if ((cmd_fd = run_command (argv)) < 0) 689 run_command (argv);
861 rxvt_fatal ("failure while running command, aborting");
862} 690}
863 691
864/*----------------------------------------------------------------------*/ 692/*----------------------------------------------------------------------*/
865void 693void
866rxvt_term::Get_Colours () 694rxvt_term::Get_Colours ()
867{ 695{
868 int i; 696 int i;
869 697
698#ifdef OFF_FOCUS_FADING
699 pix_colors = pix_colors_focused;
700#endif
701
870 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++) 702 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
871 { 703 {
872 rxvt_color xcol; 704 rxvt_color xcol;
873 705
874 if (!rs[Rs_color + i]) 706 if (!rs[Rs_color + i])
875 continue; 707 continue;
876 708
877 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 709 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
878 { 710 {
879#ifndef XTERM_REVERSE_VIDEO 711#ifndef XTERM_REVERSE_VIDEO
880 if (i < 2 && (Options & Opt_reverseVideo)) 712 if (i < 2 && (options & Opt_reverseVideo))
881 rs[Rs_color + i] = def_colorName[!i]; 713 rs[Rs_color + i] = def_colorName[!i];
882 else 714 else
883#endif 715#endif
884 rs[Rs_color + i] = def_colorName[i]; 716 rs[Rs_color + i] = def_colorName[i];
885 717
… …
891 switch (i) 723 switch (i)
892 { 724 {
893 case Color_fg: 725 case Color_fg:
894 case Color_bg: 726 case Color_bg:
895 /* fatal: need bg/fg color */ 727 /* fatal: need bg/fg color */
896 rxvt_fatal ("unable to get foreground/background colour, aborting"); 728 rxvt_fatal ("unable to get foreground/background colour, aborting.\n");
897 /* NOTREACHED */ 729 /* NOTREACHED */
898 break; 730 break;
899#ifndef NO_CURSORCOLOR 731#ifndef NO_CURSORCOLOR
900 case Color_cursor2: 732 case Color_cursor2:
901 xcol = PixColors[Color_fg]; 733 xcol = pix_colors[Color_fg];
902 break; 734 break;
903#endif /* ! NO_CURSORCOLOR */ 735#endif /* ! NO_CURSORCOLOR */
904 case Color_pointer_fg: 736 case Color_pointer_fg:
905 xcol = PixColors[Color_fg]; 737 xcol = pix_colors[Color_fg];
906 break; 738 break;
907 default: 739 default:
908 xcol = PixColors[Color_bg]; /* None */ 740 xcol = pix_colors[Color_bg]; /* None */
909 break; 741 break;
910 } 742 }
911 } 743 }
912 } 744 }
913 745
914 PixColors[i] = xcol; 746 pix_colors[i] = xcol;
747#ifdef OFF_FOCUS_FADING
748 if (rs[Rs_fade])
749 pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade]));
750#endif
915 SET_PIXCOLOR (i); 751 SET_PIXCOLOR (i);
916 } 752 }
917 753
918 if (XDEPTH <= 2) 754 if (display->depth <= 2)
919 { 755 {
920 if (!rs[Rs_color + Color_pointer_fg]) PixColors[Color_pointer_fg] = PixColors[Color_fg]; 756 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];
921 if (!rs[Rs_color + Color_pointer_bg]) PixColors[Color_pointer_bg] = PixColors[Color_bg]; 757 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
922 if (!rs[Rs_color + Color_border] ) PixColors[Color_border] = PixColors[Color_fg]; 758 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
923 } 759 }
924 760
925 /* 761 /*
926 * get scrollBar/menuBar shadow colors 762 * get scrollBar/menuBar shadow colors
927 * 763 *
928 * The calculations of topShadow/bottomShadow values are adapted 764 * The calculations of topShadow/bottomShadow values are adapted
929 * from the fvwm window manager. 765 * from the fvwm window manager.
930 */ 766 */
931#ifdef KEEP_SCROLLCOLOR 767#ifdef KEEP_SCROLLCOLOR
932 768
933 if (XDEPTH <= 2) 769 if (display->depth <= 2)
934 { /* Monochrome */ 770 { /* Monochrome */
935 PixColors[Color_scroll] = PixColors[Color_fg]; 771 pix_colors[Color_scroll] = pix_colors[Color_fg];
936 PixColors[Color_topShadow] = PixColors[Color_bg]; 772 pix_colors[Color_topShadow] = pix_colors[Color_bg];
937 PixColors[Color_bottomShadow] = PixColors[Color_bg]; 773 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
938 } 774 }
939 else 775 else
940 { 776 {
941 rxvt_color xcol[3]; 777 rxvt_color xcol[2];
942 /* xcol[0] == white 778 /* xcol[0] == white
943 * xcol[1] == top shadow 779 * xcol[1] == top shadow
944 * xcol[2] == bot shadow */ 780 * xcol[2] == bot shadow */
945 781
946 xcol[1] = PixColors[Color_scroll]; 782 xcol[1] = pix_colors[Color_scroll];
947# ifdef PREFER_24BIT
948 xcol[0].set (display, 65535, 65535, 65535); 783 xcol[0].set (display, 65535, 65535, 65535);
949 /* XFreeColors (display->display, XCMAP, & (xcol[0].pixel), 1, ~0); */
950# else
951 xcol[0].set (display, WhitePixel (display->display, display->screen));
952# endif
953 784
954 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 785 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
955 786
956 xcol[0].get (display, pr0, pg0, pb0); 787 xcol[0].get (display, pr0, pg0, pb0);
957 xcol[1].get (display, pr1, pg1, pb1); 788 xcol[1].get (display, pr1, pg1, pb1);
958 789
959 /* bottomShadowColor */
960 if (!xcol[2].set (display, pr1 / 2, pg1 / 2, pb1 / 2))
961 xcol[2] = PixColors[Color_Black];
962
963 PixColors[Color_bottomShadow] = xcol[2]; 790 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
964 791
965 /* topShadowColor */ 792 /* topShadowColor */
966 if (!xcol[1].set (display, 793 if (!xcol[1].set (display,
967 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 794 min (pr0, max (pr0 / 5, pr1) * 7 / 5),
968 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 795 min (pg0, max (pg0 / 5, pg1) * 7 / 5),
969 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 796 min (pb0, max (pb0 / 5, pb1) * 7 / 5)))
970 xcol[1] = PixColors[Color_White]; 797 xcol[1] = pix_colors[Color_White];
971 798
972 PixColors[Color_topShadow] = xcol[1]; 799 pix_colors[Color_topShadow] = xcol[1];
973 } 800 }
974#endif /* KEEP_SCROLLCOLOR */ 801#endif /* KEEP_SCROLLCOLOR */
975} 802}
976 803
977/*----------------------------------------------------------------------*/ 804/*----------------------------------------------------------------------*/
… …
988 i -= 8; 815 i -= 8;
989#ifndef NO_BRIGHTCOLOR 816#ifndef NO_BRIGHTCOLOR
990 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 817 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
991 return; 818 return;
992#endif 819#endif
993
994 } 820 }
995 821
996 if (i >= 0 && i <= 7) /* normal colors */ 822 if (i >= 0 && i <= 7) /* normal colors */
997 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 823 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
998 } 824 }
… …
1016 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 842 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
1017 }; 843 };
1018 844
1019 requestedmeta = realmeta = realalt = 0; 845 requestedmeta = realmeta = realalt = 0;
1020 rsmod = rs[Rs_modifier]; 846 rsmod = rs[Rs_modifier];
847
1021 if (rsmod 848 if (rsmod
1022 && STRCASECMP (rsmod, "mod1") >= 0 && STRCASECMP (rsmod, "mod5") <= 0) 849 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
1023 requestedmeta = rsmod[3] - '0'; 850 requestedmeta = rsmod[3] - '0';
1024 851
1025 map = XGetModifierMapping (display->display); 852 map = XGetModifierMapping (display->display);
1026 kc = map->modifiermap; 853 kc = map->modifiermap;
854
1027 for (i = 1; i < 6; i++) 855 for (i = 1; i < 6; i++)
1028 { 856 {
1029 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 857 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
858
1030 for (j = map->max_keypermod; j--; k++) 859 for (j = map->max_keypermod; j--; k++)
1031 { 860 {
1032 if (kc[k] == 0) 861 if (kc[k] == 0)
1033 break; 862 break;
863
1034 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 864 switch (XKeycodeToKeysym (display->display, kc[k], 0))
1035 { 865 {
1036 case XK_Num_Lock: 866 case XK_Num_Lock:
1037 ModNumLockMask = modmasks[i - 1]; 867 ModNumLockMask = modmasks[i - 1];
1038 /* FALLTHROUGH */ 868 continue;
1039 default: 869
1040 continue; /* for (;;) */ 870 case XK_ISO_Level3_Shift:
871 ModLevel3Mask = modmasks[i - 1];
872 continue;
873
1041 case XK_Meta_L: 874 case XK_Meta_L:
1042 case XK_Meta_R: 875 case XK_Meta_R:
1043 cm = "meta"; 876 cm = "meta";
1044 realmeta = i; 877 realmeta = i;
1045 break; 878 break;
879
1046 case XK_Alt_L: 880 case XK_Alt_L:
1047 case XK_Alt_R: 881 case XK_Alt_R:
1048 cm = "alt"; 882 cm = "alt";
1049 realalt = i; 883 realalt = i;
1050 break; 884 break;
885
1051 case XK_Super_L: 886 case XK_Super_L:
1052 case XK_Super_R: 887 case XK_Super_R:
1053 cm = "super"; 888 cm = "super";
1054 break; 889 break;
890
1055 case XK_Hyper_L: 891 case XK_Hyper_L:
1056 case XK_Hyper_R: 892 case XK_Hyper_R:
1057 cm = "hyper"; 893 cm = "hyper";
1058 break; 894 break;
895
896 default:
897 continue;
1059 } 898 }
1060 if (rsmod && STRNCASECMP (rsmod, cm, STRLEN (cm)) == 0) 899
900 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)
1061 requestedmeta = i; 901 requestedmeta = i;
1062 } 902 }
1063 } 903 }
904
1064 XFreeModifiermap (map); 905 XFreeModifiermap (map);
906
1065 i = (requestedmeta ? requestedmeta 907 i = requestedmeta ? requestedmeta
1066 : (realmeta ? realmeta 908 : realmeta ? realmeta
1067 : (realalt ? realalt : 0))); 909 : realalt ? realalt
910 : 0;
911
1068 if (i) 912 if (i)
1069 ModMetaMask = modmasks[i - 1]; 913 ModMetaMask = modmasks[i - 1];
1070} 914}
1071 915
1072/*----------------------------------------------------------------------*/ 916/*----------------------------------------------------------------------*/
… …
1074void 918void
1075rxvt_term::create_windows (int argc, const char *const *argv) 919rxvt_term::create_windows (int argc, const char *const *argv)
1076{ 920{
1077 XClassHint classHint; 921 XClassHint classHint;
1078 XWMHints wmHint; 922 XWMHints wmHint;
923#if ENABLE_FRILLS
924 Atom prop = None;
925 MWMHints mwmhints;
926#endif
1079 XGCValues gcvalue; 927 XGCValues gcvalue;
1080 long vt_emask; 928 long vt_emask;
1081 XSetWindowAttributes attributes; 929 XSetWindowAttributes attributes;
1082 XWindowAttributes gattr; 930 XWindowAttributes gattr;
1083 931
932#ifdef USING_W11LIB
933 /* enable W11 callbacks */
934 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
935#endif
936
937 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
938 XInternAtoms (display->display, (char **)xa_names, NUM_XA, False, xa);
939
1084 if (Options & Opt_transparent) 940 if (options & Opt_transparent)
1085 { 941 {
1086 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 942 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);
1087 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 943 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
1088 } 944 }
1089 945
946#if ENABLE_FRILLS
947 if (options & Opt_borderLess)
948 {
949 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True);
950
951 if (prop == None)
952 {
953 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
954#ifdef PREFER_24BIT
955 attributes.override_redirect = TRUE;
956#endif
957 mwmhints.flags = 0;
958 }
959 else
960 {
961 mwmhints.flags = MWM_HINTS_DECORATIONS;
962 mwmhints.decorations = 0;
963 }
964 }
965 else
966 {
967 mwmhints.flags = 0;
968 }
969#endif
970
1090 /* grab colors before netscape does */ 971 /* grab colors before netscape does */
1091 Get_Colours (); 972 Get_Colours ();
1092 973
1093 if (!change_font (rs[Rs_font])) 974 if (!set_fonts ())
1094 { 975 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1095 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1096 destroy ();
1097 return;
1098 }
1099 976
1100 window_calc (0, 0); 977 window_calc (0, 0);
1101 old_width = szHint.width; 978 old_width = szHint.width;
1102 old_height = szHint.height; 979 old_height = szHint.height;
1103 980
1104 /* sub-window placement & size in rxvt_resize_subwindows () */ 981 /* sub-window placement & size in rxvt_resize_subwindows () */
1105 982
1106#ifdef PREFER_24BIT 983#ifdef PREFER_24BIT
1107 attributes.background_pixel = PixColors[Color_bg]; 984 attributes.background_pixel = pix_colors_focused[Color_border];
1108 attributes.border_pixel = PixColors[Color_border]; 985 attributes.border_pixel = pix_colors_focused[Color_border];
1109 attributes.colormap = display->cmap; 986 attributes.colormap = display->cmap;
1110 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), 987 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
1111 szHint.x, szHint.y, 988 szHint.x, szHint.y,
1112 szHint.width, szHint.height, 989 szHint.width, szHint.height,
1113 TermWin.ext_bwidth, 990 TermWin.ext_bwidth,
… …
1117#else 994#else
1118 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), 995 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
1119 szHint.x, szHint.y, 996 szHint.x, szHint.y,
1120 szHint.width, szHint.height, 997 szHint.width, szHint.height,
1121 TermWin.ext_bwidth, 998 TermWin.ext_bwidth,
1122 PixColors[Color_border], 999 pix_colors_focused[Color_border],
1123 PixColors[Color_bg]); 1000 pix_colors_focused[Color_border]);
1124#endif 1001#endif
1125 1002
1126 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1003 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1127 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1004 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1128 1005
1129 classHint.res_name = (char *)rs[Rs_name]; 1006 classHint.res_name = (char *)rs[Rs_name];
1130 classHint.res_class = (char *)RESCLASS; 1007 classHint.res_class = (char *)RESCLASS;
1131 1008
1132 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1009 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1133 wmHint.input = True; 1010 wmHint.input = True;
1134 wmHint.initial_state = Options & Opt_iconic ? IconicState : NormalState; 1011 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
1135 wmHint.window_group = TermWin.parent[0]; 1012 wmHint.window_group = TermWin.parent[0];
1136 1013
1137 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1014 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL,
1138 (char **)argv, argc, &szHint, &wmHint, &classHint); 1015 (char **)argv, argc, &szHint, &wmHint, &classHint);
1139 1016
1140#ifndef NO_FRILLS 1017 /* Enable delete window protocol */
1018 XSetWMProtocols (display->display, TermWin.parent[0],
1019 &xa[XA_WMDELETEWINDOW], 1);
1020
1021#if ENABLE_FRILLS
1141 long pid = getpid (); 1022 long pid = getpid ();
1023
1142 XChangeProperty (display->display, TermWin.parent[0], 1024 XChangeProperty (display->display, TermWin.parent[0],
1143 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32, 1025 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1144 PropModeReplace, (unsigned char *)&pid, 1); 1026 PropModeReplace, (unsigned char *)&pid, 1);
1145#endif 1027#endif
1146 1028
1147 XSelectInput (display->display, TermWin.parent[0], 1029 XSelectInput (display->display, TermWin.parent[0],
1148 KeyPressMask 1030 KeyPressMask
1149#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1031#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1150 | KeyReleaseMask 1032 | KeyReleaseMask
1151#endif 1033#endif
1152 | FocusChangeMask | VisibilityChangeMask 1034 | FocusChangeMask | VisibilityChangeMask
1035 | ExposureMask
1153 | StructureNotifyMask); 1036 | StructureNotifyMask);
1154 termwin_ev.start (display, TermWin.parent[0]); 1037 termwin_ev.start (display, TermWin.parent[0]);
1038
1039#if ENABLE_FRILLS
1040 if (mwmhints.flags)
1041 XChangeProperty (display->display, TermWin.parent[0], xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1042 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1043#endif
1155 1044
1156 /* vt cursor: Black-on-White is standard, but this is more popular */ 1045 /* vt cursor: Black-on-White is standard, but this is more popular */
1157 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1046 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm);
1158 1047
1159#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1048#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1160 /* cursor (menuBar/scrollBar): Black-on-White */ 1049 /* cursor (menuBar/scrollBar): Black-on-White */
1161 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); 1050 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr);
1162#endif 1051#endif
1163 1052
1164#ifdef POINTER_BLANK
1165 {
1166 XColor blackcolour;
1167 blackcolour.red = 0;
1168 blackcolour.green = 0;
1169 blackcolour.blue = 0;
1170 Font f = XLoadFont (display->display, "fixed");
1171 blank_cursor = XCreateGlyphCursor (display->display, f, f, ' ', ' ',
1172 &blackcolour, &blackcolour);
1173 XUnloadFont (display->display, f);
1174 }
1175#endif
1176
1177 /* the vt window */ 1053 /* the vt window */
1178 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1054 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0],
1179 window_vt_x, window_vt_y, 1055 window_vt_x,
1056 window_vt_y,
1180 TermWin_TotalWidth (), 1057 TermWin_TotalWidth (),
1181 TermWin_TotalHeight (), 1058 TermWin_TotalHeight (),
1182 0, 1059 0,
1183 PixColors[Color_fg], 1060 pix_colors_focused[Color_fg],
1184 PixColors[Color_bg]); 1061 pix_colors_focused[Color_bg]);
1185
1186#ifdef DEBUG_X 1062#ifdef DEBUG_X
1187 XStoreName (display->display, TermWin.vt, "vt window"); 1063 XStoreName (display->display, TermWin.vt, "vt window");
1188#endif 1064#endif
1189 1065
1190 attributes.bit_gravity = NorthWestGravity; 1066 attributes.bit_gravity = NorthWestGravity;
1191 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); 1067 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes);
1192 1068
1193 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1069 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1194 1070
1071 pointer_unblank ();
1072
1195#ifdef POINTER_BLANK 1073#ifdef POINTER_BLANK
1196 pointer_unblank ();
1197
1198 if (Options & Opt_pointerBlank) 1074 if (options & Opt_pointerBlank)
1199 vt_emask |= PointerMotionMask; 1075 vt_emask |= PointerMotionMask;
1200 else 1076 else
1201#endif 1077#endif
1202 vt_emask |= Button1MotionMask | Button3MotionMask; 1078 vt_emask |= Button1MotionMask | Button3MotionMask;
1203 1079
… …
1210 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1086 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1211 window_vt_x, 0, 1087 window_vt_x, 0,
1212 TermWin_TotalWidth (), 1088 TermWin_TotalWidth (),
1213 menuBar_TotalHeight (), 1089 menuBar_TotalHeight (),
1214 0, 1090 0,
1215 PixColors[Color_fg], 1091 pix_colors_focused[Color_fg],
1216 PixColors[Color_scroll]); 1092 pix_colors_focused[Color_scroll]);
1217 1093
1218#ifdef DEBUG_X 1094#ifdef DEBUG_X
1219 XStoreName (display->display, menuBar.win, "menubar"); 1095 XStoreName (display->display, menuBar.win, "menubar");
1220#endif 1096#endif
1221 1097
… …
1231 } 1107 }
1232#endif 1108#endif
1233 1109
1234#ifdef XPM_BACKGROUND 1110#ifdef XPM_BACKGROUND
1235 if (rs[Rs_backgroundPixmap] != NULL 1111 if (rs[Rs_backgroundPixmap] != NULL
1236 && ! (Options & Opt_transparent)) 1112 && ! (options & Opt_transparent))
1237 { 1113 {
1238 const char *p = rs[Rs_backgroundPixmap]; 1114 const char *p = rs[Rs_backgroundPixmap];
1239 1115
1240 if ((p = STRCHR (p, ';')) != NULL) 1116 if ((p = strchr (p, ';')) != NULL)
1241 { 1117 {
1242 p++; 1118 p++;
1243 scale_pixmap (p); 1119 scale_pixmap (p);
1244 } 1120 }
1121
1245 set_bgPixmap (rs[Rs_backgroundPixmap]); 1122 set_bgPixmap (rs[Rs_backgroundPixmap]);
1246 scr_touch (True); 1123 scr_touch (true);
1247 } 1124 }
1248#endif 1125#endif
1249 1126
1250 /* graphics context for the vt window */ 1127 /* graphics context for the vt window */
1251 gcvalue.foreground = PixColors[Color_fg]; 1128 gcvalue.foreground = pix_colors[Color_fg];
1252 gcvalue.background = PixColors[Color_bg]; 1129 gcvalue.background = pix_colors[Color_bg];
1253 gcvalue.graphics_exposures = 1; 1130 gcvalue.graphics_exposures = 1;
1254 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1131 TermWin.gc = XCreateGC (display->display, TermWin.vt,
1255 GCForeground | GCBackground | GCGraphicsExposures, 1132 GCForeground | GCBackground | GCGraphicsExposures,
1256 &gcvalue); 1133 &gcvalue);
1257 1134
1258 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1135 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1259 1136
1260#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1137#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1261 gcvalue.foreground = PixColors[Color_topShadow]; 1138 gcvalue.foreground = pix_colors[Color_topShadow];
1262 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1139 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1263 gcvalue.foreground = PixColors[Color_bottomShadow]; 1140 gcvalue.foreground = pix_colors[Color_bottomShadow];
1264 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1141 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1265 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg : Color_scroll)]; 1142 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1266 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1143 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1267#endif 1144#endif
1268}
1269 1145
1270/*----------------------------------------------------------------------*/ 1146#ifdef OFF_FOCUS_FADING
1271/* 1147 // initially we are in unfocused state
1272 * Run the command in a subprocess and return a file descriptor for the 1148 if (rs[Rs_fade])
1273 * master end of the pseudo-teletype pair with the command talking to 1149 pix_colors = pix_colors_unfocused;
1274 * the slave.
1275 */
1276int
1277rxvt_term::run_command (const char *const *argv)
1278{
1279 int cfd, er;
1280
1281 /* get master (pty) */
1282 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0)
1283 rxvt_fatal ("can't open pseudo-tty");
1284
1285 fcntl (cfd, F_SETFL, O_NONBLOCK);
1286
1287 /* get slave (tty) */
1288 if (tty_fd < 0)
1289 {
1290#ifndef NO_SETOWNER_TTYDEV
1291 privileged_ttydev (SAVE);
1292#endif
1293
1294 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1295 {
1296 close (cfd);
1297 rxvt_fatal ("can't open slave tty %s", ttydev);
1298 }
1299 }
1300#ifndef NO_BACKSPACE_KEY
1301 if (key_backspace[0] && !key_backspace[1])
1302 er = key_backspace[0];
1303 else if (STRCMP (key_backspace, "DEC") == 0)
1304 er = '\177'; /* the initial state anyway */
1305 else
1306#endif
1307
1308 er = -1;
1309
1310 rxvt_get_ttymode (& (tio), er);
1311
1312#ifndef __QNX__
1313 /* spin off the command interpreter */
1314 switch (cmd_pid = fork ())
1315 {
1316 case -1:
1317 rxvt_fatal ("can't fork");
1318 case 0:
1319 close (cfd); /* only keep tty_fd and STDERR open */
1320
1321 init_env ();
1322
1323 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1324 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1325 else
1326 {
1327 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1328 dup2 (tty_fd, STDIN_FILENO);
1329 dup2 (tty_fd, STDOUT_FILENO);
1330 dup2 (tty_fd, STDERR_FILENO);
1331
1332 if (tty_fd > 2)
1333 close (tty_fd);
1334
1335 run_child (argv);
1336 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1337 }
1338
1339 _exit (EXIT_FAILURE);
1340
1341 default:
1342 {
1343#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1344 int fdstdin;
1345
1346 fdstdin = dup (STDIN_FILENO);
1347 dup2 (tty_fd, STDIN_FILENO);
1348#endif
1349
1350#ifdef UTMP_SUPPORT
1351 privileged_utmp (SAVE);
1352#endif
1353
1354#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1355
1356 dup2 (fdstdin, STDIN_FILENO);
1357 close (fdstdin);
1358#endif
1359 }
1360
1361 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */
1362 break;
1363 }
1364#else /* __QNX__ uses qnxspawn () */
1365 fchmod (tty_fd, 0622);
1366 fcntl (tty_fd, F_SETFD, FD_CLOEXEC);
1367 fcntl (cfd, F_SETFD, FD_CLOEXEC);
1368
1369 if (run_child (argv) == -1)
1370 exit (EXIT_FAILURE);
1371#endif
1372
1373 return cfd;
1374}
1375
1376/* ------------------------------------------------------------------------- *
1377 * CHILD PROCESS OPERATIONS *
1378 * ------------------------------------------------------------------------- */
1379/*
1380 * The only open file descriptor is the slave tty - so no error messages.
1381 * returns are fatal
1382 */
1383int
1384rxvt_term::run_child (const char *const *argv)
1385{
1386 char *login;
1387
1388 SET_TTYMODE (STDIN_FILENO, & (tio)); /* init terminal attributes */
1389
1390 if (Options & Opt_console)
1391 { /* be virtual console, fail silently */
1392#ifdef TIOCCONS
1393 unsigned int on = 1;
1394
1395 ioctl (STDIN_FILENO, TIOCCONS, &on);
1396#elif defined (SRIOCSREDIR)
1397 int fd;
1398
1399 fd = open (CONSOLE, O_WRONLY, 0);
1400 if (fd >= 0)
1401 {
1402 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1403 close (fd);
1404 }
1405#endif /* SRIOCSREDIR */
1406
1407 }
1408
1409 /* reset signals and spin off the command interpreter */
1410 signal (SIGINT, SIG_DFL);
1411 signal (SIGQUIT, SIG_DFL);
1412 signal (SIGCHLD, SIG_DFL);
1413 /*
1414 * mimick login's behavior by disabling the job control signals
1415 * a shell that wants them can turn them back on
1416 */
1417#ifdef SIGTSTP
1418 signal (SIGTSTP, SIG_IGN);
1419 signal (SIGTTIN, SIG_IGN);
1420 signal (SIGTTOU, SIG_IGN);
1421#endif /* SIGTSTP */
1422
1423 /* set window size */
1424 struct winsize ws;
1425
1426 ws.ws_col = TermWin.ncol;
1427 ws.ws_row = TermWin.nrow;
1428 ws.ws_xpixel = ws.ws_ypixel = 0;
1429 (void)ioctl (STDIN_FILENO, TIOCSWINSZ, &ws);
1430
1431 // unblock signals (signals are blocked by iom.C
1432 sigset_t ss;
1433 sigemptyset (&ss);
1434 sigprocmask (SIG_SETMASK, &ss, 0);
1435
1436#ifndef __QNX__
1437 /* command interpreter path */
1438 if (argv != NULL)
1439 {
1440# ifdef DEBUG_CMD
1441 int i;
1442
1443 for (i = 0; argv[i]; i++)
1444 fprintf (stderr, "argv [%d] = \"%s\"\n", i, argv[i]);
1445# endif 1150#endif
1446 1151
1447 execvp (argv[0], (char *const *)argv); 1152 scr_recolour ();
1448 /* no error message: STDERR is closed! */
1449 }
1450 else
1451 {
1452 const char *argv0, *shell;
1453
1454 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1455 shell = "/bin/sh";
1456
1457 argv0 = (const char *)rxvt_r_basename (shell);
1458 if (Options & Opt_loginShell)
1459 {
1460 login = (char *)rxvt_malloc ((STRLEN (argv0) + 2) * sizeof (char));
1461
1462 login[0] = '-';
1463 STRCPY (&login[1], argv0);
1464 argv0 = login;
1465 }
1466 execlp (shell, argv0, NULL);
1467 /* no error message: STDERR is closed! */
1468 }
1469
1470#else /* __QNX__ uses qnxspawn () */
1471
1472 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1473 char *command = NULL, fullcommand[_MAX_PATH];
1474 char **arg_v, *arg_a[2] = { NULL, NULL };
1475
1476 if (argv != NULL)
1477 {
1478 if (access (argv[0], X_OK) == -1)
1479 {
1480 if (STRCHR (argv[0], '/') == NULL)
1481 {
1482 searchenv (argv[0], "PATH", fullcommand);
1483 if (fullcommand[0] != '\0')
1484 command = fullcommand;
1485 }
1486 if (access (command, X_OK) == -1)
1487 return -1;
1488 }
1489 else
1490 command = argv[0];
1491 arg_v = argv;
1492 }
1493 else
1494 {
1495 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1496 command = "/bin/sh";
1497
1498 arg_a[0] = my_basename (command);
1499 if (Options & Opt_loginShell)
1500 {
1501 login = rxvt_malloc ((STRLEN (arg_a[0]) + 2) * sizeof (char));
1502
1503 login[0] = '-';
1504 STRCPY (&login[1], arg_a[0]);
1505 arg_a[0] = login;
1506 }
1507 arg_v = arg_a;
1508 }
1509 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd;
1510 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1511 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1512 command, arg_v, environ, iov_a, 0);
1513 if (login)
1514 free (login);
1515
1516 close (tty_fd);
1517 return cmd_fd;
1518
1519#endif
1520 return -1;
1521} 1153}
1522 1154
1523/* ------------------------------------------------------------------------- * 1155/* ------------------------------------------------------------------------- *
1524 * GET TTY CURRENT STATE * 1156 * GET TTY CURRENT STATE *
1525 * ------------------------------------------------------------------------- */ 1157 * ------------------------------------------------------------------------- */
1526/* rxvt_get_ttymode () */
1527/* EXTPROTO */
1528void 1158void
1529rxvt_get_ttymode (ttymode_t *tio, int erase) 1159rxvt_get_ttymode (ttymode_t *tio, int erase)
1530{ 1160{
1531#ifdef HAVE_TERMIOS_H 1161#ifdef HAVE_TERMIOS_H
1532 /* 1162 /*
… …
1747# undef FOO 1377# undef FOO
1748# endif /* HAVE_TERMIOS_H */ 1378# endif /* HAVE_TERMIOS_H */
1749#endif /* DEBUG_TTYMODE */ 1379#endif /* DEBUG_TTYMODE */
1750} 1380}
1751 1381
1382/*----------------------------------------------------------------------*/
1383/*
1384 * Run the command in a subprocess and return a file descriptor for the
1385 * master end of the pseudo-teletype pair with the command talking to
1386 * the slave.
1387 */
1388void
1389rxvt_term::run_command (const char *const *argv)
1390{
1391 if (!pty.get ())
1392 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1393
1394 pty.set_utf8_mode (enc_utf8);
1395
1396 /* set initial window size */
1397 tt_winch ();
1398
1399 int er;
1400
1401#ifndef NO_BACKSPACE_KEY
1402 if (key_backspace[0] && !key_backspace[1])
1403 er = key_backspace[0];
1404 else if (strcmp (key_backspace, "DEC") == 0)
1405 er = '\177'; /* the initial state anyway */
1406 else
1407#endif
1408 er = -1;
1409
1410 rxvt_get_ttymode (&tio, er);
1411
1412 sw_chld.start (SIGCHLD);
1413
1414#ifndef __QNX__
1415 /* spin off the command interpreter */
1416 switch (cmd_pid = fork ())
1417 {
1418 case -1:
1419 rxvt_fatal ("can't fork, aborting.\n");
1420 case 0:
1421 init_env ();
1422
1423 if (!pty.make_controlling_tty ())
1424 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1425 else
1426 {
1427 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1428 dup2 (pty.tty, STDIN_FILENO);
1429 dup2 (pty.tty, STDOUT_FILENO);
1430 dup2 (pty.tty, STDERR_FILENO);
1431
1432 // close all our file handles that we do no longer need
1433 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1434 {
1435 if ((*t)->pty.pty > 2) close ((*t)->pty.pty);
1436 if ((*t)->pty.tty > 2) close ((*t)->pty.tty);
1437 }
1438
1439 run_child (argv);
1440 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1441 }
1442
1443 _exit (EXIT_FAILURE);
1444
1445 default:
1446 {
1447#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1448 int fdstdin;
1449
1450 fdstdin = dup (STDIN_FILENO);
1451 dup2 (pty.tty, STDIN_FILENO);
1452#endif
1453
1454#ifdef UTMP_SUPPORT
1455 privileged_utmp (SAVE);
1456#endif
1457
1458#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1459
1460 dup2 (fdstdin, STDIN_FILENO);
1461 close (fdstdin);
1462#endif
1463 }
1464
1465 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1466 break;
1467 }
1468#else /* __QNX__ uses qnxspawn () */
1469 fchmod (pty.tty, 0622);
1470 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1471 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1472
1473 if (run_child (argv) == -1)
1474 exit (EXIT_FAILURE);
1475#endif
1476}
1477
1478/* ------------------------------------------------------------------------- *
1479 * CHILD PROCESS OPERATIONS *
1480 * ------------------------------------------------------------------------- */
1481/*
1482 * The only open file descriptor is the slave tty - so no error messages.
1483 * returns are fatal
1484 */
1485int
1486rxvt_term::run_child (const char *const *argv)
1487{
1488 char *login;
1489
1490 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1491
1492 if (options & Opt_console)
1493 { /* be virtual console, fail silently */
1494#ifdef TIOCCONS
1495 unsigned int on = 1;
1496
1497 ioctl (STDIN_FILENO, TIOCCONS, &on);
1498#elif defined (SRIOCSREDIR)
1499 int fd;
1500
1501 fd = open (CONSOLE, O_WRONLY, 0);
1502 if (fd >= 0)
1503 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1504 close (fd);
1505#endif /* SRIOCSREDIR */
1506 }
1507
1508 /* reset signals and spin off the command interpreter */
1509 signal (SIGINT, SIG_DFL);
1510 signal (SIGQUIT, SIG_DFL);
1511 signal (SIGCHLD, SIG_DFL);
1512 signal (SIGHUP, SIG_DFL);
1513 signal (SIGPIPE, SIG_DFL);
1514 /*
1515 * mimick login's behavior by disabling the job control signals
1516 * a shell that wants them can turn them back on
1517 */
1518#ifdef SIGTSTP
1519 signal (SIGTSTP, SIG_IGN);
1520 signal (SIGTTIN, SIG_IGN);
1521 signal (SIGTTOU, SIG_IGN);
1522#endif /* SIGTSTP */
1523
1524 // unblock signals (signals are blocked by iom.C
1525 sigset_t ss;
1526 sigemptyset (&ss);
1527 sigprocmask (SIG_SETMASK, &ss, 0);
1528
1529#ifndef __QNX__
1530 /* command interpreter path */
1531 if (argv != NULL)
1532 {
1533# ifdef DEBUG_CMD
1534 int i;
1535
1536 for (i = 0; argv[i]; i++)
1537 fprintf (stderr, "argv [%d] = \"%s\"\n", i, argv[i]);
1538# endif
1539
1540 execvp (argv[0], (char *const *)argv);
1541 /* no error message: STDERR is closed! */
1542 }
1543 else
1544 {
1545 const char *argv0, *shell;
1546
1547 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1548 shell = "/bin/sh";
1549
1550 argv0 = (const char *)rxvt_r_basename (shell);
1551
1552 if (options & Opt_loginShell)
1553 {
1554 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1555
1556 login[0] = '-';
1557 strcpy (&login[1], argv0);
1558 argv0 = login;
1559 }
1560 execlp (shell, argv0, NULL);
1561 /* no error message: STDERR is closed! */
1562 }
1563
1564#else /* __QNX__ uses qnxspawn () */
1565
1566 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1567 char *command = NULL, fullcommand[_MAX_PATH];
1568 char **arg_v, *arg_a[2] = { NULL, NULL };
1569
1570 if (argv != NULL)
1571 {
1572 if (access (argv[0], X_OK) == -1)
1573 {
1574 if (strchr (argv[0], '/') == NULL)
1575 {
1576 searchenv (argv[0], "PATH", fullcommand);
1577
1578 if (fullcommand[0] != '\0')
1579 command = fullcommand;
1580 }
1581
1582 if (access (command, X_OK) == -1)
1583 return -1;
1584 }
1585 else
1586 command = argv[0];
1587
1588 arg_v = argv;
1589 }
1590 else
1591 {
1592 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1593 command = "/bin/sh";
1594
1595 arg_a[0] = my_basename (command);
1596
1597 if (options & Opt_loginShell)
1598 {
1599 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1600
1601 login[0] = '-';
1602 strcpy (&login[1], arg_a[0]);
1603 arg_a[0] = login;
1604 }
1605
1606 arg_v = arg_a;
1607 }
1608
1609 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1610 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1611 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1612 command, arg_v, environ, iov_a, 0);
1613 if (login)
1614 free (login);
1615
1616 pty.close_tty ();
1617 return pty.pty;
1618#endif
1619
1620 return -1;
1621}
1622
1752/*----------------------- end-of-file (C source) -----------------------*/ 1623/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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