… | |
… | |
660 | pointerBlankDelay = i; |
660 | pointerBlankDelay = i; |
661 | else |
661 | else |
662 | pointerBlankDelay = 2; |
662 | pointerBlankDelay = 2; |
663 | #endif |
663 | #endif |
664 | |
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; |
|
|
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 | |
669 | if (!rs[Rs_cutchars]) |
676 | if (!rs[Rs_cutchars]) |
… | |
… | |
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 | |
749 | void |
760 | void |
750 | rxvt_term::init (int argc, const char *const *argv, const char *const *envv) |
761 | rxvt_term::init (int argc, const char *const *argv, const char *const *envv) |
… | |
… | |
768 | void |
779 | void |
769 | rxvt_term::init2 (int argc, const char *const *argv) |
780 | rxvt_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 | /*----------------------------------------------------------------------*/ |
947 | void |
958 | void |
948 | rxvt_term::set_locale (const char *locale) |
959 | rxvt_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 | |
985 | void |
996 | void |
986 | rxvt_term::init_xlocale () |
997 | rxvt_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 | |