Aren
/
toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

panel: Don't crash when alt-tab window is open and the last tabable window closes

This commit is contained in:
K. Lange 2021-11-18 21:26:25 +09:00
parent 045431b2de
commit e8420f9a57
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
apps/panel.c
View File

@ -961,7 +961,8 @@ static void redraw_altf2(void) {
#endif
draw_fill(a2ctx, 0);
draw_rounded_rectangle(a2ctx,0,0, ALTF2_WIDTH, ALTF2_HEIGHT, 10, ALTTAB_BACKGROUND);
draw_rounded_rectangle(a2ctx,0,0, ALTF2_WIDTH, ALTF2_HEIGHT, 10, premultiply(rgba(120,120,120,150)));
draw_rounded_rectangle(a2ctx,1,1, ALTF2_WIDTH-2, ALTF2_HEIGHT-2, 10, ALTTAB_BACKGROUND);
tt_set_size(font, 20);
int t = tt_string_width(font, altf2_buffer);
@ -973,11 +974,23 @@ static void redraw_altf2(void) {
static void redraw_alttab(void) {
if (!actx) return;
if (new_focused == -1) return;
while (new_focused > -1 && !ads_by_z[new_focused]) {
new_focused--;
}
if (new_focused == -1) {
/* Stop tabbing */
was_tabbing = 0;
free(actx->backbuffer);
free(actx);
actx = NULL;
yutani_close(yctx, alttab);
return;
}
/* Draw the background, right now just a dark semi-transparent box */
draw_fill(actx, 0);
draw_rounded_rectangle(actx,0,0, ALTTAB_WIDTH, ALTTAB_HEIGHT, 10, ALTTAB_BACKGROUND);
draw_rounded_rectangle(actx,0,0, ALTTAB_WIDTH, ALTTAB_HEIGHT, 10, premultiply(rgba(120,120,120,150)));
draw_rounded_rectangle(actx,1,1, ALTTAB_WIDTH-2, ALTTAB_HEIGHT-2, 10, ALTTAB_BACKGROUND);
if (ads_by_z[new_focused]) {
struct window_ad * ad = ads_by_z[new_focused];
@ -1183,7 +1196,11 @@ static void handle_key_event(struct yutani_msg_key_event * ke) {
}
}
} else if (ads_by_z[new_focused] == NULL) {
new_focused = 0;
if (ads_by_z[0]) {
new_focused = 0;
} else {
new_focused = -1;
}
}
was_tabbing = 1;
@ -1370,6 +1387,8 @@ static void update_window_list(void) {
list_t * new_window_list = list_create();
ads_by_z[0] = NULL;
int i = 0;
while (1) {
/* We wait for a series of WINDOW_ADVERTISE messsages */