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