| … | |
… | |
| 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_EXC (color, minCOLOR, TOTAL_COLORS)) |
| 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; |
| … | |
… | |
| 3924 | if (*str != ';') |
3922 | if (*str != ';') |
| 3925 | { |
3923 | { |
| 3926 | #if XPM_BACKGROUND |
3924 | #if XPM_BACKGROUND |
| 3927 | scale_pixmap (""); /* reset to default scaling */ |
3925 | scale_pixmap (""); /* reset to default scaling */ |
| 3928 | set_bgPixmap (str); /* change pixmap */ |
3926 | set_bgPixmap (str); /* change pixmap */ |
| 3929 | #endif |
|
|
| 3930 | scr_touch (true); |
3927 | scr_touch (true); |
|
|
3928 | #endif |
| 3931 | } |
3929 | } |
|
|
3930 | |
| 3932 | while ((str = strchr (str, ';')) != NULL) |
3931 | while ((str = strchr (str, ';')) != NULL) |
| 3933 | { |
3932 | { |
| 3934 | str++; |
3933 | str++; |
| 3935 | #if XPM_BACKGROUND |
3934 | #if XPM_BACKGROUND |
| 3936 | changed += scale_pixmap (str); |
3935 | changed += scale_pixmap (str); |
| … | |
… | |
| 3939 | |
3938 | |
| 3940 | if (changed) |
3939 | if (changed) |
| 3941 | { |
3940 | { |
| 3942 | #ifdef XPM_BACKGROUND |
3941 | #ifdef XPM_BACKGROUND |
| 3943 | resize_pixmap (); |
3942 | resize_pixmap (); |
| 3944 | #endif |
|
|
| 3945 | scr_touch (true); |
3943 | scr_touch (true); |
|
|
3944 | #endif |
| 3946 | } |
3945 | } |
| 3947 | break; |
3946 | break; |
| 3948 | |
3947 | |
| 3949 | case XTerm_restoreFG: |
3948 | case XTerm_restoreFG: |
| 3950 | set_window_color (Color_fg, str); |
3949 | set_window_color (Color_fg, str); |
