… | |
… | |
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 | |
40 | const char *const def_colorName[] = |
43 | const char *const def_colorName[] = |
41 | { |
44 | { |
42 | COLOR_FOREGROUND, |
45 | COLOR_FOREGROUND, |
43 | COLOR_BACKGROUND, |
46 | COLOR_BACKGROUND, |
… | |
… | |
155 | NULL, /* Color_BD */ |
158 | NULL, /* Color_BD */ |
156 | NULL, /* Color_IT */ |
159 | NULL, /* Color_IT */ |
157 | NULL, /* Color_UL */ |
160 | NULL, /* Color_UL */ |
158 | NULL, /* Color_RV */ |
161 | NULL, /* Color_RV */ |
159 | #endif /* ! NO_BOLD_UNDERLINE_REVERSE */ |
162 | #endif /* ! NO_BOLD_UNDERLINE_REVERSE */ |
|
|
163 | #if ENABLE_FRILLS |
|
|
164 | NULL, // Color_underline |
|
|
165 | #endif |
160 | #ifdef OPTION_HC |
166 | #ifdef OPTION_HC |
161 | NULL, |
167 | NULL, |
162 | #endif |
168 | #endif |
163 | #ifdef KEEP_SCROLLCOLOR |
169 | #ifdef KEEP_SCROLLCOLOR |
164 | COLOR_SCROLLBAR, |
170 | COLOR_SCROLLBAR, |
165 | COLOR_SCROLLTROUGH, |
171 | COLOR_SCROLLTROUGH, |
166 | #endif /* KEEP_SCROLLCOLOR */ |
172 | #endif /* KEEP_SCROLLCOLOR */ |
167 | #if TINTING |
173 | #if TINTING |
168 | NULL, |
174 | NULL, |
|
|
175 | #endif |
|
|
176 | #if OFF_FOCUS_FADING |
|
|
177 | "black", |
169 | #endif |
178 | #endif |
170 | }; |
179 | }; |
171 | |
180 | |
172 | const char *const xa_names[] = |
181 | const char *const xa_names[] = |
173 | { |
182 | { |
… | |
… | |
177 | "MULTIPLE", |
186 | "MULTIPLE", |
178 | "TARGETS", |
187 | "TARGETS", |
179 | "TIMESTAMP", |
188 | "TIMESTAMP", |
180 | "VT_SELECTION", |
189 | "VT_SELECTION", |
181 | "INCR", |
190 | "INCR", |
|
|
191 | "WM_PROTOCOLS", |
182 | "WM_DELETE_WINDOW", |
192 | "WM_DELETE_WINDOW", |
183 | "CLIPBOARD", |
193 | "CLIPBOARD", |
184 | #if ENABLE_FRILLS |
194 | #if ENABLE_FRILLS |
|
|
195 | "_MOTIF_WM_HINTS", |
|
|
196 | #endif |
|
|
197 | #if ENABLE_EWMH |
185 | "_NET_WM_PID", |
198 | "_NET_WM_PID", |
186 | "_MOTIF_WM_HINTS", |
|
|
187 | "_NET_WM_NAME", |
199 | "_NET_WM_NAME", |
188 | "_NET_WM_ICON_NAME", |
200 | "_NET_WM_ICON_NAME", |
|
|
201 | "_NET_WM_PING", |
189 | #endif |
202 | #endif |
190 | #if USE_XIM |
203 | #if USE_XIM |
191 | "WM_LOCALE_NAME", |
204 | "WM_LOCALE_NAME", |
192 | #endif |
205 | #endif |
193 | #ifdef TRANSPARENT |
206 | #ifdef TRANSPARENT |
194 | "_XROOTPMAP_ID", |
207 | "_XROOTPMAP_ID", |
195 | "_XSETROOT_ID", |
208 | "ESETROOT_PMAP_ID", |
196 | #endif |
209 | #endif |
197 | #ifdef OFFIX_DND |
210 | #ifdef OFFIX_DND |
198 | "DndProtocol", |
211 | "DndProtocol", |
199 | "DndSelection", |
212 | "DndSelection", |
200 | #endif |
213 | #endif |
|
|
214 | #if ENABLE_XEMBED |
|
|
215 | "_XEMBED", |
|
|
216 | "_XEMBED_INFO", |
|
|
217 | #endif |
201 | }; |
218 | }; |
202 | |
219 | |
203 | bool |
220 | bool |
204 | rxvt_term::init_vars () |
221 | rxvt_term::init_vars () |
205 | { |
222 | { |
206 | sw_term.start (SIGTERM); |
|
|
207 | |
|
|
208 | pix_colors_focused = new rxvt_color [TOTAL_COLORS]; |
223 | pix_colors_focused = new rxvt_color [TOTAL_COLORS]; |
209 | #ifdef OFF_FOCUS_FADING |
224 | #ifdef OFF_FOCUS_FADING |
210 | pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; |
225 | pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; |
211 | #endif |
226 | #endif |
212 | pix_colors = pix_colors_focused; |
227 | pix_colors = pix_colors_focused; |
213 | |
228 | |
214 | if (pix_colors == NULL) |
229 | if (pix_colors == NULL) |
215 | return false; |
230 | return false; |
216 | |
231 | |
217 | #if defined(XPM_BACKGROUND) || defined(TRANSPARENT) |
232 | #if defined(XPM_BACKGROUND) || defined(TRANSPARENT) |
218 | TermWin.pixmap = None; |
233 | pixmap = None; |
219 | #endif |
234 | #endif |
220 | |
235 | |
221 | MEvent.time = CurrentTime; |
236 | MEvent.time = CurrentTime; |
222 | MEvent.button = AnyButton; |
237 | MEvent.button = AnyButton; |
223 | options = DEFAULT_OPTIONS; |
238 | options = DEFAULT_OPTIONS; |
224 | want_refresh = 1; |
239 | want_refresh = 1; |
225 | cmd_pid = -1; |
|
|
226 | pty.pty = pty.tty = -1; |
|
|
227 | priv_modes = SavedModes = PrivMode_Default; |
240 | priv_modes = SavedModes = PrivMode_Default; |
228 | TermWin.focus = 0; |
241 | focus = 0; |
229 | TermWin.ncol = 80; |
242 | ncol = 80; |
230 | TermWin.nrow = 24; |
243 | nrow = 24; |
231 | TermWin.int_bwidth = INTERNALBORDERWIDTH; |
244 | int_bwidth = INTERNALBORDERWIDTH; |
232 | TermWin.ext_bwidth = EXTERNALBORDERWIDTH; |
245 | ext_bwidth = EXTERNALBORDERWIDTH; |
233 | TermWin.lineSpace = LINESPACE; |
246 | lineSpace = LINESPACE; |
234 | TermWin.saveLines = SAVELINES; |
247 | saveLines = SAVELINES; |
235 | numpix_colors = TOTAL_COLORS; |
248 | numpix_colors = TOTAL_COLORS; |
236 | |
249 | |
237 | refresh_limit = 1; |
250 | refresh_limit = 1; |
238 | refresh_type = SLOW_REFRESH; |
251 | refresh_type = SLOW_REFRESH; |
239 | prev_nrow = prev_ncol = 0; |
252 | prev_nrow = prev_ncol = 0; |
… | |
… | |
248 | last_bot = last_state = -1; |
261 | last_bot = last_state = -1; |
249 | |
262 | |
250 | #ifdef MENUBAR |
263 | #ifdef MENUBAR |
251 | menu_readonly = 1; |
264 | menu_readonly = 1; |
252 | # if ! (MENUBAR_MAX > 1) |
265 | # if ! (MENUBAR_MAX > 1) |
253 | CurrentBar = & (BarList); |
266 | CurrentBar = &BarList; |
254 | # endif /* (MENUBAR_MAX > 1) */ |
267 | # endif /* (MENUBAR_MAX > 1) */ |
255 | #endif |
268 | #endif |
256 | |
269 | |
257 | return true; |
270 | return true; |
258 | } |
271 | } |
… | |
… | |
332 | */ |
345 | */ |
333 | if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) |
346 | if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) |
334 | rs[Rs_display_name] = ":0"; |
347 | rs[Rs_display_name] = ":0"; |
335 | |
348 | |
336 | 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 (); |
337 | free (r_argv); |
355 | free (r_argv); |
338 | |
|
|
339 | #ifdef LOCAL_X_IS_UNIX |
|
|
340 | if (rs[Rs_display_name][0] == ':') |
|
|
341 | { |
|
|
342 | val = rxvt_malloc (5 + strlen (rs[Rs_display_name])); |
|
|
343 | strcpy (val, "unix"); |
|
|
344 | strcat (val, rs[Rs_display_name]); |
|
|
345 | display = displays.get (val); |
|
|
346 | free (val); |
|
|
347 | } |
|
|
348 | #endif |
|
|
349 | |
|
|
350 | if (!display |
|
|
351 | && ! (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 (display->display, rs[Rs_name]); |
|
|
355 | |
356 | |
356 | /* |
357 | /* |
357 | * set any defaults not already set |
358 | * set any defaults not already set |
358 | */ |
359 | */ |
359 | if (cmd_argv && cmd_argv[0]) |
360 | if (cmd_argv && cmd_argv[0]) |
… | |
… | |
370 | if (!rs[Rs_iconName]) |
371 | if (!rs[Rs_iconName]) |
371 | rs[Rs_iconName] = rs[Rs_name]; |
372 | rs[Rs_iconName] = rs[Rs_name]; |
372 | } |
373 | } |
373 | |
374 | |
374 | if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) |
375 | if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) |
375 | TermWin.saveLines = BOUND_POSITIVE_INT16 (i); |
376 | saveLines = min (i, MAX_SAVELINES); |
376 | |
377 | |
377 | #if ENABLE_FRILLS |
378 | #if ENABLE_FRILLS |
378 | 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) |
379 | TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ |
380 | int_bwidth = min (i, std::numeric_limits<int16_t>::max ()); |
|
|
381 | |
380 | 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) |
381 | TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ |
383 | ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); |
382 | #endif |
|
|
383 | |
384 | |
384 | #ifndef NO_LINESPACE |
|
|
385 | if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) |
385 | if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) |
386 | TermWin.lineSpace = min (i, 100); /* arbitrary limit */ |
386 | lineSpace = min (i, std::numeric_limits<int16_t>::max ()); |
387 | #endif |
387 | #endif |
388 | |
388 | |
389 | #ifdef POINTER_BLANK |
389 | #ifdef POINTER_BLANK |
390 | if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) |
390 | if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) |
391 | pointerBlankDelay = i; |
391 | pointerBlankDelay = i; |
392 | else |
392 | else |
393 | pointerBlankDelay = 2; |
393 | pointerBlankDelay = 2; |
394 | #endif |
394 | #endif |
395 | |
395 | |
396 | /* no point having a scrollbar without having any scrollback! */ |
396 | /* no point having a scrollbar without having any scrollback! */ |
397 | if (!TermWin.saveLines) |
397 | if (!saveLines) |
398 | options &= ~Opt_scrollBar; |
398 | CLR_OPTION (Opt_scrollBar); |
399 | |
399 | |
400 | #ifdef PRINTPIPE |
400 | #ifdef PRINTPIPE |
401 | if (!rs[Rs_print_pipe]) |
401 | if (!rs[Rs_print_pipe]) |
402 | rs[Rs_print_pipe] = PRINTPIPE; |
402 | rs[Rs_print_pipe] = PRINTPIPE; |
403 | #endif |
403 | #endif |
… | |
… | |
446 | setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); |
446 | setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); |
447 | #endif |
447 | #endif |
448 | |
448 | |
449 | #ifdef XTERM_REVERSE_VIDEO |
449 | #ifdef XTERM_REVERSE_VIDEO |
450 | /* this is how xterm implements reverseVideo */ |
450 | /* this is how xterm implements reverseVideo */ |
451 | if (options & Opt_reverseVideo) |
451 | if (OPTION (Opt_reverseVideo)) |
452 | { |
452 | { |
453 | if (!rs[Rs_color + Color_fg]) |
453 | if (!rs[Rs_color + Color_fg]) |
454 | rs[Rs_color + Color_fg] = def_colorName[Color_bg]; |
454 | rs[Rs_color + Color_fg] = def_colorName[Color_bg]; |
455 | if (!rs[Rs_color + Color_bg]) |
455 | if (!rs[Rs_color + Color_bg]) |
456 | rs[Rs_color + Color_bg] = def_colorName[Color_fg]; |
456 | rs[Rs_color + Color_bg] = def_colorName[Color_fg]; |
… | |
… | |
461 | if (!rs[Rs_color + i]) |
461 | if (!rs[Rs_color + i]) |
462 | rs[Rs_color + i] = def_colorName[i]; |
462 | rs[Rs_color + i] = def_colorName[i]; |
463 | |
463 | |
464 | #ifndef XTERM_REVERSE_VIDEO |
464 | #ifndef XTERM_REVERSE_VIDEO |
465 | /* this is how we implement reverseVideo */ |
465 | /* this is how we implement reverseVideo */ |
466 | if (options & Opt_reverseVideo) |
466 | if (OPTION (Opt_reverseVideo)) |
467 | 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]); |
468 | #endif |
468 | #endif |
469 | |
469 | |
470 | /* convenient aliases for setting fg/bg to colors */ |
470 | /* convenient aliases for setting fg/bg to colors */ |
471 | color_aliases (Color_fg); |
471 | color_aliases (Color_fg); |
472 | color_aliases (Color_bg); |
472 | color_aliases (Color_bg); |
… | |
… | |
522 | env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); |
522 | env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); |
523 | |
523 | |
524 | sprintf (env_display, "DISPLAY=%s", val); |
524 | sprintf (env_display, "DISPLAY=%s", val); |
525 | |
525 | |
526 | /* avoiding the math library: |
526 | /* avoiding the math library: |
527 | * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */ |
527 | * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */ |
528 | 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++) |
529 | ; |
529 | ; |
530 | MAX_IT (i, 1); |
530 | max_it (i, 1); |
531 | env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); |
531 | env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); |
532 | |
532 | |
533 | sprintf (env_windowid, "WINDOWID=%u", |
533 | sprintf (env_windowid, "WINDOWID=%u", |
534 | (unsigned int)TermWin.parent[0]); |
534 | (unsigned int)parent[0]); |
535 | |
535 | |
536 | /* add entries to the environment: |
536 | /* add entries to the environment: |
537 | * @ DISPLAY: in case we started with -display |
537 | * @ DISPLAY: in case we started with -display |
538 | * @ WINDOWID: X window id number of the window |
538 | * @ WINDOWID: X window id number of the window |
539 | * @ COLORTERM: terminal sub-name and also indicates its color |
539 | * @ COLORTERM: terminal sub-name and also indicates its color |
… | |
… | |
601 | this->locale = rxvt_strdup (this->locale); |
601 | this->locale = rxvt_strdup (this->locale); |
602 | SET_LOCALE (this->locale); |
602 | SET_LOCALE (this->locale); |
603 | mbstate.reset (); |
603 | mbstate.reset (); |
604 | #endif |
604 | #endif |
605 | |
605 | |
606 | #if 0 |
|
|
607 | #if HAVE_NL_LANGINFO |
606 | #if HAVE_NL_LANGINFO |
608 | char *codeset = strdup (nl_langinfo (CODESET)); |
607 | char *codeset = strdup (nl_langinfo (CODESET)); |
609 | enc_utf8 = !strcasecmp (codeset, "UTF-8") |
608 | // /^UTF.?8/i |
610 | || !strcasecmp (codeset, "UTF8"); |
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'); |
611 | free (codeset); |
613 | free (codeset); |
612 | #else |
614 | #else |
613 | enc_utf8 = 0; |
615 | enc_utf8 = 0; |
614 | #endif |
|
|
615 | #endif |
616 | #endif |
616 | } |
617 | } |
617 | |
618 | |
618 | void |
619 | void |
619 | rxvt_term::init_xlocale () |
620 | rxvt_term::init_xlocale () |
… | |
… | |
647 | * Initialize the command connection. |
648 | * Initialize the command connection. |
648 | * This should be called after the X server connection is established. |
649 | * This should be called after the X server connection is established. |
649 | */ |
650 | */ |
650 | |
651 | |
651 | #ifdef META8_OPTION |
652 | #ifdef META8_OPTION |
652 | meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); |
653 | meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; |
653 | #endif |
654 | #endif |
654 | |
655 | |
655 | get_ourmods (); |
656 | get_ourmods (); |
656 | |
657 | |
657 | if (!(options & Opt_scrollTtyOutput)) |
658 | if (!OPTION (Opt_scrollTtyOutput)) |
658 | priv_modes |= PrivMode_TtyOutputInh; |
659 | priv_modes |= PrivMode_TtyOutputInh; |
659 | if (options & Opt_scrollTtyKeypress) |
660 | if (OPTION (Opt_scrollTtyKeypress)) |
660 | priv_modes |= PrivMode_Keypress; |
661 | priv_modes |= PrivMode_Keypress; |
661 | if (!(options & Opt_jumpScroll)) |
662 | if (!OPTION (Opt_jumpScroll)) |
662 | priv_modes |= PrivMode_smoothScroll; |
663 | priv_modes |= PrivMode_smoothScroll; |
663 | |
664 | |
664 | #ifndef NO_BACKSPACE_KEY |
665 | #ifndef NO_BACKSPACE_KEY |
665 | if (strcmp (key_backspace, "DEC") == 0) |
666 | if (strcmp (key_backspace, "DEC") == 0) |
666 | priv_modes |= PrivMode_HaveBackSpace; |
667 | priv_modes |= PrivMode_HaveBackSpace; |
… | |
… | |
670 | if (scrollbar_visible ()) |
671 | if (scrollbar_visible ()) |
671 | { |
672 | { |
672 | priv_modes |= PrivMode_scrollBar; |
673 | priv_modes |= PrivMode_scrollBar; |
673 | SavedModes |= PrivMode_scrollBar; |
674 | SavedModes |= PrivMode_scrollBar; |
674 | } |
675 | } |
|
|
676 | |
675 | if (menubar_visible ()) |
677 | if (menubar_visible ()) |
676 | { |
678 | { |
677 | priv_modes |= PrivMode_menuBar; |
679 | priv_modes |= PrivMode_menuBar; |
678 | SavedModes |= PrivMode_menuBar; |
680 | SavedModes |= PrivMode_menuBar; |
679 | } |
681 | } |
680 | |
|
|
681 | #ifdef CURSOR_BLINK |
|
|
682 | if (options & Opt_cursorBlink) |
|
|
683 | (void)gettimeofday (&lastcursorchange, NULL); |
|
|
684 | #endif |
|
|
685 | |
682 | |
686 | run_command (argv); |
683 | run_command (argv); |
687 | } |
684 | } |
688 | |
685 | |
689 | /*----------------------------------------------------------------------*/ |
686 | /*----------------------------------------------------------------------*/ |
… | |
… | |
704 | continue; |
701 | continue; |
705 | |
702 | |
706 | if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) |
703 | if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) |
707 | { |
704 | { |
708 | #ifndef XTERM_REVERSE_VIDEO |
705 | #ifndef XTERM_REVERSE_VIDEO |
709 | if (i < 2 && (options & Opt_reverseVideo)) |
706 | if (i < 2 && OPTION (Opt_reverseVideo)) |
710 | rs[Rs_color + i] = def_colorName[!i]; |
707 | rs[Rs_color + i] = def_colorName[!i]; |
711 | else |
708 | else |
712 | #endif |
709 | #endif |
713 | rs[Rs_color + i] = def_colorName[i]; |
710 | rs[Rs_color + i] = def_colorName[i]; |
714 | |
711 | |
… | |
… | |
739 | } |
736 | } |
740 | } |
737 | } |
741 | } |
738 | } |
742 | |
739 | |
743 | pix_colors[i] = xcol; |
740 | pix_colors[i] = xcol; |
|
|
741 | SET_PIXCOLOR (i); |
|
|
742 | } |
|
|
743 | |
744 | #ifdef OFF_FOCUS_FADING |
744 | #ifdef OFF_FOCUS_FADING |
745 | if (rs[Rs_fade]) |
745 | if (rs[Rs_fade]) |
|
|
746 | for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) |
746 | pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade])); |
747 | pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); |
747 | #endif |
748 | #endif |
748 | SET_PIXCOLOR (i); |
|
|
749 | } |
|
|
750 | |
749 | |
751 | if (display->depth <= 2) |
750 | if (display->depth <= 2) |
752 | { |
751 | { |
753 | if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; |
752 | if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; |
754 | if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; |
753 | if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; |
… | |
… | |
762 | * from the fvwm window manager. |
761 | * from the fvwm window manager. |
763 | */ |
762 | */ |
764 | #ifdef KEEP_SCROLLCOLOR |
763 | #ifdef KEEP_SCROLLCOLOR |
765 | |
764 | |
766 | if (display->depth <= 2) |
765 | if (display->depth <= 2) |
|
|
766 | { |
767 | { /* Monochrome */ |
767 | /* Monochrome */ |
768 | pix_colors[Color_scroll] = pix_colors[Color_fg]; |
768 | pix_colors[Color_scroll] = pix_colors[Color_fg]; |
769 | pix_colors[Color_topShadow] = pix_colors[Color_bg]; |
769 | pix_colors[Color_topShadow] = pix_colors[Color_bg]; |
770 | pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; |
770 | pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; |
771 | } |
771 | } |
772 | else |
772 | else |
… | |
… | |
827 | * Use resource ``modifier'' to override the Meta modifier |
827 | * Use resource ``modifier'' to override the Meta modifier |
828 | */ |
828 | */ |
829 | void |
829 | void |
830 | rxvt_term::get_ourmods () |
830 | rxvt_term::get_ourmods () |
831 | { |
831 | { |
832 | int i, j, k; |
832 | int i, j, k; |
833 | int requestedmeta, realmeta, realalt; |
833 | int requestedmeta, realmeta, realalt; |
834 | const char *cm, *rsmod; |
834 | const char *cm, *rsmod; |
835 | XModifierKeymap *map; |
835 | XModifierKeymap *map; |
836 | KeyCode *kc; |
836 | KeyCode *kc; |
837 | const unsigned int modmasks[] = |
837 | const unsigned int modmasks[] = |
838 | { |
838 | { |
839 | Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask |
839 | Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask |
840 | }; |
840 | }; |
841 | |
841 | |
842 | requestedmeta = realmeta = realalt = 0; |
842 | requestedmeta = realmeta = realalt = 0; |
843 | rsmod = rs[Rs_modifier]; |
843 | rsmod = rs[Rs_modifier]; |
|
|
844 | |
844 | if (rsmod |
845 | if (rsmod |
845 | && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) |
846 | && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) |
846 | requestedmeta = rsmod[3] - '0'; |
847 | requestedmeta = rsmod[3] - '0'; |
847 | |
848 | |
848 | map = XGetModifierMapping (display->display); |
849 | map = XGetModifierMapping (display->display); |
849 | kc = map->modifiermap; |
850 | kc = map->modifiermap; |
|
|
851 | |
850 | for (i = 1; i < 6; i++) |
852 | for (i = 1; i < 6; i++) |
851 | { |
853 | { |
852 | k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ |
854 | k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ |
|
|
855 | |
853 | for (j = map->max_keypermod; j--; k++) |
856 | for (j = map->max_keypermod; j--; k++) |
854 | { |
857 | { |
855 | if (kc[k] == 0) |
858 | if (kc[k] == 0) |
856 | break; |
859 | break; |
|
|
860 | |
857 | switch (XKeycodeToKeysym (display->display, kc[k], 0)) |
861 | switch (XKeycodeToKeysym (display->display, kc[k], 0)) |
858 | { |
862 | { |
859 | case XK_Num_Lock: |
863 | case XK_Num_Lock: |
860 | ModNumLockMask = modmasks[i - 1]; |
864 | ModNumLockMask = modmasks[i - 1]; |
861 | /* FALLTHROUGH */ |
865 | continue; |
862 | default: |
866 | |
863 | continue; /* for (;;) */ |
867 | case XK_ISO_Level3_Shift: |
|
|
868 | ModLevel3Mask = modmasks[i - 1]; |
|
|
869 | continue; |
|
|
870 | |
864 | case XK_Meta_L: |
871 | case XK_Meta_L: |
865 | case XK_Meta_R: |
872 | case XK_Meta_R: |
866 | cm = "meta"; |
873 | cm = "meta"; |
867 | realmeta = i; |
874 | realmeta = i; |
868 | break; |
875 | break; |
|
|
876 | |
869 | case XK_Alt_L: |
877 | case XK_Alt_L: |
870 | case XK_Alt_R: |
878 | case XK_Alt_R: |
871 | cm = "alt"; |
879 | cm = "alt"; |
872 | realalt = i; |
880 | realalt = i; |
873 | break; |
881 | break; |
|
|
882 | |
874 | case XK_Super_L: |
883 | case XK_Super_L: |
875 | case XK_Super_R: |
884 | case XK_Super_R: |
876 | cm = "super"; |
885 | cm = "super"; |
877 | break; |
886 | break; |
|
|
887 | |
878 | case XK_Hyper_L: |
888 | case XK_Hyper_L: |
879 | case XK_Hyper_R: |
889 | case XK_Hyper_R: |
880 | cm = "hyper"; |
890 | cm = "hyper"; |
881 | break; |
891 | break; |
|
|
892 | |
|
|
893 | default: |
|
|
894 | continue; |
882 | } |
895 | } |
|
|
896 | |
883 | if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0) |
897 | if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0) |
884 | requestedmeta = i; |
898 | requestedmeta = i; |
885 | } |
899 | } |
886 | } |
900 | } |
|
|
901 | |
887 | XFreeModifiermap (map); |
902 | XFreeModifiermap (map); |
|
|
903 | |
888 | i = (requestedmeta ? requestedmeta |
904 | i = requestedmeta ? requestedmeta |
889 | : (realmeta ? realmeta |
905 | : realmeta ? realmeta |
890 | : (realalt ? realalt : 0))); |
906 | : realalt ? realalt |
|
|
907 | : 0; |
|
|
908 | |
891 | if (i) |
909 | if (i) |
892 | ModMetaMask = modmasks[i - 1]; |
910 | ModMetaMask = modmasks[i - 1]; |
893 | } |
911 | } |
894 | |
912 | |
895 | /*----------------------------------------------------------------------*/ |
913 | /*----------------------------------------------------------------------*/ |
… | |
… | |
905 | #endif |
923 | #endif |
906 | XGCValues gcvalue; |
924 | XGCValues gcvalue; |
907 | long vt_emask; |
925 | long vt_emask; |
908 | XSetWindowAttributes attributes; |
926 | XSetWindowAttributes attributes; |
909 | XWindowAttributes gattr; |
927 | XWindowAttributes gattr; |
|
|
928 | Window top, parent; |
|
|
929 | dDisp; |
910 | |
930 | |
911 | #ifdef USING_W11LIB |
931 | #ifdef USING_W11LIB |
912 | /* enable W11 callbacks */ |
932 | /* enable W11 callbacks */ |
913 | W11AddEventHandler (display->display, rxvt_W11_process_x_event); |
933 | W11AddEventHandler (disp, rxvt_W11_process_x_event); |
914 | #endif |
934 | #endif |
915 | |
935 | |
916 | assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); |
936 | assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); |
917 | XInternAtoms (display->display, (char **)xa_names, NUM_XA, False, xa); |
937 | XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); |
918 | |
938 | |
919 | if (options & Opt_transparent) |
939 | if (OPTION (Opt_transparent)) |
920 | { |
940 | { |
921 | XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); |
941 | XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); |
922 | display->depth = gattr.depth; // doh //TODO, per-term not per-display? |
942 | display->depth = gattr.depth; // doh //TODO, per-term not per-display? |
923 | } |
943 | } |
924 | |
944 | |
925 | #if ENABLE_FRILLS |
945 | #if ENABLE_FRILLS |
926 | if (options & Opt_borderLess) |
946 | if (OPTION (Opt_borderLess)) |
927 | { |
947 | { |
928 | prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); |
948 | prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); |
929 | |
949 | |
930 | if (prop == None) |
950 | if (prop == None) |
931 | { |
951 | { |
932 | /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ |
952 | /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ |
933 | #ifdef PREFER_24BIT |
953 | #ifdef PREFER_24BIT |
… | |
… | |
940 | mwmhints.flags = MWM_HINTS_DECORATIONS; |
960 | mwmhints.flags = MWM_HINTS_DECORATIONS; |
941 | mwmhints.decorations = 0; |
961 | mwmhints.decorations = 0; |
942 | } |
962 | } |
943 | } |
963 | } |
944 | else |
964 | else |
945 | { |
|
|
946 | mwmhints.flags = 0; |
965 | mwmhints.flags = 0; |
947 | } |
|
|
948 | #endif |
966 | #endif |
949 | |
967 | |
950 | /* grab colors before netscape does */ |
968 | /* grab colors before netscape does */ |
951 | Get_Colours (); |
969 | Get_Colours (); |
952 | |
970 | |
953 | if (!set_fonts ()) |
971 | if (!set_fonts ()) |
954 | rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); |
972 | rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); |
955 | |
973 | |
|
|
974 | parent = DefaultRootWindow (disp); |
|
|
975 | |
|
|
976 | #if ENABLE_XEMBED |
|
|
977 | if (rs[Rs_embed]) |
|
|
978 | { |
|
|
979 | XWindowAttributes wattr; |
|
|
980 | |
|
|
981 | parent = strtol (rs[Rs_embed], 0, 0); |
|
|
982 | |
|
|
983 | if (!XGetWindowAttributes (disp, parent, &wattr)) |
|
|
984 | rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); |
|
|
985 | |
|
|
986 | window_calc (wattr.width, wattr.height); |
|
|
987 | } |
|
|
988 | #endif |
|
|
989 | |
956 | window_calc (0, 0); |
990 | window_calc (0, 0); |
957 | old_width = szHint.width; |
|
|
958 | old_height = szHint.height; |
|
|
959 | |
991 | |
960 | /* sub-window placement & size in rxvt_resize_subwindows () */ |
992 | /* sub-window placement & size in rxvt_resize_subwindows () */ |
961 | |
|
|
962 | #ifdef PREFER_24BIT |
993 | #ifdef PREFER_24BIT |
963 | attributes.background_pixel = pix_colors_focused[Color_border]; |
994 | attributes.background_pixel = pix_colors_focused[Color_border]; |
964 | attributes.border_pixel = pix_colors_focused[Color_border]; |
995 | attributes.border_pixel = pix_colors_focused[Color_border]; |
965 | attributes.colormap = display->cmap; |
996 | attributes.colormap = display->cmap; |
966 | TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), |
997 | top = XCreateWindow (disp, parent, |
967 | szHint.x, szHint.y, |
998 | szHint.x, szHint.y, |
968 | szHint.width, szHint.height, |
999 | szHint.width, szHint.height, |
969 | TermWin.ext_bwidth, |
1000 | ext_bwidth, |
970 | display->depth, InputOutput, |
1001 | display->depth, InputOutput, |
971 | display->visual, |
1002 | display->visual, |
972 | CWColormap | CWBackPixel | CWBorderPixel, &attributes); |
1003 | CWColormap | CWBackPixel | CWBorderPixel, &attributes); |
973 | #else |
1004 | #else |
974 | TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), |
1005 | top = XCreateSimpleWindow (disp, parent, |
975 | szHint.x, szHint.y, |
1006 | szHint.x, szHint.y, |
976 | szHint.width, szHint.height, |
1007 | szHint.width, szHint.height, |
977 | TermWin.ext_bwidth, |
1008 | ext_bwidth, |
978 | pix_colors_focused[Color_border], |
1009 | pix_colors_focused[Color_border], |
979 | pix_colors_focused[Color_border]); |
1010 | pix_colors_focused[Color_border]); |
980 | #endif |
1011 | #endif |
|
|
1012 | |
|
|
1013 | this->parent[0] = top; |
|
|
1014 | |
|
|
1015 | old_width = szHint.width; |
|
|
1016 | old_height = szHint.height; |
981 | |
1017 | |
982 | process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); |
1018 | process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); |
983 | process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); |
1019 | process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); |
984 | |
1020 | |
985 | classHint.res_name = (char *)rs[Rs_name]; |
1021 | classHint.res_name = (char *)rs[Rs_name]; |
986 | classHint.res_class = (char *)RESCLASS; |
1022 | classHint.res_class = (char *)RESCLASS; |
987 | |
1023 | |
988 | wmHint.flags = InputHint | StateHint | WindowGroupHint; |
1024 | wmHint.flags = InputHint | StateHint | WindowGroupHint; |
989 | wmHint.input = True; |
1025 | wmHint.input = True; |
990 | wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; |
1026 | wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; |
991 | wmHint.window_group = TermWin.parent[0]; |
1027 | wmHint.window_group = top; |
992 | |
1028 | |
993 | XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, |
1029 | XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, |
994 | (char **)argv, argc, &szHint, &wmHint, &classHint); |
1030 | &szHint, &wmHint, &classHint); |
995 | |
1031 | |
996 | /* Enable delete window protocol */ |
1032 | Atom protocols[] = { |
997 | XSetWMProtocols (display->display, TermWin.parent[0], |
1033 | xa[XA_WM_DELETE_WINDOW], |
998 | &xa[XA_WMDELETEWINDOW], 1); |
1034 | #if ENABLE_EWMH |
|
|
1035 | xa[XA_NET_WM_PING], |
|
|
1036 | #endif |
|
|
1037 | }; |
999 | |
1038 | |
1000 | #if ENABLE_FRILLS |
1039 | XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); |
|
|
1040 | |
|
|
1041 | #if ENABLE_EWMH |
1001 | long pid = getpid (); |
1042 | long pid = getpid (); |
1002 | |
1043 | |
1003 | XChangeProperty (display->display, TermWin.parent[0], |
1044 | XChangeProperty (disp, top, |
1004 | xa[XA_NET_WM_PID], XA_CARDINAL, 32, |
1045 | xa[XA_NET_WM_PID], XA_CARDINAL, 32, |
1005 | PropModeReplace, (unsigned char *)&pid, 1); |
1046 | PropModeReplace, (unsigned char *)&pid, 1); |
1006 | #endif |
|
|
1007 | |
1047 | |
1008 | XSelectInput (display->display, TermWin.parent[0], |
1048 | // _NET_WM_WINDOW_TYPE is NORMAL, which is the default |
|
|
1049 | #endif |
|
|
1050 | |
|
|
1051 | XSelectInput (disp, top, |
1009 | KeyPressMask |
1052 | KeyPressMask |
1010 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 |
1053 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 |
1011 | | KeyReleaseMask |
1054 | | KeyReleaseMask |
1012 | #endif |
1055 | #endif |
1013 | | FocusChangeMask | VisibilityChangeMask |
1056 | | FocusChangeMask | VisibilityChangeMask |
1014 | | ExposureMask |
|
|
1015 | | StructureNotifyMask); |
1057 | | ExposureMask | StructureNotifyMask); |
|
|
1058 | |
1016 | termwin_ev.start (display, TermWin.parent[0]); |
1059 | termwin_ev.start (display, top); |
1017 | |
1060 | |
1018 | #if ENABLE_FRILLS |
1061 | #if ENABLE_FRILLS |
1019 | if (mwmhints.flags) |
1062 | if (mwmhints.flags) |
1020 | XChangeProperty (display->display, TermWin.parent[0], xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, |
1063 | XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, |
1021 | PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); |
1064 | PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); |
1022 | #endif |
1065 | #endif |
1023 | |
1066 | |
1024 | /* vt cursor: Black-on-White is standard, but this is more popular */ |
1067 | /* vt cursor: Black-on-White is standard, but this is more popular */ |
1025 | TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); |
1068 | TermWin_cursor = XCreateFontCursor (disp, XC_xterm); |
1026 | |
1069 | |
1027 | #if defined(HAVE_SCROLLBARS) || defined(MENUBAR) |
1070 | #if defined(HAVE_SCROLLBARS) || defined(MENUBAR) |
1028 | /* cursor (menuBar/scrollBar): Black-on-White */ |
1071 | /* cursor (menuBar/scrollBar): Black-on-White */ |
1029 | leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); |
1072 | leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); |
1030 | #endif |
1073 | #endif |
|
|
1074 | |
|
|
1075 | /* the vt window */ |
|
|
1076 | vt = XCreateSimpleWindow (disp, top, |
|
|
1077 | window_vt_x, |
|
|
1078 | window_vt_y, |
|
|
1079 | width, |
|
|
1080 | height, |
|
|
1081 | 0, |
|
|
1082 | pix_colors_focused[Color_fg], |
|
|
1083 | pix_colors_focused[Color_bg]); |
|
|
1084 | #ifdef DEBUG_X |
|
|
1085 | XStoreName (disp, vt, "vt window"); |
|
|
1086 | #endif |
|
|
1087 | |
|
|
1088 | attributes.bit_gravity = NorthWestGravity; |
|
|
1089 | XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); |
|
|
1090 | |
|
|
1091 | vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; |
1031 | |
1092 | |
1032 | #ifdef POINTER_BLANK |
1093 | #ifdef POINTER_BLANK |
1033 | { |
1094 | if (OPTION (Opt_pointerBlank)) |
1034 | XColor blackcolour; |
|
|
1035 | blackcolour.red = 0; |
|
|
1036 | blackcolour.green = 0; |
|
|
1037 | blackcolour.blue = 0; |
|
|
1038 | Font f = XLoadFont (display->display, "fixed"); |
|
|
1039 | blank_cursor = XCreateGlyphCursor (display->display, f, f, ' ', ' ', |
|
|
1040 | &blackcolour, &blackcolour); |
|
|
1041 | XUnloadFont (display->display, f); |
|
|
1042 | } |
|
|
1043 | #endif |
|
|
1044 | |
|
|
1045 | /* the vt window */ |
|
|
1046 | TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], |
|
|
1047 | window_vt_x, |
|
|
1048 | window_vt_y, |
|
|
1049 | TermWin_TotalWidth (), |
|
|
1050 | TermWin_TotalHeight (), |
|
|
1051 | 0, |
|
|
1052 | pix_colors_focused[Color_fg], |
|
|
1053 | pix_colors_focused[Color_bg]); |
|
|
1054 | #ifdef DEBUG_X |
|
|
1055 | XStoreName (display->display, TermWin.vt, "vt window"); |
|
|
1056 | #endif |
|
|
1057 | |
|
|
1058 | attributes.bit_gravity = NorthWestGravity; |
|
|
1059 | XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); |
|
|
1060 | |
|
|
1061 | vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; |
|
|
1062 | |
|
|
1063 | pointer_unblank (); |
|
|
1064 | |
|
|
1065 | #ifdef POINTER_BLANK |
|
|
1066 | if (options & Opt_pointerBlank) |
|
|
1067 | vt_emask |= PointerMotionMask; |
1095 | vt_emask |= PointerMotionMask; |
1068 | else |
1096 | else |
1069 | #endif |
1097 | #endif |
1070 | vt_emask |= Button1MotionMask | Button3MotionMask; |
1098 | vt_emask |= Button1MotionMask | Button3MotionMask; |
1071 | |
1099 | |
1072 | XSelectInput (display->display, TermWin.vt, vt_emask); |
1100 | XSelectInput (disp, vt, vt_emask); |
1073 | vt_ev.start (display, TermWin.vt); |
1101 | vt_ev.start (display, vt); |
1074 | |
1102 | |
1075 | #if defined(MENUBAR) && (MENUBAR_MAX > 1) |
1103 | #if defined(MENUBAR) && (MENUBAR_MAX > 1) |
1076 | if (menuBar_height ()) |
1104 | if (menuBar_height ()) |
1077 | { |
1105 | { |
1078 | menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], |
1106 | menuBar.win = XCreateSimpleWindow (disp, top, |
1079 | window_vt_x, 0, |
1107 | window_vt_x, 0, |
1080 | TermWin_TotalWidth (), |
1108 | width, |
1081 | menuBar_TotalHeight (), |
1109 | menuBar_TotalHeight (), |
1082 | 0, |
1110 | 0, |
1083 | pix_colors_focused[Color_fg], |
1111 | pix_colors_focused[Color_fg], |
1084 | pix_colors_focused[Color_scroll]); |
1112 | pix_colors_focused[Color_scroll]); |
1085 | |
1113 | |
1086 | #ifdef DEBUG_X |
1114 | #ifdef DEBUG_X |
1087 | XStoreName (display->display, menuBar.win, "menubar"); |
1115 | XStoreName (disp, menuBar.win, "menubar"); |
1088 | #endif |
1116 | #endif |
1089 | |
1117 | |
1090 | menuBar.drawable = new rxvt_drawable (display, menuBar.win); |
1118 | menuBar.drawable = new rxvt_drawable (display, menuBar.win); |
1091 | |
1119 | |
1092 | XDefineCursor (display->display, menuBar.win, |
1120 | XDefineCursor (disp, menuBar.win, |
1093 | XCreateFontCursor (display->display, XC_left_ptr)); |
1121 | XCreateFontCursor (disp, XC_left_ptr)); |
1094 | |
1122 | |
1095 | XSelectInput (display->display, menuBar.win, |
1123 | XSelectInput (disp, menuBar.win, |
1096 | (ExposureMask | ButtonPressMask | ButtonReleaseMask |
1124 | (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask)); |
1097 | | Button1MotionMask)); |
|
|
1098 | menubar_ev.start (display, menuBar.win); |
1125 | menubar_ev.start (display, menuBar.win); |
1099 | } |
1126 | } |
1100 | #endif |
1127 | #endif |
1101 | |
1128 | |
1102 | #ifdef XPM_BACKGROUND |
1129 | #ifdef XPM_BACKGROUND |
1103 | if (rs[Rs_backgroundPixmap] != NULL |
1130 | if (rs[Rs_backgroundPixmap] != NULL |
1104 | && ! (options & Opt_transparent)) |
1131 | && ! OPTION (Opt_transparent)) |
1105 | { |
1132 | { |
1106 | const char *p = rs[Rs_backgroundPixmap]; |
1133 | const char *p = rs[Rs_backgroundPixmap]; |
1107 | |
1134 | |
1108 | if ((p = strchr (p, ';')) != NULL) |
1135 | if ((p = strchr (p, ';')) != NULL) |
1109 | { |
1136 | { |
… | |
… | |
1118 | |
1145 | |
1119 | /* graphics context for the vt window */ |
1146 | /* graphics context for the vt window */ |
1120 | gcvalue.foreground = pix_colors[Color_fg]; |
1147 | gcvalue.foreground = pix_colors[Color_fg]; |
1121 | gcvalue.background = pix_colors[Color_bg]; |
1148 | gcvalue.background = pix_colors[Color_bg]; |
1122 | gcvalue.graphics_exposures = 1; |
1149 | gcvalue.graphics_exposures = 1; |
1123 | TermWin.gc = XCreateGC (display->display, TermWin.vt, |
1150 | gc = XCreateGC (disp, vt, |
1124 | GCForeground | GCBackground | GCGraphicsExposures, |
1151 | GCForeground | GCBackground | GCGraphicsExposures, |
1125 | &gcvalue); |
1152 | &gcvalue); |
1126 | |
1153 | |
1127 | TermWin.drawable = new rxvt_drawable (display, TermWin.vt); |
1154 | drawable = new rxvt_drawable (display, vt); |
1128 | |
1155 | |
1129 | #if defined(MENUBAR) || defined(RXVT_SCROLLBAR) |
1156 | #if defined(MENUBAR) || defined(RXVT_SCROLLBAR) |
1130 | gcvalue.foreground = pix_colors[Color_topShadow]; |
1157 | gcvalue.foreground = pix_colors[Color_topShadow]; |
1131 | topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); |
1158 | topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); |
1132 | gcvalue.foreground = pix_colors[Color_bottomShadow]; |
1159 | gcvalue.foreground = pix_colors[Color_bottomShadow]; |
1133 | botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); |
1160 | botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); |
1134 | gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; |
1161 | gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; |
1135 | scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); |
1162 | scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); |
1136 | #endif |
1163 | #endif |
1137 | |
1164 | |
1138 | #ifdef OFF_FOCUS_FADING |
1165 | #ifdef OFF_FOCUS_FADING |
1139 | // initially we are in unfocused state |
1166 | // initially we are in unfocused state |
1140 | if (rs[Rs_fade]) |
1167 | if (rs[Rs_fade]) |
1141 | pix_colors = pix_colors_unfocused; |
1168 | pix_colors = pix_colors_unfocused; |
1142 | #endif |
1169 | #endif |
1143 | |
1170 | |
|
|
1171 | pointer_unblank (); |
1144 | scr_recolour (); |
1172 | scr_recolour (); |
|
|
1173 | |
|
|
1174 | #if ENABLE_XEMBED |
|
|
1175 | if (rs[Rs_embed]) |
|
|
1176 | { |
|
|
1177 | long info[2] = { 0, XEMBED_MAPPED }; |
|
|
1178 | |
|
|
1179 | XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], |
|
|
1180 | 32, PropModeReplace, (unsigned char *)&info, 2); |
|
|
1181 | } |
|
|
1182 | #endif |
1145 | } |
1183 | } |
1146 | |
1184 | |
1147 | /* ------------------------------------------------------------------------- * |
1185 | /* ------------------------------------------------------------------------- * |
1148 | * GET TTY CURRENT STATE * |
1186 | * GET TTY CURRENT STATE * |
1149 | * ------------------------------------------------------------------------- */ |
1187 | * ------------------------------------------------------------------------- */ |
… | |
… | |
1154 | /* |
1192 | /* |
1155 | * standard System V termios interface |
1193 | * standard System V termios interface |
1156 | */ |
1194 | */ |
1157 | if (GET_TERMIOS (STDIN_FILENO, tio) < 0) |
1195 | if (GET_TERMIOS (STDIN_FILENO, tio) < 0) |
1158 | { |
1196 | { |
1159 | /* return error - use system defaults */ |
1197 | // return error - use system defaults, |
|
|
1198 | // where possible, and zero elsewhere |
|
|
1199 | memset (tio, 0, sizeof (ttymode_t)); |
|
|
1200 | |
1160 | tio->c_cc[VINTR] = CINTR; |
1201 | tio->c_cc[VINTR] = CINTR; |
1161 | tio->c_cc[VQUIT] = CQUIT; |
1202 | tio->c_cc[VQUIT] = CQUIT; |
1162 | tio->c_cc[VERASE] = CERASE; |
1203 | tio->c_cc[VERASE] = CERASE; |
|
|
1204 | #ifdef VERASE2 |
|
|
1205 | tio->c_cc[VERASE2] = CERASE2; |
|
|
1206 | #endif |
1163 | tio->c_cc[VKILL] = CKILL; |
1207 | tio->c_cc[VKILL] = CKILL; |
1164 | tio->c_cc[VSTART] = CSTART; |
1208 | tio->c_cc[VSTART] = CSTART; |
1165 | tio->c_cc[VSTOP] = CSTOP; |
1209 | tio->c_cc[VSTOP] = CSTOP; |
1166 | tio->c_cc[VSUSP] = CSUSP; |
1210 | tio->c_cc[VSUSP] = CSUSP; |
1167 | # ifdef VDSUSP |
1211 | # ifdef VDSUSP |
1168 | |
|
|
1169 | tio->c_cc[VDSUSP] = CDSUSP; |
1212 | tio->c_cc[VDSUSP] = CDSUSP; |
1170 | # endif |
1213 | # endif |
1171 | # ifdef VREPRINT |
1214 | # ifdef VREPRINT |
1172 | |
|
|
1173 | tio->c_cc[VREPRINT] = CRPRNT; |
1215 | tio->c_cc[VREPRINT] = CRPRNT; |
1174 | # endif |
1216 | # endif |
1175 | # ifdef VDISCRD |
1217 | # ifdef VDISCRD |
1176 | |
|
|
1177 | tio->c_cc[VDISCRD] = CFLUSH; |
1218 | tio->c_cc[VDISCRD] = CFLUSH; |
1178 | # endif |
1219 | # endif |
1179 | # ifdef VWERSE |
1220 | # ifdef VWERSE |
1180 | |
|
|
1181 | tio->c_cc[VWERSE] = CWERASE; |
1221 | tio->c_cc[VWERSE] = CWERASE; |
1182 | # endif |
1222 | # endif |
1183 | # ifdef VLNEXT |
1223 | # ifdef VLNEXT |
1184 | |
|
|
1185 | tio->c_cc[VLNEXT] = CLNEXT; |
1224 | tio->c_cc[VLNEXT] = CLNEXT; |
1186 | # endif |
1225 | # endif |
1187 | |
|
|
1188 | } |
1226 | } |
|
|
1227 | |
1189 | tio->c_cc[VEOF] = CEOF; |
1228 | tio->c_cc[VEOF] = CEOF; |
1190 | tio->c_cc[VEOL] = VDISABLE; |
1229 | tio->c_cc[VEOL] = VDISABLE; |
1191 | # ifdef VEOL2 |
1230 | # ifdef VEOL2 |
1192 | |
|
|
1193 | tio->c_cc[VEOL2] = VDISABLE; |
1231 | tio->c_cc[VEOL2] = VDISABLE; |
1194 | # endif |
1232 | # endif |
1195 | # ifdef VSWTC |
1233 | # ifdef VSWTC |
1196 | |
|
|
1197 | tio->c_cc[VSWTC] = VDISABLE; |
1234 | tio->c_cc[VSWTC] = VDISABLE; |
1198 | # endif |
1235 | # endif |
1199 | # ifdef VSWTCH |
1236 | # ifdef VSWTCH |
1200 | |
|
|
1201 | tio->c_cc[VSWTCH] = VDISABLE; |
1237 | tio->c_cc[VSWTCH] = VDISABLE; |
1202 | # endif |
1238 | # endif |
1203 | # if VMIN != VEOF |
1239 | # if VMIN != VEOF |
1204 | |
|
|
1205 | tio->c_cc[VMIN] = 1; |
1240 | tio->c_cc[VMIN] = 1; |
1206 | # endif |
1241 | # endif |
1207 | # if VTIME != VEOL |
1242 | # if VTIME != VEOL |
1208 | |
|
|
1209 | tio->c_cc[VTIME] = 0; |
1243 | tio->c_cc[VTIME] = 0; |
1210 | # endif |
1244 | # endif |
1211 | |
1245 | |
1212 | if (erase != -1) |
1246 | if (erase != -1) |
1213 | tio->c_cc[VERASE] = (char)erase; |
1247 | tio->c_cc[VERASE] = (char)erase; |
… | |
… | |
1241 | if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) |
1275 | if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) |
1242 | { |
1276 | { |
1243 | tio->sg.sg_erase = CERASE; /* ^H */ |
1277 | tio->sg.sg_erase = CERASE; /* ^H */ |
1244 | tio->sg.sg_kill = CKILL; /* ^U */ |
1278 | tio->sg.sg_kill = CKILL; /* ^U */ |
1245 | } |
1279 | } |
|
|
1280 | |
1246 | if (erase != -1) |
1281 | if (erase != -1) |
1247 | tio->sg.sg_erase = (char)erase; |
1282 | tio->sg.sg_erase = (char)erase; |
1248 | |
1283 | |
1249 | tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); |
1284 | tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); |
1250 | |
1285 | |
… | |
… | |
1256 | tio->tc.t_startc = CSTART; /* ^Q */ |
1291 | tio->tc.t_startc = CSTART; /* ^Q */ |
1257 | tio->tc.t_stopc = CSTOP; /* ^S */ |
1292 | tio->tc.t_stopc = CSTOP; /* ^S */ |
1258 | tio->tc.t_eofc = CEOF; /* ^D */ |
1293 | tio->tc.t_eofc = CEOF; /* ^D */ |
1259 | tio->tc.t_brkc = -1; |
1294 | tio->tc.t_brkc = -1; |
1260 | } |
1295 | } |
|
|
1296 | |
1261 | /* get local special chars */ |
1297 | /* get local special chars */ |
1262 | if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) |
1298 | if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) |
1263 | { |
1299 | { |
1264 | tio->lc.t_suspc = CSUSP; /* ^Z */ |
1300 | tio->lc.t_suspc = CSUSP; /* ^Z */ |
1265 | tio->lc.t_dsuspc = CDSUSP; /* ^Y */ |
1301 | tio->lc.t_dsuspc = CDSUSP; /* ^Y */ |
… | |
… | |
1269 | tio->lc.t_lnextc = CLNEXT; /* ^V */ |
1305 | tio->lc.t_lnextc = CLNEXT; /* ^V */ |
1270 | } |
1306 | } |
1271 | /* get line discipline */ |
1307 | /* get line discipline */ |
1272 | ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); |
1308 | ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); |
1273 | # ifdef NTTYDISC |
1309 | # ifdef NTTYDISC |
1274 | |
|
|
1275 | tio->line = NTTYDISC; |
1310 | tio->line = NTTYDISC; |
1276 | # endif /* NTTYDISC */ |
1311 | # endif /* NTTYDISC */ |
1277 | |
1312 | |
1278 | tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); |
1313 | tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); |
1279 | #endif /* HAVE_TERMIOS_H */ |
1314 | #endif /* HAVE_TERMIOS_H */ |
… | |
… | |
1302 | FOO (IGNCR, "IGNCR"); |
1337 | FOO (IGNCR, "IGNCR"); |
1303 | FOO (ICRNL, "ICRNL"); |
1338 | FOO (ICRNL, "ICRNL"); |
1304 | FOO (IXON, "IXON"); |
1339 | FOO (IXON, "IXON"); |
1305 | FOO (IXOFF, "IXOFF"); |
1340 | FOO (IXOFF, "IXOFF"); |
1306 | # ifdef IUCLC |
1341 | # ifdef IUCLC |
1307 | |
|
|
1308 | FOO (IUCLC, "IUCLC"); |
1342 | FOO (IUCLC, "IUCLC"); |
1309 | # endif |
1343 | # endif |
1310 | # ifdef IXANY |
1344 | # ifdef IXANY |
1311 | |
|
|
1312 | FOO (IXANY, "IXANY"); |
1345 | FOO (IXANY, "IXANY"); |
1313 | # endif |
1346 | # endif |
1314 | # ifdef IMAXBEL |
1347 | # ifdef IMAXBEL |
1315 | |
|
|
1316 | FOO (IMAXBEL, "IMAXBEL"); |
1348 | FOO (IMAXBEL, "IMAXBEL"); |
1317 | # endif |
1349 | # endif |
1318 | |
1350 | |
1319 | fprintf (stderr, "\n"); |
1351 | fprintf (stderr, "\n"); |
1320 | |
1352 | |
… | |
… | |
1327 | FOO (VERASE, "VERASE"); |
1359 | FOO (VERASE, "VERASE"); |
1328 | FOO (VKILL, "VKILL"); |
1360 | FOO (VKILL, "VKILL"); |
1329 | FOO (VEOF, "VEOF"); |
1361 | FOO (VEOF, "VEOF"); |
1330 | FOO (VEOL, "VEOL"); |
1362 | FOO (VEOL, "VEOL"); |
1331 | # ifdef VEOL2 |
1363 | # ifdef VEOL2 |
1332 | |
|
|
1333 | FOO (VEOL2, "VEOL2"); |
1364 | FOO (VEOL2, "VEOL2"); |
1334 | # endif |
1365 | # endif |
1335 | # ifdef VSWTC |
1366 | # ifdef VSWTC |
1336 | |
|
|
1337 | FOO (VSWTC, "VSWTC"); |
1367 | FOO (VSWTC, "VSWTC"); |
1338 | # endif |
1368 | # endif |
1339 | # ifdef VSWTCH |
1369 | # ifdef VSWTCH |
1340 | |
|
|
1341 | FOO (VSWTCH, "VSWTCH"); |
1370 | FOO (VSWTCH, "VSWTCH"); |
1342 | # endif |
1371 | # endif |
1343 | |
|
|
1344 | FOO (VSTART, "VSTART"); |
1372 | FOO (VSTART, "VSTART"); |
1345 | FOO (VSTOP, "VSTOP"); |
1373 | FOO (VSTOP, "VSTOP"); |
1346 | FOO (VSUSP, "VSUSP"); |
1374 | FOO (VSUSP, "VSUSP"); |
1347 | # ifdef VDSUSP |
1375 | # ifdef VDSUSP |
1348 | |
|
|
1349 | FOO (VDSUSP, "VDSUSP"); |
1376 | FOO (VDSUSP, "VDSUSP"); |
1350 | # endif |
1377 | # endif |
1351 | # ifdef VREPRINT |
1378 | # ifdef VREPRINT |
1352 | |
|
|
1353 | FOO (VREPRINT, "VREPRINT"); |
1379 | FOO (VREPRINT, "VREPRINT"); |
1354 | # endif |
1380 | # endif |
1355 | # ifdef VDISCRD |
1381 | # ifdef VDISCRD |
1356 | |
|
|
1357 | FOO (VDISCRD, "VDISCRD"); |
1382 | FOO (VDISCRD, "VDISCRD"); |
1358 | # endif |
1383 | # endif |
1359 | # ifdef VWERSE |
1384 | # ifdef VWERSE |
1360 | |
|
|
1361 | FOO (VWERSE, "VWERSE"); |
1385 | FOO (VWERSE, "VWERSE"); |
1362 | # endif |
1386 | # endif |
1363 | # ifdef VLNEXT |
1387 | # ifdef VLNEXT |
1364 | |
|
|
1365 | FOO (VLNEXT, "VLNEXT"); |
1388 | FOO (VLNEXT, "VLNEXT"); |
1366 | # endif |
1389 | # endif |
1367 | |
1390 | |
1368 | fprintf (stderr, "\n"); |
1391 | fprintf (stderr, "\n"); |
1369 | # undef FOO |
1392 | # undef FOO |
… | |
… | |
1378 | * the slave. |
1401 | * the slave. |
1379 | */ |
1402 | */ |
1380 | void |
1403 | void |
1381 | rxvt_term::run_command (const char *const *argv) |
1404 | rxvt_term::run_command (const char *const *argv) |
1382 | { |
1405 | { |
|
|
1406 | #if ENABLE_FRILLS |
|
|
1407 | if (rs[Rs_pty_fd]) |
|
|
1408 | { |
|
|
1409 | pty.pty = atoi (rs[Rs_pty_fd]); |
|
|
1410 | |
|
|
1411 | if (getfd_hook) |
|
|
1412 | pty.pty = (*getfd_hook) (pty.pty); |
|
|
1413 | |
|
|
1414 | if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK)) |
|
|
1415 | rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); |
|
|
1416 | } |
|
|
1417 | else |
|
|
1418 | #endif |
|
|
1419 | if (!pty.get ()) |
|
|
1420 | rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); |
|
|
1421 | |
|
|
1422 | pty.set_utf8_mode (enc_utf8); |
|
|
1423 | |
|
|
1424 | /* set initial window size */ |
|
|
1425 | tt_winch (); |
|
|
1426 | |
1383 | int er; |
1427 | int er; |
1384 | |
|
|
1385 | if (!pty.get ()) |
|
|
1386 | rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); |
|
|
1387 | |
1428 | |
1388 | #ifndef NO_BACKSPACE_KEY |
1429 | #ifndef NO_BACKSPACE_KEY |
1389 | if (key_backspace[0] && !key_backspace[1]) |
1430 | if (key_backspace[0] && !key_backspace[1]) |
1390 | er = key_backspace[0]; |
1431 | er = key_backspace[0]; |
1391 | else if (strcmp (key_backspace, "DEC") == 0) |
1432 | else if (strcmp (key_backspace, "DEC") == 0) |
… | |
… | |
1394 | #endif |
1435 | #endif |
1395 | er = -1; |
1436 | er = -1; |
1396 | |
1437 | |
1397 | rxvt_get_ttymode (&tio, er); |
1438 | rxvt_get_ttymode (&tio, er); |
1398 | |
1439 | |
1399 | /* set initial window size */ |
1440 | #if ENABLE_FRILLS |
1400 | tt_winch (); |
1441 | if (rs[Rs_pty_fd]) |
1401 | |
1442 | return; |
1402 | sw_chld.start (SIGCHLD); |
1443 | #endif |
1403 | |
1444 | |
1404 | #ifndef __QNX__ |
1445 | #ifndef __QNX__ |
1405 | /* spin off the command interpreter */ |
1446 | /* spin off the command interpreter */ |
1406 | switch (cmd_pid = fork ()) |
1447 | switch (cmd_pid = fork ()) |
1407 | { |
1448 | { |
1408 | case -1: |
1449 | case -1: |
|
|
1450 | { |
|
|
1451 | cmd_pid = 0; |
1409 | rxvt_fatal ("can't fork, aborting.\n"); |
1452 | rxvt_fatal ("can't fork, aborting.\n"); |
|
|
1453 | } |
1410 | case 0: |
1454 | case 0: |
1411 | init_env (); |
1455 | init_env (); |
1412 | |
1456 | |
1413 | if (!pty.make_controlling_tty ()) |
1457 | if (!pty.make_controlling_tty ()) |
1414 | fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); |
1458 | fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); |
… | |
… | |
1477 | { |
1521 | { |
1478 | char *login; |
1522 | char *login; |
1479 | |
1523 | |
1480 | SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ |
1524 | SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ |
1481 | |
1525 | |
1482 | if (options & Opt_console) |
1526 | if (OPTION (Opt_console)) |
1483 | { /* be virtual console, fail silently */ |
1527 | { /* be virtual console, fail silently */ |
1484 | #ifdef TIOCCONS |
1528 | #ifdef TIOCCONS |
1485 | unsigned int on = 1; |
1529 | unsigned int on = 1; |
1486 | |
1530 | |
1487 | ioctl (STDIN_FILENO, TIOCCONS, &on); |
1531 | ioctl (STDIN_FILENO, TIOCCONS, &on); |
… | |
… | |
1537 | if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') |
1581 | if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') |
1538 | shell = "/bin/sh"; |
1582 | shell = "/bin/sh"; |
1539 | |
1583 | |
1540 | argv0 = (const char *)rxvt_r_basename (shell); |
1584 | argv0 = (const char *)rxvt_r_basename (shell); |
1541 | |
1585 | |
1542 | if (options & Opt_loginShell) |
1586 | if (OPTION (Opt_loginShell)) |
1543 | { |
1587 | { |
1544 | login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); |
1588 | login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); |
1545 | |
1589 | |
1546 | login[0] = '-'; |
1590 | login[0] = '-'; |
1547 | strcpy (&login[1], argv0); |
1591 | strcpy (&login[1], argv0); |
… | |
… | |
1582 | if ((command = getenv ("SHELL")) == NULL || *command == '\0') |
1626 | if ((command = getenv ("SHELL")) == NULL || *command == '\0') |
1583 | command = "/bin/sh"; |
1627 | command = "/bin/sh"; |
1584 | |
1628 | |
1585 | arg_a[0] = my_basename (command); |
1629 | arg_a[0] = my_basename (command); |
1586 | |
1630 | |
1587 | if (options & Opt_loginShell) |
1631 | if (OPTION (Opt_loginShell)) |
1588 | { |
1632 | { |
1589 | login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char)); |
1633 | login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char)); |
1590 | |
1634 | |
1591 | login[0] = '-'; |
1635 | login[0] = '-'; |
1592 | strcpy (&login[1], arg_a[0]); |
1636 | strcpy (&login[1], arg_a[0]); |