Changeset 8fa9562 for functions.c
- Timestamp:
- Jan 20, 2007, 9:49:55 PM (17 years ago)
- Branches:
- master, barnowl_perlaim, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9
- Children:
- 575877f
- Parents:
- 212764e
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
functions.c
r8203afd r8fa9562 2454 2454 return; 2455 2455 } 2456 owl_filter_set_color(f, owl_util_string_to_color(argv[3])); 2456 owl_filter_set_fgcolor(f, owl_util_string_to_color(argv[3])); 2457 owl_global_set_needrefresh(&g); 2458 owl_mainwin_redisplay(owl_global_get_mainwin(&g)); 2459 return; 2460 } 2461 if (argc==4 && !strcmp(argv[2], "-b")) { 2462 f=owl_global_get_filter(&g, argv[1]); 2463 if (!f) { 2464 owl_function_error("The filter '%s' does not exist.", argv[1]); 2465 return; 2466 } 2467 if (owl_util_string_to_color(argv[3])==-1) { 2468 owl_function_error("The color '%s' is not available.", argv[3]); 2469 return; 2470 } 2471 owl_filter_set_bgcolor(f, owl_util_string_to_color(argv[3])); 2457 2472 owl_global_set_needrefresh(&g); 2458 2473 owl_mainwin_redisplay(owl_global_get_mainwin(&g)); … … 2545 2560 owl_fmtext_append_normal(&fm, " "); 2546 2561 if (owl_global_get_hascolors(&g)) { 2547 owl_fmtext_append_normal_color(&fm, owl_filter_get_name(f), owl_filter_get_ color(f));2562 owl_fmtext_append_normal_color(&fm, owl_filter_get_name(f), owl_filter_get_fgcolor(f), owl_filter_get_bgcolor(f)); 2548 2563 } else { 2549 2564 owl_fmtext_append_normal(&fm, owl_filter_get_name(f)); … … 2924 2939 * be 'color' 2925 2940 */ 2926 void owl_function_color_current_filter(char * color)2941 void owl_function_color_current_filter(char *fgcolor, char *bgcolor) 2927 2942 { 2928 2943 char *name; 2929 2944 2930 2945 name=owl_view_get_filtname(owl_global_get_current_view(&g)); 2931 owl_function_color_filter(name, color);2946 owl_function_color_filter(name, fgcolor, bgcolor); 2932 2947 } 2933 2948 … … 2936 2951 * the "all" filter, return -2. Return 0 on success 2937 2952 */ 2938 int owl_function_color_filter(char *filtname, char * color)2953 int owl_function_color_filter(char *filtname, char *fgcolor, char *bgcolor) 2939 2954 { 2940 2955 owl_filter *f; … … 2952 2967 } 2953 2968 2954 if (owl_util_string_to_color( color)==-1) {2955 owl_function_error("No color named '%s' avilable." );2969 if (owl_util_string_to_color(fgcolor)==-1) { 2970 owl_function_error("No color named '%s' avilable.", fgcolor); 2956 2971 return(-1); 2957 2972 } 2958 owl_filter_set_color(f, owl_util_string_to_color(color)); 2973 2974 2975 if (bgcolor != NULL) { 2976 if (owl_util_string_to_color(bgcolor)==-1) { 2977 owl_function_error("No color named '%s' avilable.", bgcolor); 2978 return(-1); 2979 } 2980 owl_filter_set_bgcolor(f, owl_util_string_to_color(bgcolor)); 2981 } 2982 owl_filter_set_fgcolor(f, owl_util_string_to_color(fgcolor)); 2983 2959 2984 owl_global_set_needrefresh(&g); 2960 2985 owl_mainwin_redisplay(owl_global_get_mainwin(&g)); … … 2968 2993 owl_fmtext_init_null(&fm); 2969 2994 owl_fmtext_append_normal(&fm, "default: "); 2970 owl_fmtext_append_normal_color(&fm, "default\n", OWL_COLOR_DEFAULT );2995 owl_fmtext_append_normal_color(&fm, "default\n", OWL_COLOR_DEFAULT, OWL_COLOR_DEFAULT); 2971 2996 2972 2997 owl_fmtext_append_normal(&fm,"red: "); 2973 owl_fmtext_append_normal_color(&fm, "red\n", OWL_COLOR_RED );2998 owl_fmtext_append_normal_color(&fm, "red\n", OWL_COLOR_RED, OWL_COLOR_DEFAULT); 2974 2999 2975 3000 owl_fmtext_append_normal(&fm,"green: "); 2976 owl_fmtext_append_normal_color(&fm, "green\n", OWL_COLOR_GREEN );3001 owl_fmtext_append_normal_color(&fm, "green\n", OWL_COLOR_GREEN, OWL_COLOR_DEFAULT); 2977 3002 2978 3003 owl_fmtext_append_normal(&fm,"yellow: "); 2979 owl_fmtext_append_normal_color(&fm, "yellow\n", OWL_COLOR_YELLOW );3004 owl_fmtext_append_normal_color(&fm, "yellow\n", OWL_COLOR_YELLOW, OWL_COLOR_DEFAULT); 2980 3005 2981 3006 owl_fmtext_append_normal(&fm,"blue: "); 2982 owl_fmtext_append_normal_color(&fm, "blue\n", OWL_COLOR_BLUE );3007 owl_fmtext_append_normal_color(&fm, "blue\n", OWL_COLOR_BLUE, OWL_COLOR_DEFAULT); 2983 3008 2984 3009 owl_fmtext_append_normal(&fm,"magenta: "); 2985 owl_fmtext_append_normal_color(&fm, "magenta\n", OWL_COLOR_MAGENTA );3010 owl_fmtext_append_normal_color(&fm, "magenta\n", OWL_COLOR_MAGENTA, OWL_COLOR_DEFAULT); 2986 3011 2987 3012 owl_fmtext_append_normal(&fm,"cyan: "); 2988 owl_fmtext_append_normal_color(&fm, "cyan\n", OWL_COLOR_CYAN );3013 owl_fmtext_append_normal_color(&fm, "cyan\n", OWL_COLOR_CYAN, OWL_COLOR_DEFAULT); 2989 3014 2990 3015 owl_fmtext_append_normal(&fm,"white: "); 2991 owl_fmtext_append_normal_color(&fm, "white\n", OWL_COLOR_WHITE );3016 owl_fmtext_append_normal_color(&fm, "white\n", OWL_COLOR_WHITE, OWL_COLOR_DEFAULT); 2992 3017 2993 3018 owl_function_popless_fmtext(&fm);
Note: See TracChangeset
for help on using the changeset viewer.