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

Diff Legend

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