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.97 by root, Wed Dec 15 00:12:58 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,
… …
190#if USE_XIM 194#if USE_XIM
191 "WM_LOCALE_NAME", 195 "WM_LOCALE_NAME",
192#endif 196#endif
193#ifdef TRANSPARENT 197#ifdef TRANSPARENT
194 "_XROOTPMAP_ID", 198 "_XROOTPMAP_ID",
195 "_XSETROOT_ID", 199 "ESETROOT_PMAP_ID",
196#endif 200#endif
197#ifdef OFFIX_DND 201#ifdef OFFIX_DND
198 "DndProtocol", 202 "DndProtocol",
199 "DndSelection", 203 "DndSelection",
200#endif 204#endif
… …
377#if ENABLE_FRILLS 381#if ENABLE_FRILLS
378 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)
379 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 383 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */
380 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)
381 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 385 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */
382#endif
383
384#ifndef NO_LINESPACE
385 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 386 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
386 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 387 TermWin.lineSpace = min (i, 100); /* arbitrary limit */
387#endif 388#endif
388 389
389#ifdef POINTER_BLANK 390#ifdef POINTER_BLANK
… …
601 this->locale = rxvt_strdup (this->locale); 602 this->locale = rxvt_strdup (this->locale);
602 SET_LOCALE (this->locale); 603 SET_LOCALE (this->locale);
603 mbstate.reset (); 604 mbstate.reset ();
604#endif 605#endif
605 606
606#if 0
607#if HAVE_NL_LANGINFO 607#if HAVE_NL_LANGINFO
608 char *codeset = strdup (nl_langinfo (CODESET)); 608 char *codeset = strdup (nl_langinfo (CODESET));
609 enc_utf8 = !strcasecmp (codeset, "UTF-8") 609 // /^UTF.?8/i
610 || !strcasecmp (codeset, "UTF8"); 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');
611 free (codeset); 614 free (codeset);
612#else 615#else
613 enc_utf8 = 0; 616 enc_utf8 = 0;
614#endif
615#endif 617#endif
616} 618}
617 619
618void 620void
619rxvt_term::init_xlocale () 621rxvt_term::init_xlocale ()
… …
839 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 841 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
840 }; 842 };
841 843
842 requestedmeta = realmeta = realalt = 0; 844 requestedmeta = realmeta = realalt = 0;
843 rsmod = rs[Rs_modifier]; 845 rsmod = rs[Rs_modifier];
846
844 if (rsmod 847 if (rsmod
845 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 848 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
846 requestedmeta = rsmod[3] - '0'; 849 requestedmeta = rsmod[3] - '0';
847 850
848 map = XGetModifierMapping (display->display); 851 map = XGetModifierMapping (display->display);
849 kc = map->modifiermap; 852 kc = map->modifiermap;
853
850 for (i = 1; i < 6; i++) 854 for (i = 1; i < 6; i++)
851 { 855 {
852 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 856 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
857
853 for (j = map->max_keypermod; j--; k++) 858 for (j = map->max_keypermod; j--; k++)
854 { 859 {
855 if (kc[k] == 0) 860 if (kc[k] == 0)
856 break; 861 break;
862
857 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 863 switch (XKeycodeToKeysym (display->display, kc[k], 0))
858 { 864 {
859 case XK_Num_Lock: 865 case XK_Num_Lock:
860 ModNumLockMask = modmasks[i - 1]; 866 ModNumLockMask = modmasks[i - 1];
861 /* FALLTHROUGH */ 867 continue;
862 default: 868
863 continue; /* for (;;) */ 869 case XK_ISO_Level3_Shift:
870 ModLevel3Mask = modmasks[i - 1];
871 continue;
872
864 case XK_Meta_L: 873 case XK_Meta_L:
865 case XK_Meta_R: 874 case XK_Meta_R:
866 cm = "meta"; 875 cm = "meta";
867 realmeta = i; 876 realmeta = i;
868 break; 877 break;
878
869 case XK_Alt_L: 879 case XK_Alt_L:
870 case XK_Alt_R: 880 case XK_Alt_R:
871 cm = "alt"; 881 cm = "alt";
872 realalt = i; 882 realalt = i;
873 break; 883 break;
884
874 case XK_Super_L: 885 case XK_Super_L:
875 case XK_Super_R: 886 case XK_Super_R:
876 cm = "super"; 887 cm = "super";
877 break; 888 break;
889
878 case XK_Hyper_L: 890 case XK_Hyper_L:
879 case XK_Hyper_R: 891 case XK_Hyper_R:
880 cm = "hyper"; 892 cm = "hyper";
881 break; 893 break;
894
895 default:
896 continue;
882 } 897 }
898
883 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0) 899 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)
884 requestedmeta = i; 900 requestedmeta = i;
885 } 901 }
886 } 902 }
903
887 XFreeModifiermap (map); 904 XFreeModifiermap (map);
905
888 i = (requestedmeta ? requestedmeta 906 i = requestedmeta ? requestedmeta
889 : (realmeta ? realmeta 907 : realmeta ? realmeta
890 : (realalt ? realalt : 0))); 908 : realalt ? realalt
909 : 0;
910
891 if (i) 911 if (i)
892 ModMetaMask = modmasks[i - 1]; 912 ModMetaMask = modmasks[i - 1];
893} 913}
894 914
895/*----------------------------------------------------------------------*/ 915/*----------------------------------------------------------------------*/
… …
1027#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1047#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1028 /* cursor (menuBar/scrollBar): Black-on-White */ 1048 /* cursor (menuBar/scrollBar): Black-on-White */
1029 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); 1049 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr);
1030#endif 1050#endif
1031 1051
1032#ifdef POINTER_BLANK
1033 {
1034 XColor blackcolour;
1035 blackcolour.red = 0;
1036 blackcolour.green = 0;
1037 blackcolour.blue = 0;
1038 Font f = XLoadFont (display->display, "fixed");
1039 blank_cursor = XCreateGlyphCursor (display->display, f, f, ' ', ' ',
1040 &blackcolour, &blackcolour);
1041 XUnloadFont (display->display, f);
1042 }
1043#endif
1044
1045 /* the vt window */ 1052 /* the vt window */
1046 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1053 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0],
1047 window_vt_x, 1054 window_vt_x,
1048 window_vt_y, 1055 window_vt_y,
1049 TermWin_TotalWidth (), 1056 TermWin_TotalWidth (),
… …
1378 * the slave. 1385 * the slave.
1379 */ 1386 */
1380void 1387void
1381rxvt_term::run_command (const char *const *argv) 1388rxvt_term::run_command (const char *const *argv)
1382{ 1389{
1383 int er;
1384
1385 if (!pty.get ()) 1390 if (!pty.get ())
1386 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;
1387 1399
1388#ifndef NO_BACKSPACE_KEY 1400#ifndef NO_BACKSPACE_KEY
1389 if (key_backspace[0] && !key_backspace[1]) 1401 if (key_backspace[0] && !key_backspace[1])
1390 er = key_backspace[0]; 1402 er = key_backspace[0];
1391 else if (strcmp (key_backspace, "DEC") == 0) 1403 else if (strcmp (key_backspace, "DEC") == 0)
… …
1393 else 1405 else
1394#endif 1406#endif
1395 er = -1; 1407 er = -1;
1396 1408
1397 rxvt_get_ttymode (&tio, er); 1409 rxvt_get_ttymode (&tio, er);
1398
1399 /* set initial window size */
1400 tt_winch ();
1401 1410
1402 sw_chld.start (SIGCHLD); 1411 sw_chld.start (SIGCHLD);
1403 1412
1404#ifndef __QNX__ 1413#ifndef __QNX__
1405 /* spin off the command interpreter */ 1414 /* spin off the command interpreter */

Diff Legend

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