Changes in uspace/srv/hid/display/seat.c [d7f82635:0d00e53] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/hid/display/seat.c
rd7f82635 r0d00e53 1 1 /* 2 * Copyright (c) 202 1Jiri Svoboda2 * Copyright (c) 2024 Jiri Svoboda 3 3 * All rights reserved. 4 4 * … … 38 38 #include <gfx/color.h> 39 39 #include <gfx/render.h> 40 #include <sif.h> 41 #include <stdio.h> 40 42 #include <stdlib.h> 43 #include <str.h> 41 44 #include "client.h" 42 45 #include "cursor.h" 43 46 #include "display.h" 47 #include "idevcfg.h" 44 48 #include "seat.h" 45 49 #include "window.h" … … 51 55 * 52 56 * @param display Parent display 57 * @param name Seat name 53 58 * @param rseat Place to store pointer to new seat. 54 59 * @return EOK on success, ENOMEM if out of memory 55 60 */ 56 errno_t ds_seat_create(ds_display_t *display, ds_seat_t **rseat) 61 errno_t ds_seat_create(ds_display_t *display, const char *name, 62 ds_seat_t **rseat) 57 63 { 58 64 ds_seat_t *seat; 65 ds_seat_t *s0; 66 67 s0 = ds_display_first_seat(display); 68 while (s0 != NULL) { 69 if (str_cmp(s0->name, name) == 0) 70 return EEXIST; 71 s0 = ds_display_next_seat(s0); 72 } 59 73 60 74 seat = calloc(1, sizeof(ds_seat_t)); … … 62 76 return ENOMEM; 63 77 78 seat->name = str_dup(name); 79 if (seat->name == NULL) { 80 free(seat); 81 return ENOMEM; 82 } 83 84 list_initialize(&seat->idevcfgs); 85 64 86 ds_display_add_seat(display, seat); 65 87 seat->pntpos.x = 0; … … 68 90 seat->client_cursor = display->cursor[dcurs_arrow]; 69 91 seat->wm_cursor = NULL; 92 seat->focus = ds_display_first_window(display); 70 93 71 94 *rseat = seat; … … 79 102 void ds_seat_destroy(ds_seat_t *seat) 80 103 { 104 ds_idevcfg_t *idevcfg; 105 106 /* Remove all input device configuration entries pointing to this seat */ 107 idevcfg = ds_seat_first_idevcfg(seat); 108 while (idevcfg != NULL) { 109 ds_idevcfg_destroy(idevcfg); 110 idevcfg = ds_seat_first_idevcfg(seat); 111 } 112 113 /* Remove this seat's focus */ 114 if (seat->focus != NULL) 115 ds_window_post_unfocus_event(seat->focus); 116 81 117 ds_display_remove_seat(seat); 118 119 free(seat->name); 82 120 free(seat); 83 121 } 84 122 123 /** Load seat from SIF node. 124 * 125 * @param display Display 126 * @param snode Seat node from which to load the seat 127 * @param rseat Place to store pointer to the newly loaded seat 128 * 129 * @return EOK on success or an error code 130 */ 131 errno_t ds_seat_load(ds_display_t *display, sif_node_t *snode, 132 ds_seat_t **rseat) 133 { 134 const char *sid; 135 const char *name; 136 char *endptr; 137 unsigned long id; 138 errno_t rc; 139 140 sid = sif_node_get_attr(snode, "id"); 141 if (sid == NULL) 142 return EIO; 143 144 name = sif_node_get_attr(snode, "name"); 145 if (name == NULL) 146 return EIO; 147 148 id = strtoul(sid, &endptr, 10); 149 if (*endptr != '\0') 150 return EIO; 151 152 rc = ds_seat_create(display, name, rseat); 153 if (rc != EOK) 154 return EIO; 155 156 (*rseat)->id = id; 157 return EOK; 158 } 159 160 /** Save seat to SIF node. 161 * 162 * @param seat Seat 163 * @param snode Seat node into which the seat should be saved 164 * 165 * @return EOK on success or an error code 166 */ 167 errno_t ds_seat_save(ds_seat_t *seat, sif_node_t *snode) 168 { 169 char *sid; 170 errno_t rc; 171 int rv; 172 173 rv = asprintf(&sid, "%lu", (unsigned long)seat->id); 174 if (rv < 0) { 175 rc = ENOMEM; 176 return rc; 177 } 178 179 rc = sif_node_set_attr(snode, "id", sid); 180 if (rc != EOK) { 181 free(sid); 182 return rc; 183 } 184 185 free(sid); 186 187 rc = sif_node_set_attr(snode, "name", seat->name); 188 if (rc != EOK) 189 return rc; 190 191 return EOK; 192 } 193 85 194 /** Set seat focus to a window. 86 195 * … … 90 199 void ds_seat_set_focus(ds_seat_t *seat, ds_window_t *wnd) 91 200 { 201 errno_t rc; 202 92 203 if (wnd == seat->focus) { 93 204 /* Focus is not changing */ 94 205 return; 206 } 207 208 if (wnd != NULL) { 209 rc = ds_window_unminimize(wnd); 210 if (rc != EOK) 211 return; 95 212 } 96 213 … … 130 247 /** Evacuate seat references to window. 131 248 * 132 * If seat's focus is @a wnd, it will be set to a different window.249 * If seat's focus is @a wnd, it will be set to NULL. 133 250 * If seat's popup window is @a wnd, it will be set to NULL. 134 251 * 135 252 * @param seat Seat 136 * @param wnd Window to evacuate focus from253 * @param wnd Window to evacuate references from 137 254 */ 138 255 void ds_seat_evac_wnd_refs(ds_seat_t *seat, ds_window_t *wnd) 139 256 { 140 ds_window_t *nwnd; 141 142 if (seat->focus == wnd) { 143 nwnd = ds_display_prev_window(wnd); 144 if (nwnd == NULL) 145 nwnd = ds_display_last_window(wnd->display); 146 if (nwnd == wnd) 147 nwnd = NULL; 148 149 ds_seat_set_focus(seat, nwnd); 150 } 257 if (seat->focus == wnd) 258 ds_seat_set_focus(seat, NULL); 151 259 152 260 if (seat->popup == wnd) … … 154 262 } 155 263 264 /** Unfocus window. 265 * 266 * If seat's focus is @a wnd, it will be set to a different window 267 * that is not minimized, preferably not a system window. 268 * 269 * @param seat Seat 270 * @param wnd Window to remove focus from 271 */ 272 void ds_seat_unfocus_wnd(ds_seat_t *seat, ds_window_t *wnd) 273 { 274 ds_window_t *nwnd; 275 276 if (seat->focus != wnd) 277 return; 278 279 /* Find alternate window that is neither system nor minimized */ 280 nwnd = ds_window_find_prev(wnd, ~(wndf_minimized | wndf_system)); 281 282 if (nwnd == NULL) { 283 /* Find alternate window that is not minimized */ 284 nwnd = ds_window_find_prev(wnd, ~wndf_minimized); 285 } 286 287 ds_seat_set_focus(seat, nwnd); 288 } 289 156 290 /** Switch focus to another window. 157 291 * … … 163 297 ds_window_t *nwnd; 164 298 165 if (seat->focus != NULL) 166 nwnd = ds_display_prev_window(seat->focus); 167 else 168 nwnd = NULL; 169 170 if (nwnd == NULL) 171 nwnd = ds_display_last_window(seat->display); 172 299 if (seat->focus != NULL) { 300 /* Find alternate window that is not a system window */ 301 nwnd = ds_window_find_next(seat->focus, ~wndf_system); 302 } else { 303 /* Currently no focus. Focus topmost window. */ 304 nwnd = ds_display_first_window(seat->display); 305 } 306 307 /* Only switch focus if there is another window */ 173 308 if (nwnd != NULL) 174 309 ds_seat_set_focus(seat, nwnd); … … 357 492 /* Focus window on button press */ 358 493 if (event->type == PTD_PRESS && event->btn_num == 1) { 359 if (wnd != NULL && (wnd->flags & wndf_popup) == 0) { 494 if (wnd != NULL && (wnd->flags & wndf_popup) == 0 && 495 (wnd->flags & wndf_nofocus) == 0) { 360 496 ds_seat_set_focus(seat, wnd); 361 497 } 362 498 } 363 499 364 if (event->type == PTD_PRESS || event->type == PTD_RELEASE) { 365 pevent.pos_id = 0; 366 pevent.type = (event->type == PTD_PRESS) ? 367 POS_PRESS : POS_RELEASE; 500 if (event->type == PTD_PRESS || event->type == PTD_RELEASE || 501 event->type == PTD_DCLICK) { 502 pevent.pos_id = event->pos_id; 503 switch (event->type) { 504 case PTD_PRESS: 505 pevent.type = POS_PRESS; 506 break; 507 case PTD_RELEASE: 508 pevent.type = POS_RELEASE; 509 break; 510 case PTD_DCLICK: 511 pevent.type = POS_DCLICK; 512 break; 513 default: 514 assert(false); 515 } 516 368 517 pevent.btn_num = event->btn_num; 369 518 pevent.hpos = seat->pntpos.x; … … 382 531 seat->pntpos = npos; 383 532 384 pevent.pos_id = 0;533 pevent.pos_id = event->pos_id; 385 534 pevent.type = POS_UPDATE; 386 535 pevent.btn_num = 0; … … 410 559 seat->pntpos = npos; 411 560 412 pevent.pos_id = 0;561 pevent.pos_id = event->pos_id; 413 562 pevent.type = POS_UPDATE; 414 563 pevent.btn_num = 0; … … 435 584 errno_t ds_seat_post_pos_event(ds_seat_t *seat, pos_event_t *event) 436 585 { 437 ds_window_t *wnd; 586 ds_window_t *pwindow; 587 ds_window_t *cwindow; 438 588 errno_t rc; 439 589 440 wnd = ds_display_window_by_pos(seat->display, &seat->pntpos); 590 /* Window under pointer */ 591 pwindow = ds_display_window_by_pos(seat->display, &seat->pntpos); 592 593 /* Current window: popup or focused */ 594 cwindow = seat->popup; 595 if (cwindow == NULL) 596 cwindow = seat->focus; 597 598 /* 599 * Deliver move and release event to current window if different 600 * from pwindow 601 */ 602 if (event->type != POS_PRESS && cwindow != NULL && 603 cwindow != pwindow) { 604 rc = ds_window_post_pos_event(cwindow, event); 605 if (rc != EOK) 606 return rc; 607 } 608 609 if (pwindow != NULL) { 610 /* Moving over a window */ 611 ds_seat_set_client_cursor(seat, pwindow->cursor); 612 613 rc = ds_window_post_pos_event(pwindow, event); 614 if (rc != EOK) 615 return rc; 616 } else { 617 /* Not over a window */ 618 ds_seat_set_client_cursor(seat, 619 seat->display->cursor[dcurs_arrow]); 620 } 441 621 442 622 /* Click outside popup window */ 443 if (event->type == POS_PRESS && wnd!= seat->popup) {623 if (event->type == POS_PRESS && pwindow != seat->popup) { 444 624 /* Close popup window */ 445 625 ds_seat_set_popup(seat, NULL); 446 626 } 447 627 448 /* Deliver event to popup window. */449 if (seat->popup != NULL) {450 rc = ds_window_post_pos_event(seat->popup, event);451 if (rc != EOK)452 return rc;453 }454 455 if (seat->focus != wnd && seat->focus != NULL) {456 rc = ds_window_post_pos_event(seat->focus, event);457 if (rc != EOK)458 return rc;459 460 /* Only deliver release events to the focused window */461 if (event->type == POS_RELEASE)462 return EOK;463 }464 465 if (wnd != NULL) {466 /* Moving over a window */467 ds_seat_set_client_cursor(seat, wnd->cursor);468 469 /*470 * Only deliver event if we didn't already deliver it471 * to the same window above.472 */473 if (wnd != seat->popup) {474 rc = ds_window_post_pos_event(wnd, event);475 if (rc != EOK)476 return rc;477 }478 } else {479 /* Not over a window */480 ds_seat_set_client_cursor(seat, seat->display->cursor[dcurs_arrow]);481 }482 483 628 return EOK; 484 629 } … … 497 642 } 498 643 644 /** Add input device configuration entry to seat. 645 * 646 * @param seat Seat 647 * @param idevcfg Input device configuration 648 */ 649 void ds_seat_add_idevcfg(ds_seat_t *seat, ds_idevcfg_t *idevcfg) 650 { 651 assert(idevcfg->seat == NULL); 652 assert(!link_used(&idevcfg->lseatidcfgs)); 653 654 idevcfg->seat = seat; 655 list_append(&idevcfg->lseatidcfgs, &seat->idevcfgs); 656 } 657 658 /** Remove input device configuration entry from seat. 659 * 660 * @param idevcfg Input device configuration entry 661 */ 662 void ds_seat_remove_idevcfg(ds_idevcfg_t *idevcfg) 663 { 664 list_remove(&idevcfg->lseatidcfgs); 665 idevcfg->seat = NULL; 666 } 667 668 /** Get first input device configuration entry in seat. 669 * 670 * @param disp Display 671 * @return First input device configuration entry or @c NULL if there is none 672 */ 673 ds_idevcfg_t *ds_seat_first_idevcfg(ds_seat_t *seat) 674 { 675 link_t *link = list_first(&seat->idevcfgs); 676 677 if (link == NULL) 678 return NULL; 679 680 return list_get_instance(link, ds_idevcfg_t, lseatidcfgs); 681 } 682 683 /** Get next input device configuration entry in seat. 684 * 685 * @param idevcfg Current input device configuration entry 686 * @return Next input device configuration entry or @c NULL if there is none 687 */ 688 ds_idevcfg_t *ds_seat_next_idevcfg(ds_idevcfg_t *idevcfg) 689 { 690 link_t *link = list_next(&idevcfg->lseatidcfgs, &idevcfg->seat->idevcfgs); 691 692 if (link == NULL) 693 return NULL; 694 695 return list_get_instance(link, ds_idevcfg_t, lseatidcfgs); 696 } 697 499 698 /** @} 500 699 */
Note:
See TracChangeset
for help on using the changeset viewer.