Changeset 0d00e53 in mainline
- Timestamp:
- 2024-11-07T10:38:29Z (4 weeks ago)
- Branches:
- master
- Children:
- 9a07ee3, a450088
- Parents:
- ad9e225
- git-author:
- Jiri Svoboda <jiri@…> (2024-10-06 18:37:25)
- git-committer:
- Jiri Svoboda <jiri@…> (2024-11-07 10:38:29)
- Location:
- uspace
- Files:
-
- 4 added
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/app/hello/hello.h
rad9e225 r0d00e53 1 1 /* 2 * Copyright (c) 202 0Jiri Svoboda2 * Copyright (c) 2024 Jiri Svoboda 3 3 * All rights reserved. 4 4 * … … 37 37 #define HELLO_H 38 38 39 #include <display.h>40 39 #include <ui/fixed.h> 41 40 #include <ui/label.h> -
uspace/app/meson.build
rad9e225 r0d00e53 78 78 'sbi', 79 79 'shutdown', 80 'shutdown-dlg', 80 81 'sportdmp', 81 82 'stats', -
uspace/app/shutdown/shutdown.c
rad9e225 r0d00e53 105 105 } 106 106 107 rc = nchoice_set_prompt(nchoice, "Select action"); 107 rc = nchoice_set_prompt(nchoice, "Do you want to shut the system down? " 108 "Select action:"); 108 109 if (rc != EOK) { 109 110 printf(NAME ": Out of memory.\n"); … … 194 195 195 196 fibril_mutex_lock(&shutdown.lock); 196 printf(" System is shutting down...\n");197 printf("The system is shutting down...\n"); 197 198 while (!shutdown.stopped) 198 199 fibril_condvar_wait(&shutdown.cv, &shutdown.lock); -
uspace/lib/display/include/types/display/wndparams.h
rad9e225 r0d00e53 1 1 /* 2 * Copyright (c) 202 3Jiri Svoboda2 * Copyright (c) 2024 Jiri Svoboda 3 3 * All rights reserved. 4 4 * … … 42 42 /** Popup window (capture events, no focus) */ 43 43 wndf_popup = 0x1, 44 /** Window does not receive focus */ 45 wndf_nofocus = 0x2, 44 46 /** Topmost window */ 45 wndf_topmost = 0x 2,47 wndf_topmost = 0x4, 46 48 /** Set specific initial window position */ 47 wndf_setpos = 0x 4,49 wndf_setpos = 0x8, 48 50 /** Window is minimized */ 49 wndf_minimized = 0x 8,51 wndf_minimized = 0x10, 50 52 /** Window is maximized */ 51 wndf_maximized = 0x 10,53 wndf_maximized = 0x20, 52 54 /** Special system window */ 53 wndf_system = 0x 20,55 wndf_system = 0x40, 54 56 /** Maximized windows should avoid this window */ 55 wndf_avoid = 0x 4057 wndf_avoid = 0x80 56 58 } display_wnd_flags_t; 57 59 -
uspace/lib/ui/include/types/ui/window.h
rad9e225 r0d00e53 58 58 /** Place window to the bottom-right corner of the screen */ 59 59 ui_wnd_place_bottom_right, 60 /** Place window to the center of the screen */ 61 ui_wnd_place_center, 60 62 /** Place window accross the entire screen */ 61 63 ui_wnd_place_full_screen, … … 68 70 /** Popup window */ 69 71 ui_wndf_popup = 0x1, 72 /** Window does not receive focus */ 73 ui_wndf_nofocus = 0x2, 70 74 /** Topmost window */ 71 ui_wndf_topmost = 0x 2,75 ui_wndf_topmost = 0x4, 72 76 /** Special system window */ 73 ui_wndf_system = 0x 4,77 ui_wndf_system = 0x8, 74 78 /** Maximized windows should avoid this window */ 75 ui_wndf_avoid = 0x 879 ui_wndf_avoid = 0x10 76 80 } ui_wnd_flags_t; 77 81 -
uspace/lib/ui/src/window.c
rad9e225 r0d00e53 189 189 switch (params->placement) { 190 190 case ui_wnd_place_default: 191 assert(ui_is_fullscreen(window->ui)); 191 case ui_wnd_place_center: 192 assert(params->placement != ui_wnd_place_default || 193 ui_is_fullscreen(window->ui)); 192 194 /* Center window */ 193 195 gfx_rect_dims(¶ms->rect, &dims); … … 357 359 if ((params->flags & ui_wndf_popup) != 0) 358 360 dparams.flags |= wndf_popup; 361 if ((params->flags & ui_wndf_nofocus) != 0) 362 dparams.flags |= wndf_nofocus; 359 363 if ((params->flags & ui_wndf_topmost) != 0) 360 364 dparams.flags |= wndf_topmost; -
uspace/srv/hid/display/seat.c
rad9e225 r0d00e53 492 492 /* Focus window on button press */ 493 493 if (event->type == PTD_PRESS && event->btn_num == 1) { 494 if (wnd != NULL && (wnd->flags & wndf_popup) == 0) { 494 if (wnd != NULL && (wnd->flags & wndf_popup) == 0 && 495 (wnd->flags & wndf_nofocus) == 0) { 495 496 ds_seat_set_focus(seat, wnd); 496 497 } -
uspace/srv/hid/display/window.c
rad9e225 r0d00e53 1 1 /* 2 * Copyright (c) 202 3Jiri Svoboda2 * Copyright (c) 2024 Jiri Svoboda 3 3 * All rights reserved. 4 4 * … … 153 153 154 154 /* Is this a popup window? */ 155 if ((params->flags & wndf_popup) != 0) 155 if ((params->flags & wndf_popup) != 0) { 156 156 ds_seat_set_popup(seat, wnd); 157 else 158 ds_seat_set_focus(seat, wnd); 157 } else { 158 if ((params->flags & wndf_nofocus) == 0) 159 ds_seat_set_focus(seat, wnd); 160 } 159 161 160 162 /* Is this window a panel? */
Note:
See TracChangeset
for help on using the changeset viewer.