… | |
… | |
739 | } |
739 | } |
740 | else |
740 | else |
741 | { |
741 | { |
742 | rxvt_fontset *fs = new rxvt_fontset (this); |
742 | rxvt_fontset *fs = new rxvt_fontset (this); |
743 | |
743 | |
744 | if (fs && fs->populate (fontname)) |
744 | if (fs && fs->populate (fontname ? fontname : "fixed")) |
745 | { |
745 | { |
746 | delete TermWin.fontset; |
746 | delete TermWin.fontset; |
747 | TermWin.fontset = fs; |
747 | TermWin.fontset = fs; |
748 | TermWin.fwidth = fs->base_font ()->width; |
748 | TermWin.fwidth = fs->base_font ()->width; |
749 | TermWin.fheight = fs->base_font ()->height; |
749 | TermWin.fheight = fs->base_font ()->height; |
750 | TermWin.fbase = fs->base_font ()->ascent; |
750 | TermWin.fbase = fs->base_font ()->ascent; |
751 | |
751 | |
752 | // TODO: screen needs to be told about new fonts |
|
|
753 | |
|
|
754 | if (TermWin.parent[0]) |
752 | if (TermWin.parent[0]) |
755 | { |
753 | { |
756 | resize_all_windows (0, 0, 0); |
754 | resize_all_windows (0, 0, 0); |
757 | scr_remap_chars (); |
755 | scr_remap_chars (); |
758 | scr_touch (true); |
756 | scr_touch (true); |
… | |
… | |
778 | rxvt_term::set_title (const char *str) |
776 | rxvt_term::set_title (const char *str) |
779 | { |
777 | { |
780 | #ifndef SMART_WINDOW_TITLE |
778 | #ifndef SMART_WINDOW_TITLE |
781 | XStoreName (display->display, TermWin.parent[0], str); |
779 | XStoreName (display->display, TermWin.parent[0], str); |
782 | #else |
780 | #else |
783 | char *name; |
781 | char *name; |
784 | |
782 | |
785 | if (XFetchName (display->display, TermWin.parent[0], &name) == 0) |
783 | if (XFetchName (display->display, TermWin.parent[0], &name) == 0) |
786 | name = NULL; |
784 | name = NULL; |
787 | if (name == NULL || STRCMP (name, str)) |
785 | if (name == NULL || STRCMP (name, str)) |
788 | XStoreName (display->display, TermWin.parent[0], str); |
786 | XStoreName (display->display, TermWin.parent[0], str); |
… | |
… | |
795 | rxvt_term::set_iconName (const char *str) |
793 | rxvt_term::set_iconName (const char *str) |
796 | { |
794 | { |
797 | #ifndef SMART_WINDOW_TITLE |
795 | #ifndef SMART_WINDOW_TITLE |
798 | XSetIconName (display->display, TermWin.parent[0], str); |
796 | XSetIconName (display->display, TermWin.parent[0], str); |
799 | #else |
797 | #else |
800 | char *name; |
798 | char *name; |
801 | |
799 | |
802 | if (XGetIconName (display->display, TermWin.parent[0], &name)) |
800 | if (XGetIconName (display->display, TermWin.parent[0], &name)) |
803 | name = NULL; |
801 | name = NULL; |
804 | if (name == NULL || STRCMP (name, str)) |
802 | if (name == NULL || STRCMP (name, str)) |
805 | XSetIconName (display->display, TermWin.parent[0], str); |
803 | XSetIconName (display->display, TermWin.parent[0], str); |
… | |
… | |
810 | |
808 | |
811 | #ifdef XTERM_COLOR_CHANGE |
809 | #ifdef XTERM_COLOR_CHANGE |
812 | void |
810 | void |
813 | rxvt_term::set_window_color (int idx, const char *color) |
811 | rxvt_term::set_window_color (int idx, const char *color) |
814 | { |
812 | { |
815 | rxvt_color xcol; |
813 | rxvt_color xcol; |
816 | int i; |
814 | int i; |
817 | |
815 | |
818 | if (color == NULL || *color == '\0') |
816 | if (color == NULL || *color == '\0') |
819 | return; |
817 | return; |
820 | |
818 | |
821 | /* handle color aliases */ |
819 | /* handle color aliases */ |