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.79 by root, Sun Aug 15 22:09:24 2004 UTC vs.
Revision 1.128 by root, Sat Dec 31 17:16:17 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
39#include <limits>
40
38#include <signal.h> 41#include <csignal>
39 42
40const char *const def_colorName[] = 43const char *const def_colorName[] =
41 { 44 {
42 COLOR_FOREGROUND, 45 COLOR_FOREGROUND,
43 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
… …
67 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 70 "Yellow", /* 3/11: bright yellow (#FFFF00) */
68 "Blue", /* 4/12: bright blue (#0000FF) */ 71 "Blue", /* 4/12: bright blue (#0000FF) */
69 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 72 "Magenta", /* 5/13: bright magenta (#FF00FF) */
70 "Cyan", /* 6/14: bright cyan (#00FFFF) */ 73 "Cyan", /* 6/14: bright cyan (#00FFFF) */
71 "White", /* 7/15: bright white (#FFFFFF) */ 74 "White", /* 7/15: bright white (#FFFFFF) */
72#ifdef TTY_256COLOR 75
73 "rgbi:0/0/0", /* default 16-255 color table */ 76 // 88 xterm colours
74 "rgbi:0/0/.2", /* consists of 6 6x6 colour cubes */ 77 "rgb:00/00/00",
75 "rgbi:0/0/.4", /* and a 24 greyscale ramp w/o */
76 "rgbi:0/0/.6", /* black or white */
77 "rgbi:0/0/.8", 78 "rgb:00/00/8b",
78 "rgbi:0/0/1", 79 "rgb:00/00/cd",
79 "rgbi:0/.2/0", 80 "rgb:00/00/ff",
80 "rgbi:0/.2/.2",
81 "rgbi:0/.2/.4",
82 "rgbi:0/.2/.6",
83 "rgbi:0/.2/.8",
84 "rgbi:0/.2/1",
85 "rgbi:0/.4/0",
86 "rgbi:0/.4/.2",
87 "rgbi:0/.4/.4",
88 "rgbi:0/.4/.6",
89 "rgbi:0/.4/.8",
90 "rgbi:0/.4/1",
91 "rgbi:0/.6/0",
92 "rgbi:0/.6/.2",
93 "rgbi:0/.6/.4",
94 "rgbi:0/.6/.6",
95 "rgbi:0/.6/.8",
96 "rgbi:0/.6/1",
97 "rgbi:0/.8/0", 81 "rgb:00/8b/00",
98 "rgbi:0/.8/.2",
99 "rgbi:0/.8/.4",
100 "rgbi:0/.8/.6",
101 "rgbi:0/.8/.8", 82 "rgb:00/8b/8b",
102 "rgbi:0/.8/1", 83 "rgb:00/8b/cd",
84 "rgb:00/8b/ff",
103 "rgbi:0/1/0", 85 "rgb:00/cd/00",
104 "rgbi:0/1/.2",
105 "rgbi:0/1/.4",
106 "rgbi:0/1/.6",
107 "rgbi:0/1/.8", 86 "rgb:00/cd/8b",
108 "rgbi:0/1/1", 87 "rgb:00/cd/cd",
88 "rgb:00/cd/ff",
109 "rgbi:.2/0/0", 89 "rgb:00/ff/00",
110 "rgbi:.2/0/.2", 90 "rgb:00/ff/8b",
111 "rgbi:.2/0/.4", 91 "rgb:00/ff/cd",
112 "rgbi:.2/0/.6", 92 "rgb:00/ff/ff",
113 "rgbi:.2/0/.8",
114 "rgbi:.2/0/1",
115 "rgbi:.2/.2/0",
116 "rgbi:.2/.2/.2",
117 "rgbi:.2/.2/.4",
118 "rgbi:.2/.2/.6",
119 "rgbi:.2/.2/.8",
120 "rgbi:.2/.2/1",
121 "rgbi:.2/.4/0",
122 "rgbi:.2/.4/.2",
123 "rgbi:.2/.4/.4",
124 "rgbi:.2/.4/.6",
125 "rgbi:.2/.4/.8",
126 "rgbi:.2/.4/1",
127 "rgbi:.2/.6/0",
128 "rgbi:.2/.6/.2",
129 "rgbi:.2/.6/.4",
130 "rgbi:.2/.6/.6",
131 "rgbi:.2/.6/.8",
132 "rgbi:.2/.6/1",
133 "rgbi:.2/.8/0",
134 "rgbi:.2/.8/.2",
135 "rgbi:.2/.8/.4",
136 "rgbi:.2/.8/.6",
137 "rgbi:.2/.8/.8",
138 "rgbi:.2/.8/1",
139 "rgbi:.2/1/0",
140 "rgbi:.2/1/.2",
141 "rgbi:.2/1/.4",
142 "rgbi:.2/1/.6",
143 "rgbi:.2/1/.8",
144 "rgbi:.2/1/1",
145 "rgbi:.4/0/0",
146 "rgbi:.4/0/.2",
147 "rgbi:.4/0/.4",
148 "rgbi:.4/0/.6",
149 "rgbi:.4/0/.8",
150 "rgbi:.4/0/1",
151 "rgbi:.4/.2/0",
152 "rgbi:.4/.2/.2",
153 "rgbi:.4/.2/.4",
154 "rgbi:.4/.2/.6",
155 "rgbi:.4/.2/.8",
156 "rgbi:.4/.2/1",
157 "rgbi:.4/.4/0",
158 "rgbi:.4/.4/.2",
159 "rgbi:.4/.4/.4",
160 "rgbi:.4/.4/.6",
161 "rgbi:.4/.4/.8",
162 "rgbi:.4/.4/1",
163 "rgbi:.4/.6/0",
164 "rgbi:.4/.6/.2",
165 "rgbi:.4/.6/.4",
166 "rgbi:.4/.6/.6",
167 "rgbi:.4/.6/.8",
168 "rgbi:.4/.6/1",
169 "rgbi:.4/.8/0",
170 "rgbi:.4/.8/.2",
171 "rgbi:.4/.8/.4",
172 "rgbi:.4/.8/.6",
173 "rgbi:.4/.8/.8",
174 "rgbi:.4/.8/1",
175 "rgbi:.4/1/0",
176 "rgbi:.4/1/.2",
177 "rgbi:.4/1/.4",
178 "rgbi:.4/1/.6",
179 "rgbi:.4/1/.8",
180 "rgbi:.4/1/1",
181 "rgbi:.6/0/0",
182 "rgbi:.6/0/.2",
183 "rgbi:.6/0/.4",
184 "rgbi:.6/0/.6",
185 "rgbi:.6/0/.8",
186 "rgbi:.6/0/1",
187 "rgbi:.6/.2/0",
188 "rgbi:.6/.2/.2",
189 "rgbi:.6/.2/.4",
190 "rgbi:.6/.2/.6",
191 "rgbi:.6/.2/.8",
192 "rgbi:.6/.2/1",
193 "rgbi:.6/.4/0",
194 "rgbi:.6/.4/.2",
195 "rgbi:.6/.4/.4",
196 "rgbi:.6/.4/.6",
197 "rgbi:.6/.4/.8",
198 "rgbi:.6/.4/1",
199 "rgbi:.6/.6/0",
200 "rgbi:.6/.6/.2",
201 "rgbi:.6/.6/.4",
202 "rgbi:.6/.6/.6",
203 "rgbi:.6/.6/.8",
204 "rgbi:.6/.6/1",
205 "rgbi:.6/.8/0",
206 "rgbi:.6/.8/.2",
207 "rgbi:.6/.8/.4",
208 "rgbi:.6/.8/.6",
209 "rgbi:.6/.8/.8",
210 "rgbi:.6/.8/1",
211 "rgbi:.6/1/0",
212 "rgbi:.6/1/.2",
213 "rgbi:.6/1/.4",
214 "rgbi:.6/1/.6",
215 "rgbi:.6/1/.8",
216 "rgbi:.6/1/1",
217 "rgbi:.8/0/0", 93 "rgb:8b/00/00",
218 "rgbi:.8/0/.2",
219 "rgbi:.8/0/.4",
220 "rgbi:.8/0/.6",
221 "rgbi:.8/0/.8", 94 "rgb:8b/00/8b",
222 "rgbi:.8/0/1", 95 "rgb:8b/00/cd",
223 "rgbi:.8/.2/0", 96 "rgb:8b/00/ff",
224 "rgbi:.8/.2/.2",
225 "rgbi:.8/.2/.4",
226 "rgbi:.8/.2/.6",
227 "rgbi:.8/.2/.8",
228 "rgbi:.8/.2/1",
229 "rgbi:.8/.4/0",
230 "rgbi:.8/.4/.2",
231 "rgbi:.8/.4/.4",
232 "rgbi:.8/.4/.6",
233 "rgbi:.8/.4/.8",
234 "rgbi:.8/.4/1",
235 "rgbi:.8/.6/0",
236 "rgbi:.8/.6/.2",
237 "rgbi:.8/.6/.4",
238 "rgbi:.8/.6/.6",
239 "rgbi:.8/.6/.8",
240 "rgbi:.8/.6/1",
241 "rgbi:.8/.8/0", 97 "rgb:8b/8b/00",
242 "rgbi:.8/.8/.2",
243 "rgbi:.8/.8/.4",
244 "rgbi:.8/.8/.6",
245 "rgbi:.8/.8/.8",
246 "rgbi:.8/.8/1",
247 "rgbi:.8/1/0",
248 "rgbi:.8/1/.2",
249 "rgbi:.8/1/.4",
250 "rgbi:.8/1/.6",
251 "rgbi:.8/1/.8",
252 "rgbi:.8/1/1",
253 "rgbi:1/0/0",
254 "rgbi:1/0/.2",
255 "rgbi:1/0/.4",
256 "rgbi:1/0/.6",
257 "rgbi:1/0/.8",
258 "rgbi:1/0/1",
259 "rgbi:1/.2/0",
260 "rgbi:1/.2/.2",
261 "rgbi:1/.2/.4",
262 "rgbi:1/.2/.6",
263 "rgbi:1/.2/.8",
264 "rgbi:1/.2/1",
265 "rgbi:1/.4/0",
266 "rgbi:1/.4/.2",
267 "rgbi:1/.4/.4",
268 "rgbi:1/.4/.6",
269 "rgbi:1/.4/.8",
270 "rgbi:1/.4/1",
271 "rgbi:1/.6/0",
272 "rgbi:1/.6/.2",
273 "rgbi:1/.6/.4",
274 "rgbi:1/.6/.6",
275 "rgbi:1/.6/.8",
276 "rgbi:1/.6/1",
277 "rgbi:1/.8/0",
278 "rgbi:1/.8/.2",
279 "rgbi:1/.8/.4",
280 "rgbi:1/.8/.6",
281 "rgbi:1/.8/.8",
282 "rgbi:1/.8/1",
283 "rgbi:1/1/0",
284 "rgbi:1/1/.2",
285 "rgbi:1/1/.4",
286 "rgbi:1/1/.6",
287 "rgbi:1/1/.8",
288 "rgbi:1/1/1",
289 "rgb:08/08/08", 98 "rgb:8b/8b/8b",
290 "rgb:12/12/12", 99 "rgb:8b/8b/cd",
100 "rgb:8b/8b/ff",
101 "rgb:8b/cd/00",
102 "rgb:8b/cd/8b",
103 "rgb:8b/cd/cd",
104 "rgb:8b/cd/ff",
105 "rgb:8b/ff/00",
106 "rgb:8b/ff/8b",
107 "rgb:8b/ff/cd",
108 "rgb:8b/ff/ff",
109 "rgb:cd/00/00",
110 "rgb:cd/00/8b",
111 "rgb:cd/00/cd",
112 "rgb:cd/00/ff",
113 "rgb:cd/8b/00",
114 "rgb:cd/8b/8b",
115 "rgb:cd/8b/cd",
116 "rgb:cd/8b/ff",
117 "rgb:cd/cd/00",
118 "rgb:cd/cd/8b",
291 "rgb:1c/1c/1c", 119 "rgb:cd/cd/cd",
120 "rgb:cd/cd/ff",
121 "rgb:cd/ff/00",
122 "rgb:cd/ff/8b",
123 "rgb:cd/ff/cd",
124 "rgb:cd/ff/ff",
125 "rgb:ff/00/00",
126 "rgb:ff/00/8b",
127 "rgb:ff/00/cd",
128 "rgb:ff/00/ff",
129 "rgb:ff/8b/00",
130 "rgb:ff/8b/8b",
131 "rgb:ff/8b/cd",
132 "rgb:ff/8b/ff",
133 "rgb:ff/cd/00",
134 "rgb:ff/cd/8b",
135 "rgb:ff/cd/cd",
136 "rgb:ff/cd/ff",
137 "rgb:ff/ff/00",
138 "rgb:ff/ff/8b",
139 "rgb:ff/ff/cd",
140 "rgb:ff/ff/ff",
292 "rgb:26/26/26", 141 "rgb:2e/2e/2e",
293 "rgb:30/30/30",
294 "rgb:3a/3a/3a",
295 "rgb:44/44/44",
296 "rgb:4e/4e/4e",
297 "rgb:58/58/58", 142 "rgb:5c/5c/5c",
298 "rgb:62/62/62",
299 "rgb:6c/6c/6c",
300 "rgb:76/76/76", 143 "rgb:73/73/73",
301 "rgb:80/80/80", 144 "rgb:8b/8b/8b",
302 "rgb:8a/8a/8a", 145 "rgb:a2/a2/a2",
303 "rgb:94/94/94", 146 "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", 147 "rgb:d0/d0/d0",
310 "rgb:da/da/da",
311 "rgb:e4/e4/e4", 148 "rgb:e7/e7/e7",
312 "rgb:ee/ee/ee", 149
313#endif
314#ifndef NO_CURSORCOLOR 150#ifndef NO_CURSORCOLOR
315 COLOR_CURSOR_BACKGROUND, 151 COLOR_CURSOR_BACKGROUND,
316 COLOR_CURSOR_FOREGROUND, 152 COLOR_CURSOR_FOREGROUND,
317#endif /* ! NO_CURSORCOLOR */ 153#endif /* ! NO_CURSORCOLOR */
318 NULL, /* Color_pointer_fg */ 154 NULL, /* Color_pointer_fg */
319 NULL, /* Color_pointer_bg */ 155 NULL, /* Color_pointer_bg */
320 NULL, /* Color_border */ 156 NULL, /* Color_border */
321#ifndef NO_BOLD_UNDERLINE_REVERSE 157#ifndef NO_BOLD_UNDERLINE_REVERSE
322 NULL, /* Color_BD */ 158 NULL, /* Color_BD */
159 NULL, /* Color_IT */
323 NULL, /* Color_UL */ 160 NULL, /* Color_UL */
324 NULL, /* Color_RV */ 161 NULL, /* Color_RV */
325#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 162#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
163#if ENABLE_FRILLS
164 NULL, // Color_underline
165#endif
326#ifdef OPTION_HC 166#ifdef OPTION_HC
327 NULL, 167 NULL,
328#endif 168#endif
329#ifdef KEEP_SCROLLCOLOR 169#ifdef KEEP_SCROLLCOLOR
330 COLOR_SCROLLBAR, 170 COLOR_SCROLLBAR,
331 COLOR_SCROLLTROUGH, 171 COLOR_SCROLLTROUGH,
332#endif /* KEEP_SCROLLCOLOR */ 172#endif /* KEEP_SCROLLCOLOR */
333#if TINTING 173#if TINTING
334 NULL, 174 NULL,
335#endif 175#endif
176#if OFF_FOCUS_FADING
177 "black",
178#endif
336 }; 179 };
337 180
338const char *const xa_names[NUM_XA] = 181const char *const xa_names[] =
339 { 182 {
340 "TEXT", 183 "TEXT",
341 "COMPOUND_TEXT", 184 "COMPOUND_TEXT",
342 "UTF8_STRING", 185 "UTF8_STRING",
343 "MULTIPLE", 186 "MULTIPLE",
344 "TARGETS", 187 "TARGETS",
345 "TIMESTAMP", 188 "TIMESTAMP",
346 "VT_SELECTION", 189 "VT_SELECTION",
347 "INCR", 190 "INCR",
191 "WM_PROTOCOLS",
348 "WM_DELETE_WINDOW", 192 "WM_DELETE_WINDOW",
193 "CLIPBOARD",
194#if ENABLE_FRILLS
195 "_MOTIF_WM_HINTS",
196#endif
197#if ENABLE_EWMH
198 "_NET_WM_PID",
199 "_NET_WM_NAME",
200 "_NET_WM_ICON_NAME",
201 "_NET_WM_PING",
202#endif
203#if USE_XIM
204 "WM_LOCALE_NAME",
205#endif
349#ifdef TRANSPARENT 206#ifdef TRANSPARENT
350 "_XROOTPMAP_ID", 207 "_XROOTPMAP_ID",
208 "ESETROOT_PMAP_ID",
351#endif 209#endif
352#ifdef OFFIX_DND 210#ifdef OFFIX_DND
353 "DndProtocol", 211 "DndProtocol",
354 "DndSelection", 212 "DndSelection",
355#endif 213#endif
356 "CLIPBOARD" 214#if ENABLE_XEMBED
215 "_XEMBED",
216 "_XEMBED_INFO",
217#endif
357 }; 218 };
358 219
359bool 220bool
360rxvt_term::init_vars () 221rxvt_term::init_vars ()
361{ 222{
… …
367 228
368 if (pix_colors == NULL) 229 if (pix_colors == NULL)
369 return false; 230 return false;
370 231
371#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 232#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
372 TermWin.pixmap = None; 233 pixmap = None;
373#endif 234#endif
374 235
375 MEvent.time = CurrentTime; 236 MEvent.time = CurrentTime;
376 MEvent.button = AnyButton; 237 MEvent.button = AnyButton;
377 options = DEFAULT_OPTIONS; 238 options = DEFAULT_OPTIONS;
378 want_refresh = 1; 239 want_refresh = 1;
379 cmd_pid = -1;
380 pty.pty = pty.tty = -1;
381 priv_modes = SavedModes = PrivMode_Default; 240 priv_modes = SavedModes = PrivMode_Default;
382 TermWin.focus = 0; 241 focus = 0;
383 TermWin.ncol = 80; 242 ncol = 80;
384 TermWin.nrow = 24; 243 nrow = 24;
385 TermWin.int_bwidth = INTERNALBORDERWIDTH; 244 int_bwidth = INTERNALBORDERWIDTH;
386 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 245 ext_bwidth = EXTERNALBORDERWIDTH;
387 TermWin.lineSpace = LINESPACE; 246 lineSpace = LINESPACE;
388 TermWin.saveLines = SAVELINES; 247 saveLines = SAVELINES;
389 numpix_colors = TOTAL_COLORS; 248 numpix_colors = TOTAL_COLORS;
390
391#ifndef NO_BRIGHTCOLOR
392 colorfgbg = DEFAULT_RSTYLE;
393#endif
394 249
395 refresh_limit = 1; 250 refresh_limit = 1;
396 refresh_type = SLOW_REFRESH; 251 refresh_type = SLOW_REFRESH;
397 prev_nrow = prev_ncol = 0; 252 prev_nrow = prev_ncol = 0;
398 253
… …
406 last_bot = last_state = -1; 261 last_bot = last_state = -1;
407 262
408#ifdef MENUBAR 263#ifdef MENUBAR
409 menu_readonly = 1; 264 menu_readonly = 1;
410# if ! (MENUBAR_MAX > 1) 265# if ! (MENUBAR_MAX > 1)
411 CurrentBar = & (BarList); 266 CurrentBar = &BarList;
412# endif /* (MENUBAR_MAX > 1) */ 267# endif /* (MENUBAR_MAX > 1) */
413#endif 268#endif
414 269
415 return true; 270 return true;
416} 271}
… …
490 */ 345 */
491 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 346 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
492 rs[Rs_display_name] = ":0"; 347 rs[Rs_display_name] = ":0";
493 348
494 get_options (r_argc, r_argv); 349 get_options (r_argc, r_argv);
350
351 if (!(display = displays.get (rs[Rs_display_name])))
352 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
353
354 extract_resources ();
495 free (r_argv); 355 free (r_argv);
496
497#ifdef LOCAL_X_IS_UNIX
498 if (rs[Rs_display_name][0] == ':')
499 {
500 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
501 strcpy (val, "unix");
502 strcat (val, rs[Rs_display_name]);
503 display = displays.get (val);
504 free (val);
505 }
506#endif
507
508 if (!display
509 && ! (display = displays.get (rs[Rs_display_name])))
510 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
511
512 extract_resources (display->display, rs[Rs_name]);
513 356
514 /* 357 /*
515 * set any defaults not already set 358 * set any defaults not already set
516 */ 359 */
517 if (cmd_argv && cmd_argv[0]) 360 if (cmd_argv && cmd_argv[0])
… …
528 if (!rs[Rs_iconName]) 371 if (!rs[Rs_iconName])
529 rs[Rs_iconName] = rs[Rs_name]; 372 rs[Rs_iconName] = rs[Rs_name];
530 } 373 }
531 374
532 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 375 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
533 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 376 saveLines = min (i, MAX_SAVELINES);
534 377
535#if ENABLE_FRILLS 378#if ENABLE_FRILLS
536 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 379 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
537 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 380 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
381
538 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 382 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
539 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 383 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
540#endif
541 384
542#ifndef NO_LINESPACE
543 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 385 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
544 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 386 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
545#endif 387#endif
546 388
547#ifdef POINTER_BLANK 389#ifdef POINTER_BLANK
548 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 390 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
549 pointerBlankDelay = i; 391 pointerBlankDelay = i;
550 else 392 else
551 pointerBlankDelay = 2; 393 pointerBlankDelay = 2;
552#endif 394#endif
553 395
554 /* no point having a scrollbar without having any scrollback! */ 396 /* no point having a scrollbar without having any scrollback! */
555 if (!TermWin.saveLines) 397 if (!saveLines)
556 options &= ~Opt_scrollBar; 398 CLR_OPTION (Opt_scrollBar);
557 399
558#ifdef PRINTPIPE 400#ifdef PRINTPIPE
559 if (!rs[Rs_print_pipe]) 401 if (!rs[Rs_print_pipe])
560 rs[Rs_print_pipe] = PRINTPIPE; 402 rs[Rs_print_pipe] = PRINTPIPE;
561#endif 403#endif
… …
599 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]); 441 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
600 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]); 442 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
601 } 443 }
602 444
603#ifdef HAVE_SCROLLBARS 445#ifdef HAVE_SCROLLBARS
604 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], 446 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
605 rs[Rs_scrollBar_thickness]);
606#endif 447#endif
607 448
608#ifdef XTERM_REVERSE_VIDEO 449#ifdef XTERM_REVERSE_VIDEO
609 /* this is how xterm implements reverseVideo */ 450 /* this is how xterm implements reverseVideo */
610 if (options & Opt_reverseVideo) 451 if (OPTION (Opt_reverseVideo))
611 { 452 {
612 if (!rs[Rs_color + Color_fg]) 453 if (!rs[Rs_color + Color_fg])
613 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 454 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
614 if (!rs[Rs_color + Color_bg]) 455 if (!rs[Rs_color + Color_bg])
615 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 456 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
620 if (!rs[Rs_color + i]) 461 if (!rs[Rs_color + i])
621 rs[Rs_color + i] = def_colorName[i]; 462 rs[Rs_color + i] = def_colorName[i];
622 463
623#ifndef XTERM_REVERSE_VIDEO 464#ifndef XTERM_REVERSE_VIDEO
624 /* this is how we implement reverseVideo */ 465 /* this is how we implement reverseVideo */
625 if (options & Opt_reverseVideo) 466 if (OPTION (Opt_reverseVideo))
626 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 467 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
627#endif 468#endif
628 469
629 /* convenient aliases for setting fg/bg to colors */ 470 /* convenient aliases for setting fg/bg to colors */
630 color_aliases (Color_fg); 471 color_aliases (Color_fg);
631 color_aliases (Color_bg); 472 color_aliases (Color_bg);
… …
640 color_aliases (Color_BD); 481 color_aliases (Color_BD);
641 color_aliases (Color_UL); 482 color_aliases (Color_UL);
642 color_aliases (Color_RV); 483 color_aliases (Color_RV);
643#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 484#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
644 485
486 if (!rs[Rs_color + Color_border])
487 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
488
645 return cmd_argv; 489 return cmd_argv;
646} 490}
647 491
648/*----------------------------------------------------------------------*/ 492/*----------------------------------------------------------------------*/
649void 493void
… …
678 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 522 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
679 523
680 sprintf (env_display, "DISPLAY=%s", val); 524 sprintf (env_display, "DISPLAY=%s", val);
681 525
682 /* avoiding the math library: 526 /* avoiding the math library:
683 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */ 527 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
684 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++) 528 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
685 ; 529 ;
686 MAX_IT (i, 1); 530 max_it (i, 1);
687 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); 531 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
688 532
689 sprintf (env_windowid, "WINDOWID=%u", 533 sprintf (env_windowid, "WINDOWID=%u",
690 (unsigned int)TermWin.parent[0]); 534 (unsigned int)parent[0]);
691 535
692 /* add entries to the environment: 536 /* add entries to the environment:
693 * @ DISPLAY: in case we started with -display 537 * @ DISPLAY: in case we started with -display
694 * @ WINDOWID: X window id number of the window 538 * @ WINDOWID: X window id number of the window
695 * @ COLORTERM: terminal sub-name and also indicates its color 539 * @ COLORTERM: terminal sub-name and also indicates its color
… …
756 600
757 this->locale = rxvt_strdup (this->locale); 601 this->locale = rxvt_strdup (this->locale);
758 SET_LOCALE (this->locale); 602 SET_LOCALE (this->locale);
759 mbstate.reset (); 603 mbstate.reset ();
760#endif 604#endif
761#if 0 605
762#if HAVE_NL_LANGINFO 606#if HAVE_NL_LANGINFO
607 char *codeset = strdup (nl_langinfo (CODESET));
608 // /^UTF.?8/i
609 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
610 && (codeset[1] == 'T' || codeset[1] == 't')
611 && (codeset[2] == 'F' || codeset[2] == 'f')
612 && (codeset[3] == '8' || codeset[4] == '8');
763 free (codeset); 613 free (codeset);
764 codeset = strdup (nl_langinfo (CODESET));
765 enc_utf8 = !strcasecmp (codeset, "UTF-8")
766 || !strcasecmp (codeset, "UTF8");
767#else 614#else
768 enc_utf8 = 1; 615 enc_utf8 = 0;
769#endif
770#endif 616#endif
771} 617}
772 618
773void 619void
774rxvt_term::init_xlocale () 620rxvt_term::init_xlocale ()
… …
776#ifdef USE_XIM 622#ifdef USE_XIM
777 if (!locale) 623 if (!locale)
778 rxvt_warn ("setting locale failed, working without locale support.\n"); 624 rxvt_warn ("setting locale failed, working without locale support.\n");
779 else 625 else
780 { 626 {
781 Atom wmlocale; 627 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
782
783 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
784 XChangeProperty (display->display, TermWin.parent[0], wmlocale,
785 XA_STRING, 8, PropModeReplace,
786 (unsigned char *)locale, strlen (locale));
787 628
788 if (!XSupportsLocale ()) 629 if (!XSupportsLocale ())
789 { 630 {
790 rxvt_warn ("the locale is not supported by Xlib, working withotu locale support.\n"); 631 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n");
791 return; 632 return;
792 } 633 }
793 634
794 im_ev.start (display); 635 im_ev.start (display);
795 636
… …
805{ 646{
806 /* 647 /*
807 * Initialize the command connection. 648 * Initialize the command connection.
808 * This should be called after the X server connection is established. 649 * This should be called after the X server connection is established.
809 */ 650 */
810 int i;
811
812 for (i = 0; i < NUM_XA; i++)
813 xa[i] = XInternAtom (display->display, xa_names[i], False);
814
815 /* Enable delete window protocol */
816 XSetWMProtocols (display->display, TermWin.parent[0],
817 & (xa[XA_WMDELETEWINDOW]), 1);
818
819#ifdef USING_W11LIB
820 /* enable W11 callbacks */
821 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
822#endif
823 651
824#ifdef META8_OPTION 652#ifdef META8_OPTION
825 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 653 meta_char = OPTION ((Opt_meta8) ? 0x80 : C0_ESC);
826#endif 654#endif
827 655
828 get_ourmods (); 656 get_ourmods ();
829 657
830 if (!(options & Opt_scrollTtyOutput)) 658 if (!OPTION (Opt_scrollTtyOutput))
831 priv_modes |= PrivMode_TtyOutputInh; 659 priv_modes |= PrivMode_TtyOutputInh;
832 if (options & Opt_scrollTtyKeypress) 660 if (OPTION (Opt_scrollTtyKeypress))
833 priv_modes |= PrivMode_Keypress; 661 priv_modes |= PrivMode_Keypress;
834 if (!(options & Opt_jumpScroll)) 662 if (!OPTION (Opt_jumpScroll))
835 priv_modes |= PrivMode_smoothScroll; 663 priv_modes |= PrivMode_smoothScroll;
836 664
837#ifndef NO_BACKSPACE_KEY 665#ifndef NO_BACKSPACE_KEY
838 if (strcmp (key_backspace, "DEC") == 0) 666 if (strcmp (key_backspace, "DEC") == 0)
839 priv_modes |= PrivMode_HaveBackSpace; 667 priv_modes |= PrivMode_HaveBackSpace;
… …
843 if (scrollbar_visible ()) 671 if (scrollbar_visible ())
844 { 672 {
845 priv_modes |= PrivMode_scrollBar; 673 priv_modes |= PrivMode_scrollBar;
846 SavedModes |= PrivMode_scrollBar; 674 SavedModes |= PrivMode_scrollBar;
847 } 675 }
676
848 if (menubar_visible ()) 677 if (menubar_visible ())
849 { 678 {
850 priv_modes |= PrivMode_menuBar; 679 priv_modes |= PrivMode_menuBar;
851 SavedModes |= PrivMode_menuBar; 680 SavedModes |= PrivMode_menuBar;
852 } 681 }
853 682
854#ifdef CURSOR_BLINK 683#ifdef CURSOR_BLINK
855 if (options & Opt_cursorBlink) 684 if (OPTION (Opt_cursorBlink))
856 (void)gettimeofday (&lastcursorchange, NULL); 685 (void)gettimeofday (&lastcursorchange, NULL);
857#endif 686#endif
858 687
859 run_command (argv); 688 run_command (argv);
860} 689}
… …
877 continue; 706 continue;
878 707
879 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 708 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
880 { 709 {
881#ifndef XTERM_REVERSE_VIDEO 710#ifndef XTERM_REVERSE_VIDEO
882 if (i < 2 && (options & Opt_reverseVideo)) 711 if (i < 2 && OPTION (Opt_reverseVideo))
883 rs[Rs_color + i] = def_colorName[!i]; 712 rs[Rs_color + i] = def_colorName[!i];
884 else 713 else
885#endif 714#endif
886 rs[Rs_color + i] = def_colorName[i]; 715 rs[Rs_color + i] = def_colorName[i];
887 716
… …
912 } 741 }
913 } 742 }
914 } 743 }
915 744
916 pix_colors[i] = xcol; 745 pix_colors[i] = xcol;
746 SET_PIXCOLOR (i);
747 }
748
917#ifdef OFF_FOCUS_FADING 749#ifdef OFF_FOCUS_FADING
918 if (rs[Rs_fade]) 750 if (rs[Rs_fade])
751 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
919 pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade])); 752 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
920#endif 753#endif
921 SET_PIXCOLOR (i);
922 }
923 754
924 if (display->depth <= 2) 755 if (display->depth <= 2)
925 { 756 {
926 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 757 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];
927 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 758 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
… …
935 * from the fvwm window manager. 766 * from the fvwm window manager.
936 */ 767 */
937#ifdef KEEP_SCROLLCOLOR 768#ifdef KEEP_SCROLLCOLOR
938 769
939 if (display->depth <= 2) 770 if (display->depth <= 2)
771 {
940 { /* Monochrome */ 772 /* Monochrome */
941 pix_colors[Color_scroll] = pix_colors[Color_fg]; 773 pix_colors[Color_scroll] = pix_colors[Color_fg];
942 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 774 pix_colors[Color_topShadow] = pix_colors[Color_bg];
943 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 775 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
944 } 776 }
945 else 777 else
… …
985 i -= 8; 817 i -= 8;
986#ifndef NO_BRIGHTCOLOR 818#ifndef NO_BRIGHTCOLOR
987 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 819 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
988 return; 820 return;
989#endif 821#endif
990
991 } 822 }
992 823
993 if (i >= 0 && i <= 7) /* normal colors */ 824 if (i >= 0 && i <= 7) /* normal colors */
994 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 825 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
995 } 826 }
… …
1001 * Use resource ``modifier'' to override the Meta modifier 832 * Use resource ``modifier'' to override the Meta modifier
1002 */ 833 */
1003void 834void
1004rxvt_term::get_ourmods () 835rxvt_term::get_ourmods ()
1005{ 836{
1006 int i, j, k; 837 int i, j, k;
1007 int requestedmeta, realmeta, realalt; 838 int requestedmeta, realmeta, realalt;
1008 const char *cm, *rsmod; 839 const char *cm, *rsmod;
1009 XModifierKeymap *map; 840 XModifierKeymap *map;
1010 KeyCode *kc; 841 KeyCode *kc;
1011 const unsigned int modmasks[] = 842 const unsigned int modmasks[] =
1012 { 843 {
1013 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 844 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
1014 }; 845 };
1015 846
1016 requestedmeta = realmeta = realalt = 0; 847 requestedmeta = realmeta = realalt = 0;
1017 rsmod = rs[Rs_modifier]; 848 rsmod = rs[Rs_modifier];
849
1018 if (rsmod 850 if (rsmod
1019 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 851 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
1020 requestedmeta = rsmod[3] - '0'; 852 requestedmeta = rsmod[3] - '0';
1021 853
1022 map = XGetModifierMapping (display->display); 854 map = XGetModifierMapping (display->display);
1023 kc = map->modifiermap; 855 kc = map->modifiermap;
856
1024 for (i = 1; i < 6; i++) 857 for (i = 1; i < 6; i++)
1025 { 858 {
1026 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 859 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
860
1027 for (j = map->max_keypermod; j--; k++) 861 for (j = map->max_keypermod; j--; k++)
1028 { 862 {
1029 if (kc[k] == 0) 863 if (kc[k] == 0)
1030 break; 864 break;
865
1031 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 866 switch (XKeycodeToKeysym (display->display, kc[k], 0))
1032 { 867 {
1033 case XK_Num_Lock: 868 case XK_Num_Lock:
1034 ModNumLockMask = modmasks[i - 1]; 869 ModNumLockMask = modmasks[i - 1];
1035 /* FALLTHROUGH */ 870 continue;
1036 default: 871
1037 continue; /* for (;;) */ 872 case XK_ISO_Level3_Shift:
873 ModLevel3Mask = modmasks[i - 1];
874 continue;
875
1038 case XK_Meta_L: 876 case XK_Meta_L:
1039 case XK_Meta_R: 877 case XK_Meta_R:
1040 cm = "meta"; 878 cm = "meta";
1041 realmeta = i; 879 realmeta = i;
1042 break; 880 break;
881
1043 case XK_Alt_L: 882 case XK_Alt_L:
1044 case XK_Alt_R: 883 case XK_Alt_R:
1045 cm = "alt"; 884 cm = "alt";
1046 realalt = i; 885 realalt = i;
1047 break; 886 break;
887
1048 case XK_Super_L: 888 case XK_Super_L:
1049 case XK_Super_R: 889 case XK_Super_R:
1050 cm = "super"; 890 cm = "super";
1051 break; 891 break;
892
1052 case XK_Hyper_L: 893 case XK_Hyper_L:
1053 case XK_Hyper_R: 894 case XK_Hyper_R:
1054 cm = "hyper"; 895 cm = "hyper";
1055 break; 896 break;
897
898 default:
899 continue;
1056 } 900 }
901
1057 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0) 902 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)
1058 requestedmeta = i; 903 requestedmeta = i;
1059 } 904 }
1060 } 905 }
906
1061 XFreeModifiermap (map); 907 XFreeModifiermap (map);
908
1062 i = (requestedmeta ? requestedmeta 909 i = requestedmeta ? requestedmeta
1063 : (realmeta ? realmeta 910 : realmeta ? realmeta
1064 : (realalt ? realalt : 0))); 911 : realalt ? realalt
912 : 0;
913
1065 if (i) 914 if (i)
1066 ModMetaMask = modmasks[i - 1]; 915 ModMetaMask = modmasks[i - 1];
1067} 916}
1068 917
1069/*----------------------------------------------------------------------*/ 918/*----------------------------------------------------------------------*/
… …
1079#endif 928#endif
1080 XGCValues gcvalue; 929 XGCValues gcvalue;
1081 long vt_emask; 930 long vt_emask;
1082 XSetWindowAttributes attributes; 931 XSetWindowAttributes attributes;
1083 XWindowAttributes gattr; 932 XWindowAttributes gattr;
933 Window top, parent;
934 dDisp;
1084 935
1085 if (options & Opt_transparent) 936#ifdef USING_W11LIB
937 /* enable W11 callbacks */
938 W11AddEventHandler (disp, rxvt_W11_process_x_event);
939#endif
940
941 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
942 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
943
944 if (OPTION (Opt_transparent))
1086 { 945 {
1087 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 946 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
1088 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 947 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
1089 } 948 }
1090 949
1091#if ENABLE_FRILLS 950#if ENABLE_FRILLS
1092 if (options & Opt_borderLess) 951 if (OPTION (Opt_borderLess))
1093 { 952 {
1094 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 953 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
954
1095 if (prop == None) 955 if (prop == None)
1096 { 956 {
1097 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 957 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
1098#ifdef PREFER_24BIT 958#ifdef PREFER_24BIT
1099 attributes.override_redirect = TRUE; 959 attributes.override_redirect = TRUE;
… …
1105 mwmhints.flags = MWM_HINTS_DECORATIONS; 965 mwmhints.flags = MWM_HINTS_DECORATIONS;
1106 mwmhints.decorations = 0; 966 mwmhints.decorations = 0;
1107 } 967 }
1108 } 968 }
1109 else 969 else
1110 {
1111 mwmhints.flags = 0; 970 mwmhints.flags = 0;
1112 }
1113#endif 971#endif
1114 972
1115 /* grab colors before netscape does */ 973 /* grab colors before netscape does */
1116 Get_Colours (); 974 Get_Colours ();
1117 975
1118 if (!change_font (rs[Rs_font])) 976 if (!set_fonts ())
1119 { 977 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1120 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n"); 978
1121 destroy (); 979 parent = DefaultRootWindow (disp);
1122 return; 980
981#if ENABLE_XEMBED
982 if (rs[Rs_embed])
1123 } 983 {
984 XWindowAttributes wattr;
985
986 parent = strtol (rs[Rs_embed], 0, 0);
987
988 if (!XGetWindowAttributes (disp, parent, &wattr))
989 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
990
991 window_calc (wattr.width, wattr.height);
992 }
993#endif
1124 994
1125 window_calc (0, 0); 995 window_calc (0, 0);
996
997 /* sub-window placement & size in rxvt_resize_subwindows () */
998#ifdef PREFER_24BIT
999 attributes.background_pixel = pix_colors_focused[Color_border];
1000 attributes.border_pixel = pix_colors_focused[Color_border];
1001 attributes.colormap = display->cmap;
1002 top = XCreateWindow (disp, parent,
1003 szHint.x, szHint.y,
1004 szHint.width, szHint.height,
1005 ext_bwidth,
1006 display->depth, InputOutput,
1007 display->visual,
1008 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1009#else
1010 top = XCreateSimpleWindow (disp, parent,
1011 szHint.x, szHint.y,
1012 szHint.width, szHint.height,
1013 ext_bwidth,
1014 pix_colors_focused[Color_border],
1015 pix_colors_focused[Color_border]);
1016#endif
1017
1018 this->parent[0] = top;
1019
1126 old_width = szHint.width; 1020 old_width = szHint.width;
1127 old_height = szHint.height; 1021 old_height = szHint.height;
1128 1022
1129 /* sub-window placement & size in rxvt_resize_subwindows () */
1130
1131#ifdef PREFER_24BIT
1132 attributes.background_pixel = pix_colors[Color_bg];
1133 attributes.border_pixel = pix_colors[Color_border];
1134 attributes.colormap = display->cmap;
1135 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
1136 szHint.x, szHint.y,
1137 szHint.width, szHint.height,
1138 TermWin.ext_bwidth,
1139 display->depth, InputOutput,
1140 display->visual,
1141 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1142#else
1143 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
1144 szHint.x, szHint.y,
1145 szHint.width, szHint.height,
1146 TermWin.ext_bwidth,
1147 pix_colors[Color_border],
1148 pix_colors[Color_bg]);
1149#endif
1150
1151 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1023 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1152 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1024 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1153 1025
1154 classHint.res_name = (char *)rs[Rs_name]; 1026 classHint.res_name = (char *)rs[Rs_name];
1155 classHint.res_class = (char *)RESCLASS; 1027 classHint.res_class = (char *)RESCLASS;
1156 1028
1157 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1029 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1158 wmHint.input = True; 1030 wmHint.input = True;
1159 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1031 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1160 wmHint.window_group = TermWin.parent[0]; 1032 wmHint.window_group = top;
1161 1033
1162 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1034 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1163 (char **)argv, argc, &szHint, &wmHint, &classHint); 1035 &szHint, &wmHint, &classHint);
1164 1036
1165#if ENABLE_FRILLS 1037 Atom protocols[] = {
1038 xa[XA_WM_DELETE_WINDOW],
1039#if ENABLE_EWMH
1040 xa[XA_NET_WM_PING],
1041#endif
1042 };
1043
1044 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1045
1046#if ENABLE_EWMH
1166 long pid = getpid (); 1047 long pid = getpid ();
1167 XChangeProperty (display->display, TermWin.parent[0], 1048
1049 XChangeProperty (disp, top,
1168 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32, 1050 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1169 PropModeReplace, (unsigned char *)&pid, 1); 1051 PropModeReplace, (unsigned char *)&pid, 1);
1170#endif
1171 1052
1172 XSelectInput (display->display, TermWin.parent[0], 1053 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1054#endif
1055
1056 XSelectInput (disp, top,
1173 KeyPressMask 1057 KeyPressMask
1174#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1058#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1175 | KeyReleaseMask 1059 | KeyReleaseMask
1176#endif 1060#endif
1177 | FocusChangeMask | VisibilityChangeMask 1061 | FocusChangeMask | VisibilityChangeMask
1178 | ExposureMask
1179 | StructureNotifyMask); 1062 | ExposureMask | StructureNotifyMask);
1063
1180 termwin_ev.start (display, TermWin.parent[0]); 1064 termwin_ev.start (display, top);
1181 1065
1182#if ENABLE_FRILLS 1066#if ENABLE_FRILLS
1183 if (mwmhints.flags) 1067 if (mwmhints.flags)
1184 { 1068 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1185 prop = XInternAtom(display->display, "_MOTIF_WM_HINTS", False); 1069 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1186 XChangeProperty(display->display, TermWin.parent[0], prop, prop, 32, PropModeReplace, (unsigned char *) &mwmhints, PROP_MWM_HINTS_ELEMENTS);
1187 }
1188#endif 1070#endif
1189 1071
1190 /* vt cursor: Black-on-White is standard, but this is more popular */ 1072 /* vt cursor: Black-on-White is standard, but this is more popular */
1191 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1073 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1192 1074
1193#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1075#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1194 /* cursor (menuBar/scrollBar): Black-on-White */ 1076 /* cursor (menuBar/scrollBar): Black-on-White */
1195 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); 1077 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1196#endif 1078#endif
1079
1080 /* the vt window */
1081 vt = XCreateSimpleWindow (disp, top,
1082 window_vt_x,
1083 window_vt_y,
1084 TermWin_TotalWidth (),
1085 TermWin_TotalHeight (),
1086 0,
1087 pix_colors_focused[Color_fg],
1088 pix_colors_focused[Color_bg]);
1089#ifdef DEBUG_X
1090 XStoreName (disp, vt, "vt window");
1091#endif
1092
1093 attributes.bit_gravity = NorthWestGravity;
1094 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1095
1096 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1197 1097
1198#ifdef POINTER_BLANK 1098#ifdef POINTER_BLANK
1199 { 1099 if (OPTION (Opt_pointerBlank))
1200 XColor blackcolour;
1201 blackcolour.red = 0;
1202 blackcolour.green = 0;
1203 blackcolour.blue = 0;
1204 Font f = XLoadFont (display->display, "fixed");
1205 blank_cursor = XCreateGlyphCursor (display->display, f, f, ' ', ' ',
1206 &blackcolour, &blackcolour);
1207 XUnloadFont (display->display, f);
1208 }
1209#endif
1210
1211 /* the vt window */
1212 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0],
1213 window_vt_x,
1214 window_vt_y,
1215 TermWin_TotalWidth (),
1216 TermWin_TotalHeight (),
1217 0,
1218 pix_colors[Color_fg],
1219 pix_colors[Color_bg]);
1220#ifdef DEBUG_X
1221 XStoreName (display->display, TermWin.vt, "vt window");
1222#endif
1223
1224 attributes.bit_gravity = NorthWestGravity;
1225 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes);
1226
1227 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1228
1229 pointer_unblank ();
1230
1231#ifdef POINTER_BLANK
1232 if (options & Opt_pointerBlank)
1233 vt_emask |= PointerMotionMask; 1100 vt_emask |= PointerMotionMask;
1234 else 1101 else
1235#endif 1102#endif
1236 vt_emask |= Button1MotionMask | Button3MotionMask; 1103 vt_emask |= Button1MotionMask | Button3MotionMask;
1237 1104
1238 XSelectInput (display->display, TermWin.vt, vt_emask); 1105 XSelectInput (disp, vt, vt_emask);
1239 vt_ev.start (display, TermWin.vt); 1106 vt_ev.start (display, vt);
1240 1107
1241#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1108#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1242 if (menuBar_height ()) 1109 if (menuBar_height ())
1243 { 1110 {
1244 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1111 menuBar.win = XCreateSimpleWindow (disp, top,
1245 window_vt_x, 0, 1112 window_vt_x, 0,
1246 TermWin_TotalWidth (), 1113 TermWin_TotalWidth (),
1247 menuBar_TotalHeight (), 1114 menuBar_TotalHeight (),
1248 0, 1115 0,
1249 pix_colors[Color_fg], 1116 pix_colors_focused[Color_fg],
1250 pix_colors[Color_scroll]); 1117 pix_colors_focused[Color_scroll]);
1251 1118
1252#ifdef DEBUG_X 1119#ifdef DEBUG_X
1253 XStoreName (display->display, menuBar.win, "menubar"); 1120 XStoreName (disp, menuBar.win, "menubar");
1254#endif 1121#endif
1255 1122
1256 menuBar.drawable = new rxvt_drawable (display, menuBar.win); 1123 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1257 1124
1258 XDefineCursor (display->display, menuBar.win, 1125 XDefineCursor (disp, menuBar.win,
1259 XCreateFontCursor (display->display, XC_left_ptr)); 1126 XCreateFontCursor (disp, XC_left_ptr));
1260 1127
1261 XSelectInput (display->display, menuBar.win, 1128 XSelectInput (disp, menuBar.win,
1262 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1129 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1263 | Button1MotionMask));
1264 menubar_ev.start (display, menuBar.win); 1130 menubar_ev.start (display, menuBar.win);
1265 } 1131 }
1266#endif 1132#endif
1267 1133
1268#ifdef XPM_BACKGROUND 1134#ifdef XPM_BACKGROUND
1269 if (rs[Rs_backgroundPixmap] != NULL 1135 if (rs[Rs_backgroundPixmap] != NULL
1270 && ! (options & Opt_transparent)) 1136 && ! OPTION (Opt_transparent))
1271 { 1137 {
1272 const char *p = rs[Rs_backgroundPixmap]; 1138 const char *p = rs[Rs_backgroundPixmap];
1273 1139
1274 if ((p = strchr (p, ';')) != NULL) 1140 if ((p = strchr (p, ';')) != NULL)
1275 { 1141 {
1276 p++; 1142 p++;
1277 scale_pixmap (p); 1143 scale_pixmap (p);
1278 } 1144 }
1145
1279 set_bgPixmap (rs[Rs_backgroundPixmap]); 1146 set_bgPixmap (rs[Rs_backgroundPixmap]);
1280 scr_touch (True); 1147 scr_touch (true);
1281 } 1148 }
1282#endif 1149#endif
1283 1150
1284 /* graphics context for the vt window */ 1151 /* graphics context for the vt window */
1285 gcvalue.foreground = pix_colors[Color_fg]; 1152 gcvalue.foreground = pix_colors[Color_fg];
1286 gcvalue.background = pix_colors[Color_bg]; 1153 gcvalue.background = pix_colors[Color_bg];
1287 gcvalue.graphics_exposures = 1; 1154 gcvalue.graphics_exposures = 1;
1288 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1155 gc = XCreateGC (disp, vt,
1289 GCForeground | GCBackground | GCGraphicsExposures, 1156 GCForeground | GCBackground | GCGraphicsExposures,
1290 &gcvalue); 1157 &gcvalue);
1291 1158
1292 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1159 drawable = new rxvt_drawable (display, vt);
1293 1160
1294#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1161#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1295 gcvalue.foreground = pix_colors[Color_topShadow]; 1162 gcvalue.foreground = pix_colors[Color_topShadow];
1296 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1163 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1297 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1164 gcvalue.foreground = pix_colors[Color_bottomShadow];
1298 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1165 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1299 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1166 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1300 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1167 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1301#endif 1168#endif
1302 1169
1303#ifdef OFF_FOCUS_FADING 1170#ifdef OFF_FOCUS_FADING
1304 // initially we are in unfocused state 1171 // initially we are in unfocused state
1305 if (rs[Rs_fade]) 1172 if (rs[Rs_fade])
1306 pix_colors = pix_colors_unfocused; 1173 pix_colors = pix_colors_unfocused;
1174#endif
1175
1176 pointer_unblank ();
1177 scr_recolour ();
1178
1179#if ENABLE_XEMBED
1180 if (rs[Rs_embed])
1181 {
1182 long info[2] = { 0, XEMBED_MAPPED };
1183
1184 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1185 32, PropModeReplace, (unsigned char *)&info, 2);
1186 }
1307#endif 1187#endif
1308} 1188}
1309 1189
1310/* ------------------------------------------------------------------------- * 1190/* ------------------------------------------------------------------------- *
1311 * GET TTY CURRENT STATE * 1191 * GET TTY CURRENT STATE *
… …
1317 /* 1197 /*
1318 * standard System V termios interface 1198 * standard System V termios interface
1319 */ 1199 */
1320 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1200 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1321 { 1201 {
1322 /* return error - use system defaults */ 1202 // return error - use system defaults,
1203 // where possible, and zero elsewhere
1204 memset (tio, 0, sizeof (ttymode_t));
1205
1323 tio->c_cc[VINTR] = CINTR; 1206 tio->c_cc[VINTR] = CINTR;
1324 tio->c_cc[VQUIT] = CQUIT; 1207 tio->c_cc[VQUIT] = CQUIT;
1325 tio->c_cc[VERASE] = CERASE; 1208 tio->c_cc[VERASE] = CERASE;
1209#ifdef VERASE2
1210 tio->c_cc[VERASE2] = CERASE2;
1211#endif
1326 tio->c_cc[VKILL] = CKILL; 1212 tio->c_cc[VKILL] = CKILL;
1327 tio->c_cc[VSTART] = CSTART; 1213 tio->c_cc[VSTART] = CSTART;
1328 tio->c_cc[VSTOP] = CSTOP; 1214 tio->c_cc[VSTOP] = CSTOP;
1329 tio->c_cc[VSUSP] = CSUSP; 1215 tio->c_cc[VSUSP] = CSUSP;
1330# ifdef VDSUSP 1216# ifdef VDSUSP
1331
1332 tio->c_cc[VDSUSP] = CDSUSP; 1217 tio->c_cc[VDSUSP] = CDSUSP;
1333# endif 1218# endif
1334# ifdef VREPRINT 1219# ifdef VREPRINT
1335
1336 tio->c_cc[VREPRINT] = CRPRNT; 1220 tio->c_cc[VREPRINT] = CRPRNT;
1337# endif 1221# endif
1338# ifdef VDISCRD 1222# ifdef VDISCRD
1339
1340 tio->c_cc[VDISCRD] = CFLUSH; 1223 tio->c_cc[VDISCRD] = CFLUSH;
1341# endif 1224# endif
1342# ifdef VWERSE 1225# ifdef VWERSE
1343
1344 tio->c_cc[VWERSE] = CWERASE; 1226 tio->c_cc[VWERSE] = CWERASE;
1345# endif 1227# endif
1346# ifdef VLNEXT 1228# ifdef VLNEXT
1347
1348 tio->c_cc[VLNEXT] = CLNEXT; 1229 tio->c_cc[VLNEXT] = CLNEXT;
1349# endif 1230# endif
1350
1351 } 1231 }
1232
1352 tio->c_cc[VEOF] = CEOF; 1233 tio->c_cc[VEOF] = CEOF;
1353 tio->c_cc[VEOL] = VDISABLE; 1234 tio->c_cc[VEOL] = VDISABLE;
1354# ifdef VEOL2 1235# ifdef VEOL2
1355
1356 tio->c_cc[VEOL2] = VDISABLE; 1236 tio->c_cc[VEOL2] = VDISABLE;
1357# endif 1237# endif
1358# ifdef VSWTC 1238# ifdef VSWTC
1359
1360 tio->c_cc[VSWTC] = VDISABLE; 1239 tio->c_cc[VSWTC] = VDISABLE;
1361# endif 1240# endif
1362# ifdef VSWTCH 1241# ifdef VSWTCH
1363
1364 tio->c_cc[VSWTCH] = VDISABLE; 1242 tio->c_cc[VSWTCH] = VDISABLE;
1365# endif 1243# endif
1366# if VMIN != VEOF 1244# if VMIN != VEOF
1367
1368 tio->c_cc[VMIN] = 1; 1245 tio->c_cc[VMIN] = 1;
1369# endif 1246# endif
1370# if VTIME != VEOL 1247# if VTIME != VEOL
1371
1372 tio->c_cc[VTIME] = 0; 1248 tio->c_cc[VTIME] = 0;
1373# endif 1249# endif
1374 1250
1375 if (erase != -1) 1251 if (erase != -1)
1376 tio->c_cc[VERASE] = (char)erase; 1252 tio->c_cc[VERASE] = (char)erase;
… …
1404 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1280 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1405 { 1281 {
1406 tio->sg.sg_erase = CERASE; /* ^H */ 1282 tio->sg.sg_erase = CERASE; /* ^H */
1407 tio->sg.sg_kill = CKILL; /* ^U */ 1283 tio->sg.sg_kill = CKILL; /* ^U */
1408 } 1284 }
1285
1409 if (erase != -1) 1286 if (erase != -1)
1410 tio->sg.sg_erase = (char)erase; 1287 tio->sg.sg_erase = (char)erase;
1411 1288
1412 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1289 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1413 1290
… …
1419 tio->tc.t_startc = CSTART; /* ^Q */ 1296 tio->tc.t_startc = CSTART; /* ^Q */
1420 tio->tc.t_stopc = CSTOP; /* ^S */ 1297 tio->tc.t_stopc = CSTOP; /* ^S */
1421 tio->tc.t_eofc = CEOF; /* ^D */ 1298 tio->tc.t_eofc = CEOF; /* ^D */
1422 tio->tc.t_brkc = -1; 1299 tio->tc.t_brkc = -1;
1423 } 1300 }
1301
1424 /* get local special chars */ 1302 /* get local special chars */
1425 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1303 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1426 { 1304 {
1427 tio->lc.t_suspc = CSUSP; /* ^Z */ 1305 tio->lc.t_suspc = CSUSP; /* ^Z */
1428 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1306 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1432 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1310 tio->lc.t_lnextc = CLNEXT; /* ^V */
1433 } 1311 }
1434 /* get line discipline */ 1312 /* get line discipline */
1435 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1313 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1436# ifdef NTTYDISC 1314# ifdef NTTYDISC
1437
1438 tio->line = NTTYDISC; 1315 tio->line = NTTYDISC;
1439# endif /* NTTYDISC */ 1316# endif /* NTTYDISC */
1440 1317
1441 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1318 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1442#endif /* HAVE_TERMIOS_H */ 1319#endif /* HAVE_TERMIOS_H */
… …
1465 FOO (IGNCR, "IGNCR"); 1342 FOO (IGNCR, "IGNCR");
1466 FOO (ICRNL, "ICRNL"); 1343 FOO (ICRNL, "ICRNL");
1467 FOO (IXON, "IXON"); 1344 FOO (IXON, "IXON");
1468 FOO (IXOFF, "IXOFF"); 1345 FOO (IXOFF, "IXOFF");
1469# ifdef IUCLC 1346# ifdef IUCLC
1470
1471 FOO (IUCLC, "IUCLC"); 1347 FOO (IUCLC, "IUCLC");
1472# endif 1348# endif
1473# ifdef IXANY 1349# ifdef IXANY
1474
1475 FOO (IXANY, "IXANY"); 1350 FOO (IXANY, "IXANY");
1476# endif 1351# endif
1477# ifdef IMAXBEL 1352# ifdef IMAXBEL
1478
1479 FOO (IMAXBEL, "IMAXBEL"); 1353 FOO (IMAXBEL, "IMAXBEL");
1480# endif 1354# endif
1481 1355
1482 fprintf (stderr, "\n"); 1356 fprintf (stderr, "\n");
1483 1357
… …
1490 FOO (VERASE, "VERASE"); 1364 FOO (VERASE, "VERASE");
1491 FOO (VKILL, "VKILL"); 1365 FOO (VKILL, "VKILL");
1492 FOO (VEOF, "VEOF"); 1366 FOO (VEOF, "VEOF");
1493 FOO (VEOL, "VEOL"); 1367 FOO (VEOL, "VEOL");
1494# ifdef VEOL2 1368# ifdef VEOL2
1495
1496 FOO (VEOL2, "VEOL2"); 1369 FOO (VEOL2, "VEOL2");
1497# endif 1370# endif
1498# ifdef VSWTC 1371# ifdef VSWTC
1499
1500 FOO (VSWTC, "VSWTC"); 1372 FOO (VSWTC, "VSWTC");
1501# endif 1373# endif
1502# ifdef VSWTCH 1374# ifdef VSWTCH
1503
1504 FOO (VSWTCH, "VSWTCH"); 1375 FOO (VSWTCH, "VSWTCH");
1505# endif 1376# endif
1506
1507 FOO (VSTART, "VSTART"); 1377 FOO (VSTART, "VSTART");
1508 FOO (VSTOP, "VSTOP"); 1378 FOO (VSTOP, "VSTOP");
1509 FOO (VSUSP, "VSUSP"); 1379 FOO (VSUSP, "VSUSP");
1510# ifdef VDSUSP 1380# ifdef VDSUSP
1511
1512 FOO (VDSUSP, "VDSUSP"); 1381 FOO (VDSUSP, "VDSUSP");
1513# endif 1382# endif
1514# ifdef VREPRINT 1383# ifdef VREPRINT
1515
1516 FOO (VREPRINT, "VREPRINT"); 1384 FOO (VREPRINT, "VREPRINT");
1517# endif 1385# endif
1518# ifdef VDISCRD 1386# ifdef VDISCRD
1519
1520 FOO (VDISCRD, "VDISCRD"); 1387 FOO (VDISCRD, "VDISCRD");
1521# endif 1388# endif
1522# ifdef VWERSE 1389# ifdef VWERSE
1523
1524 FOO (VWERSE, "VWERSE"); 1390 FOO (VWERSE, "VWERSE");
1525# endif 1391# endif
1526# ifdef VLNEXT 1392# ifdef VLNEXT
1527
1528 FOO (VLNEXT, "VLNEXT"); 1393 FOO (VLNEXT, "VLNEXT");
1529# endif 1394# endif
1530 1395
1531 fprintf (stderr, "\n"); 1396 fprintf (stderr, "\n");
1532# undef FOO 1397# undef FOO
… …
1541 * the slave. 1406 * the slave.
1542 */ 1407 */
1543void 1408void
1544rxvt_term::run_command (const char *const *argv) 1409rxvt_term::run_command (const char *const *argv)
1545{ 1410{
1411#if ENABLE_FRILLS
1412 if (rs[Rs_pty_fd])
1413 {
1414 pty.pty = atoi (rs[Rs_pty_fd]);
1415
1416 if (getfd_hook)
1417 pty.pty = (*getfd_hook) (pty.pty);
1418
1419 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK))
1420 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1421 }
1422 else
1423#endif
1424 if (!pty.get ())
1425 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1426
1427 pty.set_utf8_mode (enc_utf8);
1428
1429 /* set initial window size */
1430 tt_winch ();
1431
1546 int er; 1432 int er;
1547
1548 if (!pty.get ())
1549 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1550 1433
1551#ifndef NO_BACKSPACE_KEY 1434#ifndef NO_BACKSPACE_KEY
1552 if (key_backspace[0] && !key_backspace[1]) 1435 if (key_backspace[0] && !key_backspace[1])
1553 er = key_backspace[0]; 1436 er = key_backspace[0];
1554 else if (strcmp (key_backspace, "DEC") == 0) 1437 else if (strcmp (key_backspace, "DEC") == 0)
… …
1557#endif 1440#endif
1558 er = -1; 1441 er = -1;
1559 1442
1560 rxvt_get_ttymode (&tio, er); 1443 rxvt_get_ttymode (&tio, er);
1561 1444
1562 /* set initial window size */ 1445#if ENABLE_FRILLS
1563 tt_winch (); 1446 if (rs[Rs_pty_fd])
1447 return;
1448#endif
1564 1449
1565#ifndef __QNX__ 1450#ifndef __QNX__
1566 /* spin off the command interpreter */ 1451 /* spin off the command interpreter */
1567 switch (cmd_pid = fork ()) 1452 switch (cmd_pid = fork ())
1568 { 1453 {
1569 case -1: 1454 case -1:
1455 {
1456 cmd_pid = 0;
1570 rxvt_fatal ("can't fork, aborting.\n"); 1457 rxvt_fatal ("can't fork, aborting.\n");
1458 }
1571 case 0: 1459 case 0:
1572 init_env (); 1460 init_env ();
1573 1461
1574 if (!pty.make_controlling_tty ()) 1462 if (!pty.make_controlling_tty ())
1575 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1463 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
… …
1638{ 1526{
1639 char *login; 1527 char *login;
1640 1528
1641 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1529 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1642 1530
1643 if (options & Opt_console) 1531 if (OPTION (Opt_console))
1644 { /* be virtual console, fail silently */ 1532 { /* be virtual console, fail silently */
1645#ifdef TIOCCONS 1533#ifdef TIOCCONS
1646 unsigned int on = 1; 1534 unsigned int on = 1;
1647 1535
1648 ioctl (STDIN_FILENO, TIOCCONS, &on); 1536 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1698 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1586 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1699 shell = "/bin/sh"; 1587 shell = "/bin/sh";
1700 1588
1701 argv0 = (const char *)rxvt_r_basename (shell); 1589 argv0 = (const char *)rxvt_r_basename (shell);
1702 1590
1703 if (options & Opt_loginShell) 1591 if (OPTION (Opt_loginShell))
1704 { 1592 {
1705 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1593 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1706 1594
1707 login[0] = '-'; 1595 login[0] = '-';
1708 strcpy (&login[1], argv0); 1596 strcpy (&login[1], argv0);
… …
1743 if ((command = getenv ("SHELL")) == NULL || *command == '\0') 1631 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1744 command = "/bin/sh"; 1632 command = "/bin/sh";
1745 1633
1746 arg_a[0] = my_basename (command); 1634 arg_a[0] = my_basename (command);
1747 1635
1748 if (options & Opt_loginShell) 1636 if (OPTION (Opt_loginShell))
1749 { 1637 {
1750 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char)); 1638 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1751 1639
1752 login[0] = '-'; 1640 login[0] = '-';
1753 strcpy (&login[1], arg_a[0]); 1641 strcpy (&login[1], arg_a[0]);

Diff Legend

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