Changeset 1771 for libcaca/trunk/cacaTweet

Timestamp:

Jun 27, 2007, 3:06:18 PM (12 years ago)

Author:

Sam Hocevar

Message:

• Disabled USE_RGB12_FGBG for now, as it was reported not to work.

File:

• libcaca/trunk/caca/driver_cocoa.m (modified) (8 diffs)

libcaca/trunk/caca/driver_cocoa.m

@@ -45 +45 @@
 #define PRECACHE_WHOLE_COLOR_TABLE 1
 
-#define USE_RGB12_FGBG 1
+//#define USE_RGB12_FGBG 1
 
 //#define USE_GLOBAL_AUTORELEASE_POOL 1
@@ -268 +268 @@
                 attrs = _attrs + x + y * _w;
                 NSColor* color = nil;
-            #if USE_RGB12_FGBG
+#if USE_RGB12_FGBG
                 uint16_t bg = _cucul_attr_to_rgb12bg(*attrs);
                 if(bg)
                 {
-                #ifdef PRECACHE_WHOLE_COLOR_TABLE
+#   ifdef PRECACHE_WHOLE_COLOR_TABLE
                     color = _colorCache[bg];
-                #else
+#   else
                     NSNumber* numberBg = [NSNumber numberWithInt:bg];
                     color = [_colorCache objectForKey:numberBg];
@@ -283 +283 @@
                             [_colorCache setObject:color forKey:numberBg];
                     }
-                #endif
+#   endif
                 }
-            #else
+#else
                 uint8_t argb[8];
                 _cucul_attr_to_argb4(*attrs, argb);
@@ -292 +292 @@
                                   blue:((float)argb[3]) / 15.0
                                   alpha:1.0];
-            #endif
+#endif
                 if(color)
                 {
@@ -326 +326 @@
                 {
                     NSColor* color = nil;
-                #if USE_RGB12_FGBG
+#if USE_RGB12_FGBG
                     uint16_t fg = _cucul_attr_to_rgb12fg(*attrs);
-                #ifdef PRECACHE_WHOLE_COLOR_TABLE
+#   ifdef PRECACHE_WHOLE_COLOR_TABLE
                     color = _colorCache[fg];
-                #else // PRECACHE_WHOLE_COLOR_TABLE
+#   else // PRECACHE_WHOLE_COLOR_TABLE
                     NSNumber* numberFg = [NSNumber numberWithInt:fg];
                     color = [_colorCache objectForKey:numberFg];
@@ -339 +339 @@
                             [_colorCache setObject:color forKey:numberFg];
                     }
-                #endif // PRECACHE_WHOLE_COLOR_TABLE
-                #else // USE_RGB12_FGBG
+#   endif // PRECACHE_WHOLE_COLOR_TABLE
+#else // USE_RGB12_FGBG
                     uint8_t argb[8];
                     _cucul_attr_to_argb4(*attrs, argb);
@@ -349 +349 @@
                                       blue:((float)argb[7]) / 15.0
                                       alpha:1.0];
-                #endif // USE_RGB12_FGBG
+#endif // USE_RGB12_FGBG
 
                     if(color)
@@ -360 +360 @@
                         NSString* str = [[NSString alloc] initWithCharacters:&ch length:1];
 
-                    #ifdef USE_LOWLEVEL_COCOA
+#ifdef USE_LOWLEVEL_COCOA
                         [[_textStorage mutableString] setString:str];
                         [_textStorage setAttributes:attrDict range:NSMakeRange(0, 1)];
                         [_layoutManager drawGlyphsForGlyphRange:NSMakeRange(0, 1) atPoint:r.origin];
-                    #else
+#else
                         [str drawInRect:r withAttributes:attrDict];
-                    #endif
+#endif
                         [str release];
                     }