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.322 by sf-exg, Thu May 17 10:18:32 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
… …
76#include <netinet/in.h> 76#include <netinet/in.h>
77#include <arpa/inet.h> 77#include <arpa/inet.h>
78#include <net/if.h> 78#include <net/if.h>
79#include <net/if_arp.h> 79#include <net/if_arp.h>
80 80
81static char * 81static char * ecb_cold
82rxvt_network_display (const char *display) 82rxvt_network_display (const char *display)
83{ 83{
84 char buffer[1024], *rval = NULL; 84 char buffer[1024], *rval = NULL;
85 struct ifconf ifc; 85 struct ifconf ifc;
86 struct ifreq *ifr; 86 struct ifreq *ifr;
… …
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
… …
588 xa = display->xa; 588 xa = display->xa;
589 589
590 set (display); 590 set (display);
591 extract_resources (); 591 extract_resources ();
592 592
593#if XFT 593#if ENABLE_FRILLS
594 if (rs[Rs_depth]) 594 if (rs[Rs_visual])
595 select_visual (strtol (rs[Rs_depth], 0, 0)); 595 select_visual (strtol (rs[Rs_visual], 0, 0));
596 else if (rs[Rs_depth])
597 select_depth (strtol (rs[Rs_depth], 0, 0));
596#endif 598#endif
597 599
598 for (int i = NUM_RESOURCES; i--; ) 600 for (int i = NUM_RESOURCES; i--; )
599 if (rs [i] == resval_undef) 601 if (rs [i] == resval_undef)
600 rs [i] = 0; 602 rs [i] = 0;
… …
657 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 659 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
658 pointerBlankDelay = i; 660 pointerBlankDelay = i;
659 else 661 else
660 pointerBlankDelay = 2; 662 pointerBlankDelay = 2;
661#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;
662 671
663 /* no point having a scrollbar without having any scrollback! */ 672 /* no point having a scrollbar without having any scrollback! */
664 if (!saveLines) 673 if (!saveLines)
665 set_option (Opt_scrollBar, 0); 674 set_option (Opt_scrollBar, 0);
666 675
… …
739 envv->push_back (0); 748 envv->push_back (0);
740 749
741 this->argv = argv; 750 this->argv = argv;
742 this->envv = envv; 751 this->envv = envv;
743 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
744 init2 (argv->size () - 1, argv->begin ()); 757 init2 (argv->size () - 1, argv->begin ());
745} 758}
746 759
747void 760void
748rxvt_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)
… …
766void 779void
767rxvt_term::init2 (int argc, const char *const *argv) 780rxvt_term::init2 (int argc, const char *const *argv)
768{ 781{
769 SET_R (this); 782 SET_R (this);
770 set_locale (""); 783 set_locale ("");
771 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 :(
772 785
773 init_vars (); 786 init_vars ();
774 787
775 const char **cmd_argv = init_resources (argc, argv); 788 const char **cmd_argv = init_resources (argc, argv);
776 789
… …
791 if (option (Opt_scrollBar)) 804 if (option (Opt_scrollBar))
792 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */ 805 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
793 806
794 pty = ptytty::create (); 807 pty = ptytty::create ();
795 808
796 // must be called before create_windows, because the latter may call set_icon
797#ifdef HAVE_PIXBUF
798 g_type_init ();
799#endif
800
801 create_windows (argc, argv); 809 create_windows (argc, argv);
802 810
803 init_xlocale (); 811 init_xlocale ();
804 812
805 scr_poweron (); // initialize screen 813 scr_poweron (); // initialize screen
… …
808 XSynchronize (dpy, True); 816 XSynchronize (dpy, True);
809#endif 817#endif
810 818
811 if (option (Opt_scrollBar)) 819 if (option (Opt_scrollBar))
812 scrollBar.resize (); /* create and map scrollbar */ 820 scrollBar.resize (); /* create and map scrollbar */
821
813#ifdef HAVE_BG_PIXMAP 822#ifdef HAVE_BG_PIXMAP
814 {
815 bg_init (); 823 bg_init ();
816
817#ifdef ENABLE_TRANSPARENCY
818 if (option (Opt_transparent))
819 {
820 bg_set_transparent ();
821
822 if (rs [Rs_blurradius])
823 bg_set_blur (rs [Rs_blurradius]);
824
825 if (ISSET_PIXCOLOR (Color_tint))
826 bg_set_tint (pix_colors_focused [Color_tint]);
827
828 if (rs [Rs_shade])
829 bg_set_shade (rs [Rs_shade]);
830
831 bg_set_root_pixmap ();
832 XSelectInput (dpy, display->root, PropertyChangeMask);
833 rootwin_ev.start (display, display->root);
834 }
835#endif
836
837#ifdef BG_IMAGE_FROM_FILE
838 if (rs[Rs_backgroundPixmap])
839 if (bg_image.set_file (rs[Rs_backgroundPixmap]))
840 if (!bg_window_position_sensitive ())
841 update_background ();
842#endif
843 }
844#endif 824#endif
845 825
846#if ENABLE_PERL 826#if ENABLE_PERL
847 rootwin_ev.start (display, display->root); 827 rootwin_ev.start (display, display->root);
848#endif 828#endif
… …
976 956
977/*----------------------------------------------------------------------*/ 957/*----------------------------------------------------------------------*/
978void 958void
979rxvt_term::set_locale (const char *locale) 959rxvt_term::set_locale (const char *locale)
980{ 960{
981 set_environ (envv); 961 set_environ (env);
982 962
983 free (this->locale); 963 free (this->locale);
984 this->locale = setlocale (LC_CTYPE, locale); 964 this->locale = setlocale (LC_CTYPE, locale);
985 965
986 if (!this->locale) 966 if (!this->locale)
… …
1014} 994}
1015 995
1016void 996void
1017rxvt_term::init_xlocale () 997rxvt_term::init_xlocale ()
1018{ 998{
1019 set_environ (envv); 999 set_environ (env);
1020 1000
1021#ifdef USE_XIM 1001#if USE_XIM
1022 if (!locale) 1002 if (!locale)
1023 rxvt_warn ("setting locale failed, continuing without locale support.\n"); 1003 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1024 else 1004 else
1025 { 1005 {
1026 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1006 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
… …
1234 for (j = map->max_keypermod; j--; k++) 1214 for (j = map->max_keypermod; j--; k++)
1235 { 1215 {
1236 if (kc[k] == 0) 1216 if (kc[k] == 0)
1237 break; 1217 break;
1238 1218
1239 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1219 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
1240 { 1220 {
1241 case XK_Num_Lock: 1221 case XK_Num_Lock:
1242 ModNumLockMask = modmasks[i - 1]; 1222 ModNumLockMask = modmasks[i - 1];
1243 continue; 1223 continue;
1244 1224
… …
1289} 1269}
1290 1270
1291void 1271void
1292rxvt_term::set_icon (const char *file) 1272rxvt_term::set_icon (const char *file)
1293{ 1273{
1294#ifdef HAVE_PIXBUF 1274#if HAVE_PIXBUF
1295 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1275 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1296 if (!pixbuf) 1276 if (!pixbuf)
1297 { 1277 {
1298 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1278 rxvt_warn ("Loading image icon failed, continuing without.\n");
1299 return; 1279 return;
… …
1427 classHint.res_name = (char *)rs[Rs_name]; 1407 classHint.res_name = (char *)rs[Rs_name];
1428 classHint.res_class = (char *)RESCLASS; 1408 classHint.res_class = (char *)RESCLASS;
1429 1409
1430 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1410 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1431 wmHint.input = True; 1411 wmHint.input = True;
1432 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1412 wmHint.initial_state = option (Opt_iconic) ? IconicState
1413 : option (Opt_dockapp) ? WithdrawnState
1414 : NormalState;
1433 wmHint.window_group = top; 1415 wmHint.window_group = top;
1434 1416
1435 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1417 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1436 &szHint, &wmHint, &classHint); 1418 &szHint, &wmHint, &classHint);
1437#if ENABLE_EWMH 1419#if ENABLE_EWMH
… …
1439 * set up icon hint 1421 * set up icon hint
1440 * rs [Rs_iconfile] is path to icon 1422 * rs [Rs_iconfile] is path to icon
1441 */ 1423 */
1442 1424
1443 if (rs [Rs_iconfile]) 1425 if (rs [Rs_iconfile])
1444 {
1445 set_icon (rs [Rs_iconfile]); 1426 set_icon (rs [Rs_iconfile]);
1446 }
1447#endif 1427#endif
1448 1428
1449#if ENABLE_FRILLS 1429#if ENABLE_FRILLS
1450 if (mwmhints.flags) 1430 if (mwmhints.flags)
1451 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