Changeset 6feccae in mainline


Ignore:
Timestamp:
2020-05-11T16:20:17Z (5 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
4d8002d
Parents:
83cb672
Message:

Remove compositor, libgraph

Libgraph is the old display driver protocol library (replaced by libddev).
We need to keep libdraw/libsoftrend for now as they are required by libgui.

Location:
uspace
Files:
9 deleted
8 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/c/include/io/window.h

    r83cb672 r6feccae  
    3636#define _LIBC_IO_WINDOW_H_
    3737
    38 #include <stdbool.h>
    39 #include <async.h>
    40 #include <loc.h>
    4138#include <io/kbd_event.h>
    4239#include <io/pos_event.h>
     40#include <types/common.h>
    4341
    4442typedef enum {
    … …  
    113111} window_event_t;
    114112
    115 extern errno_t win_register(async_sess_t *, window_flags_t, service_id_t *,
    116     service_id_t *);
    117 
    118 extern errno_t win_get_event(async_sess_t *, window_event_t *);
    119 
    120 extern errno_t win_damage(async_sess_t *, sysarg_t, sysarg_t, sysarg_t, sysarg_t);
    121 extern errno_t win_grab(async_sess_t *, sysarg_t, sysarg_t);
    122 extern errno_t win_resize(async_sess_t *, sysarg_t, sysarg_t, sysarg_t, sysarg_t,
    123     window_placement_flags_t, void *);
    124 extern errno_t win_close(async_sess_t *);
    125 extern errno_t win_close_request(async_sess_t *);
    126 
    127113#endif
    128114

  • uspace/lib/c/meson.build

    r83cb672 r6feccae  
    132132        'generic/io/table.c',
    133133        'generic/io/visualizer.c',
    134         'generic/io/window.c',
    135134        'generic/iplink.c',
    136135        'generic/iplink_srv.c',

  • uspace/lib/gui/terminal.c

    r83cb672 r6feccae  
    4242#include <io/concaps.h>
    4343#include <io/console.h>
     44#include <loc.h>
    4445#include <task.h>
    4546#include <adt/list.h>

  • uspace/lib/gui/terminal.h

    r83cb672 r6feccae  
    4242#include <io/chargrid.h>
    4343#include <io/con_srv.h>
     44#include <loc.h>
    4445#include <adt/list.h>
    4546#include <adt/prodcons.h>

  • uspace/lib/gui/window.c

    r83cb672 r6feccae  
    519519
    520520        if (width > 0 && height > 0) {
    521                 /* Notify compositor. */
    522                 //win_damage(win->osess, x, y, width, height);
    523 
    524521                rect.p0.x = x;
    525522                rect.p0.y = y;

  • uspace/lib/gui/window.h

    r83cb672 r6feccae  
    6161        widget_t *focus; /**< Widget owning the keyboard or NULL. */
    6262        fibril_mutex_t guard; /**< Mutex guarding window surface. */
    63         surface_t *surface; /**< Window surface shared with compositor. */
     63        surface_t *surface; /**< Window surface shared with display server. */
    6464        gfx_bitmap_t *bitmap; /**< Window bitmap */
    6565};
    6666
    6767/**
    68  * Allocate all resources for new window and register it in the compositor.
     68 * Allocate all resources for new window and register it in the display server.
    6969 * If the window is declared as main, its closure causes termination of the
    7070 * whole application. Note that opened window does not have any surface yet.
    … …  
    7575/**
    7676 * Post resize event into event loop. Window negotiates new surface with
    77  * compositor and asks all widgets in the tree to calculate their new properties
    78  * and to paint themselves on the new surface (top-bottom order). Should be
    79  * called also after opening new window to obtain surface.
     77 * display server and asks all widgets in the tree to calculate their new
     78 * properties and to paint themselves on the new surface (top-bottom order).
     79 * Should be called also after opening new window to obtain surface.
    8080 */
    8181extern void window_resize(window_t *, sysarg_t, sysarg_t, sysarg_t, sysarg_t,
    … …  
    9494
    9595/**
    96  * Post damage event into event loop. Handler informs compositor to update the
    97  * window surface on the screen. Should be called by widget after painting
     96 * Post damage event into event loop. Handler informs display server to update
     97 * the window surface on the screen. Should be called by widget after painting
    9898 * itself or copying its buffer onto window surface.
    9999 */
    … …  
    124124
    125125/**
    126  * Initiate the closing cascade for the window. First, compositor deallocates
     126 * Initiate the closing cascade for the window. First, display sever deallocates
    127127 * output resources, prepares special closing input event for the window and
    128128 * deallocates input resources after the event is dispatched. When window

  • uspace/lib/meson.build

    r83cb672 r6feccae  
    6060        'fs',
    6161        'gfx',
    62         'graph',
    6362        'http',
    6463        'label',

  • uspace/srv/meson.build

    r83cb672 r6feccae  
    4343        'fs/tmpfs',
    4444        'fs/udf',
    45         'hid/compositor',
    4645        'hid/console',
    4746        'hid/display',
Note: See TracChangeset for help on using the changeset viewer.