Put a square below the desktop stack.

Wed Mar 22 10:33:21 2006  Søren Sandmann  <sandmann@redhat.com>

	* src/c-screen.c (meta_screen_info_redirect): Put a square below
	the desktop stack.
This commit is contained in:
Søren Sandmann 2006-03-22 15:33:55 +00:00 committed by Søren Sandmann Pedersen
parent c5d4cbd742
commit fd1e1c76e8
2 changed files with 25 additions and 4 deletions

View File

@ -1,3 +1,8 @@
Wed Mar 22 10:33:21 2006 Søren Sandmann <sandmann@redhat.com>
* 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 <sandmann@redhat.com> Mon Mar 20 11:50:44 2006 Søren Sandmann <sandmann@redhat.com>
* src/c-screen.c (meta_screen_info_redirect): Put the desktop into * src/c-screen.c (meta_screen_info_redirect): Put the desktop into

View File

@ -26,6 +26,7 @@
#include <cm/drawable-node.h> #include <cm/drawable-node.h>
#include <cm/state.h> #include <cm/state.h>
#include <cm/magnifier.h> #include <cm/magnifier.h>
#include <cm/square.h>
#include "screen.h" #include "screen.h"
#include "c-screen.h" #include "c-screen.h"
@ -112,13 +113,24 @@ repaint (gpointer data)
info->meta_screen->rect.width, info->meta_screen->rect.width,
info->meta_screen->rect.height); info->meta_screen->rect.height);
glLoadIdentity();
#if 0 #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); glClear (GL_COLOR_BUFFER_BIT);
#endif #endif
ws_window_raise (info->gl_window); 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 (); state = cm_state_new ();
cm_state_disable_depth_buffer_update (state); cm_state_disable_depth_buffer_update (state);
@ -279,14 +291,16 @@ meta_screen_info_redirect (MetaScreenInfo *info)
info->stacker = cm_stacker_new (); 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.x = 600;
source.y = 100; source.y = 100;
source.width = 400; source.width = 400;
source.height = 75; source.height = 75;
target.x = 0; target.x = 1300;
target.y = 900; target.y = 900;
target.width = 1600; target.width = 300;
target.height = 300; target.height = 300;
info->magnifier = cm_magnifier_new (info->stacker, &source, &target); info->magnifier = cm_magnifier_new (info->stacker, &source, &target);
@ -487,6 +501,8 @@ meta_screen_info_add_window (MetaScreenInfo *info,
node = CM_NODE (cm_drawable_node_new (drawable, &geometry)); node = CM_NODE (cm_drawable_node_new (drawable, &geometry));
cm_drawable_node_set_alpha (node, 1.0);
#if 0 #if 0
print_child_titles (WS_WINDOW (drawable)); print_child_titles (WS_WINDOW (drawable));
#endif #endif