Changeset c6f08726 in mainline for uspace/srv/hid/console


Ignore:
Timestamp:
2011-08-11T14:14:53Z (14 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
8d8eeb9
Parents:
67b05ff
Message:

eradicate PPMs and pixmaps completely
make TGA and image map code more robust

Location:
uspace/srv/hid/console
Files:
8 added
8 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/hid/console/Makefile

    r67b05ff rc6f08726  
    3333BINARY = console
    3434
    35 GENERIC_SOURCES = \
     35SOURCES = \
    3636        console.c \
    3737        keybuffer.c \
    … …  
    3939        gcons.c
    4040
    41 IMAGES_OLD = \
    42         gfx/cons_selected.ppm \
    43         gfx/cons_idle.ppm \
    44         gfx/cons_has_data.ppm \
    45         gfx/cons_kernel.ppm \
    46         gfx/anim_1.ppm \
    47         gfx/anim_2.ppm \
    48         gfx/anim_3.ppm \
    49         gfx/anim_4.ppm
    50 
    5141IMAGES = \
    5242        gfx/helenos.tga \
    53         gfx/nameic.tga
    54 
    55 SOURCES = \
    56         $(GENERIC_SOURCES) \
    57         $(IMAGES_OLD)
     43        gfx/nameic.tga \
     44        gfx/cons_selected.tga \
     45        gfx/cons_idle.tga \
     46        gfx/cons_has_data.tga \
     47        gfx/cons_kernel.tga \
     48        gfx/anim_1.tga \
     49        gfx/anim_2.tga \
     50        gfx/anim_3.tga \
     51        gfx/anim_4.tga
    5852
    5953PRE_DEPEND = images.c images.h
    … …  
    6256include $(USPACE_PREFIX)/Makefile.common
    6357
    64 %.o: %.ppm
    65         $(OBJCOPY) -I binary -O $(BFD_NAME) -B $(BFD_ARCH) $< $@
    66 
    6758images.c images.h: $(IMAGES)
    6859        $(ROOT_PATH)/tools/mkarray.py images CONSOLE_IMAGES $^

  • uspace/srv/hid/console/gcons.c

    r67b05ff rc6f08726  
    6060#define COLOR_BACKGROUND  0xffffff
    6161
    62 extern char _binary_gfx_anim_1_ppm_start[0];
    63 extern int _binary_gfx_anim_1_ppm_size;
    64 extern char _binary_gfx_anim_2_ppm_start[0];
    65 extern int _binary_gfx_anim_2_ppm_size;
    66 extern char _binary_gfx_anim_3_ppm_start[0];
    67 extern int _binary_gfx_anim_3_ppm_size;
    68 extern char _binary_gfx_anim_4_ppm_start[0];
    69 extern int _binary_gfx_anim_4_ppm_size;
    70 
    71 extern char _binary_gfx_cons_selected_ppm_start[0];
    72 extern int _binary_gfx_cons_selected_ppm_size;
    73 extern char _binary_gfx_cons_idle_ppm_start[0];
    74 extern int _binary_gfx_cons_idle_ppm_size;
    75 extern char _binary_gfx_cons_has_data_ppm_start[0];
    76 extern int _binary_gfx_cons_has_data_ppm_size;
    77 extern char _binary_gfx_cons_kernel_ppm_start[0];
    78 extern int _binary_gfx_cons_kernel_ppm_size;
    79 
    8062static bool use_gcons = false;
    8163static sysarg_t xres;
    … …  
    8466static imgmap_t *helenos_img;
    8567static imgmap_t *nameic_img;
     68
     69static imgmap_t *anim_1_img;
     70static imgmap_t *anim_2_img;
     71static imgmap_t *anim_3_img;
     72static imgmap_t *anim_4_img;
     73
     74static imgmap_t *cons_has_data_img;
     75static imgmap_t *cons_idle_img;
     76static imgmap_t *cons_kernel_img;
     77static imgmap_t *cons_selected_img;
    8678
    8779enum butstate {
    … …  
    10193static int fbphone;
    10294
    103 /** List of pixmaps identifying these icons */
    104 static int ic_pixmaps[CONS_LAST] = {-1, -1, -1, -1, -1, -1};
     95/** List of image maps identifying these icons */
     96static int ic_imgmaps[CONS_LAST] = {-1, -1, -1, -1, -1, -1};
    10597static int animation = -1;
    10698
    … …  
    149141        enum butstate state = console_state[index];
    150142       
    151         if (ic_pixmaps[state] != -1)
    152                 async_obsolete_msg_2(fbphone, FB_VP_DRAW_PIXMAP, cstatus_vp[index],
    153                     ic_pixmaps[state]);
     143        if (ic_imgmaps[state] != -1)
     144                async_obsolete_msg_2(fbphone, FB_VP_DRAW_IMGMAP, cstatus_vp[index],
     145                    ic_imgmaps[state]);
    154146       
    155147        if ((state != CONS_DISCONNECTED) && (state != CONS_KERNEL)
    … …  
    388380       
    389381        /* Draw logo */
    390         async_obsolete_msg_2(fbphone, FB_DRAW_PPM, x, y);
     382        async_obsolete_msg_2(fbphone, FB_DRAW_IMGMAP, x, y);
    391383       
    392384drop:
    … …  
    418410}
    419411
    420 /** Creates a pixmap on framebuffer
    421  *
    422  * @param data PPM data
    423  * @param size PPM data size
    424  *
    425  * @return Pixmap identification
    426  *
    427  */
    428 static int make_pixmap(char *data, size_t size)
    429 {
     412/** Create an image map on framebuffer
     413 *
     414 * @param img Image map.
     415 *
     416 * @return Image map identification
     417 *
     418 */
     419static int make_imgmap(imgmap_t *img)
     420{
     421        if (img == NULL)
     422                return -1;
     423       
    430424        /* Create area */
    431         char *shm = mmap(NULL, size, PROTO_READ | PROTO_WRITE, MAP_SHARED |
    432             MAP_ANONYMOUS, 0, 0);
     425        char *shm = mmap(NULL, img->size, PROTO_READ | PROTO_WRITE,
     426            MAP_SHARED | MAP_ANONYMOUS, 0, 0);
    433427        if (shm == MAP_FAILED)
    434428                return -1;
    435429       
    436         memcpy(shm, data, size);
    437        
    438         int pxid = -1;
     430        memcpy(shm, img, img->size);
     431       
     432        int id = -1;
    439433       
    440434        /* Send area */
    … …  
    447441                goto drop;
    448442       
    449         /* Obtain pixmap */
    450         rc = async_obsolete_req_0_0(fbphone, FB_SHM2PIXMAP);
     443        /* Obtain image map identifier */
     444        rc = async_obsolete_req_0_0(fbphone, FB_SHM2IMGMAP);
    451445        if (rc < 0)
    452446                goto drop;
    453447       
    454         pxid = rc;
     448        id = rc;
    455449       
    456450drop:
    … …  
    460454exit:
    461455        /* Remove area */
    462         munmap(shm, size);
    463        
    464         return pxid;
     456        munmap(shm, img->size);
     457       
     458        return id;
    465459}
    466460
    … …  
    472466                return;
    473467       
    474         int pm = make_pixmap(_binary_gfx_anim_1_ppm_start,
    475             (size_t) &_binary_gfx_anim_1_ppm_size);
    476         async_obsolete_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm);
    477        
    478         pm = make_pixmap(_binary_gfx_anim_2_ppm_start,
    479             (size_t) &_binary_gfx_anim_2_ppm_size);
    480         async_obsolete_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm);
    481        
    482         pm = make_pixmap(_binary_gfx_anim_3_ppm_start,
    483             (size_t) &_binary_gfx_anim_3_ppm_size);
    484         async_obsolete_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm);
    485        
    486         pm = make_pixmap(_binary_gfx_anim_4_ppm_start,
    487             (size_t) &_binary_gfx_anim_4_ppm_size);
    488         async_obsolete_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm);
     468        int pm = make_imgmap(anim_1_img);
     469        async_obsolete_msg_2(fbphone, FB_ANIM_ADDIMGMAP, an, pm);
     470       
     471        pm = make_imgmap(anim_2_img);
     472        async_obsolete_msg_2(fbphone, FB_ANIM_ADDIMGMAP, an, pm);
     473       
     474        pm = make_imgmap(anim_3_img);
     475        async_obsolete_msg_2(fbphone, FB_ANIM_ADDIMGMAP, an, pm);
     476       
     477        pm = make_imgmap(anim_4_img);
     478        async_obsolete_msg_2(fbphone, FB_ANIM_ADDIMGMAP, an, pm);
    489479       
    490480        async_obsolete_msg_1(fbphone, FB_ANIM_START, an);
    … …  
    506496       
    507497        /* Create image maps */
    508         helenos_img = imgmap_decode_tga((void *) helenos_tga);
    509         nameic_img = imgmap_decode_tga((void *) nameic_tga);
     498        helenos_img = imgmap_decode_tga((void *) helenos_tga,
     499            helenos_tga_size);
     500        nameic_img = imgmap_decode_tga((void *) nameic_tga,
     501            nameic_tga_size);
     502       
     503        anim_1_img = imgmap_decode_tga((void *) anim_1_tga,
     504            anim_1_tga_size);
     505        anim_2_img = imgmap_decode_tga((void *) anim_2_tga,
     506            anim_2_tga_size);
     507        anim_3_img = imgmap_decode_tga((void *) anim_3_tga,
     508            anim_3_tga_size);
     509        anim_4_img = imgmap_decode_tga((void *) anim_4_tga,
     510            anim_4_tga_size);
     511       
     512        cons_has_data_img = imgmap_decode_tga((void *) cons_has_data_tga,
     513            cons_has_data_tga_size);
     514        cons_idle_img = imgmap_decode_tga((void *) cons_idle_tga,
     515            cons_idle_tga_size);
     516        cons_kernel_img = imgmap_decode_tga((void *) cons_kernel_tga,
     517            cons_kernel_tga_size);
     518        cons_selected_img = imgmap_decode_tga((void *) cons_selected_tga,
     519            cons_selected_tga_size);
    510520       
    511521        /* Create console viewport */
    … …  
    535545       
    536546        /* Initialize icons */
    537         ic_pixmaps[CONS_SELECTED] =
    538             make_pixmap(_binary_gfx_cons_selected_ppm_start,
    539             (size_t) &_binary_gfx_cons_selected_ppm_size);
    540         ic_pixmaps[CONS_IDLE] =
    541             make_pixmap(_binary_gfx_cons_idle_ppm_start,
    542             (size_t) &_binary_gfx_cons_idle_ppm_size);
    543         ic_pixmaps[CONS_HAS_DATA] =
    544             make_pixmap(_binary_gfx_cons_has_data_ppm_start,
    545             (size_t) &_binary_gfx_cons_has_data_ppm_size);
    546         ic_pixmaps[CONS_DISCONNECTED] =
    547             make_pixmap(_binary_gfx_cons_idle_ppm_start,
    548             (size_t) &_binary_gfx_cons_idle_ppm_size);
    549         ic_pixmaps[CONS_KERNEL] =
    550             make_pixmap(_binary_gfx_cons_kernel_ppm_start,
    551             (size_t) &_binary_gfx_cons_kernel_ppm_size);
    552         ic_pixmaps[CONS_DISCONNECTED_SEL] = ic_pixmaps[CONS_SELECTED];
     547        ic_imgmaps[CONS_SELECTED] = make_imgmap(cons_selected_img);
     548        ic_imgmaps[CONS_IDLE] = make_imgmap(cons_idle_img);
     549        ic_imgmaps[CONS_HAS_DATA] = make_imgmap(cons_has_data_img);
     550        ic_imgmaps[CONS_DISCONNECTED] = make_imgmap(cons_idle_img);
     551        ic_imgmaps[CONS_KERNEL] = make_imgmap(cons_kernel_img);
     552        ic_imgmaps[CONS_DISCONNECTED_SEL] = ic_imgmaps[CONS_SELECTED];
    553553       
    554554        make_anim();
Note: See TracChangeset for help on using the changeset viewer.