Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 827d73f in mainline for uspace/srv/hid/console/gcons.c


Ignore:
Timestamp:
2010-02-12T14:09:22Z (12 years ago)
Author:
Lukas Mejdrech <lukasmejdrech@…>
Branches:
lfn, master
Children:
a70bda4
Parents:
918e9910 (diff), e70edd1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merged the actual head

File:
1 moved

Legend:

Unmodified
Added
Removed
  • uspace/srv/hid/console/gcons.c

    r918e9910 r827d73f  
    241241
    242242/** Return x, where left <= x <= right && |a-x| == min(|a-x|) is smallest */
    243 static inline int limit(size_t a, size_t left, size_t right)
     243static inline ssize_t limit(ssize_t a, ssize_t left, ssize_t right)
    244244{
    245245        if (a < left)
     
    261261        mouse_x = limit(mouse_x + dx, 0, xres);
    262262        mouse_y = limit(mouse_y + dy, 0, yres);
    263        
    264         async_msg_2(fbphone, FB_POINTER_MOVE, mouse_x, mouse_y);
     263
     264        if (active_console != KERNEL_CONSOLE)
     265                async_msg_2(fbphone, FB_POINTER_MOVE, mouse_x, mouse_y);
    265266}
    266267
     
    447448       
    448449        int pm = make_pixmap(_binary_gfx_anim_1_ppm_start,
    449             (int) &_binary_gfx_anim_1_ppm_size);
     450            (size_t) &_binary_gfx_anim_1_ppm_size);
    450451        async_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm);
    451452       
    452453        pm = make_pixmap(_binary_gfx_anim_2_ppm_start,
    453             (int) &_binary_gfx_anim_2_ppm_size);
     454            (size_t) &_binary_gfx_anim_2_ppm_size);
    454455        async_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm);
    455456       
    456457        pm = make_pixmap(_binary_gfx_anim_3_ppm_start,
    457             (int) &_binary_gfx_anim_3_ppm_size);
     458            (size_t) &_binary_gfx_anim_3_ppm_size);
    458459        async_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm);
    459460       
    460461        pm = make_pixmap(_binary_gfx_anim_4_ppm_start,
    461             (int) &_binary_gfx_anim_4_ppm_size);
     462            (size_t) &_binary_gfx_anim_4_ppm_size);
    462463        async_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm);
    463464       
Note: See TracChangeset for help on using the changeset viewer.