WebSVN – Kolibri OS – Diff – /programs/media/Fplay/winlib/caption.c

 #include "system.h"
 #include
 #include
 #include
 #include "winlib.h"
 #define CAPTION_CORNER_W    8
 extern int res_caption_left[];
 extern int res_caption_right[];
 extern int res_caption_body[];
 extern int res_close_btn[];
 extern int res_close_btn_hl[];
 extern int res_close_btn_pressed[];
 extern int res_minimize_btn[];
 extern int res_minimize_btn_hl[];
 extern int res_minimize_btn_pressed[];
 extern uint32_t main_cursor;
 void update_caption_size(window_t *win);
 int caption_proc(ctrl_t *ctrl, uint32_t msg, uint32_t arg1, uint32_t arg2);
 int init_caption(window_t *win)
+{
     button_t  *btn;
     caption_t *cpt = &win->caption;
     ctx_t     *ctx = &cpt->ctx;
     link_initialize(&cpt->ctrl.link);
     list_initialize(&cpt->ctrl.child);
     cpt->ctrl.handler = caption_proc;
     cpt->ctrl.parent  = (ctrl_t*)win;
     cpt->text = win->caption_txt;
+    cpt->bitmap.width  = 1920;
-    ctx->pixmap = user_alloc(1920*CAPTION_HEIGHT*4);
+    cpt->bitmap.height = CAPTION_HEIGHT;
+    cpt->bitmap.flags  = 0;
-    if(!ctx->pixmap)
+    if( create_bitmap(&cpt->bitmap) )
+    {
         printf("not enough memory for caption bitmap\n");
         return 0;
     };
-//    printf("win_w %d win_h %d\n", win->w, win->h);
+//    printf("win_w %d win_h %d\n", win->w, win->h);
-    ctx->stride   = win->w*4;
+    ctx->pixmap   = &cpt->bitmap;
     ctx->offset_x = 0;
     ctx->offset_y = 0;
     cpt->ctrl.ctx = ctx;
     btn = create_button(NULL, ID_CLOSE,0,5,16,18,(ctrl_t*)cpt);
     cpt->close_btn = btn;
     btn->img_default = res_close_btn;
     btn->img_hilite  = res_close_btn_hl;
     btn->img_pressed = res_close_btn_pressed;
     btn = create_button(NULL, ID_MINIMIZE,0,5,16,18,(ctrl_t*)cpt);
     cpt->minimize_btn = btn;
     btn->img_default = res_minimize_btn;
     btn->img_hilite  = res_minimize_btn_hl;
     btn->img_pressed = res_minimize_btn_pressed;
     update_caption_size(win);
     return 1;
 };
 void update_caption_size(window_t *win)
+{
     caption_t *cpt = &win->caption;
     bitmap_t  *bitmap = cpt->ctx.pixmap;
     int old_size;
     int new_size;
-    int stride;
+    int pitch;
-    old_size = cpt->ctx.stride * CAPTION_HEIGHT;
+    old_size = bitmap->pitch * bitmap->height;
     old_size = (old_size+4095) & ~4095;
-    stride = win->w*4;
+    pitch = ALIGN(win->w*4, 16);
-    new_size = stride * CAPTION_HEIGHT;
+    new_size = pitch * CAPTION_HEIGHT;
     new_size = (new_size+4095) & ~4095;
     if( new_size < old_size)
-        user_unmap(cpt->ctx.pixmap, new_size, old_size-new_size);
+        user_unmap(bitmap->data, new_size, old_size-new_size);
-    cpt->ctx.stride = stride;
+    bitmap->width = win->w;
+    bitmap->pitch = pitch;
     cpt->ctrl.rc.l    = 0;
     cpt->ctrl.rc.t    = 0;
     cpt->ctrl.rc.r    = win->w;
     cpt->ctrl.rc.b    = CAPTION_HEIGHT;
     cpt->ctrl.w       = win->w;
     cpt->ctrl.h       = CAPTION_HEIGHT;
     win->client.t     = CAPTION_HEIGHT;
     cpt->close_btn->ctrl.rc.l = win->w - 25;
     cpt->close_btn->ctrl.rc.r = cpt->close_btn->ctrl.rc.l +
                            cpt->close_btn->ctrl.w;
     cpt->minimize_btn->ctrl.rc.l = win->w - 25 - 16 - 5;
     cpt->minimize_btn->ctrl.rc.r = cpt->minimize_btn->ctrl.rc.l +
                            cpt->minimize_btn->ctrl.w;
 };
-typedef struct
-{
-    uint32_t    width;
-    uint32_t    height;
-    uint32_t    pitch;
-    uint32_t    handle;
-    uint8_t    *data;
-}bitmap_t;
 extern int win_font;
 void draw_caption(caption_t *cpt)
