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.329 by sf-exg, Mon Jun 11 14:56:33 2012 UTC vs.
Revision 1.339 by sf-exg, Mon Oct 13 17:05:32 2014 UTC

… …
14 * - extensive modifications 14 * - extensive modifications
15 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de> 15 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de>
16 * 16 *
17 * This program is free software; you can redistribute it and/or modify 17 * This program is free software; you can redistribute it and/or modify
18 * it under the terms of the GNU General Public License as published by 18 * it under the terms of the GNU General Public License as published by
19 * the Free Software Foundation; either version 2 of the License, or 19 * the Free Software Foundation; either version 3 of the License, or
20 * (at your option) any later version. 20 * (at your option) any later version.
21 * 21 *
22 * This program is distributed in the hope that it will be useful, 22 * This program is distributed in the hope that it will be useful,
23 * but WITHOUT ANY WARRANTY; without even the implied warranty of 23 * but WITHOUT ANY WARRANTY; without even the implied warranty of
24 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 24 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
519#endif 519#endif
520 COLOR_SCROLLBAR, 520 COLOR_SCROLLBAR,
521#ifdef RXVT_SCROLLBAR 521#ifdef RXVT_SCROLLBAR
522 COLOR_SCROLLTROUGH, 522 COLOR_SCROLLTROUGH,
523#endif 523#endif
524#if ENABLE_TRANSPARENCY 524#if BG_IMAGE_FROM_ROOT
525 NULL, 525 NULL,
526#endif 526#endif
527#if OFF_FOCUS_FADING 527#if OFF_FOCUS_FADING
528 "rgb:00/00/00", 528 "rgb:00/00/00",
529#endif 529#endif
… …
659 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 659 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
660 pointerBlankDelay = i; 660 pointerBlankDelay = i;
661 else 661 else
662 pointerBlankDelay = 2; 662 pointerBlankDelay = 2;
663#endif 663#endif
664
665 if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0)
666 multiClickTime = i;
667 else
668 multiClickTime = 500;
669
670 cursor_type = option (Opt_cursorUnderline) ? 1 : 0;
664 671
665 /* no point having a scrollbar without having any scrollback! */ 672 /* no point having a scrollbar without having any scrollback! */
666 if (!saveLines) 673 if (!saveLines)
667 set_option (Opt_scrollBar, 0); 674 set_option (Opt_scrollBar, 0);
668 675
… …
741 envv->push_back (0); 748 envv->push_back (0);
742 749
743 this->argv = argv; 750 this->argv = argv;
744 this->envv = envv; 751 this->envv = envv;
745 752
753 env = new char *[this->envv->size ()];
754 for (int i = 0; i < this->envv->size (); i++)
755 env[i] = this->envv->at (i);
756
746 init2 (argv->size () - 1, argv->begin ()); 757 init2 (argv->size () - 1, argv->begin ());
747} 758}
748 759
749void 760void
750rxvt_term::init (int argc, const char *const *argv, const char *const *envv) 761rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
… …
768void 779void
769rxvt_term::init2 (int argc, const char *const *argv) 780rxvt_term::init2 (int argc, const char *const *argv)
770{ 781{
771 SET_R (this); 782 SET_R (this);
772 set_locale (""); 783 set_locale ("");
773 set_environ (envv); // a few things in X do not call setlocale :( 784 set_environ (env); // a few things in X do not call setlocale :(
774 785
775 init_vars (); 786 init_vars ();
776 787
777 const char **cmd_argv = init_resources (argc, argv); 788 const char **cmd_argv = init_resources (argc, argv);
778 789
… …
945 956
946/*----------------------------------------------------------------------*/ 957/*----------------------------------------------------------------------*/
947void 958void
948rxvt_term::set_locale (const char *locale) 959rxvt_term::set_locale (const char *locale)
949{ 960{
950 set_environ (envv); 961 set_environ (env);
951 962
952 free (this->locale); 963 free (this->locale);
953 this->locale = setlocale (LC_CTYPE, locale); 964 this->locale = setlocale (LC_CTYPE, locale);
954 965
955 if (!this->locale) 966 if (!this->locale)
… …
983} 994}
984 995
985void 996void
986rxvt_term::init_xlocale () 997rxvt_term::init_xlocale ()
987{ 998{
988 set_environ (envv); 999 set_environ (env);
989 1000
990#if USE_XIM 1001#if USE_XIM
991 if (!locale) 1002 if (!locale)
992 rxvt_warn ("setting locale failed, continuing without locale support.\n"); 1003 rxvt_warn ("setting locale failed, continuing without locale support.\n");
993 else 1004 else
… …
1203 for (j = map->max_keypermod; j--; k++) 1214 for (j = map->max_keypermod; j--; k++)
1204 { 1215 {
1205 if (kc[k] == 0) 1216 if (kc[k] == 0)
1206 break; 1217 break;
1207 1218
1208 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1219 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
1209 { 1220 {
1210 case XK_Num_Lock: 1221 case XK_Num_Lock:
1211 ModNumLockMask = modmasks[i - 1]; 1222 ModNumLockMask = modmasks[i - 1];
1212 continue; 1223 continue;
1213 1224
… …
1396 classHint.res_name = (char *)rs[Rs_name]; 1407 classHint.res_name = (char *)rs[Rs_name];
1397 classHint.res_class = (char *)RESCLASS; 1408 classHint.res_class = (char *)RESCLASS;
1398 1409
1399 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1410 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1400 wmHint.input = True; 1411 wmHint.input = True;
1401 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1412 wmHint.initial_state = option (Opt_iconic) ? IconicState
1413 : option (Opt_dockapp) ? WithdrawnState
1414 : NormalState;
1402 wmHint.window_group = top; 1415 wmHint.window_group = top;
1403 1416
1404 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1417 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1405 &szHint, &wmHint, &classHint); 1418 &szHint, &wmHint, &classHint);
1406#if ENABLE_EWMH 1419#if ENABLE_EWMH
… …
1408 * set up icon hint 1421 * set up icon hint
1409 * rs [Rs_iconfile] is path to icon 1422 * rs [Rs_iconfile] is path to icon
1410 */ 1423 */
1411 1424
1412 if (rs [Rs_iconfile]) 1425 if (rs [Rs_iconfile])
1413 {
1414 set_icon (rs [Rs_iconfile]); 1426 set_icon (rs [Rs_iconfile]);
1415 }
1416#endif 1427#endif
1417 1428
1418#if ENABLE_FRILLS 1429#if ENABLE_FRILLS
1419 if (mwmhints.flags) 1430 if (mwmhints.flags)
1420 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1431 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,

Diff Legend

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