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

Diff Legend

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