Changeset 4337


Ignore:
Timestamp:
Feb 8, 2010, 12:12:55 PM (7 years ago)
Author:
pterjan
Message:
  • Depend on libcaca beta17 now that it is released
Location:
neercs/trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • neercs/trunk/configure.ac

    r4336 r4337  
    6767
    6868CACA="no"
    69 PKG_CHECK_MODULES(CACA, caca >= 0.99.beta16,
     69PKG_CHECK_MODULES(CACA, caca >= 0.99.beta17,
    7070 [CACA="yes"],
    7171 [AC_MSG_RESULT(no)
     
    8282AC_MSG_RESULT(Disabling lock support on OSX)
    8383fi
    84 
    85 AC_CHECK_LIB(caca, caca_clear_dirty_rect_list,
    86  [AC_DEFINE(HAVE_CACA_DIRTY_RECTANGLES, 1, [libcaca has dirty rectangles])])
    87 
    88 AC_CHECK_LIB(caca, caca_fill_triangle_textured,
    89  [AC_DEFINE(HAVE_CACA_TRIANGLE_TEXTURING, 1, [libcaca has trifiller])])
    9084
    9185AC_CHECK_LIB(util, forkpty, UTIL_LIBS="${UTIL_LIBS} -lutil")
  • neercs/trunk/src/client.c

    r4218 r4337  
    243243                    {
    244244                        l2 += lb;
    245 #if defined HAVE_CACA_DIRTY_RECTANGLES
    246245                        l = caca_import_area_from_memory(screen_list->cv, x, y,
    247246                                                         buf, l2, "caca");
    248 #else
    249                         l = caca_import_memory(screen_list->cv, buf, l2,
    250                                                "caca");
    251 #endif
    252247                    }
    253248                }
  • neercs/trunk/src/screensaver.c

    r4214 r4337  
    125125        flying_toaster->toaster[i] = caca_create_canvas(0, 0);
    126126        flying_toaster->mask[i] = caca_create_canvas(0, 0);
    127 #if !defined HAVE_CACA_DIRTY_RECTANGLES
    128 #   define caca_import_canvas_from_memory caca_import_memory
    129 #endif
    130127        caca_import_canvas_from_memory(flying_toaster->toaster[i],
    131128                                       toaster_text[i],
  • neercs/trunk/src/server.c

    r4110 r4337  
    104104static int request_refresh(struct screen_list *screen_list)
    105105{
    106 #if defined HAVE_CACA_DIRTY_RECTANGLES
    107106    int ndirty = caca_get_dirty_rect_count(screen_list->cv);
    108107    if (!ndirty)
    109108        return 0;
    110 #endif
    111109    if (!screen_list->comm.socket[SOCK_CLIENT])
    112110        connect_socket(screen_list, SOCK_CLIENT);
     
    126124        debug("bufsize=%d", bufsize);
    127125
    128 #if defined HAVE_CACA_DIRTY_RECTANGLES
    129126        for (i = 0; i < ndirty; i++)
    130127        {
     
    137134                caca_export_area_to_memory(screen_list->cv, x, y, w, h, "caca",
    138135                                           &bytes);
    139 #else
    140         {
    141             i = 0;
    142             x = 0;
    143             y = 0;
    144             buf = caca_export_memory(screen_list->cv, "caca", &bytes);
    145 #endif
    146136            debug("Requesting refresh for %d", bytes);
    147137            towrite = bytes;
     
    181171        int r = send_to_client(buf2, strlen(buf2) + 1, screen_list);
    182172        (void)r;
    183 #if defined HAVE_CACA_DIRTY_RECTANGLES
    184173        caca_clear_dirty_rect_list(screen_list->cv);
    185 #endif
    186174    }
    187175    return 0;
  • neercs/trunk/src/wm.c

    r4102 r4337  
    374374        uv[4] = 0;
    375375        uv[5] = 0;
    376 #if defined HAVE_CACA_TRIANGLE_TEXTURING
    377376        caca_fill_triangle_textured(cv, coords, tex, uv);
    378 #endif
    379377        coords[0] = p1x;
    380378        coords[1] = p1y;
     
    389387        uv[4] = 1;
    390388        uv[5] = 0;
    391 #if defined HAVE_CACA_TRIANGLE_TEXTURING
    392389        caca_fill_triangle_textured(cv, coords, tex, uv);
    393 #endif
    394390        caca_set_color_ansi(cv, color, CACA_BLACK);
    395391        if (borders)
Note: See TracChangeset for help on using the changeset viewer.