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.96 by root, Sat Dec 11 23:01:36 2004 UTC vs.
Revision 1.107 by root, Wed Feb 2 08:09: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{
196 sw_term.start (SIGTERM); 210 sw_term.start (SIGTERM);
211 sw_int.start (SIGINT);
197 212
198 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 213 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
199#ifdef OFF_FOCUS_FADING 214#ifdef OFF_FOCUS_FADING
200 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 215 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
201#endif 216#endif
… …
238 last_bot = last_state = -1; 253 last_bot = last_state = -1;
239 254
240#ifdef MENUBAR 255#ifdef MENUBAR
241 menu_readonly = 1; 256 menu_readonly = 1;
242# if ! (MENUBAR_MAX > 1) 257# if ! (MENUBAR_MAX > 1)
243 CurrentBar = & (BarList); 258 CurrentBar = &BarList;
244# endif /* (MENUBAR_MAX > 1) */ 259# endif /* (MENUBAR_MAX > 1) */
245#endif 260#endif
246 261
247 return true; 262 return true;
248} 263}
… …
367#if ENABLE_FRILLS 382#if ENABLE_FRILLS
368 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 383 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
369 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 384 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */
370 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 385 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
371 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 386 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */
372#endif
373
374#ifndef NO_LINESPACE
375 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 387 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
376 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 388 TermWin.lineSpace = min (i, 100); /* arbitrary limit */
377#endif 389#endif
378 390
379#ifdef POINTER_BLANK 391#ifdef POINTER_BLANK
… …
591 this->locale = rxvt_strdup (this->locale); 603 this->locale = rxvt_strdup (this->locale);
592 SET_LOCALE (this->locale); 604 SET_LOCALE (this->locale);
593 mbstate.reset (); 605 mbstate.reset ();
594#endif 606#endif
595 607
596#if 0
597#if HAVE_NL_LANGINFO 608#if HAVE_NL_LANGINFO
598 char *codeset = strdup (nl_langinfo (CODESET)); 609 char *codeset = strdup (nl_langinfo (CODESET));
599 enc_utf8 = !strcasecmp (codeset, "UTF-8") 610 // /^UTF.?8/i
600 || !strcasecmp (codeset, "UTF8"); 611 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
612 && (codeset[1] == 'T' || codeset[1] == 't')
613 && (codeset[2] == 'F' || codeset[2] == 'f')
614 && (codeset[3] == '8' || codeset[4] == '8');
601 free (codeset); 615 free (codeset);
602#else 616#else
603 enc_utf8 = 0; 617 enc_utf8 = 0;
604#endif
605#endif 618#endif
606} 619}
607 620
608void 621void
609rxvt_term::init_xlocale () 622rxvt_term::init_xlocale ()
… …
611#ifdef USE_XIM 624#ifdef USE_XIM
612 if (!locale) 625 if (!locale)
613 rxvt_warn ("setting locale failed, working without locale support.\n"); 626 rxvt_warn ("setting locale failed, working without locale support.\n");
614 else 627 else
615 { 628 {
616 set_string_property (display->atom ("WM_LOCALE_NAME"), locale); 629 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
617 630
618 if (!XSupportsLocale ()) 631 if (!XSupportsLocale ())
619 { 632 {
620 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 633 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n");
621 return; 634 return;
… …
829 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 842 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
830 }; 843 };
831 844
832 requestedmeta = realmeta = realalt = 0; 845 requestedmeta = realmeta = realalt = 0;
833 rsmod = rs[Rs_modifier]; 846 rsmod = rs[Rs_modifier];
847
834 if (rsmod 848 if (rsmod
835 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 849 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
836 requestedmeta = rsmod[3] - '0'; 850 requestedmeta = rsmod[3] - '0';
837 851
838 map = XGetModifierMapping (display->display); 852 map = XGetModifierMapping (display->display);
839 kc = map->modifiermap; 853 kc = map->modifiermap;
854
840 for (i = 1; i < 6; i++) 855 for (i = 1; i < 6; i++)
841 { 856 {
842 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 857 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
858
843 for (j = map->max_keypermod; j--; k++) 859 for (j = map->max_keypermod; j--; k++)
844 { 860 {
845 if (kc[k] == 0) 861 if (kc[k] == 0)
846 break; 862 break;
863
847 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 864 switch (XKeycodeToKeysym (display->display, kc[k], 0))
848 { 865 {
849 case XK_Num_Lock: 866 case XK_Num_Lock:
850 ModNumLockMask = modmasks[i - 1]; 867 ModNumLockMask = modmasks[i - 1];
851 /* FALLTHROUGH */ 868 continue;
852 default: 869
853 continue; /* for (;;) */ 870 case XK_ISO_Level3_Shift:
871 ModLevel3Mask = modmasks[i - 1];
872 continue;
873
854 case XK_Meta_L: 874 case XK_Meta_L:
855 case XK_Meta_R: 875 case XK_Meta_R:
856 cm = "meta"; 876 cm = "meta";
857 realmeta = i; 877 realmeta = i;
858 break; 878 break;
879
859 case XK_Alt_L: 880 case XK_Alt_L:
860 case XK_Alt_R: 881 case XK_Alt_R:
861 cm = "alt"; 882 cm = "alt";
862 realalt = i; 883 realalt = i;
863 break; 884 break;
885
864 case XK_Super_L: 886 case XK_Super_L:
865 case XK_Super_R: 887 case XK_Super_R:
866 cm = "super"; 888 cm = "super";
867 break; 889 break;
890
868 case XK_Hyper_L: 891 case XK_Hyper_L:
869 case XK_Hyper_R: 892 case XK_Hyper_R:
870 cm = "hyper"; 893 cm = "hyper";
871 break; 894 break;
895
896 default:
897 continue;
872 } 898 }
899
873 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0) 900 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)
874 requestedmeta = i; 901 requestedmeta = i;
875 } 902 }
876 } 903 }
904
877 XFreeModifiermap (map); 905 XFreeModifiermap (map);
906
878 i = (requestedmeta ? requestedmeta 907 i = requestedmeta ? requestedmeta
879 : (realmeta ? realmeta 908 : realmeta ? realmeta
880 : (realalt ? realalt : 0))); 909 : realalt ? realalt
910 : 0;
911
881 if (i) 912 if (i)
882 ModMetaMask = modmasks[i - 1]; 913 ModMetaMask = modmasks[i - 1];
883} 914}
884 915
885/*----------------------------------------------------------------------*/ 916/*----------------------------------------------------------------------*/
… …
896 XGCValues gcvalue; 927 XGCValues gcvalue;
897 long vt_emask; 928 long vt_emask;
898 XSetWindowAttributes attributes; 929 XSetWindowAttributes attributes;
899 XWindowAttributes gattr; 930 XWindowAttributes gattr;
900 931
901 for (int i = 0; i < NUM_XA; i++)
902 xa[i] = XInternAtom (display->display, xa_names[i], False);
903
904#ifdef USING_W11LIB 932#ifdef USING_W11LIB
905 /* enable W11 callbacks */ 933 /* enable W11 callbacks */
906 W11AddEventHandler (display->display, rxvt_W11_process_x_event); 934 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
907#endif 935#endif
936
937 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
938 XInternAtoms (display->display, (char **)xa_names, NUM_XA, False, xa);
908 939
909 if (options & Opt_transparent) 940 if (options & Opt_transparent)
910 { 941 {
911 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 942 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);
912 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 943 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
… …
989 1020
990#if ENABLE_FRILLS 1021#if ENABLE_FRILLS
991 long pid = getpid (); 1022 long pid = getpid ();
992 1023
993 XChangeProperty (display->display, TermWin.parent[0], 1024 XChangeProperty (display->display, TermWin.parent[0],
994 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32, 1025 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
995 PropModeReplace, (unsigned char *)&pid, 1); 1026 PropModeReplace, (unsigned char *)&pid, 1);
996#endif 1027#endif
997 1028
998 XSelectInput (display->display, TermWin.parent[0], 1029 XSelectInput (display->display, TermWin.parent[0],
999 KeyPressMask 1030 KeyPressMask
… …
1005 | StructureNotifyMask); 1036 | StructureNotifyMask);
1006 termwin_ev.start (display, TermWin.parent[0]); 1037 termwin_ev.start (display, TermWin.parent[0]);
1007 1038
1008#if ENABLE_FRILLS 1039#if ENABLE_FRILLS
1009 if (mwmhints.flags) 1040 if (mwmhints.flags)
1010 { 1041 XChangeProperty (display->display, TermWin.parent[0], xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1011 prop = XInternAtom (display->display, "_MOTIF_WM_HINTS", False);
1012 XChangeProperty (display->display, TermWin.parent[0], prop, prop, 32,
1013 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1042 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1014 }
1015#endif 1043#endif
1016 1044
1017 /* vt cursor: Black-on-White is standard, but this is more popular */ 1045 /* vt cursor: Black-on-White is standard, but this is more popular */
1018 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1046 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm);
1019 1047
1020#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1048#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1021 /* cursor (menuBar/scrollBar): Black-on-White */ 1049 /* cursor (menuBar/scrollBar): Black-on-White */
1022 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); 1050 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 1051#endif
1037 1052
1038 /* the vt window */ 1053 /* the vt window */
1039 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1054 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0],
1040 window_vt_x, 1055 window_vt_x,
… …
1371 * the slave. 1386 * the slave.
1372 */ 1387 */
1373void 1388void
1374rxvt_term::run_command (const char *const *argv) 1389rxvt_term::run_command (const char *const *argv)
1375{ 1390{
1376 int er;
1377
1378 if (!pty.get ()) 1391 if (!pty.get ())
1379 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1392 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1393
1394 pty.set_utf8_mode (enc_utf8);
1395
1396 /* set initial window size */
1397 tt_winch ();
1398
1399 int er;
1380 1400
1381#ifndef NO_BACKSPACE_KEY 1401#ifndef NO_BACKSPACE_KEY
1382 if (key_backspace[0] && !key_backspace[1]) 1402 if (key_backspace[0] && !key_backspace[1])
1383 er = key_backspace[0]; 1403 er = key_backspace[0];
1384 else if (strcmp (key_backspace, "DEC") == 0) 1404 else if (strcmp (key_backspace, "DEC") == 0)
… …
1386 else 1406 else
1387#endif 1407#endif
1388 er = -1; 1408 er = -1;
1389 1409
1390 rxvt_get_ttymode (&tio, er); 1410 rxvt_get_ttymode (&tio, er);
1391
1392 /* set initial window size */
1393 tt_winch ();
1394 1411
1395 sw_chld.start (SIGCHLD); 1412 sw_chld.start (SIGCHLD);
1396 1413
1397#ifndef __QNX__ 1414#ifndef __QNX__
1398 /* spin off the command interpreter */ 1415 /* spin off the command interpreter */

Diff Legend

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