Changeset 6fbd1f9 in mainline
- Timestamp:
- 2024-10-14T16:30:24Z (2 months ago)
- Branches:
- master
- Children:
- 514108e
- Parents:
- b3b79981
- Location:
- uspace/srv/hid/display
- Files:
-
- 4 added
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/hid/display/display.c
rb3b79981 r6fbd1f9 105 105 list_initialize(&disp->ddevs); 106 106 list_initialize(&disp->idevcfgs); 107 list_initialize(&disp->ievents); 108 fibril_condvar_initialize(&disp->ievent_cv); 107 109 list_initialize(&disp->seats); 108 110 list_initialize(&disp->windows); … … 129 131 assert(list_empty(&disp->ddevs)); 130 132 assert(list_empty(&disp->idevcfgs)); 133 assert(list_empty(&disp->ievents)); 131 134 assert(list_empty(&disp->seats)); 132 135 assert(list_empty(&disp->windows)); -
uspace/srv/hid/display/input.c
rb3b79981 r6fbd1f9 1 1 /* 2 * Copyright (c) 202 2Jiri Svoboda2 * Copyright (c) 2024 Jiri Svoboda 3 3 * All rights reserved. 4 4 * … … 40 40 #include <str_error.h> 41 41 #include "display.h" 42 #include "ievent.h" 42 43 #include "input.h" 43 44 #include "main.h" … … 87 88 88 89 ds_display_lock(disp); 89 rc = ds_ display_post_kbd_event(disp, &event);90 rc = ds_ievent_post_kbd(disp, &event); 90 91 ds_display_unlock(disp); 91 92 return rc; … … 104 105 105 106 ds_display_lock(disp); 106 rc = ds_ display_post_ptd_event(disp, &event);107 rc = ds_ievent_post_ptd(disp, &event); 107 108 ds_display_unlock(disp); 108 109 return rc; … … 126 127 127 128 ds_display_lock(disp); 128 rc = ds_ display_post_ptd_event(disp, &event);129 rc = ds_ievent_post_ptd(disp, &event); 129 130 ds_display_unlock(disp); 130 131 return rc; … … 145 146 146 147 ds_display_lock(disp); 147 rc = ds_ display_post_ptd_event(disp, &event);148 rc = ds_ievent_post_ptd(disp, &event); 148 149 ds_display_unlock(disp); 149 150 return rc; … … 163 164 164 165 ds_display_lock(disp); 165 rc = ds_ display_post_ptd_event(disp, &event);166 rc = ds_ievent_post_ptd(disp, &event); 166 167 ds_display_unlock(disp); 167 168 return rc; -
uspace/srv/hid/display/main.c
rb3b79981 r6fbd1f9 54 54 #include "display.h" 55 55 #include "dsops.h" 56 #include "ievent.h" 56 57 #include "input.h" 57 58 #include "main.h" … … 156 157 output->def_display = disp; 157 158 rc = ds_output_start_discovery(output); 159 if (rc != EOK) 160 goto error; 161 162 rc = ds_ievent_init(disp); 158 163 if (rc != EOK) 159 164 goto error; … … 211 216 ds_input_close(disp); 212 217 #endif 218 ds_ievent_fini(disp); 213 219 if (output != NULL) 214 220 ds_output_destroy(output); -
uspace/srv/hid/display/meson.build
rb3b79981 r6fbd1f9 41 41 'dsops.c', 42 42 'idevcfg.c', 43 'ievent.c', 43 44 'input.c', 44 45 'main.c', … … 59 60 'display.c', 60 61 'idevcfg.c', 62 'ievent.c', 61 63 'seat.c', 62 64 'window.c', … … 67 69 'test/cursor.c', 68 70 'test/display.c', 71 'test/ievent.c', 69 72 'test/main.c', 70 73 'test/seat.c', -
uspace/srv/hid/display/test/main.c
rb3b79981 r6fbd1f9 1 1 /* 2 * Copyright (c) 202 3Jiri Svoboda2 * Copyright (c) 2024 Jiri Svoboda 3 3 * All rights reserved. 4 4 * … … 36 36 PCUT_IMPORT(cursor); 37 37 PCUT_IMPORT(display); 38 PCUT_IMPORT(ievent); 38 39 PCUT_IMPORT(seat); 39 40 PCUT_IMPORT(window); -
uspace/srv/hid/display/types/display/display.h
rb3b79981 r6fbd1f9 1 1 /* 2 * Copyright (c) 202 3Jiri Svoboda2 * Copyright (c) 2024 Jiri Svoboda 3 3 * All rights reserved. 4 4 * … … 38 38 39 39 #include <adt/list.h> 40 #include <fibril.h> 40 41 #include <fibril_synch.h> 41 42 #include <gfx/color.h> … … 93 94 list_t idevcfgs; 94 95 96 /** Queue of input events */ 97 list_t ievents; 98 99 /** Input event processing fibril ID */ 100 fid_t ievent_fid; 101 /** Input event condition variable */ 102 fibril_condvar_t ievent_cv; 103 /** Signal input event fibril to quit */ 104 bool ievent_quit; 105 /** Input event fibril terminated */ 106 bool ievent_done; 107 95 108 /** Background color */ 96 109 gfx_color_t *bg_color;
Note:
See TracChangeset
for help on using the changeset viewer.