stacking: Remove transient window support
authorJasper St. Pierre <jstpierre@mecheye.net>
Mon, 9 Dec 2013 19:52:33 +0000 (14:52 -0500)
committerKristian Høgsberg <krh@bitplanet.net>
Sat, 1 Feb 2014 09:42:28 +0000 (01:42 -0800)
This will be replaced with xdg_surface_set_transient_for at some point...

clients/stacking.c

index 544094c..bfccbc6 100644 (file)
@@ -56,20 +56,13 @@ fullscreen_handler(struct window *window, void *data);
 static void
 redraw_handler(struct widget *widget, void *data);
 
-/* Iff parent_window is set, the new window will be transient. */
 static struct window *
-new_window(struct stacking *stacking, struct window *parent_window)
+new_window(struct stacking *stacking)
 {
        struct window *new_window;
        struct widget *new_widget;
 
-       if (parent_window == NULL) {
-               new_window = window_create(stacking->display);
-       } else {
-               new_window = window_create_transient(stacking->display,
-                                                    parent_window, 50, 50, 0);
-       }
-
+       new_window = window_create(stacking->display);
        new_widget = window_frame_create(new_window, new_window);
 
        window_set_title(new_window, "Stacking Test");
@@ -148,8 +141,7 @@ key_handler(struct window *window,
                break;
 
        case XKB_KEY_n:
-               /* New top-level window. */
-               new_window(stacking, NULL);
+               new_window(stacking);
                break;
 
        case XKB_KEY_p:
@@ -160,11 +152,6 @@ key_handler(struct window *window,
                exit (0);
                break;
 
-       case XKB_KEY_t:
-               /* New transient window. */
-               new_window(stacking, window);
-               break;
-
        default:
                break;
        }
@@ -234,9 +221,7 @@ draw_string(cairo_t *cr,
 static void
 set_window_background_colour(cairo_t *cr, struct window *window)
 {
-       if (window_is_transient(window))
-               cairo_set_source_rgba(cr, 0.0, 1.0, 0.0, 0.4);
-       else if (window_is_maximized(window))
+       if (window_is_maximized(window))
                cairo_set_source_rgba(cr, 1.0, 1.0, 0.0, 0.6);
        else if (window_is_fullscreen(window))
                cairo_set_source_rgba(cr, 0.0, 1.0, 1.0, 0.6);
@@ -275,12 +260,11 @@ redraw_handler(struct widget *widget, void *data)
                    "Window: %p\n"
                    "Fullscreen? %u\n"
                    "Maximized? %u\n"
-                   "Transient? %u\n"
                    "Keys: (f)ullscreen, (m)aximize,\n"
                    "      (n)ew window, (p)opup,\n"
-                   "      (q)uit, (t)ransient window\n",
+                   "      (q)uit\n",
                    window, window_is_fullscreen(window),
-                   window_is_maximized(window), window_is_transient(window));
+                   window_is_maximized(window));
 
        cairo_destroy(cr);
 }
@@ -304,7 +288,7 @@ main(int argc, char *argv[])
 
        display_set_user_data(stacking.display, &stacking);
 
-       stacking.root_window = new_window(&stacking, NULL);
+       stacking.root_window = new_window(&stacking);
 
        display_run(stacking.display);