… | |
… | |
985 | int start_row = row; |
985 | int start_row = row; |
986 | line_t *l; |
986 | line_t *l; |
987 | |
987 | |
988 | do |
988 | do |
989 | { |
989 | { |
990 | l = &ROW (row); |
990 | l = &ROW (row++); |
991 | |
991 | |
992 | if (l->f & LINE_FILTERED) |
992 | if (!(l->f & LINE_FILTERED)) |
993 | row++; |
|
|
994 | else |
|
|
995 | { |
993 | { |
996 | // line not filtered, mark it as filtered |
994 | // line not filtered, mark it as filtered |
997 | l->f |= LINE_FILTERED; |
995 | l->f |= LINE_FILTERED; |
998 | while (l->is_longer ()) |
996 | while (l->is_longer ()) |
999 | { |
997 | { |
1000 | l = &ROW (++row); |
998 | l = &ROW (row++); |
1001 | l->f |= LINE_FILTERED; |
999 | l->f |= LINE_FILTERED; |
1002 | } |
1000 | } |
1003 | |
1001 | |
1004 | // and filter it |
1002 | // and filter it |
1005 | HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); |
1003 | HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); |
… | |
… | |
1007 | break; |
1005 | break; |
1008 | } |
1006 | } |
1009 | } |
1007 | } |
1010 | while (l->is_longer () && row < end_row); |
1008 | while (l->is_longer () && row < end_row); |
1011 | } |
1009 | } |
1012 | while (++row < end_row); |
1010 | while (row < end_row); |
1013 | } |
1011 | } |
1014 | |
1012 | |
1015 | scr_refresh (refresh_type); |
1013 | scr_refresh (refresh_type); |
1016 | scrollbar_show (1); |
1014 | scrollbar_show (1); |
1017 | #ifdef USE_XIM |
1015 | #ifdef USE_XIM |
… | |
… | |
3860 | { |
3858 | { |
3861 | if ((name = strchr (buf, ';')) == NULL) |
3859 | if ((name = strchr (buf, ';')) == NULL) |
3862 | break; |
3860 | break; |
3863 | |
3861 | |
3864 | *name++ = '\0'; |
3862 | *name++ = '\0'; |
3865 | color = atoi (buf); |
3863 | color = atoi (buf) + minCOLOR; |
3866 | |
3864 | |
3867 | if (color < 0 || color >= TOTAL_COLORS) |
3865 | if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) |
3868 | break; |
3866 | break; |
3869 | |
3867 | |
3870 | if ((buf = strchr (name, ';')) != NULL) |
3868 | if ((buf = strchr (name, ';')) != NULL) |
3871 | *buf++ = '\0'; |
3869 | *buf++ = '\0'; |
3872 | |
3870 | |
3873 | if (name[0] == '?' && !name[1]) |
3871 | if (name[0] == '?' && !name[1]) |
3874 | { |
3872 | { |
3875 | unsigned short r, g, b; |
3873 | unsigned short r, g, b; |
3876 | pix_colors_focused[color + minCOLOR].get (display, r, g, b); |
3874 | pix_colors_focused[color].get (display, r, g, b); |
3877 | tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); |
3875 | tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); |
3878 | } |
3876 | } |
3879 | else |
3877 | else |
3880 | set_window_color (color + minCOLOR, name); |
3878 | set_window_color (color, name); |
3881 | } |
3879 | } |
3882 | break; |
3880 | break; |
3883 | case XTerm_Color00: |
3881 | case XTerm_Color00: |
3884 | process_color_seq (XTerm_Color00, Color_fg, str, resp); |
3882 | process_color_seq (XTerm_Color00, Color_fg, str, resp); |
3885 | break; |
3883 | break; |
3886 | case XTerm_Color01: |
3884 | case XTerm_Color01: |
3887 | process_color_seq (XTerm_Color00, Color_bg, str, resp); |
3885 | process_color_seq (XTerm_Color01, Color_bg, str, resp); |
3888 | break; |
3886 | break; |
3889 | #ifndef NO_CURSORCOLOR |
3887 | #ifndef NO_CURSORCOLOR |
3890 | case XTerm_Color_cursor: |
3888 | case XTerm_Color_cursor: |
3891 | process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); |
3889 | process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); |
3892 | break; |
3890 | break; |
… | |
… | |
3896 | break; |
3894 | break; |
3897 | case XTerm_Color_pointer_bg: |
3895 | case XTerm_Color_pointer_bg: |
3898 | process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); |
3896 | process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); |
3899 | break; |
3897 | break; |
3900 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3898 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3901 | case XTerm_Color_BD: |
|
|
3902 | process_color_seq (XTerm_Color_BD, Color_BD, str, resp); |
|
|
3903 | break; |
|
|
3904 | case XTerm_Color_UL: |
|
|
3905 | process_color_seq (XTerm_Color_UL, Color_UL, str, resp); |
|
|
3906 | break; |
|
|
3907 | case XTerm_Color_RV: |
3899 | case XTerm_Color_RV: |
3908 | process_color_seq (XTerm_Color_RV, Color_RV, str, resp); |
3900 | process_color_seq (XTerm_Color_RV, Color_RV, str, resp); |
|
|
3901 | break; |
|
|
3902 | case Rxvt_Color_BD: |
|
|
3903 | case URxvt_Color_BD: |
|
|
3904 | process_color_seq (op, Color_BD, str, resp); |
|
|
3905 | break; |
|
|
3906 | case Rxvt_Color_UL: |
|
|
3907 | case URxvt_Color_UL: |
|
|
3908 | process_color_seq (op, Color_UL, str, resp); |
3909 | break; |
3909 | break; |
3910 | case URxvt_Color_IT: |
3910 | case URxvt_Color_IT: |
3911 | process_color_seq (URxvt_Color_IT, Color_IT, str, resp); |
3911 | process_color_seq (URxvt_Color_IT, Color_IT, str, resp); |
3912 | break; |
3912 | break; |
3913 | #endif |
3913 | #endif |
… | |
… | |
3918 | if (am_transparent) |
3918 | if (am_transparent) |
3919 | want_full_refresh = want_refresh = 1; |
3919 | want_full_refresh = want_refresh = 1; |
3920 | break; |
3920 | break; |
3921 | #endif |
3921 | #endif |
3922 | |
3922 | |
3923 | case XTerm_Pixmap: |
3923 | case Rxvt_Pixmap: |
3924 | if (*str != ';') |
3924 | if (*str != ';') |
3925 | { |
3925 | { |
3926 | #if XPM_BACKGROUND |
3926 | #if XPM_BACKGROUND |
3927 | scale_pixmap (""); /* reset to default scaling */ |
3927 | scale_pixmap (""); /* reset to default scaling */ |
3928 | set_bgPixmap (str); /* change pixmap */ |
3928 | set_bgPixmap (str); /* change pixmap */ |
3929 | #endif |
|
|
3930 | scr_touch (true); |
3929 | scr_touch (true); |
|
|
3930 | #endif |
3931 | } |
3931 | } |
|
|
3932 | |
3932 | while ((str = strchr (str, ';')) != NULL) |
3933 | while ((str = strchr (str, ';')) != NULL) |
3933 | { |
3934 | { |
3934 | str++; |
3935 | str++; |
3935 | #if XPM_BACKGROUND |
3936 | #if XPM_BACKGROUND |
3936 | changed += scale_pixmap (str); |
3937 | changed += scale_pixmap (str); |
… | |
… | |
3939 | |
3940 | |
3940 | if (changed) |
3941 | if (changed) |
3941 | { |
3942 | { |
3942 | #ifdef XPM_BACKGROUND |
3943 | #ifdef XPM_BACKGROUND |
3943 | resize_pixmap (); |
3944 | resize_pixmap (); |
3944 | #endif |
|
|
3945 | scr_touch (true); |
3945 | scr_touch (true); |
|
|
3946 | #endif |
3946 | } |
3947 | } |
3947 | break; |
3948 | break; |
3948 | |
3949 | |
3949 | case XTerm_restoreFG: |
3950 | case Rxvt_restoreFG: |
3950 | set_window_color (Color_fg, str); |
3951 | set_window_color (Color_fg, str); |
3951 | break; |
3952 | break; |
3952 | case XTerm_restoreBG: |
3953 | case Rxvt_restoreBG: |
3953 | set_window_color (Color_bg, str); |
3954 | set_window_color (Color_bg, str); |
3954 | break; |
3955 | break; |
3955 | |
3956 | |
3956 | case XTerm_logfile: |
3957 | case XTerm_logfile: |
3957 | // TODO, when secure mode? |
3958 | // TODO, when secure mode? |
… | |
… | |
3962 | if (OPTION (Opt_insecure)) |
3963 | if (OPTION (Opt_insecure)) |
3963 | menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked |
3964 | menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked |
3964 | break; |
3965 | break; |
3965 | #endif |
3966 | #endif |
3966 | #if 0 |
3967 | #if 0 |
3967 | case XTerm_dumpscreen: /* no error notices */ |
3968 | case Rxvt_dumpscreen: /* no error notices */ |
3968 | { |
3969 | { |
3969 | int fd; |
3970 | int fd; |
3970 | if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) |
3971 | if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) |
3971 | { |
3972 | { |
3972 | scr_dump (fd); |
3973 | scr_dump (fd); |