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.112 by root, Sat Feb 19 01:07:58 2005 UTC vs.
Revision 1.130 by root, Wed Jan 4 04:42:45 2006 UTC

… …
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 "rxvtutil.h"
37#include "init.h" 37#include "init.h"
38
39#include <limits>
38 40
39#include <csignal> 41#include <csignal>
40 42
41const char *const def_colorName[] = 43const char *const def_colorName[] =
42 { 44 {
… …
169 COLOR_SCROLLTROUGH, 171 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 172#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 173#if TINTING
172 NULL, 174 NULL,
173#endif 175#endif
176#if OFF_FOCUS_FADING
177 "black",
178#endif
174 }; 179 };
175 180
176const char *const xa_names[] = 181const char *const xa_names[] =
177 { 182 {
178 "TEXT", 183 "TEXT",
… …
185 "INCR", 190 "INCR",
186 "WM_PROTOCOLS", 191 "WM_PROTOCOLS",
187 "WM_DELETE_WINDOW", 192 "WM_DELETE_WINDOW",
188 "CLIPBOARD", 193 "CLIPBOARD",
189#if ENABLE_FRILLS 194#if ENABLE_FRILLS
195 "_MOTIF_WM_HINTS",
196#endif
197#if ENABLE_EWMH
190 "_NET_WM_PID", 198 "_NET_WM_PID",
191 "_MOTIF_WM_HINTS",
192 "_NET_WM_NAME", 199 "_NET_WM_NAME",
193 "_NET_WM_ICON_NAME", 200 "_NET_WM_ICON_NAME",
201 "_NET_WM_PING",
194#endif 202#endif
195#if USE_XIM 203#if USE_XIM
196 "WM_LOCALE_NAME", 204 "WM_LOCALE_NAME",
197#endif 205#endif
198#ifdef TRANSPARENT 206#ifdef TRANSPARENT
… …
203 "DndProtocol", 211 "DndProtocol",
204 "DndSelection", 212 "DndSelection",
205#endif 213#endif
206#if ENABLE_XEMBED 214#if ENABLE_XEMBED
207 "_XEMBED", 215 "_XEMBED",
216 "_XEMBED_INFO",
208#endif 217#endif
209 }; 218 };
210 219
211bool 220bool
212rxvt_term::init_vars () 221rxvt_term::init_vars ()
213{ 222{
214 sw_term.start (SIGTERM);
215 sw_int.start (SIGINT);
216
217 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 223 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
218#ifdef OFF_FOCUS_FADING 224#ifdef OFF_FOCUS_FADING
219 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 225 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
220#endif 226#endif
221 pix_colors = pix_colors_focused; 227 pix_colors = pix_colors_focused;
222 228
223 if (pix_colors == NULL) 229 if (pix_colors == NULL)
224 return false; 230 return false;
225 231
226#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 232#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
227 TermWin.pixmap = None; 233 pixmap = None;
228#endif 234#endif
229 235
230 MEvent.time = CurrentTime; 236 MEvent.time = CurrentTime;
231 MEvent.button = AnyButton; 237 MEvent.button = AnyButton;
232 options = DEFAULT_OPTIONS; 238 options = DEFAULT_OPTIONS;
233 want_refresh = 1; 239 want_refresh = 1;
234 priv_modes = SavedModes = PrivMode_Default; 240 priv_modes = SavedModes = PrivMode_Default;
235 TermWin.focus = 0; 241 focus = 0;
236 TermWin.ncol = 80; 242 ncol = 80;
237 TermWin.nrow = 24; 243 nrow = 24;
238 TermWin.int_bwidth = INTERNALBORDERWIDTH; 244 int_bwidth = INTERNALBORDERWIDTH;
239 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 245 ext_bwidth = EXTERNALBORDERWIDTH;
240 TermWin.lineSpace = LINESPACE; 246 lineSpace = LINESPACE;
241 TermWin.saveLines = SAVELINES; 247 saveLines = SAVELINES;
242 numpix_colors = TOTAL_COLORS; 248 numpix_colors = TOTAL_COLORS;
243 249
244 refresh_limit = 1; 250 refresh_limit = 1;
245 refresh_type = SLOW_REFRESH; 251 refresh_type = SLOW_REFRESH;
246 prev_nrow = prev_ncol = 0; 252 prev_nrow = prev_ncol = 0;
… …
340 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 346 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
341 rs[Rs_display_name] = ":0"; 347 rs[Rs_display_name] = ":0";
342 348
343 get_options (r_argc, r_argv); 349 get_options (r_argc, r_argv);
344 350
345#ifdef LOCAL_X_IS_UNIX
346 if (rs[Rs_display_name][0] == ':')
347 {
348 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
349 strcpy (val, "unix");
350 strcat (val, rs[Rs_display_name]);
351 display = displays.get (val);
352 free (val);
353 }
354#endif
355
356 if (!display
357 && ! (display = displays.get (rs[Rs_display_name]))) 351 if (!(display = displays.get (rs[Rs_display_name])))
358 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 352 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
359 353
360 extract_resources (); 354 extract_resources ();
361 free (r_argv); 355 free (r_argv);
362 356
… …
377 if (!rs[Rs_iconName]) 371 if (!rs[Rs_iconName])
378 rs[Rs_iconName] = rs[Rs_name]; 372 rs[Rs_iconName] = rs[Rs_name];
379 } 373 }
380 374
381 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 375 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
382 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 376 saveLines = min (i, MAX_SAVELINES);
383 377
384#if ENABLE_FRILLS 378#if ENABLE_FRILLS
385 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)
386 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 380 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
381
387 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)
388 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 383 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
384
389 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 385 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
390 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 386 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
391#endif 387#endif
392 388
393#ifdef POINTER_BLANK 389#ifdef POINTER_BLANK
394 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 390 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
395 pointerBlankDelay = i; 391 pointerBlankDelay = i;
396 else 392 else
397 pointerBlankDelay = 2; 393 pointerBlankDelay = 2;
398#endif 394#endif
399 395
400 /* no point having a scrollbar without having any scrollback! */ 396 /* no point having a scrollbar without having any scrollback! */
401 if (!TermWin.saveLines) 397 if (!saveLines)
402 options &= ~Opt_scrollBar; 398 CLR_OPTION (Opt_scrollBar);
403 399
404#ifdef PRINTPIPE 400#ifdef PRINTPIPE
405 if (!rs[Rs_print_pipe]) 401 if (!rs[Rs_print_pipe])
406 rs[Rs_print_pipe] = PRINTPIPE; 402 rs[Rs_print_pipe] = PRINTPIPE;
407#endif 403#endif
… …
450 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]);
451#endif 447#endif
452 448
453#ifdef XTERM_REVERSE_VIDEO 449#ifdef XTERM_REVERSE_VIDEO
454 /* this is how xterm implements reverseVideo */ 450 /* this is how xterm implements reverseVideo */
455 if (options & Opt_reverseVideo) 451 if (OPTION (Opt_reverseVideo))
456 { 452 {
457 if (!rs[Rs_color + Color_fg]) 453 if (!rs[Rs_color + Color_fg])
458 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 454 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
459 if (!rs[Rs_color + Color_bg]) 455 if (!rs[Rs_color + Color_bg])
460 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 456 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
465 if (!rs[Rs_color + i]) 461 if (!rs[Rs_color + i])
466 rs[Rs_color + i] = def_colorName[i]; 462 rs[Rs_color + i] = def_colorName[i];
467 463
468#ifndef XTERM_REVERSE_VIDEO 464#ifndef XTERM_REVERSE_VIDEO
469 /* this is how we implement reverseVideo */ 465 /* this is how we implement reverseVideo */
470 if (options & Opt_reverseVideo) 466 if (OPTION (Opt_reverseVideo))
471 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]);
472#endif 468#endif
473 469
474 /* convenient aliases for setting fg/bg to colors */ 470 /* convenient aliases for setting fg/bg to colors */
475 color_aliases (Color_fg); 471 color_aliases (Color_fg);
476 color_aliases (Color_bg); 472 color_aliases (Color_bg);
… …
526 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 522 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
527 523
528 sprintf (env_display, "DISPLAY=%s", val); 524 sprintf (env_display, "DISPLAY=%s", val);
529 525
530 /* avoiding the math library: 526 /* avoiding the math library:
531 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */ 527 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
532 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++)
533 ; 529 ;
534 MAX_IT (i, 1); 530 max_it (i, 1);
535 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); 531 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
536 532
537 sprintf (env_windowid, "WINDOWID=%u", 533 sprintf (env_windowid, "WINDOWID=%u",
538 (unsigned int)TermWin.parent[0]); 534 (unsigned int)parent[0]);
539 535
540 /* add entries to the environment: 536 /* add entries to the environment:
541 * @ DISPLAY: in case we started with -display 537 * @ DISPLAY: in case we started with -display
542 * @ WINDOWID: X window id number of the window 538 * @ WINDOWID: X window id number of the window
543 * @ COLORTERM: terminal sub-name and also indicates its color 539 * @ COLORTERM: terminal sub-name and also indicates its color
… …
652 * Initialize the command connection. 648 * Initialize the command connection.
653 * This should be called after the X server connection is established. 649 * This should be called after the X server connection is established.
654 */ 650 */
655 651
656#ifdef META8_OPTION 652#ifdef META8_OPTION
657 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 653 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
658#endif 654#endif
659 655
660 get_ourmods (); 656 get_ourmods ();
661 657
662 if (!(options & Opt_scrollTtyOutput)) 658 if (!OPTION (Opt_scrollTtyOutput))
663 priv_modes |= PrivMode_TtyOutputInh; 659 priv_modes |= PrivMode_TtyOutputInh;
664 if (options & Opt_scrollTtyKeypress) 660 if (OPTION (Opt_scrollTtyKeypress))
665 priv_modes |= PrivMode_Keypress; 661 priv_modes |= PrivMode_Keypress;
666 if (!(options & Opt_jumpScroll)) 662 if (!OPTION (Opt_jumpScroll))
667 priv_modes |= PrivMode_smoothScroll; 663 priv_modes |= PrivMode_smoothScroll;
668 664
669#ifndef NO_BACKSPACE_KEY 665#ifndef NO_BACKSPACE_KEY
670 if (strcmp (key_backspace, "DEC") == 0) 666 if (strcmp (key_backspace, "DEC") == 0)
671 priv_modes |= PrivMode_HaveBackSpace; 667 priv_modes |= PrivMode_HaveBackSpace;
… …
681 if (menubar_visible ()) 677 if (menubar_visible ())
682 { 678 {
683 priv_modes |= PrivMode_menuBar; 679 priv_modes |= PrivMode_menuBar;
684 SavedModes |= PrivMode_menuBar; 680 SavedModes |= PrivMode_menuBar;
685 } 681 }
686
687#ifdef CURSOR_BLINK
688 if (options & Opt_cursorBlink)
689 (void)gettimeofday (&lastcursorchange, NULL);
690#endif
691 682
692 run_command (argv); 683 run_command (argv);
693} 684}
694 685
695/*----------------------------------------------------------------------*/ 686/*----------------------------------------------------------------------*/
… …
710 continue; 701 continue;
711 702
712 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 703 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
713 { 704 {
714#ifndef XTERM_REVERSE_VIDEO 705#ifndef XTERM_REVERSE_VIDEO
715 if (i < 2 && (options & Opt_reverseVideo)) 706 if (i < 2 && OPTION (Opt_reverseVideo))
716 rs[Rs_color + i] = def_colorName[!i]; 707 rs[Rs_color + i] = def_colorName[!i];
717 else 708 else
718#endif 709#endif
719 rs[Rs_color + i] = def_colorName[i]; 710 rs[Rs_color + i] = def_colorName[i];
720 711
… …
745 } 736 }
746 } 737 }
747 } 738 }
748 739
749 pix_colors[i] = xcol; 740 pix_colors[i] = xcol;
741 SET_PIXCOLOR (i);
742 }
743
750#ifdef OFF_FOCUS_FADING 744#ifdef OFF_FOCUS_FADING
751 if (rs[Rs_fade]) 745 if (rs[Rs_fade])
746 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
752 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]);
753#endif 748#endif
754 SET_PIXCOLOR (i);
755 }
756 749
757 if (display->depth <= 2) 750 if (display->depth <= 2)
758 { 751 {
759 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];
760 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];
… …
768 * from the fvwm window manager. 761 * from the fvwm window manager.
769 */ 762 */
770#ifdef KEEP_SCROLLCOLOR 763#ifdef KEEP_SCROLLCOLOR
771 764
772 if (display->depth <= 2) 765 if (display->depth <= 2)
766 {
773 { /* Monochrome */ 767 /* Monochrome */
774 pix_colors[Color_scroll] = pix_colors[Color_fg]; 768 pix_colors[Color_scroll] = pix_colors[Color_fg];
775 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 769 pix_colors[Color_topShadow] = pix_colors[Color_bg];
776 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 770 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
777 } 771 }
778 else 772 else
… …
929#endif 923#endif
930 XGCValues gcvalue; 924 XGCValues gcvalue;
931 long vt_emask; 925 long vt_emask;
932 XSetWindowAttributes attributes; 926 XSetWindowAttributes attributes;
933 XWindowAttributes gattr; 927 XWindowAttributes gattr;
934 Window top; 928 Window top, parent;
935 dDisp; 929 dDisp;
936 930
937#ifdef USING_W11LIB 931#ifdef USING_W11LIB
938 /* enable W11 callbacks */ 932 /* enable W11 callbacks */
939 W11AddEventHandler (disp, rxvt_W11_process_x_event); 933 W11AddEventHandler (disp, rxvt_W11_process_x_event);
940#endif 934#endif
941 935
942 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 936 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
943 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 937 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
944 938
945 if (options & Opt_transparent) 939 if (OPTION (Opt_transparent))
946 { 940 {
947 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 941 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
948 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 942 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
949 } 943 }
950 944
951#if ENABLE_FRILLS 945#if ENABLE_FRILLS
952 if (options & Opt_borderLess) 946 if (OPTION (Opt_borderLess))
953 { 947 {
954 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 948 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
955 949
956 if (prop == None) 950 if (prop == None)
957 { 951 {
… …
966 mwmhints.flags = MWM_HINTS_DECORATIONS; 960 mwmhints.flags = MWM_HINTS_DECORATIONS;
967 mwmhints.decorations = 0; 961 mwmhints.decorations = 0;
968 } 962 }
969 } 963 }
970 else 964 else
971 {
972 mwmhints.flags = 0; 965 mwmhints.flags = 0;
973 }
974#endif 966#endif
975 967
976 /* grab colors before netscape does */ 968 /* grab colors before netscape does */
977 Get_Colours (); 969 Get_Colours ();
978 970
979 if (!set_fonts ()) 971 if (!set_fonts ())
980 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");
981 973
974 parent = DefaultRootWindow (disp);
975
982#if ENABLE_XEMBED 976#if ENABLE_XEMBED
983 if (rs[Rs_embed]) 977 if (rs[Rs_embed])
984 { 978 {
985 XWindowAttributes wattr; 979 XWindowAttributes wattr;
986 980
987 top = strtol (rs[Rs_embed], 0, 0); 981 parent = strtol (rs[Rs_embed], 0, 0);
988 982
989 if (!XGetWindowAttributes (disp, top, &wattr)) 983 if (!XGetWindowAttributes (disp, parent, &wattr))
990 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 984 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
991 985
992 window_calc (wattr.width, wattr.height); 986 window_calc (wattr.width, wattr.height);
987 }
988#endif
993 989
994#if 0 990 window_calc (0, 0);
995 if (wattr.map_state == IsViewable) 991
996 { 992 /* sub-window placement & size in rxvt_resize_subwindows () */
997 TermWin.mapped = 1; 993#ifdef PREFER_24BIT
998 refresh_type = FAST_REFRESH; 994 attributes.background_pixel = pix_colors_focused[Color_border];
999 XClearWindow (disp, top); 995 attributes.border_pixel = pix_colors_focused[Color_border];
1000 // TODO: make XMapNotify-event-code a function and call it 996 attributes.colormap = display->cmap;
1001 // TODO: how can I detetc visibility without unmpa/map? 997 top = XCreateWindow (disp, parent,
1002 // TODO: focusin etc. 998 szHint.x, szHint.y,
1003 } 999 szHint.width, szHint.height,
1000 ext_bwidth,
1001 display->depth, InputOutput,
1002 display->visual,
1003 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1004#else 1004#else
1005 // it'S easiets just to unmap/map to get all state correctly set-up 1005 top = XCreateSimpleWindow (disp, parent,
1006 XUnmapWindow (disp, top);
1007#endif
1008 }
1009 else
1010#endif
1011 {
1012 window_calc (0, 0);
1013
1014 /* sub-window placement & size in rxvt_resize_subwindows () */
1015#ifdef PREFER_24BIT
1016 attributes.background_pixel = pix_colors_focused[Color_border];
1017 attributes.border_pixel = pix_colors_focused[Color_border];
1018 attributes.colormap = display->cmap;
1019 top = XCreateWindow (disp, DefaultRootWindow (disp),
1020 szHint.x, szHint.y, 1006 szHint.x, szHint.y,
1021 szHint.width, szHint.height, 1007 szHint.width, szHint.height,
1022 TermWin.ext_bwidth, 1008 ext_bwidth,
1023 display->depth, InputOutput,
1024 display->visual,
1025 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1026#else
1027 top = XCreateSimpleWindow (disp, DefaultRootWindow (disp),
1028 szHint.x, szHint.y,
1029 szHint.width, szHint.height,
1030 TermWin.ext_bwidth,
1031 pix_colors_focused[Color_border], 1009 pix_colors_focused[Color_border],
1032 pix_colors_focused[Color_border]); 1010 pix_colors_focused[Color_border]);
1033#endif 1011#endif
1034 }
1035 1012
1036 TermWin.parent[0] = top; 1013 this->parent[0] = top;
1037 1014
1038 old_width = szHint.width; 1015 old_width = szHint.width;
1039 old_height = szHint.height; 1016 old_height = szHint.height;
1040 1017
1041 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1018 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
… …
1044 classHint.res_name = (char *)rs[Rs_name]; 1021 classHint.res_name = (char *)rs[Rs_name];
1045 classHint.res_class = (char *)RESCLASS; 1022 classHint.res_class = (char *)RESCLASS;
1046 1023
1047 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1024 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1048 wmHint.input = True; 1025 wmHint.input = True;
1049 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1026 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1050 wmHint.window_group = top; 1027 wmHint.window_group = top;
1051 1028
1052 XSetWMProperties (disp, top, NULL, NULL, 1029 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1053 (char **)argv, argc, &szHint, &wmHint, &classHint); 1030 &szHint, &wmHint, &classHint);
1054 1031
1055 /* Enable delete window protocol */ 1032 Atom protocols[] = {
1056 XSetWMProtocols (disp, top, &xa[XA_WM_DELETE_WINDOW], 1); 1033 xa[XA_WM_DELETE_WINDOW],
1034#if ENABLE_EWMH
1035 xa[XA_NET_WM_PING],
1036#endif
1037 };
1057 1038
1058#if ENABLE_FRILLS 1039 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1040
1041#if ENABLE_EWMH
1059 long pid = getpid (); 1042 long pid = getpid ();
1060 1043
1061 XChangeProperty (disp, top, 1044 XChangeProperty (disp, top,
1062 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1045 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1063 PropModeReplace, (unsigned char *)&pid, 1); 1046 PropModeReplace, (unsigned char *)&pid, 1);
1047
1048 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1064#endif 1049#endif
1065 1050
1066 XSelectInput (disp, top, 1051 XSelectInput (disp, top,
1067 KeyPressMask 1052 KeyPressMask
1068#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1053#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
… …
1086 /* cursor (menuBar/scrollBar): Black-on-White */ 1071 /* cursor (menuBar/scrollBar): Black-on-White */
1087 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1072 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1088#endif 1073#endif
1089 1074
1090 /* the vt window */ 1075 /* the vt window */
1091 TermWin.vt = XCreateSimpleWindow (disp, top, 1076 vt = XCreateSimpleWindow (disp, top,
1092 window_vt_x, 1077 window_vt_x,
1093 window_vt_y, 1078 window_vt_y,
1094 TermWin_TotalWidth (), 1079 width,
1095 TermWin_TotalHeight (), 1080 height,
1096 0, 1081 0,
1097 pix_colors_focused[Color_fg], 1082 pix_colors_focused[Color_fg],
1098 pix_colors_focused[Color_bg]); 1083 pix_colors_focused[Color_bg]);
1099#ifdef DEBUG_X 1084#ifdef DEBUG_X
1100 XStoreName (disp, TermWin.vt, "vt window"); 1085 XStoreName (disp, vt, "vt window");
1101#endif 1086#endif
1102 1087
1103 attributes.bit_gravity = NorthWestGravity; 1088 attributes.bit_gravity = NorthWestGravity;
1104 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes); 1089 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1105 1090
1106 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1091 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1107 1092
1108 pointer_unblank ();
1109
1110#ifdef POINTER_BLANK 1093#ifdef POINTER_BLANK
1111 if (options & Opt_pointerBlank) 1094 if (OPTION (Opt_pointerBlank))
1112 vt_emask |= PointerMotionMask; 1095 vt_emask |= PointerMotionMask;
1113 else 1096 else
1114#endif 1097#endif
1115 vt_emask |= Button1MotionMask | Button3MotionMask; 1098 vt_emask |= Button1MotionMask | Button3MotionMask;
1116 1099
1117 XSelectInput (disp, TermWin.vt, vt_emask); 1100 XSelectInput (disp, vt, vt_emask);
1118 vt_ev.start (display, TermWin.vt); 1101 vt_ev.start (display, vt);
1119 1102
1120#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1103#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1121 if (menuBar_height ()) 1104 if (menuBar_height ())
1122 { 1105 {
1123 menuBar.win = XCreateSimpleWindow (disp, top, 1106 menuBar.win = XCreateSimpleWindow (disp, top,
1124 window_vt_x, 0, 1107 window_vt_x, 0,
1125 TermWin_TotalWidth (), 1108 width,
1126 menuBar_TotalHeight (), 1109 menuBar_TotalHeight (),
1127 0, 1110 0,
1128 pix_colors_focused[Color_fg], 1111 pix_colors_focused[Color_fg],
1129 pix_colors_focused[Color_scroll]); 1112 pix_colors_focused[Color_scroll]);
1130 1113
… …
1143 } 1126 }
1144#endif 1127#endif
1145 1128
1146#ifdef XPM_BACKGROUND 1129#ifdef XPM_BACKGROUND
1147 if (rs[Rs_backgroundPixmap] != NULL 1130 if (rs[Rs_backgroundPixmap] != NULL
1148 && ! (options & Opt_transparent)) 1131 && ! OPTION (Opt_transparent))
1149 { 1132 {
1150 const char *p = rs[Rs_backgroundPixmap]; 1133 const char *p = rs[Rs_backgroundPixmap];
1151 1134
1152 if ((p = strchr (p, ';')) != NULL) 1135 if ((p = strchr (p, ';')) != NULL)
1153 { 1136 {
… …
1162 1145
1163 /* graphics context for the vt window */ 1146 /* graphics context for the vt window */
1164 gcvalue.foreground = pix_colors[Color_fg]; 1147 gcvalue.foreground = pix_colors[Color_fg];
1165 gcvalue.background = pix_colors[Color_bg]; 1148 gcvalue.background = pix_colors[Color_bg];
1166 gcvalue.graphics_exposures = 1; 1149 gcvalue.graphics_exposures = 1;
1167 TermWin.gc = XCreateGC (disp, TermWin.vt, 1150 gc = XCreateGC (disp, vt,
1168 GCForeground | GCBackground | GCGraphicsExposures, 1151 GCForeground | GCBackground | GCGraphicsExposures,
1169 &gcvalue); 1152 &gcvalue);
1170 1153
1171 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1154 drawable = new rxvt_drawable (display, vt);
1172 1155
1173#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1156#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1174 gcvalue.foreground = pix_colors[Color_topShadow]; 1157 gcvalue.foreground = pix_colors[Color_topShadow];
1175 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1158 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1176 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1159 gcvalue.foreground = pix_colors[Color_bottomShadow];
1177 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1160 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1178 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1161 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1179 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1162 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1180#endif 1163#endif
1181 1164
1182#ifdef OFF_FOCUS_FADING 1165#ifdef OFF_FOCUS_FADING
1183 // initially we are in unfocused state 1166 // initially we are in unfocused state
1184 if (rs[Rs_fade]) 1167 if (rs[Rs_fade])
1185 pix_colors = pix_colors_unfocused; 1168 pix_colors = pix_colors_unfocused;
1186#endif 1169#endif
1187 1170
1171 pointer_unblank ();
1188 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
1189} 1183}
1190 1184
1191/* ------------------------------------------------------------------------- * 1185/* ------------------------------------------------------------------------- *
1192 * GET TTY CURRENT STATE * 1186 * GET TTY CURRENT STATE *
1193 * ------------------------------------------------------------------------- */ 1187 * ------------------------------------------------------------------------- */
… …
1198 /* 1192 /*
1199 * standard System V termios interface 1193 * standard System V termios interface
1200 */ 1194 */
1201 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1195 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1202 { 1196 {
1203 /* 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
1204 tio->c_cc[VINTR] = CINTR; 1201 tio->c_cc[VINTR] = CINTR;
1205 tio->c_cc[VQUIT] = CQUIT; 1202 tio->c_cc[VQUIT] = CQUIT;
1206 tio->c_cc[VERASE] = CERASE; 1203 tio->c_cc[VERASE] = CERASE;
1204#ifdef VERASE2
1205 tio->c_cc[VERASE2] = CERASE2;
1206#endif
1207 tio->c_cc[VKILL] = CKILL; 1207 tio->c_cc[VKILL] = CKILL;
1208 tio->c_cc[VSTART] = CSTART; 1208 tio->c_cc[VSTART] = CSTART;
1209 tio->c_cc[VSTOP] = CSTOP; 1209 tio->c_cc[VSTOP] = CSTOP;
1210 tio->c_cc[VSUSP] = CSUSP; 1210 tio->c_cc[VSUSP] = CSUSP;
1211# ifdef VDSUSP 1211# ifdef VDSUSP
1212
1213 tio->c_cc[VDSUSP] = CDSUSP; 1212 tio->c_cc[VDSUSP] = CDSUSP;
1214# endif 1213# endif
1215# ifdef VREPRINT 1214# ifdef VREPRINT
1216
1217 tio->c_cc[VREPRINT] = CRPRNT; 1215 tio->c_cc[VREPRINT] = CRPRNT;
1218# endif 1216# endif
1219# ifdef VDISCRD 1217# ifdef VDISCRD
1220
1221 tio->c_cc[VDISCRD] = CFLUSH; 1218 tio->c_cc[VDISCRD] = CFLUSH;
1222# endif 1219# endif
1223# ifdef VWERSE 1220# ifdef VWERSE
1224
1225 tio->c_cc[VWERSE] = CWERASE; 1221 tio->c_cc[VWERSE] = CWERASE;
1226# endif 1222# endif
1227# ifdef VLNEXT 1223# ifdef VLNEXT
1228
1229 tio->c_cc[VLNEXT] = CLNEXT; 1224 tio->c_cc[VLNEXT] = CLNEXT;
1230# endif 1225# endif
1231
1232 } 1226 }
1227
1233 tio->c_cc[VEOF] = CEOF; 1228 tio->c_cc[VEOF] = CEOF;
1234 tio->c_cc[VEOL] = VDISABLE; 1229 tio->c_cc[VEOL] = VDISABLE;
1235# ifdef VEOL2 1230# ifdef VEOL2
1236
1237 tio->c_cc[VEOL2] = VDISABLE; 1231 tio->c_cc[VEOL2] = VDISABLE;
1238# endif 1232# endif
1239# ifdef VSWTC 1233# ifdef VSWTC
1240
1241 tio->c_cc[VSWTC] = VDISABLE; 1234 tio->c_cc[VSWTC] = VDISABLE;
1242# endif 1235# endif
1243# ifdef VSWTCH 1236# ifdef VSWTCH
1244
1245 tio->c_cc[VSWTCH] = VDISABLE; 1237 tio->c_cc[VSWTCH] = VDISABLE;
1246# endif 1238# endif
1247# if VMIN != VEOF 1239# if VMIN != VEOF
1248
1249 tio->c_cc[VMIN] = 1; 1240 tio->c_cc[VMIN] = 1;
1250# endif 1241# endif
1251# if VTIME != VEOL 1242# if VTIME != VEOL
1252
1253 tio->c_cc[VTIME] = 0; 1243 tio->c_cc[VTIME] = 0;
1254# endif 1244# endif
1255 1245
1256 if (erase != -1) 1246 if (erase != -1)
1257 tio->c_cc[VERASE] = (char)erase; 1247 tio->c_cc[VERASE] = (char)erase;
… …
1285 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1275 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1286 { 1276 {
1287 tio->sg.sg_erase = CERASE; /* ^H */ 1277 tio->sg.sg_erase = CERASE; /* ^H */
1288 tio->sg.sg_kill = CKILL; /* ^U */ 1278 tio->sg.sg_kill = CKILL; /* ^U */
1289 } 1279 }
1280
1290 if (erase != -1) 1281 if (erase != -1)
1291 tio->sg.sg_erase = (char)erase; 1282 tio->sg.sg_erase = (char)erase;
1292 1283
1293 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1284 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1294 1285
… …
1300 tio->tc.t_startc = CSTART; /* ^Q */ 1291 tio->tc.t_startc = CSTART; /* ^Q */
1301 tio->tc.t_stopc = CSTOP; /* ^S */ 1292 tio->tc.t_stopc = CSTOP; /* ^S */
1302 tio->tc.t_eofc = CEOF; /* ^D */ 1293 tio->tc.t_eofc = CEOF; /* ^D */
1303 tio->tc.t_brkc = -1; 1294 tio->tc.t_brkc = -1;
1304 } 1295 }
1296
1305 /* get local special chars */ 1297 /* get local special chars */
1306 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1298 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1307 { 1299 {
1308 tio->lc.t_suspc = CSUSP; /* ^Z */ 1300 tio->lc.t_suspc = CSUSP; /* ^Z */
1309 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1301 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1313 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1305 tio->lc.t_lnextc = CLNEXT; /* ^V */
1314 } 1306 }
1315 /* get line discipline */ 1307 /* get line discipline */
1316 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1308 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1317# ifdef NTTYDISC 1309# ifdef NTTYDISC
1318
1319 tio->line = NTTYDISC; 1310 tio->line = NTTYDISC;
1320# endif /* NTTYDISC */ 1311# endif /* NTTYDISC */
1321 1312
1322 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1313 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1323#endif /* HAVE_TERMIOS_H */ 1314#endif /* HAVE_TERMIOS_H */
… …
1346 FOO (IGNCR, "IGNCR"); 1337 FOO (IGNCR, "IGNCR");
1347 FOO (ICRNL, "ICRNL"); 1338 FOO (ICRNL, "ICRNL");
1348 FOO (IXON, "IXON"); 1339 FOO (IXON, "IXON");
1349 FOO (IXOFF, "IXOFF"); 1340 FOO (IXOFF, "IXOFF");
1350# ifdef IUCLC 1341# ifdef IUCLC
1351
1352 FOO (IUCLC, "IUCLC"); 1342 FOO (IUCLC, "IUCLC");
1353# endif 1343# endif
1354# ifdef IXANY 1344# ifdef IXANY
1355
1356 FOO (IXANY, "IXANY"); 1345 FOO (IXANY, "IXANY");
1357# endif 1346# endif
1358# ifdef IMAXBEL 1347# ifdef IMAXBEL
1359
1360 FOO (IMAXBEL, "IMAXBEL"); 1348 FOO (IMAXBEL, "IMAXBEL");
1361# endif 1349# endif
1362 1350
1363 fprintf (stderr, "\n"); 1351 fprintf (stderr, "\n");
1364 1352
… …
1371 FOO (VERASE, "VERASE"); 1359 FOO (VERASE, "VERASE");
1372 FOO (VKILL, "VKILL"); 1360 FOO (VKILL, "VKILL");
1373 FOO (VEOF, "VEOF"); 1361 FOO (VEOF, "VEOF");
1374 FOO (VEOL, "VEOL"); 1362 FOO (VEOL, "VEOL");
1375# ifdef VEOL2 1363# ifdef VEOL2
1376
1377 FOO (VEOL2, "VEOL2"); 1364 FOO (VEOL2, "VEOL2");
1378# endif 1365# endif
1379# ifdef VSWTC 1366# ifdef VSWTC
1380
1381 FOO (VSWTC, "VSWTC"); 1367 FOO (VSWTC, "VSWTC");
1382# endif 1368# endif
1383# ifdef VSWTCH 1369# ifdef VSWTCH
1384
1385 FOO (VSWTCH, "VSWTCH"); 1370 FOO (VSWTCH, "VSWTCH");
1386# endif 1371# endif
1387
1388 FOO (VSTART, "VSTART"); 1372 FOO (VSTART, "VSTART");
1389 FOO (VSTOP, "VSTOP"); 1373 FOO (VSTOP, "VSTOP");
1390 FOO (VSUSP, "VSUSP"); 1374 FOO (VSUSP, "VSUSP");
1391# ifdef VDSUSP 1375# ifdef VDSUSP
1392
1393 FOO (VDSUSP, "VDSUSP"); 1376 FOO (VDSUSP, "VDSUSP");
1394# endif 1377# endif
1395# ifdef VREPRINT 1378# ifdef VREPRINT
1396
1397 FOO (VREPRINT, "VREPRINT"); 1379 FOO (VREPRINT, "VREPRINT");
1398# endif 1380# endif
1399# ifdef VDISCRD 1381# ifdef VDISCRD
1400
1401 FOO (VDISCRD, "VDISCRD"); 1382 FOO (VDISCRD, "VDISCRD");
1402# endif 1383# endif
1403# ifdef VWERSE 1384# ifdef VWERSE
1404
1405 FOO (VWERSE, "VWERSE"); 1385 FOO (VWERSE, "VWERSE");
1406# endif 1386# endif
1407# ifdef VLNEXT 1387# ifdef VLNEXT
1408
1409 FOO (VLNEXT, "VLNEXT"); 1388 FOO (VLNEXT, "VLNEXT");
1410# endif 1389# endif
1411 1390
1412 fprintf (stderr, "\n"); 1391 fprintf (stderr, "\n");
1413# undef FOO 1392# undef FOO
… …
1426{ 1405{
1427#if ENABLE_FRILLS 1406#if ENABLE_FRILLS
1428 if (rs[Rs_pty_fd]) 1407 if (rs[Rs_pty_fd])
1429 { 1408 {
1430 pty.pty = atoi (rs[Rs_pty_fd]); 1409 pty.pty = atoi (rs[Rs_pty_fd]);
1410
1411 if (getfd_hook)
1412 pty.pty = (*getfd_hook) (pty.pty);
1413
1431 fcntl (pty.pty, F_SETFL, O_NONBLOCK); 1414 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK))
1415 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1432 } 1416 }
1433 else 1417 else
1434#endif 1418#endif
1435 if (!pty.get ()) 1419 if (!pty.get ())
1436 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1420 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
… …
1455 1439
1456#if ENABLE_FRILLS 1440#if ENABLE_FRILLS
1457 if (rs[Rs_pty_fd]) 1441 if (rs[Rs_pty_fd])
1458 return; 1442 return;
1459#endif 1443#endif
1460
1461 sw_chld.start (SIGCHLD);
1462 1444
1463#ifndef __QNX__ 1445#ifndef __QNX__
1464 /* spin off the command interpreter */ 1446 /* spin off the command interpreter */
1465 switch (cmd_pid = fork ()) 1447 switch (cmd_pid = fork ())
1466 { 1448 {
… …
1539{ 1521{
1540 char *login; 1522 char *login;
1541 1523
1542 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1524 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1543 1525
1544 if (options & Opt_console) 1526 if (OPTION (Opt_console))
1545 { /* be virtual console, fail silently */ 1527 { /* be virtual console, fail silently */
1546#ifdef TIOCCONS 1528#ifdef TIOCCONS
1547 unsigned int on = 1; 1529 unsigned int on = 1;
1548 1530
1549 ioctl (STDIN_FILENO, TIOCCONS, &on); 1531 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1599 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1581 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1600 shell = "/bin/sh"; 1582 shell = "/bin/sh";
1601 1583
1602 argv0 = (const char *)rxvt_r_basename (shell); 1584 argv0 = (const char *)rxvt_r_basename (shell);
1603 1585
1604 if (options & Opt_loginShell) 1586 if (OPTION (Opt_loginShell))
1605 { 1587 {
1606 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1588 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1607 1589
1608 login[0] = '-'; 1590 login[0] = '-';
1609 strcpy (&login[1], argv0); 1591 strcpy (&login[1], argv0);
… …
1644 if ((command = getenv ("SHELL")) == NULL || *command == '\0') 1626 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1645 command = "/bin/sh"; 1627 command = "/bin/sh";
1646 1628
1647 arg_a[0] = my_basename (command); 1629 arg_a[0] = my_basename (command);
1648 1630
1649 if (options & Opt_loginShell) 1631 if (OPTION (Opt_loginShell))
1650 { 1632 {
1651 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char)); 1633 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1652 1634
1653 login[0] = '-'; 1635 login[0] = '-';
1654 strcpy (&login[1], arg_a[0]); 1636 strcpy (&login[1], arg_a[0]);

Diff Legend

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