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.90 by root, Wed Aug 25 03:47:20 2004 UTC vs.
Revision 1.105 by root, Mon Jan 17 00:59:23 2005 UTC

… …
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
38#include <signal.h> 39#include <csignal>
39 40
40const char *const def_colorName[] = 41const char *const def_colorName[] =
41 { 42 {
42 COLOR_FOREGROUND, 43 COLOR_FOREGROUND,
43 COLOR_BACKGROUND, 44 COLOR_BACKGROUND,
… …
155 NULL, /* Color_BD */ 156 NULL, /* Color_BD */
156 NULL, /* Color_IT */ 157 NULL, /* Color_IT */
157 NULL, /* Color_UL */ 158 NULL, /* Color_UL */
158 NULL, /* Color_RV */ 159 NULL, /* Color_RV */
159#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 160#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
161#if ENABLE_FRILLS
162 NULL, // Color_underline
163#endif
160#ifdef OPTION_HC 164#ifdef OPTION_HC
161 NULL, 165 NULL,
162#endif 166#endif
163#ifdef KEEP_SCROLLCOLOR 167#ifdef KEEP_SCROLLCOLOR
164 COLOR_SCROLLBAR, 168 COLOR_SCROLLBAR,
… …
167#if TINTING 171#if TINTING
168 NULL, 172 NULL,
169#endif 173#endif
170 }; 174 };
171 175
172const char *const xa_names[NUM_XA] = 176const char *const xa_names[] =
173 { 177 {
174 "TEXT", 178 "TEXT",
175 "COMPOUND_TEXT", 179 "COMPOUND_TEXT",
176 "UTF8_STRING", 180 "UTF8_STRING",
177 "MULTIPLE", 181 "MULTIPLE",
178 "TARGETS", 182 "TARGETS",
179 "TIMESTAMP", 183 "TIMESTAMP",
180 "VT_SELECTION", 184 "VT_SELECTION",
181 "INCR", 185 "INCR",
182 "WM_DELETE_WINDOW", 186 "WM_DELETE_WINDOW",
187 "CLIPBOARD",
188#if ENABLE_FRILLS
189 "_NET_WM_PID",
190 "_MOTIF_WM_HINTS",
191 "_NET_WM_NAME",
192 "_NET_WM_ICON_NAME",
193#endif
194#if USE_XIM
195 "WM_LOCALE_NAME",
196#endif
183#ifdef TRANSPARENT 197#ifdef TRANSPARENT
184 "_XROOTPMAP_ID", 198 "_XROOTPMAP_ID",
199 "ESETROOT_PMAP_ID",
185#endif 200#endif
186#ifdef OFFIX_DND 201#ifdef OFFIX_DND
187 "DndProtocol", 202 "DndProtocol",
188 "DndSelection", 203 "DndSelection",
189#endif 204#endif
190 "CLIPBOARD"
191 }; 205 };
192 206
193bool 207bool
194rxvt_term::init_vars () 208rxvt_term::init_vars ()
195{ 209{
210 sw_term.start (SIGTERM);
211
196 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 212 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
197#ifdef OFF_FOCUS_FADING 213#ifdef OFF_FOCUS_FADING
198 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 214 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
199#endif 215#endif
200 pix_colors = pix_colors_focused; 216 pix_colors = pix_colors_focused;
… …
365#if ENABLE_FRILLS 381#if ENABLE_FRILLS
366 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 382 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
367 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 383 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */
368 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 384 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
369 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 385 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */
370#endif
371
372#ifndef NO_LINESPACE
373 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 386 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
374 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 387 TermWin.lineSpace = min (i, 100); /* arbitrary limit */
375#endif 388#endif
376 389
377#ifdef POINTER_BLANK 390#ifdef POINTER_BLANK
… …
588 601
589 this->locale = rxvt_strdup (this->locale); 602 this->locale = rxvt_strdup (this->locale);
590 SET_LOCALE (this->locale); 603 SET_LOCALE (this->locale);
591 mbstate.reset (); 604 mbstate.reset ();
592#endif 605#endif
593#if 0 606
594#if HAVE_NL_LANGINFO 607#if HAVE_NL_LANGINFO
608 char *codeset = strdup (nl_langinfo (CODESET));
609 // /^UTF.?8/i
610 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
611 && (codeset[1] == 'T' || codeset[1] == 't')
612 && (codeset[2] == 'F' || codeset[2] == 'f')
613 && (codeset[3] == '8' || codeset[4] == '8');
595 free (codeset); 614 free (codeset);
596 codeset = strdup (nl_langinfo (CODESET));
597 enc_utf8 = !strcasecmp (codeset, "UTF-8")
598 || !strcasecmp (codeset, "UTF8");
599#else 615#else
600 enc_utf8 = 1; 616 enc_utf8 = 0;
601#endif
602#endif 617#endif
603} 618}
604 619
605void 620void
606rxvt_term::init_xlocale () 621rxvt_term::init_xlocale ()
… …
608#ifdef USE_XIM 623#ifdef USE_XIM
609 if (!locale) 624 if (!locale)
610 rxvt_warn ("setting locale failed, working without locale support.\n"); 625 rxvt_warn ("setting locale failed, working without locale support.\n");
611 else 626 else
612 { 627 {
613 Atom wmlocale; 628 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
614
615 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
616 XChangeProperty (display->display, TermWin.parent[0], wmlocale,
617 XA_STRING, 8, PropModeReplace,
618 (unsigned char *)locale, strlen (locale));
619 629
620 if (!XSupportsLocale ()) 630 if (!XSupportsLocale ())
621 { 631 {
622 rxvt_warn ("the locale is not supported by Xlib, working withotu locale support.\n"); 632 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n");
623 return; 633 return;
624 } 634 }
625 635
626 im_ev.start (display); 636 im_ev.start (display);
627 637
… …
637{ 647{
638 /* 648 /*
639 * Initialize the command connection. 649 * Initialize the command connection.
640 * This should be called after the X server connection is established. 650 * This should be called after the X server connection is established.
641 */ 651 */
642 int i;
643
644 for (i = 0; i < NUM_XA; i++)
645 xa[i] = XInternAtom (display->display, xa_names[i], False);
646
647 /* Enable delete window protocol */
648 XSetWMProtocols (display->display, TermWin.parent[0],
649 & (xa[XA_WMDELETEWINDOW]), 1);
650
651#ifdef USING_W11LIB
652 /* enable W11 callbacks */
653 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
654#endif
655 652
656#ifdef META8_OPTION 653#ifdef META8_OPTION
657 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 654 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC);
658#endif 655#endif
659 656
… …
844 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 841 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
845 }; 842 };
846 843
847 requestedmeta = realmeta = realalt = 0; 844 requestedmeta = realmeta = realalt = 0;
848 rsmod = rs[Rs_modifier]; 845 rsmod = rs[Rs_modifier];
846
849 if (rsmod 847 if (rsmod
850 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 848 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
851 requestedmeta = rsmod[3] - '0'; 849 requestedmeta = rsmod[3] - '0';
852 850
853 map = XGetModifierMapping (display->display); 851 map = XGetModifierMapping (display->display);
854 kc = map->modifiermap; 852 kc = map->modifiermap;
853
855 for (i = 1; i < 6; i++) 854 for (i = 1; i < 6; i++)
856 { 855 {
857 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 856 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
857
858 for (j = map->max_keypermod; j--; k++) 858 for (j = map->max_keypermod; j--; k++)
859 { 859 {
860 if (kc[k] == 0) 860 if (kc[k] == 0)
861 break; 861 break;
862
862 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 863 switch (XKeycodeToKeysym (display->display, kc[k], 0))
863 { 864 {
864 case XK_Num_Lock: 865 case XK_Num_Lock:
865 ModNumLockMask = modmasks[i - 1]; 866 ModNumLockMask = modmasks[i - 1];
866 /* FALLTHROUGH */ 867 continue;
867 default: 868
868 continue; /* for (;;) */ 869 case XK_ISO_Level3_Shift:
870 ModLevel3Mask = modmasks[i - 1];
871 continue;
872
869 case XK_Meta_L: 873 case XK_Meta_L:
870 case XK_Meta_R: 874 case XK_Meta_R:
871 cm = "meta"; 875 cm = "meta";
872 realmeta = i; 876 realmeta = i;
873 break; 877 break;
878
874 case XK_Alt_L: 879 case XK_Alt_L:
875 case XK_Alt_R: 880 case XK_Alt_R:
876 cm = "alt"; 881 cm = "alt";
877 realalt = i; 882 realalt = i;
878 break; 883 break;
884
879 case XK_Super_L: 885 case XK_Super_L:
880 case XK_Super_R: 886 case XK_Super_R:
881 cm = "super"; 887 cm = "super";
882 break; 888 break;
889
883 case XK_Hyper_L: 890 case XK_Hyper_L:
884 case XK_Hyper_R: 891 case XK_Hyper_R:
885 cm = "hyper"; 892 cm = "hyper";
886 break; 893 break;
894
895 default:
896 continue;
887 } 897 }
898
888 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0) 899 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)
889 requestedmeta = i; 900 requestedmeta = i;
890 } 901 }
891 } 902 }
903
892 XFreeModifiermap (map); 904 XFreeModifiermap (map);
905
893 i = (requestedmeta ? requestedmeta 906 i = requestedmeta ? requestedmeta
894 : (realmeta ? realmeta 907 : realmeta ? realmeta
895 : (realalt ? realalt : 0))); 908 : realalt ? realalt
909 : 0;
910
896 if (i) 911 if (i)
897 ModMetaMask = modmasks[i - 1]; 912 ModMetaMask = modmasks[i - 1];
898} 913}
899 914
900/*----------------------------------------------------------------------*/ 915/*----------------------------------------------------------------------*/
… …
911 XGCValues gcvalue; 926 XGCValues gcvalue;
912 long vt_emask; 927 long vt_emask;
913 XSetWindowAttributes attributes; 928 XSetWindowAttributes attributes;
914 XWindowAttributes gattr; 929 XWindowAttributes gattr;
915 930
931#ifdef USING_W11LIB
932 /* enable W11 callbacks */
933 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
934#endif
935
936 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
937 XInternAtoms (display->display, (char **)xa_names, NUM_XA, False, xa);
938
916 if (options & Opt_transparent) 939 if (options & Opt_transparent)
917 { 940 {
918 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 941 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);
919 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 942 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
920 } 943 }
921 944
922#if ENABLE_FRILLS 945#if ENABLE_FRILLS
923 if (options & Opt_borderLess) 946 if (options & Opt_borderLess)
924 { 947 {
925 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 948 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True);
949
926 if (prop == None) 950 if (prop == None)
927 { 951 {
928 /* 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");*/
929#ifdef PREFER_24BIT 953#ifdef PREFER_24BIT
930 attributes.override_redirect = TRUE; 954 attributes.override_redirect = TRUE;
… …
945 969
946 /* grab colors before netscape does */ 970 /* grab colors before netscape does */
947 Get_Colours (); 971 Get_Colours ();
948 972
949 if (!set_fonts ()) 973 if (!set_fonts ())
950 rxvt_fatal ("unable to load base fontset, please specify one using -fn, aborting.\n"); 974 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
951 975
952 window_calc (0, 0); 976 window_calc (0, 0);
953 old_width = szHint.width; 977 old_width = szHint.width;
954 old_height = szHint.height; 978 old_height = szHint.height;
955 979
… …
987 wmHint.window_group = TermWin.parent[0]; 1011 wmHint.window_group = TermWin.parent[0];
988 1012
989 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1013 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL,
990 (char **)argv, argc, &szHint, &wmHint, &classHint); 1014 (char **)argv, argc, &szHint, &wmHint, &classHint);
991 1015
1016 /* Enable delete window protocol */
1017 XSetWMProtocols (display->display, TermWin.parent[0],
1018 &xa[XA_WMDELETEWINDOW], 1);
1019
992#if ENABLE_FRILLS 1020#if ENABLE_FRILLS
993 long pid = getpid (); 1021 long pid = getpid ();
1022
994 XChangeProperty (display->display, TermWin.parent[0], 1023 XChangeProperty (display->display, TermWin.parent[0],
995 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32, 1024 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
996 PropModeReplace, (unsigned char *)&pid, 1); 1025 PropModeReplace, (unsigned char *)&pid, 1);
997#endif 1026#endif
998 1027
999 XSelectInput (display->display, TermWin.parent[0], 1028 XSelectInput (display->display, TermWin.parent[0],
1000 KeyPressMask 1029 KeyPressMask
… …
1006 | StructureNotifyMask); 1035 | StructureNotifyMask);
1007 termwin_ev.start (display, TermWin.parent[0]); 1036 termwin_ev.start (display, TermWin.parent[0]);
1008 1037
1009#if ENABLE_FRILLS 1038#if ENABLE_FRILLS
1010 if (mwmhints.flags) 1039 if (mwmhints.flags)
1011 { 1040 XChangeProperty (display->display, TermWin.parent[0], xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1012 prop = XInternAtom (display->display, "_MOTIF_WM_HINTS", False); 1041 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1013 XChangeProperty (display->display, TermWin.parent[0], prop, prop, 32, PropModeReplace, (unsigned char *) &mwmhints, PROP_MWM_HINTS_ELEMENTS);
1014 }
1015#endif 1042#endif
1016 1043
1017 /* vt cursor: Black-on-White is standard, but this is more popular */ 1044 /* vt cursor: Black-on-White is standard, but this is more popular */
1018 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1045 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm);
1019 1046
1020#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1047#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1021 /* cursor (menuBar/scrollBar): Black-on-White */ 1048 /* cursor (menuBar/scrollBar): Black-on-White */
1022 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); 1049 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr);
1023#endif
1024
1025#ifdef POINTER_BLANK
1026 {
1027 XColor blackcolour;
1028 blackcolour.red = 0;
1029 blackcolour.green = 0;
1030 blackcolour.blue = 0;
1031 Font f = XLoadFont (display->display, "fixed");
1032 blank_cursor = XCreateGlyphCursor (display->display, f, f, ' ', ' ',
1033 &blackcolour, &blackcolour);
1034 XUnloadFont (display->display, f);
1035 }
1036#endif 1050#endif
1037 1051
1038 /* the vt window */ 1052 /* the vt window */
1039 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1053 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0],
1040 window_vt_x, 1054 window_vt_x,
… …
1371 * the slave. 1385 * the slave.
1372 */ 1386 */
1373void 1387void
1374rxvt_term::run_command (const char *const *argv) 1388rxvt_term::run_command (const char *const *argv)
1375{ 1389{
1376 int er;
1377
1378 if (!pty.get ()) 1390 if (!pty.get ())
1379 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1391 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1392
1393 pty.set_utf8_mode (enc_utf8);
1394
1395 /* set initial window size */
1396 tt_winch ();
1397
1398 int er;
1380 1399
1381#ifndef NO_BACKSPACE_KEY 1400#ifndef NO_BACKSPACE_KEY
1382 if (key_backspace[0] && !key_backspace[1]) 1401 if (key_backspace[0] && !key_backspace[1])
1383 er = key_backspace[0]; 1402 er = key_backspace[0];
1384 else if (strcmp (key_backspace, "DEC") == 0) 1403 else if (strcmp (key_backspace, "DEC") == 0)
… …
1387#endif 1406#endif
1388 er = -1; 1407 er = -1;
1389 1408
1390 rxvt_get_ttymode (&tio, er); 1409 rxvt_get_ttymode (&tio, er);
1391 1410
1392 /* set initial window size */ 1411 sw_chld.start (SIGCHLD);
1393 tt_winch ();
1394 1412
1395#ifndef __QNX__ 1413#ifndef __QNX__
1396 /* spin off the command interpreter */ 1414 /* spin off the command interpreter */
1397 switch (cmd_pid = fork ()) 1415 switch (cmd_pid = fork ())
1398 { 1416 {

Diff Legend

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