+{
     int *pixmap, *src;
-    int  i, j, w;
+    rect_t rc;
+    int  i, j, w;
-    pixmap = cpt->ctx.pixmap;
-    src = res_caption_left;
+    blit_raw(&cpt->ctx, res_caption_left, 0, 0,
-    for(i=0; i < CAPTION_HEIGHT; i++)
-    {
-        for(j=0; j < CAPTION_CORNER_W; j++)
+             CAPTION_CORNER_W, CAPTION_HEIGHT, CAPTION_CORNER_W*4);
-            pixmap[j] = src[j];
-        pixmap+= cpt->ctx.stride/4;
-        src+= CAPTION_CORNER_W;
-    };
     w = cpt->ctrl.w - (2*CAPTION_CORNER_W);
     if( w > 0)
+    {
-        pixmap = cpt->ctx.pixmap;
+        pixmap = (int*)cpt->ctx.pixmap->data;
         pixmap+= CAPTION_CORNER_W;
         src = res_caption_body;
         for(i = 0; i < CAPTION_HEIGHT; i++)
+        {
             for(j = 0; j < w; j++)
                 pixmap[j] = src[i];
-            pixmap+= cpt->ctx.stride/4;
+            pixmap+= cpt->ctx.pixmap->pitch/4;
         }
     };
-    pixmap = cpt->ctx.pixmap;
-    pixmap+= cpt->ctrl.w - CAPTION_CORNER_W;
+//        blit_raw(&cpt->ctx,res_caption_body, CAPTION_CORNER_W, 0,
-    src = res_caption_right;
+//                 w, CAPTION_HEIGHT, 0);
-    for(i = 0; i < CAPTION_HEIGHT; i++)
-    {
-        for(j = 0; j < CAPTION_CORNER_W; j++)
-            pixmap[j] = src[j];
-        pixmap+= cpt->ctx.stride/4;
         src+= CAPTION_CORNER_W;
-    };
+    };
+    blit_raw(&cpt->ctx,res_caption_right, cpt->ctrl.w - CAPTION_CORNER_W, 0,
+             CAPTION_CORNER_W, CAPTION_HEIGHT,CAPTION_CORNER_W*4);
-    bitmap_t bitmap;
+    rc.l = 8;
+    rc.t = 0;
+    rc.r = cpt->ctrl.w - 25 - 16 - 5 - 8;
-    bitmap.data  = cpt->ctx.pixmap;
+    rc.b = 18;
     bitmap.pitch = cpt->ctx.stride;
     printf(cpt->text);
-    draw_text(&bitmap, win_font, cpt->text, 8, 18, 0xFFFFFFFF);
+    draw_text_ext(cpt->ctx.pixmap, win_font, cpt->text, &rc, 0xFFFFFFFF);
     ctrl_t *child;
     child  = (ctrl_t*)cpt->ctrl.child.next;
     while( &child->link != &cpt->ctrl.child)
+    {
         send_message(child, 1, 0, 0);
         child = (ctrl_t*)child->link.next;
     };
 };
 int caption_proc(ctrl_t *ctrl, uint32_t msg, uint32_t arg1, uint32_t arg2)
+{
     caption_t *cpt = (caption_t*)ctrl;
     window_t *win  = (window_t*)ctrl->parent;
     ctrl_t *child;
     int x, y;
     x = ((pos_t)arg2).x;
     y = ((pos_t)arg2).y;
     switch( msg )
+    {
         case 1:
             break;
         case MSG_MOUSEMOVE:
             child = get_child(ctrl, x, y);
             if( win->child_over )
+            {
                 if(child == win->child_over)
                     send_message(child, msg, 0, arg2);
                 else
                     send_message(win->child_over, MSG_MOUSELEAVE, 0, arg2);
             };
             win->child_over = child;
             if( child )
+            {
                 send_message(child, MSG_MOUSEENTER, 0, arg2);
                 send_message(child,msg,0,arg2);
+            }
             else if(main_cursor != 0)
+            {
                 set_cursor(0);
                 main_cursor = 0;
+            }
             break;
         case MSG_COMMAND:
             switch((short)arg1)
+            {
                 case ID_CLOSE:
                     win = (window_t*)ctrl->parent;
                     win->win_command = WIN_CLOSED;
                     break;
                 case ID_MINIMIZE:
                     __asm__ __volatile__(
                     "int $0x40"
                     ::"a"(18),"b"(10));
                     break;
                 default:
                     break;
             };
         default:
             child = get_child(ctrl, x, y);
             if(child)
                 return send_message(child, msg, 0, arg2);
+    }
     return 1;
 };
 void blit_caption(caption_t *cpt)
+{
 //    printf("%s w:%d h:%d stride: %d\n",__FUNCTION__,
 //            cpt->ctrl.w, cpt->ctrl.h, cpt->ctx.stride);
-    Blit(cpt->ctx.pixmap, 0, 0, 0, 0, cpt->ctrl.w, cpt->ctrl.h,
+    Blit(cpt->ctx.pixmap->data, 0, 0, 0, 0, cpt->ctrl.w, cpt->ctrl.h,
-         cpt->ctrl.w, cpt->ctrl.h, cpt->ctx.stride);
+         cpt->ctrl.w, cpt->ctrl.h, cpt->ctx.pixmap->pitch);
 };

Subversion Repositories Kolibri OS

(root)/programs/media/Fplay/winlib/caption.c – Rev 3068 → 3248