From fd1e1c76e860b02f80da9f17fecba6d1ab9937a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Sandmann?= Date: Wed, 22 Mar 2006 15:33:55 +0000 Subject: [PATCH] Put a square below the desktop stack. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Wed Mar 22 10:33:21 2006 Søren Sandmann * src/c-screen.c (meta_screen_info_redirect): Put a square below the desktop stack. --- ChangeLog | 5 +++++ src/c-screen.c | 24 ++++++++++++++++++++---- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 481442c30..e1eb09659 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Mar 22 10:33:21 2006 Søren Sandmann + + * src/c-screen.c (meta_screen_info_redirect): Put a square below + the desktop stack. + Mon Mar 20 11:50:44 2006 Søren Sandmann * src/c-screen.c (meta_screen_info_redirect): Put the desktop into diff --git a/src/c-screen.c b/src/c-screen.c index eeca4488a..5432c9f44 100644 --- a/src/c-screen.c +++ b/src/c-screen.c @@ -26,6 +26,7 @@ #include #include #include +#include #include "screen.h" #include "c-screen.h" @@ -111,13 +112,24 @@ repaint (gpointer data) glViewport (0, 0, info->meta_screen->rect.width, info->meta_screen->rect.height); + + glLoadIdentity(); #if 0 - glClearColor (1.0, 1.0, 0.8, 0.0); + glClearColor (1.0, 1.0, 0.8, 1.0); glClear (GL_COLOR_BUFFER_BIT); #endif - + ws_window_raise (info->gl_window); + +#if 0 + glDisable (GL_TEXTURE_2D); + glDisable (GL_TEXTURE_RECTANGLE_ARB); + glPolygonMode (GL_FRONT_AND_BACK, GL_FILL); + glColor4f (0.0, 1.0, 0.0, 1.0); + glRectf (-1.0, -1.0, 1.0, 1.0); + glFinish(); +#endif state = cm_state_new (); @@ -279,14 +291,16 @@ meta_screen_info_redirect (MetaScreenInfo *info) info->stacker = cm_stacker_new (); + cm_stacker_add_child (info->stacker, cm_square_new (0.3, 0.3, 0.8, 1.0)); + source.x = 600; source.y = 100; source.width = 400; source.height = 75; - target.x = 0; + target.x = 1300; target.y = 900; - target.width = 1600; + target.width = 300; target.height = 300; info->magnifier = cm_magnifier_new (info->stacker, &source, &target); @@ -486,6 +500,8 @@ meta_screen_info_add_window (MetaScreenInfo *info, ws_drawable_query_geometry (drawable, &geometry); node = CM_NODE (cm_drawable_node_new (drawable, &geometry)); + + cm_drawable_node_set_alpha (node, 1.0); #if 0 print_child_titles (WS_WINDOW (drawable));