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.34 by pcg, Tue Feb 24 00:02:44 2004 UTC vs.
Revision 1.40 by pcg, Sun Mar 14 23:14:39 2004 UTC

… …
384 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 384 TermWin.ext_bwidth = EXTERNALBORDERWIDTH;
385 TermWin.lineSpace = LINESPACE; 385 TermWin.lineSpace = LINESPACE;
386 TermWin.saveLines = SAVELINES; 386 TermWin.saveLines = SAVELINES;
387 numPixColors = TOTAL_COLORS; 387 numPixColors = TOTAL_COLORS;
388 388
389#ifndef NO_NEW_SELECTION
390 selection_style = NEW_SELECT;
391#else
392 selection_style = OLD_SELECT;
393#endif
394
395#ifndef NO_BRIGHTCOLOR 389#ifndef NO_BRIGHTCOLOR
396 colorfgbg = DEFAULT_RSTYLE; 390 colorfgbg = DEFAULT_RSTYLE;
397#endif
398
399#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
400 ks_bigfont = XK_greater;
401 ks_smallfont = XK_less;
402#endif 391#endif
403 392
404 refresh_limit = 1; 393 refresh_limit = 1;
405 refresh_type = SLOW_REFRESH; 394 refresh_type = SLOW_REFRESH;
406 prev_nrow = prev_ncol = 0; 395 prev_nrow = prev_ncol = 0;
… …
592#endif 581#endif
593 582
594 if (!rs[Rs_cutchars]) 583 if (!rs[Rs_cutchars])
595 rs[Rs_cutchars] = CUTCHARS; 584 rs[Rs_cutchars] = CUTCHARS;
596 585
597#ifdef ACS_ASCII
598 if (!rs[Rs_acs_chars])
599 rs[Rs_acs_chars] = ACS_CHARS;
600 if ((i = STRLEN (rs[Rs_acs_chars])) < 0x20)
601 {
602 val = rxvt_realloc ((void *)rs[Rs_acs_chars], 0x20);
603 for (; i < 0x20; )
604 val[i] = ' ';
605 rs[Rs_acs_chars] = val;
606 }
607#endif
608
609#ifndef NO_BACKSPACE_KEY 586#ifndef NO_BACKSPACE_KEY
610 if (!rs[Rs_backspace_key]) 587 if (!rs[Rs_backspace_key])
611# ifdef DEFAULT_BACKSPACE 588# ifdef DEFAULT_BACKSPACE
612 key_backspace = DEFAULT_BACKSPACE; 589 key_backspace = DEFAULT_BACKSPACE;
613# else 590# else
… …
639#endif 616#endif
640 if (rs[Rs_answerbackstring]) 617 if (rs[Rs_answerbackstring])
641 { 618 {
642 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]); 619 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
643 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]); 620 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
644 }
645
646 if (rs[Rs_selectstyle])
647 {
648 if (STRNCASECMP (rs[Rs_selectstyle], "oldword", 7) == 0)
649 selection_style = OLD_WORD_SELECT;
650#ifndef NO_OLD_SELECTION
651
652 else if (STRNCASECMP (rs[Rs_selectstyle], "old", 3) == 0)
653 selection_style = OLD_SELECT;
654#endif
655
656 } 621 }
657 622
658#ifdef HAVE_SCROLLBARS 623#ifdef HAVE_SCROLLBARS
659 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], 624 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle],
660 rs[Rs_scrollBar_thickness]); 625 rs[Rs_scrollBar_thickness]);
… …
1167 1132
1168 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1133 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1169 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1134 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1170 1135
1171 classHint.res_name = (char *)rs[Rs_name]; 1136 classHint.res_name = (char *)rs[Rs_name];
1172 classHint.res_class = (char *)APL_CLASS; 1137 classHint.res_class = (char *)RESCLASS;
1173 1138
1174 wmHint.flags = (InputHint | StateHint | WindowGroupHint); 1139 wmHint.flags = (InputHint | StateHint | WindowGroupHint);
1175 wmHint.input = True; 1140 wmHint.input = True;
1176 wmHint.initial_state = (Options & Opt_iconic ? IconicState 1141 wmHint.initial_state = (Options & Opt_iconic ? IconicState
1177 : NormalState); 1142 : NormalState);
… …
1240 1205
1241#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1206#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1242 if (menuBar_height ()) 1207 if (menuBar_height ())
1243 { 1208 {
1244 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1209 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1245 window_vt_x, 0, 1210 window_vt_x, 0,
1246 TermWin_TotalWidth (), 1211 TermWin_TotalWidth (),
1247 menuBar_TotalHeight (), 1212 menuBar_TotalHeight (),
1248 0, 1213 0,
1249 PixColors[Color_fg], 1214 PixColors[Color_fg],
1250 PixColors[Color_scroll]); 1215 PixColors[Color_scroll]);
1216
1251#ifdef DEBUG_X 1217#ifdef DEBUG_X
1252 XStoreName (display->display, menuBar.win, "menubar"); 1218 XStoreName (display->display, menuBar.win, "menubar");
1253#endif 1219#endif
1220
1221 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1254 1222
1255 XDefineCursor (display->display, menuBar.win, 1223 XDefineCursor (display->display, menuBar.win,
1256 XCreateFontCursor (display->display, XC_left_ptr)); 1224 XCreateFontCursor (display->display, XC_left_ptr));
1257 1225
1258 XSelectInput (display->display, menuBar.win, 1226 XSelectInput (display->display, menuBar.win,
… …
1284 gcvalue.graphics_exposures = 1; 1252 gcvalue.graphics_exposures = 1;
1285 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1253 TermWin.gc = XCreateGC (display->display, TermWin.vt,
1286 GCForeground | GCBackground 1254 GCForeground | GCBackground
1287 | GCGraphicsExposures, &gcvalue); 1255 | GCGraphicsExposures, &gcvalue);
1288 1256
1257 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1258
1289#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1259#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1290 gcvalue.foreground = PixColors[Color_topShadow]; 1260 gcvalue.foreground = PixColors[Color_topShadow];
1291 topShadowGC = XCreateGC (display->display, TermWin.vt, 1261 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1292 GCForeground, &gcvalue);
1293 gcvalue.foreground = PixColors[Color_bottomShadow]; 1262 gcvalue.foreground = PixColors[Color_bottomShadow];
1294 botShadowGC = XCreateGC (display->display, TermWin.vt, 1263 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1295 GCForeground, &gcvalue);
1296 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg 1264 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg : Color_scroll)];
1297 : Color_scroll)];
1298 scrollbarGC = XCreateGC (display->display, TermWin.vt, 1265 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1299 GCForeground, &gcvalue);
1300#endif 1266#endif
1301} 1267}
1302 1268
1303/*----------------------------------------------------------------------*/ 1269/*----------------------------------------------------------------------*/
1304/* 1270/*

Diff Legend

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