mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "stacking: Remove transient window support"

Browse Source 
This reverts commit 4c1a11074af2c2221d50b0c35d2d0d883647bc15.

Use the new window_set_transient_for / window_get_transient_for
and xdg-shell support for this...
This commit is contained in:
Jasper St. Pierre
2013-12-09 15:20:16 -05:00
committed by Kristian Høgsberg
parent 53686048cc
commit 1e47a93f85
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/stacking.c
+18 -6
View File
@@ -56,13 +56,16 @@ fullscreen_handler(struct window *window, void *data);
static void static void
redraw_handler(struct widget *widget, void *data); redraw_handler(struct widget *widget, void *data);
/* Iff parent_window is set, the new window will be transient. */
static struct window * static struct window *
new_window(struct stacking *stacking) new_window(struct stacking *stacking, struct window *parent_window)
{ {
struct window *new_window; struct window *new_window;
struct widget *new_widget; struct widget *new_widget;
new_window = window_create(stacking->display); new_window = window_create(stacking->display);
window_set_transient_for(new_window, parent_window);
new_widget = window_frame_create(new_window, new_window); new_widget = window_frame_create(new_window, new_window);
window_set_title(new_window, "Stacking Test"); window_set_title(new_window, "Stacking Test");
@@ -141,7 +144,8 @@ key_handler(struct window *window,
break; break;
case XKB_KEY_n: case XKB_KEY_n:
new_window(stacking); /* New top-level window. */
new_window(stacking, NULL);
break; break;
case XKB_KEY_p: case XKB_KEY_p:
@@ -152,6 +156,11 @@ key_handler(struct window *window,
exit (0); exit (0);
break; break;
case XKB_KEY_t:
/* New transient window. */
new_window(stacking, window);
break;
default: default:
break; break;
} }
@@ -221,7 +230,9 @@ draw_string(cairo_t *cr,
static void static void
set_window_background_colour(cairo_t *cr, struct window *window) set_window_background_colour(cairo_t *cr, struct window *window)
{ {
if (window_is_maximized(window)) if (window_get_transient_for(window))
cairo_set_source_rgba(cr, 0.0, 1.0, 0.0, 0.4);
else if (window_is_maximized(window))
cairo_set_source_rgba(cr, 1.0, 1.0, 0.0, 0.6); cairo_set_source_rgba(cr, 1.0, 1.0, 0.0, 0.6);
else if (window_is_fullscreen(window)) else if (window_is_fullscreen(window))
cairo_set_source_rgba(cr, 0.0, 1.0, 1.0, 0.6); cairo_set_source_rgba(cr, 0.0, 1.0, 1.0, 0.6);
@@ -260,11 +271,12 @@ redraw_handler(struct widget *widget, void *data)
"Window: %p\n" "Window: %p\n"
"Fullscreen? %u\n" "Fullscreen? %u\n"
"Maximized? %u\n" "Maximized? %u\n"
"Transient? %u\n"
"Keys: (f)ullscreen, (m)aximize,\n" "Keys: (f)ullscreen, (m)aximize,\n"
" (n)ew window, (p)opup,\n" " (n)ew window, (p)opup,\n"
" (q)uit\n", " (q)uit, (t)ransient window\n",
window, window_is_fullscreen(window), window, window_is_fullscreen(window),
window_is_maximized(window)); window_is_maximized(window), window_get_transient_for(window) ? 1 : 0);
cairo_destroy(cr); cairo_destroy(cr);
} }
@@ -288,7 +300,7 @@ main(int argc, char *argv[])
display_set_user_data(stacking.display, &stacking); display_set_user_data(stacking.display, &stacking);
stacking.root_window = new_window(&stacking); stacking.root_window = new_window(&stacking, NULL);
display_run(stacking.display); display_run(stacking.display);