Changes in fmtext.c [4479497:7b4f3be]
Legend:
- Unmodified
- Added
- Removed
-
fmtext.c
r4479497 r7b4f3be 184 184 } 185 185 186 static void _owl_fmtext_update_colorpair(short fg, short bg, short *pair)187 {188 if (owl_global_get_hascolors(&g)) {189 *pair = owl_fmtext_get_colorpair(fg, bg);190 }191 }192 193 186 static void _owl_fmtext_wcolor_set(WINDOW *w, short pair) 194 187 { 195 if ( owl_global_get_hascolors(&g)) {188 if (has_colors()) { 196 189 wcolor_set(w,pair,NULL); 197 190 wbkgdset(w, COLOR_PAIR(pair)); … … 221 214 bg = default_bgcolor; 222 215 _owl_fmtext_wattrset(w, attr); 223 _owl_fmtext_update_colorpair(fg, bg, &pair);216 pair = owl_fmtext_get_colorpair(fg, bg); 224 217 _owl_fmtext_wcolor_set(w, pair); 225 218 … … 270 263 if (bg == OWL_COLOR_DEFAULT) bg = default_bgcolor; 271 264 _owl_fmtext_wattrset(w, attr); 272 _owl_fmtext_update_colorpair(fg, bg, &pair);265 pair = owl_fmtext_get_colorpair(fg, bg); 273 266 _owl_fmtext_wcolor_set(w, pair); 274 267 … … 662 655 continue */ 663 656 } else if (!strcasecmp(buff, "@color") 664 && owl_global_get_hascolors(&g)665 657 && owl_global_is_colorztext(&g)) { 666 658 g_free(buff); … … 820 812 } 821 813 } 822 if ( owl_global_get_hascolors(&g)) {814 if (has_colors()) { 823 815 for(i = 0; i < 8; i++) { 824 816 short fg, bg; … … 835 827 owl_colorpair_mgr *cpmgr; 836 828 short pair; 829 830 if (!has_colors()) 831 return 0; 837 832 838 833 /* Sanity (Bounds) Check */ … … 852 847 if (!(pair != -1 && pair < cpmgr->next)) { 853 848 /* If we didn't find a pair, search for a free one to assign. */ 854 pair = (cpmgr->next < COLOR_PAIRS) ? cpmgr->next : -1;849 pair = (cpmgr->next < owl_util_get_colorpairs()) ? cpmgr->next : -1; 855 850 if (pair != -1) { 856 851 /* We found a free pair, initialize it. */
Note: See TracChangeset
for help on using the changeset viewer.