Changes in uspace/lib/ui/src/ui.c [26edcd6:3d10a2f] in mainline
- File:
-
- 1 edited
-
uspace/lib/ui/src/ui.c (modified) (21 diffs)
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/ui/src/ui.c
r26edcd6 r3d10a2f 1 1 /* 2 * Copyright (c) 202 6Jiri Svoboda2 * Copyright (c) 2021 Jiri Svoboda 3 3 * All rights reserved. 4 4 * … … 39 39 #include <errno.h> 40 40 #include <fibril.h> 41 #include <fibril_synch.h>42 41 #include <gfx/color.h> 43 #include <gfx/cursor.h>44 42 #include <gfx/render.h> 45 43 #include <io/console.h> … … 48 46 #include <str.h> 49 47 #include <task.h> 50 #include <types/common.h>51 #include <ui/clickmatic.h>52 48 #include <ui/ui.h> 53 49 #include <ui/wdecor.h> 54 50 #include <ui/window.h> 55 #include "../private/wdecor.h"56 51 #include "../private/window.h" 57 52 #include "../private/ui.h" … … 66 61 * @param ws Place to store window system type (protocol) 67 62 * @param osvc Place to store pointer to output service name 68 * @param ridev_id Place to store input device ID 69 * @return EOK on success, EINVAL if syntax is invalid, ENOMEM if out of 70 * memory 71 */ 72 static errno_t ui_ospec_parse(const char *ospec, ui_winsys_t *ws, 73 char **osvc, sysarg_t *ridev_id) 63 */ 64 static void ui_ospec_parse(const char *ospec, ui_winsys_t *ws, 65 const char **osvc) 74 66 { 75 67 const char *cp; 76 const char *qm; 77 const char *endptr;78 uint64_t idev_id;79 errno_t rc;80 81 *ridev_id = 0;68 69 if (ospec == UI_DISPLAY_DEFAULT) { 70 *ws = ui_ws_display; 71 *osvc = DISPLAY_DEFAULT; 72 return; 73 } 82 74 83 75 cp = ospec; … … 85 77 ++cp; 86 78 87 /* Window system / protocol */88 79 if (*cp == '@') { 89 80 if (str_lcmp(ospec, "disp@", str_length("disp@")) == 0) { … … 93 84 } else if (str_lcmp(ospec, "null@", str_length("null@")) == 0) { 94 85 *ws = ui_ws_null; 95 } else if (str_lcmp(ospec, "@", str_length("@")) == 0) {96 *ws = ui_ws_any;97 86 } else { 98 87 *ws = ui_ws_unknown; 99 88 } 100 89 101 ++cp; 90 if (cp[1] != '\0') 91 *osvc = cp + 1; 92 else 93 *osvc = NULL; 102 94 } else { 103 95 *ws = ui_ws_display; 104 } 105 106 /* Output service is the part before question mark */ 107 qm = str_chr(cp, '?'); 108 if (qm != NULL) { 109 *osvc = str_ndup(cp, qm - cp); 110 } else { 111 /* No question mark */ 112 *osvc = str_dup(cp); 113 } 114 115 if (*osvc == NULL) 116 return ENOMEM; 117 118 if (qm != NULL) { 119 /* The part after the question mark */ 120 cp = qm + 1; 121 122 /* Input device ID parameter */ 123 if (str_lcmp(cp, "idev=", str_length("idev=")) == 0) { 124 cp += str_length("idev="); 125 126 rc = str_uint64_t(cp, &endptr, 10, false, &idev_id); 127 if (rc != EOK) 128 goto error; 129 130 *ridev_id = idev_id; 131 cp = endptr; 132 } 133 } 134 135 if (*cp != '\0') { 136 rc = EINVAL; 137 goto error; 138 } 139 140 return EOK; 141 error: 142 free(*osvc); 143 *osvc = NULL; 144 return rc; 96 *osvc = ospec; 97 } 145 98 } 146 99 … … 161 114 console_gc_t *cgc; 162 115 ui_winsys_t ws; 163 c har *osvc;116 const char *osvc; 164 117 sysarg_t cols; 165 118 sysarg_t rows; 166 sysarg_t idev_id;167 119 ui_t *ui; 168 120 169 rc = ui_ospec_parse(ospec, &ws, &osvc, &idev_id); 170 if (rc != EOK) 171 return rc; 172 173 if (ws == ui_ws_display || ws == ui_ws_any) { 174 rc = display_open((str_cmp(osvc, "") != 0) ? osvc : 175 DISPLAY_DEFAULT, &display); 121 ui_ospec_parse(ospec, &ws, &osvc); 122 123 if (ws == ui_ws_display) { 124 rc = display_open(osvc, &display); 176 125 if (rc != EOK) 177 goto disp_fail;126 return rc; 178 127 179 128 rc = ui_create_disp(display, &ui); 180 129 if (rc != EOK) { 181 130 display_close(display); 182 goto disp_fail; 183 } 184 185 free(osvc); 186 ui->myoutput = true; 187 ui->idev_id = idev_id; 188 *rui = ui; 189 return EOK; 190 } 191 192 disp_fail: 193 if (ws == ui_ws_console || ws == ui_ws_any) { 131 return rc; 132 } 133 } else if (ws == ui_ws_console) { 194 134 console = console_init(stdin, stdout); 195 135 if (console == NULL) 196 goto cons_fail;136 return EIO; 197 137 198 138 rc = console_get_size(console, &cols, &rows); 199 139 if (rc != EOK) { 200 140 console_done(console); 201 goto cons_fail;141 return rc; 202 142 } 203 143 … … 208 148 if (rc != EOK) { 209 149 console_done(console); 210 goto cons_fail;150 return rc; 211 151 } 212 152 … … 215 155 ui_destroy(ui); 216 156 console_done(console); 217 goto cons_fail; 218 } 219 220 free(osvc); 157 return rc; 158 } 221 159 222 160 ui->cgc = cgc; … … 227 165 228 166 (void) ui_paint(ui); 229 ui->myoutput = true; 230 *rui = ui; 231 return EOK; 232 } 233 234 cons_fail: 235 if (ws == ui_ws_null) { 236 free(osvc); 167 } else if (ws == ui_ws_null) { 237 168 rc = ui_create_disp(NULL, &ui); 238 169 if (rc != EOK) 239 170 return rc; 240 241 ui->myoutput = true; 242 *rui = ui; 243 return EOK; 244 } 245 246 free(osvc); 247 return EINVAL; 171 } else { 172 return EINVAL; 173 } 174 175 ui->myoutput = true; 176 *rui = ui; 177 return EOK; 248 178 } 249 179 … … 256 186 { 257 187 ui_t *ui; 258 errno_t rc;259 188 260 189 ui = calloc(1, sizeof(ui_t)); … … 262 191 return ENOMEM; 263 192 264 rc = ui_clickmatic_create(ui, &ui->clickmatic);265 if (rc != EOK) {266 free(ui);267 return rc;268 }269 270 193 ui->console = console; 271 194 list_initialize(&ui->windows); 272 fibril_mutex_initialize(&ui->lock);273 195 *rui = ui; 274 196 return EOK; … … 284 206 { 285 207 ui_t *ui; 286 errno_t rc;287 208 288 209 ui = calloc(1, sizeof(ui_t)); … … 290 211 return ENOMEM; 291 212 292 rc = ui_clickmatic_create(ui, &ui->clickmatic);293 if (rc != EOK) {294 free(ui);295 return rc;296 }297 298 213 ui->display = disp; 299 214 list_initialize(&ui->windows); 300 fibril_mutex_initialize(&ui->lock);301 215 *rui = ui; 302 216 return EOK; … … 326 240 } 327 241 328 /** Resize UI after screen size change.329 *330 * @param ui UI331 * @param rect New screen rectangle.332 */333 static void ui_resize(ui_t *ui, gfx_rect_t *rect)334 {335 ui_window_t *wnd;336 337 ui->rect = *rect;338 339 /* Reposition/resize windows */340 wnd = ui_window_first(ui);341 while (wnd != NULL) {342 ui_window_update_placement(wnd);343 wnd = ui_window_next(wnd);344 }345 346 /*347 * XXX Resizing cleared console GC so we need to repaint the348 * background.349 */350 (void)ui_paint(ui);351 }352 353 242 static void ui_cons_event_process(ui_t *ui, cons_event_t *event) 354 243 { … … 356 245 ui_evclaim_t claim; 357 246 pos_event_t pos; 358 sysarg_t cols, rows;359 gfx_rect_t rect;360 errno_t rc;361 247 362 248 awnd = ui_window_get_active(ui); … … 366 252 switch (event->type) { 367 253 case CEV_KEY: 368 ui_lock(ui);369 254 ui_window_send_kbd(awnd, &event->ev.key); 370 ui_unlock(ui);371 255 break; 372 256 case CEV_POS: … … 378 262 claim = ui_wdecor_pos_event(awnd->wdecor, &pos); 379 263 /* Note: If event is claimed, awnd might not be valid anymore */ 380 if (claim == ui_unclaimed) { 381 ui_lock(ui); 264 if (claim == ui_unclaimed) 382 265 ui_window_send_pos(awnd, &pos); 383 ui_unlock(ui); 384 } 385 386 break; 387 case CEV_RESIZE: 388 rc = console_gc_resize(ui->cgc); 389 if (rc != EOK) { 390 /* XXX No good way to recover. */ 391 console_done(ui->console); 392 exit(1); 393 } 394 395 rc = console_get_size(ui->console, &cols, &rows); 396 if (rc != EOK) { 397 /* XXX No good way to recover. */ 398 console_done(ui->console); 399 exit(1); 400 } 401 402 ui_lock(ui); 403 404 rect.p0.x = 0; 405 rect.p0.y = 0; 406 rect.p1.x = cols; 407 rect.p1.y = rows; 408 409 ui_resize(ui, &rect); 410 ui_unlock(ui); 266 411 267 break; 412 268 } … … 460 316 errno_t rc; 461 317 gfx_context_t *gc; 462 ui_window_t * wnd;318 ui_window_t *awnd; 463 319 gfx_color_t *color = NULL; 464 320 … … 487 343 gfx_color_delete(color); 488 344 489 /* Repaint all windows */ 490 wnd = ui_window_first(ui); 491 while (wnd != NULL) { 492 rc = ui_wdecor_paint(wnd->wdecor); 493 if (rc != EOK) 494 return rc; 495 496 rc = ui_window_paint(wnd); 497 if (rc != EOK) 498 return rc; 499 500 wnd = ui_window_next(wnd); 501 } 502 503 return EOK; 504 } 505 506 /** Free up console for other users. 507 * 508 * Release console resources for another application (that the current 509 * task is starting). After the other application finishes, resume 510 * operation with ui_resume(). No calls to UI must happen inbetween 511 * and no events must be processed (i.e. the calling function must not 512 * return control to UI. 513 * 514 * @param ui UI 515 * @return EOK on success or an error code 516 */ 517 errno_t ui_suspend(ui_t *ui) 518 { 519 errno_t rc; 520 521 assert(!ui->suspended); 522 523 if (ui->cgc == NULL) { 524 ui->suspended = true; 345 /* XXX Should repaint all windows */ 346 awnd = ui_window_get_active(ui); 347 if (awnd == NULL) 525 348 return EOK; 526 } 527 528 (void) console_set_caption(ui->console, ""); 529 rc = console_gc_suspend(ui->cgc); 349 350 rc = ui_wdecor_paint(awnd->wdecor); 530 351 if (rc != EOK) 531 352 return rc; 532 353 533 ui->suspended = true; 534 return EOK; 535 } 536 537 /** Resume suspended UI. 538 * 539 * Reclaim console resources (after child application has finished running) 540 * and restore UI operation previously suspended by calling ui_suspend(). 541 * 542 * @param ui UI 543 * @return EOK on success or an error code 544 */ 545 errno_t ui_resume(ui_t *ui) 546 { 547 errno_t rc; 548 ui_window_t *awnd; 549 sysarg_t col; 550 sysarg_t row; 551 cons_event_t ev; 552 553 assert(ui->suspended); 554 555 if (ui->cgc == NULL) { 556 ui->suspended = false; 557 return EOK; 558 } 559 560 rc = console_get_pos(ui->console, &col, &row); 561 if (rc != EOK) 562 return rc; 563 564 /* 565 * Here's a little heuristic to help determine if we need 566 * to pause before returning to the UI. If we are in the 567 * top-left corner, chances are the screen is empty and 568 * there is no need to pause. 569 */ 570 if (col != 0 || row != 0) { 571 printf("Press any key or button to continue...\n"); 572 573 while (true) { 574 rc = console_get_event(ui->console, &ev); 575 if (rc != EOK) 576 return EIO; 577 578 if (ev.type == CEV_KEY && ev.ev.key.type == KEY_PRESS) 579 break; 580 581 if (ev.type == CEV_POS && ev.ev.pos.type == POS_PRESS) 582 break; 583 } 584 } 585 586 rc = console_gc_resume(ui->cgc); 587 if (rc != EOK) 588 return rc; 589 590 ui->suspended = false; 591 592 awnd = ui_window_get_active(ui); 593 if (awnd != NULL) 594 (void) console_set_caption(ui->console, awnd->wdecor->caption); 595 596 rc = gfx_cursor_set_visible(console_gc_get_ctx(ui->cgc), false); 597 if (rc != EOK) 598 return rc; 599 600 return EOK; 601 } 602 603 /** Determine if UI is suspended. 604 * 605 * @param ui UI 606 * @return @c true iff UI is suspended 607 */ 608 bool ui_is_suspended(ui_t *ui) 609 { 610 return ui->suspended; 611 } 612 613 /** Lock UI. 614 * 615 * Block UI from calling window callbacks. @c ui_lock() and @c ui_unlock() 616 * must be used when accessing UI resources from a fibril (as opposed to 617 * from a window callback). 618 * 619 * @param ui UI 620 */ 621 void ui_lock(ui_t *ui) 622 { 623 if (ui->display != NULL) 624 display_lock(ui->display); 625 fibril_mutex_lock(&ui->lock); 626 } 627 628 /** Unlock UI. 629 * 630 * Allow UI to call window callbacks. @c ui_lock() and @c ui_unlock() 631 * must be used when accessing window resources from a fibril (as opposed to 632 * from a window callback). 633 * 634 * @param ui UI 635 */ 636 void ui_unlock(ui_t *ui) 637 { 638 fibril_mutex_unlock(&ui->lock); 639 if (ui->display != NULL) 640 display_unlock(ui->display); 354 return ui_window_paint(awnd); 641 355 } 642 356 … … 678 392 } 679 393 680 /** Get UI screen rectangle.681 *682 * @param ui User interface683 * @param rect Place to store bounding rectangle684 */685 errno_t ui_get_rect(ui_t *ui, gfx_rect_t *rect)686 {687 display_info_t info;688 sysarg_t cols, rows;689 errno_t rc;690 691 if (ui->display != NULL) {692 rc = display_get_info(ui->display, &info);693 if (rc != EOK)694 return rc;695 696 *rect = info.rect;697 } else if (ui->console != NULL) {698 rc = console_get_size(ui->console, &cols, &rows);699 if (rc != EOK)700 return rc;701 702 rect->p0.x = 0;703 rect->p0.y = 0;704 rect->p1.x = cols;705 rect->p1.y = rows;706 } else {707 return ENOTSUP;708 }709 710 return EOK;711 }712 713 /** Get clickmatic from UI.714 *715 * @pararm ui UI716 * @return Clickmatic717 */718 ui_clickmatic_t *ui_get_clickmatic(ui_t *ui)719 {720 return ui->clickmatic;721 }722 723 394 /** @} 724 395 */
Note:
See TracChangeset
for help on using the changeset viewer.
