isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-24 17:10:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Put the desktop into a magnifier.

Browse Source 
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
	a magnifier.

	* src/c-screen.c (struct MetaScreenInfo): Add a CmMagnifier

	* src/c-screen.c (meta_screen_info_redirect): Move some of the gl
	window related stuff here.
This commit is contained in:
Søren Sandmann 2006-03-20 16:52:25 +00:00 committed by Søren Sandmann Pedersen
parent bdb60c4e72
commit fc7a246074
2 changed files with 47 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
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
a magnifier.
* src/c-screen.c (struct MetaScreenInfo): Add a CmMagnifier
* src/c-screen.c (meta_screen_info_redirect): Move some of the gl
window related stuff here.
2006-03-16 Soren Sandmann (sandmann@daimi.au.dk) 2006-03-16 Soren Sandmann (sandmann@daimi.au.dk)
* src/c-screen.c (meta_screen_info_set_target_rect): Put inside * src/c-screen.c (meta_screen_info_set_target_rect): Put inside

57
src/c-screen.c
View File

@ -25,6 +25,7 @@
#include <cm/wsint.h> #include <cm/wsint.h>
#include <cm/drawable-node.h> #include <cm/drawable-node.h>
#include <cm/state.h> #include <cm/state.h>
#include <cm/magnifier.h>
#include "screen.h" #include "screen.h"
#include "c-screen.h" #include "c-screen.h"
@ -44,6 +45,7 @@ struct MetaScreenInfo
{ {
WsDisplay *display; WsDisplay *display;
CmStacker *stacker; CmStacker *stacker;
CmMagnifier *magnifier;
WsWindow *gl_window; WsWindow *gl_window;
@ -121,7 +123,7 @@ repaint (gpointer data)
cm_state_disable_depth_buffer_update (state); cm_state_disable_depth_buffer_update (state);
cm_node_render (CM_NODE (info->stacker), state); cm_node_render (CM_NODE (info->magnifier), state);
cm_state_enable_depth_buffer_update (state); cm_state_enable_depth_buffer_update (state);
@ -188,18 +190,11 @@ meta_screen_info_new (WsDisplay *display,
scr_info->screen = ws_display_get_screen_from_number ( scr_info->screen = ws_display_get_screen_from_number (
display, screen->number); display, screen->number);
scr_info->display = display; scr_info->display = display;
scr_info->gl_window = ws_screen_get_gl_window (scr_info->screen);
scr_info->window_infos_by_xid = scr_info->window_infos_by_xid =
g_hash_table_new_full (g_direct_hash, g_direct_equal, g_hash_table_new_full (g_direct_hash, g_direct_equal,
NULL, g_free); NULL, g_free);
scr_info->meta_screen = screen; scr_info->meta_screen = screen;
/* FIXME: This should probably happen in libcm */
ws_window_set_override_redirect (scr_info->gl_window, TRUE);
region = ws_server_region_new (scr_info->display);
ws_window_set_input_shape (scr_info->gl_window, region);
g_object_unref (G_OBJECT (region));
all_screen_infos = g_list_prepend (all_screen_infos, scr_info); all_screen_infos = g_list_prepend (all_screen_infos, scr_info);
return scr_info; return scr_info;
@ -249,16 +244,33 @@ claim_selection (MetaScreenInfo *info)
return TRUE; return TRUE;
} }
static void
queue_paint (CmStacker *stacker,
MetaScreenInfo *info)
{
meta_screen_info_queue_paint (info);
}
void void
meta_screen_info_redirect (MetaScreenInfo *info) meta_screen_info_redirect (MetaScreenInfo *info)
{ {
WsWindow *root = ws_screen_get_root_window (info->screen); WsWindow *root = ws_screen_get_root_window (info->screen);
WsRectangle source;
WsRectangle target;
WsRegion *region;
#if 0 #if 0
g_print ("redirecting %lx\n", WS_RESOURCE_XID (root)); g_print ("redirecting %lx\n", WS_RESOURCE_XID (root));
#endif #endif
ws_window_redirect_subwindows (root); ws_window_redirect_subwindows (root);
info->gl_window = ws_screen_get_gl_window (info->screen);
/* FIXME: This should probably happen in libcm */
ws_window_set_override_redirect (info->gl_window, TRUE);
region = ws_server_region_new (info->display);
ws_window_set_input_shape (info->gl_window, region);
g_object_unref (G_OBJECT (region));
ws_window_unredirect (info->gl_window); ws_window_unredirect (info->gl_window);
claim_selection (info); claim_selection (info);
@ -266,6 +278,23 @@ meta_screen_info_redirect (MetaScreenInfo *info)
ws_window_map (info->gl_window); ws_window_map (info->gl_window);
info->stacker = cm_stacker_new (); info->stacker = cm_stacker_new ();
source.x = 600;
source.y = 100;
source.width = 400;
source.height = 75;
target.x = 0;
target.y = 900;
target.width = 1600;
target.height = 300;
info->magnifier = cm_magnifier_new (info->stacker, &source, &target);
cm_magnifier_set_active (info->magnifier, FALSE);
info->repaint_id =
g_signal_connect (info->magnifier, "need_repaint",
G_CALLBACK (queue_paint), info);
ws_display_sync (info->display); ws_display_sync (info->display);
} }
@ -400,13 +429,6 @@ meta_screen_info_set_size (MetaScreenInfo *info,
} }
} }
static void
queue_paint (CmStacker *stacker,
MetaScreenInfo *info)
{
meta_screen_info_queue_paint (info);
}
static void static void
print_child_titles (WsWindow *window) print_child_titles (WsWindow *window)
{ {
@ -476,11 +498,6 @@ meta_screen_info_add_window (MetaScreenInfo *info,
window_info_new (xwindow, node)); window_info_new (xwindow, node));
g_object_unref (node); g_object_unref (node);
info->repaint_id =
g_signal_connect (info->stacker, "need_repaint",
G_CALLBACK (queue_paint), info);
out: out:
if (node) if (node)
{ {