Ignore:
Timestamp:
Jul 27, 2009, 1:26:15 AM (11 years ago)
Author:
Sam Hocevar
Message:

Rename caca_get_cursor_x() and caca_get_cursor_y() to caca_wherex() and
caca_wherey(), in order to match the old <conio.h> naming scheme.

Location:
libcaca/trunk/caca
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • libcaca/trunk/caca/caca.h

    r3586 r3587  
    226226#define CACA_MAGIC_FULLWIDTH 0x000ffffe /**< Used to indicate that the previous character was a fullwidth glyph. */
    227227__extern int caca_gotoxy(caca_canvas_t *, int, int);
    228 __extern int caca_get_cursor_x(caca_canvas_t const *);
    229 __extern int caca_get_cursor_y(caca_canvas_t const *);
     228__extern int caca_wherex(caca_canvas_t const *);
     229__extern int caca_wherey(caca_canvas_t const *);
    230230__extern int caca_put_char(caca_canvas_t *, int, int, uint32_t);
    231231__extern uint32_t caca_get_char(caca_canvas_t const *, int, int);
     
    507507
    508508
    509 /* Aliases from old libcucul functions */
     509/* Aliases from old libcaca and libcucul functions */
    510510__extern int cucul_putchar(caca_canvas_t *, int, int,
    511511                           unsigned long int) CACA_DEPRECATED;
     
    601601
    602602#   if !defined __LIBCACA__
     603#       define caca_get_cursor_x caca_wherex
     604#       define caca_get_cursor_y caca_wherey
    603605#       define cucul_draw_triangle caca_draw_triangle
    604606#       define cucul_draw_thin_triangle caca_draw_thin_triangle
     
    612614#       define cucul_free_font caca_free_font
    613615#       define cucul_gotoxy caca_gotoxy
    614 #       define cucul_get_cursor_x caca_get_cursor_x
    615 #       define cucul_get_cursor_y caca_get_cursor_y
     616#       define cucul_get_cursor_x caca_wherex
     617#       define cucul_get_cursor_y caca_wherey
    616618#       define cucul_put_char caca_put_char
    617619#       define cucul_get_char caca_get_char
  • libcaca/trunk/caca/driver/ncurses.c

    r3578 r3587  
    376376    }
    377377
    378     x = caca_get_cursor_x(dp->cv);
    379     y = caca_get_cursor_y(dp->cv);
     378    x = caca_wherex(dp->cv);
     379    y = caca_wherey(dp->cv);
    380380    move(y, x);
    381381
  • libcaca/trunk/caca/driver/slang.c

    r3569 r3587  
    288288        }
    289289    }
    290     SLsmg_gotorc(caca_get_cursor_y(dp->cv), caca_get_cursor_x(dp->cv));
     290    SLsmg_gotorc(caca_wherey(dp->cv), caca_wherex(dp->cv));
    291291    SLsmg_refresh();
    292292}
  • libcaca/trunk/caca/driver/x11.c

    r3581 r3587  
    377377        XSetForeground(dp->drv.p->dpy, dp->drv.p->gc,
    378378                       dp->drv.p->colors[0xfff]);
    379         x = caca_get_cursor_x(dp->cv);
    380         y = caca_get_cursor_y(dp->cv);
     379        x = caca_wherex(dp->cv);
     380        y = caca_wherey(dp->cv);
    381381        XFillRectangle(dp->drv.p->dpy, dp->drv.p->pixmap, dp->drv.p->gc,
    382382                       x * dp->drv.p->font_width, y * dp->drv.p->font_height,
  • libcaca/trunk/caca/string.c

    r3586 r3587  
    6969 *  \return The cursor's X coordinate.
    7070 */
    71 int caca_get_cursor_x(caca_canvas_t const *cv)
     71int caca_wherex(caca_canvas_t const *cv)
    7272{
    7373    return cv->frames[cv->frame].x;
     
    8383 *  \return The cursor's Y coordinate.
    8484 */
    85 int caca_get_cursor_y(caca_canvas_t const *cv)
     85int caca_wherey(caca_canvas_t const *cv)
    8686{
    8787    return cv->frames[cv->frame].y;
     
    583583
    584584int cucul_gotoxy(cucul_canvas_t *, int, int) CACA_ALIAS(caca_gotoxy);
    585 int cucul_get_cursor_x(cucul_canvas_t const *) CACA_ALIAS(caca_get_cursor_x);
    586 int cucul_get_cursor_y(cucul_canvas_t const *) CACA_ALIAS(caca_get_cursor_y);
     585int cucul_get_cursor_x(cucul_canvas_t const *) CACA_ALIAS(caca_wherex);
     586int cucul_get_cursor_y(cucul_canvas_t const *) CACA_ALIAS(caca_wherey);
     587int caca_get_cursor_x(caca_canvas_t const *) CACA_ALIAS(caca_wherex);
     588int caca_get_cursor_y(caca_canvas_t const *) CACA_ALIAS(caca_wherey);
    587589int cucul_put_char(cucul_canvas_t *, int, int, uint32_t)
    588590         CACA_ALIAS(caca_put_char);
Note: See TracChangeset for help on using the changeset viewer.