Changeset 25eec4e in mainline for uspace/lib/gui/canvas.h


Ignore:
Timestamp:
2013-04-19T18:38:18Z (12 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
6d717a4
Parents:
a1e2df13 (diff), 289cb7dd (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:

Merge mainline chages.

File:
1 moved

Legend:

Unmodified
Added
Removed
  • uspace/lib/gui/canvas.h

    ra1e2df13 r25eec4e  
    11/*
    2  * Copyright (c) 2011 Martin Sucha
     2 * Copyright (c) 2013 Martin Decky
    33 * All rights reserved.
    44 *
     
    2727 */
    2828
    29 /** @addtogroup fs
     29/** @addtogroup gui
    3030 * @{
    31  */
     31 */
     32/**
     33 * @file
     34 */
    3235
    33 #ifndef EXT2FS_EXT2FS_H_
    34 #define EXT2FS_EXT2FS_H_
     36#ifndef GUI_CANVAS_H_
     37#define GUI_CANVAS_H_
    3538
    36 #include <libext2.h>
    37 #include <libfs.h>
     39#include <stdbool.h>
    3840#include <sys/types.h>
     41#include <io/pixel.h>
     42#include <surface.h>
     43#include "widget.h"
    3944
    40 #define min(a, b)               ((a) < (b) ? (a) : (b))
     45typedef struct {
     46        widget_t widget;
     47        sysarg_t width;
     48        sysarg_t height;
     49        surface_t *surface;
     50} canvas_t;
    4151
    42 extern vfs_out_ops_t ext2fs_ops;
    43 extern libfs_ops_t ext2fs_libfs_ops;
    44 
    45 extern int ext2fs_global_init(void);
    46 extern int ext2fs_global_fini(void);
     52extern bool init_canvas(canvas_t *, widget_t *, sysarg_t, sysarg_t,
     53    surface_t *);
     54extern canvas_t *create_canvas(widget_t *, sysarg_t, sysarg_t, surface_t *);
     55extern void deinit_canvas(canvas_t *);
    4756
    4857#endif
    4958
    50 /**
    51  * @}
     59/** @}
    5260 */
Note: See TracChangeset for help on using the changeset viewer.