… | |
… | |
171 | #endif |
171 | #endif |
172 | #ifdef USE_XIM |
172 | #ifdef USE_XIM |
173 | im_ev (this, &rxvt_term::im_cb), |
173 | im_ev (this, &rxvt_term::im_cb), |
174 | #endif |
174 | #endif |
175 | check_ev (this, &rxvt_term::check_cb), |
175 | check_ev (this, &rxvt_term::check_cb), |
|
|
176 | flush_ev (this, &rxvt_term::flush_cb), |
176 | destroy_ev (this, &rxvt_term::destroy_cb), |
177 | destroy_ev (this, &rxvt_term::destroy_cb), |
177 | pty_ev (this, &rxvt_term::pty_cb), |
178 | pty_ev (this, &rxvt_term::pty_cb), |
178 | incr_ev (this, &rxvt_term::incr_cb) |
179 | incr_ev (this, &rxvt_term::incr_cb) |
179 | { |
180 | { |
180 | cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; |
181 | cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; |
… | |
… | |
886 | resize_all_windows (0, 0, 0); |
887 | resize_all_windows (0, 0, 0); |
887 | scr_remap_chars (); |
888 | scr_remap_chars (); |
888 | scr_touch (true); |
889 | scr_touch (true); |
889 | } |
890 | } |
890 | |
891 | |
|
|
892 | for (unicode_t ch = 0x20; ch <= 0x7f; ch++) |
|
|
893 | TermWin.ascii_map [ch - 0x20] = fs->find_font (ch); |
|
|
894 | |
891 | return true; |
895 | return true; |
892 | } |
896 | } |
893 | } |
897 | } |
894 | |
898 | |
895 | return false; |
899 | return false; |
… | |
… | |
975 | } |
979 | } |
976 | |
980 | |
977 | if (!rXParseAllocColor (& xcol, color)) |
981 | if (!rXParseAllocColor (& xcol, color)) |
978 | return; |
982 | return; |
979 | |
983 | |
980 | /* XStoreColor (display->display, XCMAP, XColor*); */ |
984 | /* XStoreColor (display->display, display->cmap, XColor*); */ |
981 | |
985 | |
982 | /* |
986 | /* |
983 | * FIXME: should free colors here, but no idea how to do it so instead, |
987 | * FIXME: should free colors here, but no idea how to do it so instead, |
984 | * so just keep gobbling up the colormap |
988 | * so just keep gobbling up the colormap |
985 | */ |
989 | */ |
… | |
… | |
988 | if (PixColors[idx] == PixColors[i]) |
992 | if (PixColors[idx] == PixColors[i]) |
989 | break; |
993 | break; |
990 | if (i > Color_White) |
994 | if (i > Color_White) |
991 | { |
995 | { |
992 | /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */ |
996 | /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */ |
993 | XFreeColors (display->display, XCMAP, (PixColors + idx), 1, |
997 | XFreeColors (display->display, display->cmap, (PixColors + idx), 1, |
994 | DisplayPlanes (display->display, display->screen)); |
998 | DisplayPlanes (display->display, display->screen)); |
995 | } |
999 | } |
996 | # endif |
1000 | # endif |
997 | |
1001 | |
998 | PixColorsFocused[idx] = xcol; |
1002 | PixColorsFocused[idx] = xcol; |
… | |
… | |
1023 | { |
1027 | { |
1024 | XColor xcol[2]; |
1028 | XColor xcol[2]; |
1025 | |
1029 | |
1026 | xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) ? PixColorsFocused[Color_pointer_fg] : PixColorsFocused[Color_fg]; |
1030 | xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) ? PixColorsFocused[Color_pointer_fg] : PixColorsFocused[Color_fg]; |
1027 | xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) ? PixColorsFocused[Color_pointer_bg] : PixColorsFocused[Color_bg]; |
1031 | xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) ? PixColorsFocused[Color_pointer_bg] : PixColorsFocused[Color_bg]; |
1028 | XQueryColors (display->display, XCMAP, xcol, 2); |
1032 | XQueryColors (display->display, display->cmap, xcol, 2); |
1029 | XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1); |
1033 | XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1); |
1030 | } |
1034 | } |
1031 | |
1035 | |
1032 | /*----------------------------------------------------------------------*/ |
1036 | /*----------------------------------------------------------------------*/ |
1033 | /* |
1037 | /* |