Changes in uspace/srv/hid/display/dsops.c [3be5366:195b7b3] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/hid/display/dsops.c
r3be5366 r195b7b3 1 1 /* 2 * Copyright (c) 20 23Jiri Svoboda2 * Copyright (c) 2019 Jiri Svoboda 3 3 * All rights reserved. 4 4 * … … 46 46 static errno_t disp_window_create(void *, display_wnd_params_t *, sysarg_t *); 47 47 static errno_t disp_window_destroy(void *, sysarg_t); 48 static errno_t disp_window_move_req(void *, sysarg_t, gfx_coord2_t *, 49 sysarg_t); 48 static errno_t disp_window_move_req(void *, sysarg_t, gfx_coord2_t *); 50 49 static errno_t disp_window_move(void *, sysarg_t, gfx_coord2_t *); 51 static errno_t disp_window_get_pos(void *, sysarg_t, gfx_coord2_t *);52 static errno_t disp_window_get_max_rect(void *, sysarg_t, gfx_rect_t *);53 50 static errno_t disp_window_resize_req(void *, sysarg_t, 54 display_wnd_rsztype_t, gfx_coord2_t * , sysarg_t);51 display_wnd_rsztype_t, gfx_coord2_t *); 55 52 static errno_t disp_window_resize(void *, sysarg_t, gfx_coord2_t *, 56 53 gfx_rect_t *); 57 static errno_t disp_window_minimize(void *, sysarg_t);58 static errno_t disp_window_maximize(void *, sysarg_t);59 static errno_t disp_window_unmaximize(void *, sysarg_t);60 54 static errno_t disp_window_set_cursor(void *, sysarg_t, display_stock_cursor_t); 61 static errno_t disp_window_set_caption(void *, sysarg_t, const char *);62 55 static errno_t disp_get_event(void *, sysarg_t *, display_wnd_ev_t *); 63 56 static errno_t disp_get_info(void *, display_info_t *); … … 68 61 .window_move_req = disp_window_move_req, 69 62 .window_move = disp_window_move, 70 .window_get_pos = disp_window_get_pos,71 .window_get_max_rect = disp_window_get_max_rect,72 63 .window_resize_req = disp_window_resize_req, 73 64 .window_resize = disp_window_resize, 74 .window_minimize = disp_window_minimize,75 .window_maximize = disp_window_maximize,76 .window_unmaximize = disp_window_unmaximize,77 65 .window_set_cursor = disp_window_set_cursor, 78 .window_set_caption = disp_window_set_caption,79 66 .get_event = disp_get_event, 80 67 .get_info = disp_get_info … … 86 73 errno_t rc; 87 74 ds_client_t *client = (ds_client_t *) arg; 75 ds_seat_t *seat; 88 76 ds_window_t *wnd; 89 77 … … 102 90 wnd->id); 103 91 92 /* XXX All the below should probably be part of ds_window_create() */ 93 wnd->dpos.x = ((wnd->id - 1) & 1) * 400; 94 wnd->dpos.y = ((wnd->id - 1) & 2) / 2 * 300; 95 96 seat = ds_display_first_seat(client->display); 97 ds_seat_set_focus(seat, wnd); 98 (void) ds_display_paint(wnd->display, NULL); 99 104 100 ds_display_unlock(client->display); 105 101 … … 122 118 123 119 log_msg(LOG_DEFAULT, LVL_DEBUG, "disp_window_destroy()"); 120 ds_client_remove_window(wnd); 124 121 ds_window_destroy(wnd); 125 122 ds_display_unlock(client->display); … … 128 125 129 126 static errno_t disp_window_move_req(void *arg, sysarg_t wnd_id, 130 gfx_coord2_t *pos , sysarg_t pos_id)127 gfx_coord2_t *pos) 131 128 { 132 129 ds_client_t *client = (ds_client_t *) arg; … … 142 139 143 140 log_msg(LOG_DEFAULT, LVL_DEBUG, "disp_window_move_req()"); 144 ds_window_move_req(wnd, pos , pos_id);141 ds_window_move_req(wnd, pos); 145 142 ds_display_unlock(client->display); 146 143 return EOK; … … 166 163 } 167 164 168 static errno_t disp_window_get_pos(void *arg, sysarg_t wnd_id,169 gfx_coord2_t *pos)170 {171 ds_client_t *client = (ds_client_t *) arg;172 ds_window_t *wnd;173 174 ds_display_lock(client->display);175 176 wnd = ds_client_find_window(client, wnd_id);177 if (wnd == NULL) {178 ds_display_unlock(client->display);179 return ENOENT;180 }181 182 log_msg(LOG_DEFAULT, LVL_DEBUG, "disp_window_get_pos()");183 ds_window_get_pos(wnd, pos);184 ds_display_unlock(client->display);185 return EOK;186 }187 188 static errno_t disp_window_get_max_rect(void *arg, sysarg_t wnd_id,189 gfx_rect_t *rect)190 {191 ds_client_t *client = (ds_client_t *) arg;192 ds_window_t *wnd;193 194 ds_display_lock(client->display);195 196 wnd = ds_client_find_window(client, wnd_id);197 if (wnd == NULL) {198 ds_display_unlock(client->display);199 return ENOENT;200 }201 202 log_msg(LOG_DEFAULT, LVL_DEBUG, "disp_window_get_max_rect()");203 ds_window_get_max_rect(wnd, rect);204 ds_display_unlock(client->display);205 return EOK;206 }207 208 165 static errno_t disp_window_resize_req(void *arg, sysarg_t wnd_id, 209 display_wnd_rsztype_t rsztype, gfx_coord2_t *pos , sysarg_t pos_id)166 display_wnd_rsztype_t rsztype, gfx_coord2_t *pos) 210 167 { 211 168 ds_client_t *client = (ds_client_t *) arg; … … 224 181 225 182 log_msg(LOG_DEFAULT, LVL_DEBUG, "disp_window_resize_req()"); 226 ds_window_resize_req(wnd, rsztype, pos , pos_id);183 ds_window_resize_req(wnd, rsztype, pos); 227 184 ds_display_unlock(client->display); 228 185 return EOK; … … 250 207 } 251 208 252 static errno_t disp_window_minimize(void *arg, sysarg_t wnd_id)253 {254 ds_client_t *client = (ds_client_t *) arg;255 ds_window_t *wnd;256 errno_t rc;257 258 ds_display_lock(client->display);259 260 wnd = ds_client_find_window(client, wnd_id);261 if (wnd == NULL) {262 ds_display_unlock(client->display);263 return ENOENT;264 }265 266 log_msg(LOG_DEFAULT, LVL_DEBUG, "disp_window_maximize()");267 rc = ds_window_minimize(wnd);268 ds_display_unlock(client->display);269 return rc;270 }271 272 static errno_t disp_window_maximize(void *arg, sysarg_t wnd_id)273 {274 ds_client_t *client = (ds_client_t *) arg;275 ds_window_t *wnd;276 errno_t rc;277 278 ds_display_lock(client->display);279 280 wnd = ds_client_find_window(client, wnd_id);281 if (wnd == NULL) {282 ds_display_unlock(client->display);283 return ENOENT;284 }285 286 log_msg(LOG_DEFAULT, LVL_DEBUG, "disp_window_maximize()");287 rc = ds_window_maximize(wnd);288 ds_display_unlock(client->display);289 return rc;290 }291 292 static errno_t disp_window_unmaximize(void *arg, sysarg_t wnd_id)293 {294 ds_client_t *client = (ds_client_t *) arg;295 ds_window_t *wnd;296 errno_t rc;297 298 ds_display_lock(client->display);299 300 wnd = ds_client_find_window(client, wnd_id);301 if (wnd == NULL) {302 ds_display_unlock(client->display);303 return ENOENT;304 }305 306 log_msg(LOG_DEFAULT, LVL_DEBUG, "disp_window_unmaximize()");307 rc = ds_window_unmaximize(wnd);308 ds_display_unlock(client->display);309 return rc;310 }311 312 209 static errno_t disp_window_set_cursor(void *arg, sysarg_t wnd_id, 313 210 display_stock_cursor_t cursor) … … 331 228 } 332 229 333 static errno_t disp_window_set_caption(void *arg, sysarg_t wnd_id,334 const char *caption)335 {336 ds_client_t *client = (ds_client_t *) arg;337 ds_window_t *wnd;338 errno_t rc;339 340 ds_display_lock(client->display);341 342 wnd = ds_client_find_window(client, wnd_id);343 if (wnd == NULL) {344 ds_display_unlock(client->display);345 return ENOENT;346 }347 348 log_msg(LOG_DEFAULT, LVL_DEBUG, "disp_window_set_caption()");349 rc = ds_window_set_caption(wnd, caption);350 ds_display_unlock(client->display);351 return rc;352 }353 354 230 static errno_t disp_get_event(void *arg, sysarg_t *wnd_id, 355 231 display_wnd_ev_t *event) … … 359 235 errno_t rc; 360 236 361 log_msg(LOG_DEFAULT, LVL_DEBUG 2, "disp_window_get_event()");237 log_msg(LOG_DEFAULT, LVL_DEBUG, "disp_window_get_event()"); 362 238 363 239 ds_display_lock(client->display);
Note:
See TracChangeset
for help on using the changeset viewer.