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.110 by root, Thu Feb 17 15:07:48 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 "rgbi:0/0/0", /* default 16-255 color table */ 74 // 88 xterm colours
74 "rgbi:0/0/.2", /* consists of 6 6x6 colour cubes */ 75 "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", 76 "rgb:00/00/8b",
78 "rgbi:0/0/1", 77 "rgb:00/00/cd",
79 "rgbi:0/.2/0", 78 "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", 79 "rgb:00/8b/00",
98 "rgbi:0/.8/.2",
99 "rgbi:0/.8/.4",
100 "rgbi:0/.8/.6",
101 "rgbi:0/.8/.8", 80 "rgb:00/8b/8b",
102 "rgbi:0/.8/1", 81 "rgb:00/8b/cd",
82 "rgb:00/8b/ff",
103 "rgbi:0/1/0", 83 "rgb:00/cd/00",
104 "rgbi:0/1/.2",
105 "rgbi:0/1/.4",
106 "rgbi:0/1/.6",
107 "rgbi:0/1/.8", 84 "rgb:00/cd/8b",
108 "rgbi:0/1/1", 85 "rgb:00/cd/cd",
86 "rgb:00/cd/ff",
109 "rgbi:.2/0/0", 87 "rgb:00/ff/00",
110 "rgbi:.2/0/.2", 88 "rgb:00/ff/8b",
111 "rgbi:.2/0/.4", 89 "rgb:00/ff/cd",
112 "rgbi:.2/0/.6", 90 "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", 91 "rgb:8b/00/00",
218 "rgbi:.8/0/.2",
219 "rgbi:.8/0/.4",
220 "rgbi:.8/0/.6",
221 "rgbi:.8/0/.8", 92 "rgb:8b/00/8b",
222 "rgbi:.8/0/1", 93 "rgb:8b/00/cd",
223 "rgbi:.8/.2/0", 94 "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", 95 "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", 96 "rgb:8b/8b/8b",
290 "rgb:12/12/12", 97 "rgb:8b/8b/cd",
98 "rgb:8b/8b/ff",
99 "rgb:8b/cd/00",
100 "rgb:8b/cd/8b",
101 "rgb:8b/cd/cd",
102 "rgb:8b/cd/ff",
103 "rgb:8b/ff/00",
104 "rgb:8b/ff/8b",
105 "rgb:8b/ff/cd",
106 "rgb:8b/ff/ff",
107 "rgb:cd/00/00",
108 "rgb:cd/00/8b",
109 "rgb:cd/00/cd",
110 "rgb:cd/00/ff",
111 "rgb:cd/8b/00",
112 "rgb:cd/8b/8b",
113 "rgb:cd/8b/cd",
114 "rgb:cd/8b/ff",
115 "rgb:cd/cd/00",
116 "rgb:cd/cd/8b",
291 "rgb:1c/1c/1c", 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",
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",
292 "rgb:26/26/26", 139 "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", 140 "rgb:5c/5c/5c",
298 "rgb:62/62/62",
299 "rgb:6c/6c/6c",
300 "rgb:76/76/76", 141 "rgb:73/73/73",
301 "rgb:80/80/80", 142 "rgb:8b/8b/8b",
302 "rgb:8a/8a/8a", 143 "rgb:a2/a2/a2",
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 pix_colors_focused = 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 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 215 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
365#endif 216#endif
366 pix_colors = pix_colors_focused; 217 pix_colors = pix_colors_focused;
… …
374 225
375 MEvent.time = CurrentTime; 226 MEvent.time = CurrentTime;
376 MEvent.button = AnyButton; 227 MEvent.button = AnyButton;
377 options = DEFAULT_OPTIONS; 228 options = DEFAULT_OPTIONS;
378 want_refresh = 1; 229 want_refresh = 1;
379 cmd_pid = -1;
380 pty.pty = pty.tty = -1;
381 priv_modes = SavedModes = PrivMode_Default; 230 priv_modes = SavedModes = PrivMode_Default;
382 TermWin.focus = 0; 231 TermWin.focus = 0;
383 TermWin.ncol = 80; 232 TermWin.ncol = 80;
384 TermWin.nrow = 24; 233 TermWin.nrow = 24;
385 TermWin.int_bwidth = INTERNALBORDERWIDTH; 234 TermWin.int_bwidth = INTERNALBORDERWIDTH;
386 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 235 TermWin.ext_bwidth = EXTERNALBORDERWIDTH;
387 TermWin.lineSpace = LINESPACE; 236 TermWin.lineSpace = LINESPACE;
388 TermWin.saveLines = SAVELINES; 237 TermWin.saveLines = SAVELINES;
389 numpix_colors = TOTAL_COLORS; 238 numpix_colors = TOTAL_COLORS;
390 239
391#ifndef NO_BRIGHTCOLOR
392 colorfgbg = DEFAULT_RSTYLE;
393#endif
394
395 refresh_limit = 1; 240 refresh_limit = 1;
396 refresh_type = SLOW_REFRESH; 241 refresh_type = SLOW_REFRESH;
397 prev_nrow = prev_ncol = 0; 242 prev_nrow = prev_ncol = 0;
398 243
399 oldcursor.row = oldcursor.col = -1; 244 oldcursor.row = oldcursor.col = -1;
… …
406 last_bot = last_state = -1; 251 last_bot = last_state = -1;
407 252
408#ifdef MENUBAR 253#ifdef MENUBAR
409 menu_readonly = 1; 254 menu_readonly = 1;
410# if ! (MENUBAR_MAX > 1) 255# if ! (MENUBAR_MAX > 1)
411 CurrentBar = & (BarList); 256 CurrentBar = &BarList;
412# endif /* (MENUBAR_MAX > 1) */ 257# endif /* (MENUBAR_MAX > 1) */
413#endif 258#endif
414 259
415 return true; 260 return true;
416} 261}
… …
490 */ 335 */
491 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 336 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
492 rs[Rs_display_name] = ":0"; 337 rs[Rs_display_name] = ":0";
493 338
494 get_options (r_argc, r_argv); 339 get_options (r_argc, r_argv);
495 free (r_argv);
496 340
497#ifdef LOCAL_X_IS_UNIX 341#ifdef LOCAL_X_IS_UNIX
498 if (rs[Rs_display_name][0] == ':') 342 if (rs[Rs_display_name][0] == ':')
499 { 343 {
500 val = rxvt_malloc (5 + strlen (rs[Rs_display_name])); 344 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
… …
507 351
508 if (!display 352 if (!display
509 && ! (display = displays.get (rs[Rs_display_name]))) 353 && ! (display = displays.get (rs[Rs_display_name])))
510 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 354 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
511 355
512 extract_resources (display->display, rs[Rs_name]); 356 extract_resources ();
357 free (r_argv);
513 358
514 /* 359 /*
515 * set any defaults not already set 360 * set any defaults not already set
516 */ 361 */
517 if (cmd_argv && cmd_argv[0]) 362 if (cmd_argv && cmd_argv[0])
… …
535#if ENABLE_FRILLS 380#if ENABLE_FRILLS
536 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 381 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
537 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 382 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */
538 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 383 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
539 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 384 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */
540#endif
541
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 TermWin.lineSpace = min (i, 100); /* arbitrary limit */
545#endif 387#endif
546 388
547#ifdef POINTER_BLANK 389#ifdef POINTER_BLANK
… …
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 (options & Opt_reverseVideo)
… …
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
… …
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 = (options & Opt_meta8 ? 0x80 : C0_ESC);
826#endif 654#endif
827 655
… …
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 }
… …
985 i -= 8; 814 i -= 8;
986#ifndef NO_BRIGHTCOLOR 815#ifndef NO_BRIGHTCOLOR
987 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 816 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
988 return; 817 return;
989#endif 818#endif
990
991 } 819 }
992 820
993 if (i >= 0 && i <= 7) /* normal colors */ 821 if (i >= 0 && i <= 7) /* normal colors */
994 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 822 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
995 } 823 }
… …
1001 * Use resource ``modifier'' to override the Meta modifier 829 * Use resource ``modifier'' to override the Meta modifier
1002 */ 830 */
1003void 831void
1004rxvt_term::get_ourmods () 832rxvt_term::get_ourmods ()
1005{ 833{
1006 int i, j, k; 834 int i, j, k;
1007 int requestedmeta, realmeta, realalt; 835 int requestedmeta, realmeta, realalt;
1008 const char *cm, *rsmod; 836 const char *cm, *rsmod;
1009 XModifierKeymap *map; 837 XModifierKeymap *map;
1010 KeyCode *kc; 838 KeyCode *kc;
1011 const unsigned int modmasks[] = 839 const unsigned int modmasks[] =
1012 { 840 {
1013 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 841 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
1014 }; 842 };
1015 843
1016 requestedmeta = realmeta = realalt = 0; 844 requestedmeta = realmeta = realalt = 0;
1017 rsmod = rs[Rs_modifier]; 845 rsmod = rs[Rs_modifier];
846
1018 if (rsmod 847 if (rsmod
1019 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 848 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
1020 requestedmeta = rsmod[3] - '0'; 849 requestedmeta = rsmod[3] - '0';
1021 850
1022 map = XGetModifierMapping (display->display); 851 map = XGetModifierMapping (display->display);
1023 kc = map->modifiermap; 852 kc = map->modifiermap;
853
1024 for (i = 1; i < 6; i++) 854 for (i = 1; i < 6; i++)
1025 { 855 {
1026 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 856 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
857
1027 for (j = map->max_keypermod; j--; k++) 858 for (j = map->max_keypermod; j--; k++)
1028 { 859 {
1029 if (kc[k] == 0) 860 if (kc[k] == 0)
1030 break; 861 break;
862
1031 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 863 switch (XKeycodeToKeysym (display->display, kc[k], 0))
1032 { 864 {
1033 case XK_Num_Lock: 865 case XK_Num_Lock:
1034 ModNumLockMask = modmasks[i - 1]; 866 ModNumLockMask = modmasks[i - 1];
1035 /* FALLTHROUGH */ 867 continue;
1036 default: 868
1037 continue; /* for (;;) */ 869 case XK_ISO_Level3_Shift:
870 ModLevel3Mask = modmasks[i - 1];
871 continue;
872
1038 case XK_Meta_L: 873 case XK_Meta_L:
1039 case XK_Meta_R: 874 case XK_Meta_R:
1040 cm = "meta"; 875 cm = "meta";
1041 realmeta = i; 876 realmeta = i;
1042 break; 877 break;
878
1043 case XK_Alt_L: 879 case XK_Alt_L:
1044 case XK_Alt_R: 880 case XK_Alt_R:
1045 cm = "alt"; 881 cm = "alt";
1046 realalt = i; 882 realalt = i;
1047 break; 883 break;
884
1048 case XK_Super_L: 885 case XK_Super_L:
1049 case XK_Super_R: 886 case XK_Super_R:
1050 cm = "super"; 887 cm = "super";
1051 break; 888 break;
889
1052 case XK_Hyper_L: 890 case XK_Hyper_L:
1053 case XK_Hyper_R: 891 case XK_Hyper_R:
1054 cm = "hyper"; 892 cm = "hyper";
1055 break; 893 break;
894
895 default:
896 continue;
1056 } 897 }
898
1057 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0) 899 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)
1058 requestedmeta = i; 900 requestedmeta = i;
1059 } 901 }
1060 } 902 }
903
1061 XFreeModifiermap (map); 904 XFreeModifiermap (map);
905
1062 i = (requestedmeta ? requestedmeta 906 i = requestedmeta ? requestedmeta
1063 : (realmeta ? realmeta 907 : realmeta ? realmeta
1064 : (realalt ? realalt : 0))); 908 : realalt ? realalt
909 : 0;
910
1065 if (i) 911 if (i)
1066 ModMetaMask = modmasks[i - 1]; 912 ModMetaMask = modmasks[i - 1];
1067} 913}
1068 914
1069/*----------------------------------------------------------------------*/ 915/*----------------------------------------------------------------------*/
… …
1079#endif 925#endif
1080 XGCValues gcvalue; 926 XGCValues gcvalue;
1081 long vt_emask; 927 long vt_emask;
1082 XSetWindowAttributes attributes; 928 XSetWindowAttributes attributes;
1083 XWindowAttributes gattr; 929 XWindowAttributes gattr;
930 Window top;
931 dDisp;
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);
1084 940
1085 if (options & Opt_transparent) 941 if (options & Opt_transparent)
1086 { 942 {
1087 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 943 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
1088 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 944 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
1089 } 945 }
1090 946
1091#if ENABLE_FRILLS 947#if ENABLE_FRILLS
1092 if (options & Opt_borderLess) 948 if (options & Opt_borderLess)
1093 { 949 {
1094 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 950 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
951
1095 if (prop == None) 952 if (prop == None)
1096 { 953 {
1097 /* 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");*/
1098#ifdef PREFER_24BIT 955#ifdef PREFER_24BIT
1099 attributes.override_redirect = TRUE; 956 attributes.override_redirect = TRUE;
… …
1113#endif 970#endif
1114 971
1115 /* grab colors before netscape does */ 972 /* grab colors before netscape does */
1116 Get_Colours (); 973 Get_Colours ();
1117 974
1118 if (!change_font (rs[Rs_font])) 975 if (!set_fonts ())
1119 { 976 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"); 977
1121 destroy (); 978#if ENABLE_FRILLS
1122 return; 979 if (rs[Rs_embed])
1123 } 980 {
981 top = strtol (rs[Rs_embed], 0, 0);
1124 982
983 XWindowAttributes wattr;
984 XGetWindowAttributes (disp, top, &wattr);
985
986 window_calc (wattr.width, wattr.height);
987
988#if 0
989 if (wattr.map_state == IsViewable)
990 {
991 TermWin.mapped = 1;
992 refresh_type = FAST_REFRESH;
993 XClearWindow (disp, top);
994 // TODO: make XMapNotify-event-code a function and call it
995 // TODO: how can I detetc visibility without unmpa/map?
996 // TODO: focusin etc.
997 }
998#else
999 // it'S easiets just to unmap/map to get all state correctly set-up
1000 XUnmapWindow (disp, top);
1001#endif
1002 }
1003 else
1004#endif
1005 {
1125 window_calc (0, 0); 1006 window_calc (0, 0);
1007
1008 /* sub-window placement & size in rxvt_resize_subwindows () */
1009#ifdef PREFER_24BIT
1010 attributes.background_pixel = pix_colors_focused[Color_border];
1011 attributes.border_pixel = pix_colors_focused[Color_border];
1012 attributes.colormap = display->cmap;
1013 top = XCreateWindow (disp, DefaultRootWindow (disp),
1014 szHint.x, szHint.y,
1015 szHint.width, szHint.height,
1016 TermWin.ext_bwidth,
1017 display->depth, InputOutput,
1018 display->visual,
1019 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1020#else
1021 top = XCreateSimpleWindow (disp, DefaultRootWindow (disp),
1022 szHint.x, szHint.y,
1023 szHint.width, szHint.height,
1024 TermWin.ext_bwidth,
1025 pix_colors_focused[Color_border],
1026 pix_colors_focused[Color_border]);
1027#endif
1028 }
1029
1030 TermWin.parent[0] = top;
1031
1126 old_width = szHint.width; 1032 old_width = szHint.width;
1127 old_height = szHint.height; 1033 old_height = szHint.height;
1128
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 1034
1151 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1035 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1152 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1036 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1153 1037
1154 classHint.res_name = (char *)rs[Rs_name]; 1038 classHint.res_name = (char *)rs[Rs_name];
1155 classHint.res_class = (char *)RESCLASS; 1039 classHint.res_class = (char *)RESCLASS;
1156 1040
1157 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1041 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1158 wmHint.input = True; 1042 wmHint.input = True;
1159 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1043 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
1160 wmHint.window_group = TermWin.parent[0]; 1044 wmHint.window_group = top;
1161 1045
1162 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1046 XSetWMProperties (disp, top, NULL, NULL,
1163 (char **)argv, argc, &szHint, &wmHint, &classHint); 1047 (char **)argv, argc, &szHint, &wmHint, &classHint);
1048
1049 /* Enable delete window protocol */
1050 XSetWMProtocols (disp, top, &xa[XA_WMDELETEWINDOW], 1);
1164 1051
1165#if ENABLE_FRILLS 1052#if ENABLE_FRILLS
1166 long pid = getpid (); 1053 long pid = getpid ();
1167 XChangeProperty (display->display, TermWin.parent[0], 1054
1055 XChangeProperty (disp, top,
1168 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32, 1056 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1169 PropModeReplace, (unsigned char *)&pid, 1); 1057 PropModeReplace, (unsigned char *)&pid, 1);
1170#endif 1058#endif
1171 1059
1172 XSelectInput (display->display, TermWin.parent[0], 1060 XSelectInput (disp, top,
1173 KeyPressMask 1061 KeyPressMask
1174#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1062#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1175 | KeyReleaseMask 1063 | KeyReleaseMask
1176#endif 1064#endif
1177 | FocusChangeMask | VisibilityChangeMask 1065 | FocusChangeMask | VisibilityChangeMask
1178 | ExposureMask 1066 | ExposureMask
1179 | StructureNotifyMask); 1067 | StructureNotifyMask);
1180 termwin_ev.start (display, TermWin.parent[0]); 1068 termwin_ev.start (display, top);
1181 1069
1182#if ENABLE_FRILLS 1070#if ENABLE_FRILLS
1183 if (mwmhints.flags) 1071 if (mwmhints.flags)
1184 { 1072 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1185 prop = XInternAtom(display->display, "_MOTIF_WM_HINTS", False); 1073 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 1074#endif
1189 1075
1190 /* vt cursor: Black-on-White is standard, but this is more popular */ 1076 /* vt cursor: Black-on-White is standard, but this is more popular */
1191 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1077 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1192 1078
1193#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1079#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1194 /* cursor (menuBar/scrollBar): Black-on-White */ 1080 /* cursor (menuBar/scrollBar): Black-on-White */
1195 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); 1081 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1196#endif
1197
1198#ifdef POINTER_BLANK
1199 {
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 1082#endif
1210 1083
1211 /* the vt window */ 1084 /* the vt window */
1212 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1085 TermWin.vt = XCreateSimpleWindow (disp, top,
1213 window_vt_x, 1086 window_vt_x,
1214 window_vt_y, 1087 window_vt_y,
1215 TermWin_TotalWidth (), 1088 TermWin_TotalWidth (),
1216 TermWin_TotalHeight (), 1089 TermWin_TotalHeight (),
1217 0, 1090 0,
1218 pix_colors[Color_fg], 1091 pix_colors_focused[Color_fg],
1219 pix_colors[Color_bg]); 1092 pix_colors_focused[Color_bg]);
1220#ifdef DEBUG_X 1093#ifdef DEBUG_X
1221 XStoreName (display->display, TermWin.vt, "vt window"); 1094 XStoreName (disp, TermWin.vt, "vt window");
1222#endif 1095#endif
1223 1096
1224 attributes.bit_gravity = NorthWestGravity; 1097 attributes.bit_gravity = NorthWestGravity;
1225 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); 1098 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);
1226 1099
1227 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1100 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1228 1101
1229 pointer_unblank (); 1102 pointer_unblank ();
1230 1103
… …
1233 vt_emask |= PointerMotionMask; 1106 vt_emask |= PointerMotionMask;
1234 else 1107 else
1235#endif 1108#endif
1236 vt_emask |= Button1MotionMask | Button3MotionMask; 1109 vt_emask |= Button1MotionMask | Button3MotionMask;
1237 1110
1238 XSelectInput (display->display, TermWin.vt, vt_emask); 1111 XSelectInput (disp, TermWin.vt, vt_emask);
1239 vt_ev.start (display, TermWin.vt); 1112 vt_ev.start (display, TermWin.vt);
1240 1113
1241#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1114#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1242 if (menuBar_height ()) 1115 if (menuBar_height ())
1243 { 1116 {
1244 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1117 menuBar.win = XCreateSimpleWindow (disp, top,
1245 window_vt_x, 0, 1118 window_vt_x, 0,
1246 TermWin_TotalWidth (), 1119 TermWin_TotalWidth (),
1247 menuBar_TotalHeight (), 1120 menuBar_TotalHeight (),
1248 0, 1121 0,
1249 pix_colors[Color_fg], 1122 pix_colors_focused[Color_fg],
1250 pix_colors[Color_scroll]); 1123 pix_colors_focused[Color_scroll]);
1251 1124
1252#ifdef DEBUG_X 1125#ifdef DEBUG_X
1253 XStoreName (display->display, menuBar.win, "menubar"); 1126 XStoreName (disp, menuBar.win, "menubar");
1254#endif 1127#endif
1255 1128
1256 menuBar.drawable = new rxvt_drawable (display, menuBar.win); 1129 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1257 1130
1258 XDefineCursor (display->display, menuBar.win, 1131 XDefineCursor (disp, menuBar.win,
1259 XCreateFontCursor (display->display, XC_left_ptr)); 1132 XCreateFontCursor (disp, XC_left_ptr));
1260 1133
1261 XSelectInput (display->display, menuBar.win, 1134 XSelectInput (disp, menuBar.win,
1262 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1135 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1263 | Button1MotionMask));
1264 menubar_ev.start (display, menuBar.win); 1136 menubar_ev.start (display, menuBar.win);
1265 } 1137 }
1266#endif 1138#endif
1267 1139
1268#ifdef XPM_BACKGROUND 1140#ifdef XPM_BACKGROUND
… …
1274 if ((p = strchr (p, ';')) != NULL) 1146 if ((p = strchr (p, ';')) != NULL)
1275 { 1147 {
1276 p++; 1148 p++;
1277 scale_pixmap (p); 1149 scale_pixmap (p);
1278 } 1150 }
1151
1279 set_bgPixmap (rs[Rs_backgroundPixmap]); 1152 set_bgPixmap (rs[Rs_backgroundPixmap]);
1280 scr_touch (True); 1153 scr_touch (true);
1281 } 1154 }
1282#endif 1155#endif
1283 1156
1284 /* graphics context for the vt window */ 1157 /* graphics context for the vt window */
1285 gcvalue.foreground = pix_colors[Color_fg]; 1158 gcvalue.foreground = pix_colors[Color_fg];
1286 gcvalue.background = pix_colors[Color_bg]; 1159 gcvalue.background = pix_colors[Color_bg];
1287 gcvalue.graphics_exposures = 1; 1160 gcvalue.graphics_exposures = 1;
1288 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1161 TermWin.gc = XCreateGC (disp, TermWin.vt,
1289 GCForeground | GCBackground | GCGraphicsExposures, 1162 GCForeground | GCBackground | GCGraphicsExposures,
1290 &gcvalue); 1163 &gcvalue);
1291 1164
1292 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1165 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1293 1166
1294#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1167#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1295 gcvalue.foreground = pix_colors[Color_topShadow]; 1168 gcvalue.foreground = pix_colors[Color_topShadow];
1296 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1169 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1297 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1170 gcvalue.foreground = pix_colors[Color_bottomShadow];
1298 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1171 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1299 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1172 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1300 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1173 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1301#endif 1174#endif
1302 1175
1303#ifdef OFF_FOCUS_FADING 1176#ifdef OFF_FOCUS_FADING
1304 // initially we are in unfocused state 1177 // initially we are in unfocused state
1305 if (rs[Rs_fade]) 1178 if (rs[Rs_fade])
1306 pix_colors = pix_colors_unfocused; 1179 pix_colors = pix_colors_unfocused;
1307#endif 1180#endif
1181
1182 scr_recolour ();
1308} 1183}
1309 1184
1310/* ------------------------------------------------------------------------- * 1185/* ------------------------------------------------------------------------- *
1311 * GET TTY CURRENT STATE * 1186 * GET TTY CURRENT STATE *
1312 * ------------------------------------------------------------------------- */ 1187 * ------------------------------------------------------------------------- */
… …
1541 * the slave. 1416 * the slave.
1542 */ 1417 */
1543void 1418void
1544rxvt_term::run_command (const char *const *argv) 1419rxvt_term::run_command (const char *const *argv)
1545{ 1420{
1421#if ENABLE_FRILLS
1422 if (rs[Rs_pty_fd])
1423 {
1424 pty.pty = atoi (rs[Rs_pty_fd]);
1425 fcntl (pty.pty, F_SETFL, O_NONBLOCK);
1426 }
1427 else
1428#endif
1429 if (!pty.get ())
1430 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1431
1432 pty.set_utf8_mode (enc_utf8);
1433
1434 /* set initial window size */
1435 tt_winch ();
1436
1546 int er; 1437 int er;
1547
1548 if (!pty.get ())
1549 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1550 1438
1551#ifndef NO_BACKSPACE_KEY 1439#ifndef NO_BACKSPACE_KEY
1552 if (key_backspace[0] && !key_backspace[1]) 1440 if (key_backspace[0] && !key_backspace[1])
1553 er = key_backspace[0]; 1441 er = key_backspace[0];
1554 else if (strcmp (key_backspace, "DEC") == 0) 1442 else if (strcmp (key_backspace, "DEC") == 0)
… …
1557#endif 1445#endif
1558 er = -1; 1446 er = -1;
1559 1447
1560 rxvt_get_ttymode (&tio, er); 1448 rxvt_get_ttymode (&tio, er);
1561 1449
1562 /* set initial window size */ 1450#if ENABLE_FRILLS
1563 tt_winch (); 1451 if (rs[Rs_pty_fd])
1452 return;
1453#endif
1454
1455 sw_chld.start (SIGCHLD);
1564 1456
1565#ifndef __QNX__ 1457#ifndef __QNX__
1566 /* spin off the command interpreter */ 1458 /* spin off the command interpreter */
1567 switch (cmd_pid = fork ()) 1459 switch (cmd_pid = fork ())
1568 { 1460 {
1569 case -1: 1461 case -1:
1462 {
1463 cmd_pid = 0;
1570 rxvt_fatal ("can't fork, aborting.\n"); 1464 rxvt_fatal ("can't fork, aborting.\n");
1465 }
1571 case 0: 1466 case 0:
1572 init_env (); 1467 init_env ();
1573 1468
1574 if (!pty.make_controlling_tty ()) 1469 if (!pty.make_controlling_tty ())
1575 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1470 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);

Diff Legend

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