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.98 by root, Wed Dec 15 00:53:23 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,
… …
205 206
206bool 207bool
207rxvt_term::init_vars () 208rxvt_term::init_vars ()
208{ 209{
209 sw_term.start (SIGTERM); 210 sw_term.start (SIGTERM);
211 sw_int.start (SIGINT);
210 212
211 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 213 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
212#ifdef OFF_FOCUS_FADING 214#ifdef OFF_FOCUS_FADING
213 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 215 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
214#endif 216#endif
… …
251 last_bot = last_state = -1; 253 last_bot = last_state = -1;
252 254
253#ifdef MENUBAR 255#ifdef MENUBAR
254 menu_readonly = 1; 256 menu_readonly = 1;
255# if ! (MENUBAR_MAX > 1) 257# if ! (MENUBAR_MAX > 1)
256 CurrentBar = & (BarList); 258 CurrentBar = &BarList;
257# endif /* (MENUBAR_MAX > 1) */ 259# endif /* (MENUBAR_MAX > 1) */
258#endif 260#endif
259 261
260 return true; 262 return true;
261} 263}
… …
380#if ENABLE_FRILLS 382#if ENABLE_FRILLS
381 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)
382 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 384 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */
383 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)
384 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 386 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) 387 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
389 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 388 TermWin.lineSpace = min (i, 100); /* arbitrary limit */
390#endif 389#endif
391 390
392#ifdef POINTER_BLANK 391#ifdef POINTER_BLANK
… …
604 this->locale = rxvt_strdup (this->locale); 603 this->locale = rxvt_strdup (this->locale);
605 SET_LOCALE (this->locale); 604 SET_LOCALE (this->locale);
606 mbstate.reset (); 605 mbstate.reset ();
607#endif 606#endif
608 607
609#if 0
610#if HAVE_NL_LANGINFO 608#if HAVE_NL_LANGINFO
611 char *codeset = strdup (nl_langinfo (CODESET)); 609 char *codeset = strdup (nl_langinfo (CODESET));
612 enc_utf8 = !strcasecmp (codeset, "UTF-8") 610 // /^UTF.?8/i
613 || !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');
614 free (codeset); 615 free (codeset);
615#else 616#else
616 enc_utf8 = 0; 617 enc_utf8 = 0;
617#endif
618#endif 618#endif
619} 619}
620 620
621void 621void
622rxvt_term::init_xlocale () 622rxvt_term::init_xlocale ()
… …
842 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 842 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
843 }; 843 };
844 844
845 requestedmeta = realmeta = realalt = 0; 845 requestedmeta = realmeta = realalt = 0;
846 rsmod = rs[Rs_modifier]; 846 rsmod = rs[Rs_modifier];
847
847 if (rsmod 848 if (rsmod
848 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 849 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
849 requestedmeta = rsmod[3] - '0'; 850 requestedmeta = rsmod[3] - '0';
850 851
851 map = XGetModifierMapping (display->display); 852 map = XGetModifierMapping (display->display);
852 kc = map->modifiermap; 853 kc = map->modifiermap;
854
853 for (i = 1; i < 6; i++) 855 for (i = 1; i < 6; i++)
854 { 856 {
855 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 857 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
858
856 for (j = map->max_keypermod; j--; k++) 859 for (j = map->max_keypermod; j--; k++)
857 { 860 {
858 if (kc[k] == 0) 861 if (kc[k] == 0)
859 break; 862 break;
863
860 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 864 switch (XKeycodeToKeysym (display->display, kc[k], 0))
861 { 865 {
862 case XK_Num_Lock: 866 case XK_Num_Lock:
863 ModNumLockMask = modmasks[i - 1]; 867 ModNumLockMask = modmasks[i - 1];
864 /* FALLTHROUGH */ 868 continue;
865 default: 869
866 continue; /* for (;;) */ 870 case XK_ISO_Level3_Shift:
871 ModLevel3Mask = modmasks[i - 1];
872 continue;
873
867 case XK_Meta_L: 874 case XK_Meta_L:
868 case XK_Meta_R: 875 case XK_Meta_R:
869 cm = "meta"; 876 cm = "meta";
870 realmeta = i; 877 realmeta = i;
871 break; 878 break;
879
872 case XK_Alt_L: 880 case XK_Alt_L:
873 case XK_Alt_R: 881 case XK_Alt_R:
874 cm = "alt"; 882 cm = "alt";
875 realalt = i; 883 realalt = i;
876 break; 884 break;
885
877 case XK_Super_L: 886 case XK_Super_L:
878 case XK_Super_R: 887 case XK_Super_R:
879 cm = "super"; 888 cm = "super";
880 break; 889 break;
890
881 case XK_Hyper_L: 891 case XK_Hyper_L:
882 case XK_Hyper_R: 892 case XK_Hyper_R:
883 cm = "hyper"; 893 cm = "hyper";
884 break; 894 break;
895
896 default:
897 continue;
885 } 898 }
899
886 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0) 900 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)
887 requestedmeta = i; 901 requestedmeta = i;
888 } 902 }
889 } 903 }
904
890 XFreeModifiermap (map); 905 XFreeModifiermap (map);
906
891 i = (requestedmeta ? requestedmeta 907 i = requestedmeta ? requestedmeta
892 : (realmeta ? realmeta 908 : realmeta ? realmeta
893 : (realalt ? realalt : 0))); 909 : realalt ? realalt
910 : 0;
911
894 if (i) 912 if (i)
895 ModMetaMask = modmasks[i - 1]; 913 ModMetaMask = modmasks[i - 1];
896} 914}
897 915
898/*----------------------------------------------------------------------*/ 916/*----------------------------------------------------------------------*/
… …
1030#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1048#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1031 /* cursor (menuBar/scrollBar): Black-on-White */ 1049 /* cursor (menuBar/scrollBar): Black-on-White */
1032 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); 1050 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr);
1033#endif 1051#endif
1034 1052
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 */ 1053 /* the vt window */
1049 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1054 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0],
1050 window_vt_x, 1055 window_vt_x,
1051 window_vt_y, 1056 window_vt_y,
1052 TermWin_TotalWidth (), 1057 TermWin_TotalWidth (),
… …
1381 * the slave. 1386 * the slave.
1382 */ 1387 */
1383void 1388void
1384rxvt_term::run_command (const char *const *argv) 1389rxvt_term::run_command (const char *const *argv)
1385{ 1390{
1386 int er;
1387
1388 if (!pty.get ()) 1391 if (!pty.get ())
1389 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;
1390 1400
1391#ifndef NO_BACKSPACE_KEY 1401#ifndef NO_BACKSPACE_KEY
1392 if (key_backspace[0] && !key_backspace[1]) 1402 if (key_backspace[0] && !key_backspace[1])
1393 er = key_backspace[0]; 1403 er = key_backspace[0];
1394 else if (strcmp (key_backspace, "DEC") == 0) 1404 else if (strcmp (key_backspace, "DEC") == 0)
… …
1396 else 1406 else
1397#endif 1407#endif
1398 er = -1; 1408 er = -1;
1399 1409
1400 rxvt_get_ttymode (&tio, er); 1410 rxvt_get_ttymode (&tio, er);
1401
1402 /* set initial window size */
1403 tt_winch ();
1404 1411
1405 sw_chld.start (SIGCHLD); 1412 sw_chld.start (SIGCHLD);
1406 1413
1407#ifndef __QNX__ 1414#ifndef __QNX__
1408 /* spin off the command interpreter */ 1415 /* spin off the command interpreter */

Diff Legend

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