#include <popt.h>
#include <gdk/gdkwindow.h>
-#include <bonobo/Bonobo.h>
+#include <libbonobo.h>
#include "magnifier.h"
#include "mag_image.h"
struct sockaddr_un mag_server = { AF_UNIX , "/tmp/magnifier_socket" };
typedef struct {
+ GdkRectangle extents;
+ GdkRectangle roi;
+ float zoom_x;
+ float zoom_y;
+ int contrast;
+ gboolean is_managed;
+ gboolean is_dirty;
+} ZoomRegionData;
+
+typedef struct {
gchar *target_display;
gchar *source_display;
int vertical_split;
int mouse_follow;
int invert_image;
float zoom_factor;
- int refresh_time;
+ int min_refresh_time;
int no_bonobo;
+ int fast_cmap_convert;
+ GList *zoom_regions;
} MagnifierOptions;
static MagnifierOptions global_options = { ":0.0",
0,
2.0,
200,
+ 0,
0
};
{"horizontal", 'h', POPT_ARG_NONE, &global_options.horizontal_split, 'h', "split screen horizontally (if target display = source display)", NULL},
{"dual-head", 'd', POPT_ARG_NONE, &global_options.dual_head, 'd', "dual-head display mode (maps magnifier to second display)", NULL},
{"mouse follow", 'm', POPT_ARG_NONE, &global_options.mouse_follow, 'm', "track mouse movements", NULL},
- {"refresh time", 'r', POPT_ARG_NONE, &global_options.refresh_time, 'r', "refresh time for mouse follow and idle, in ms", NULL},
+ {"refresh time", 'r', POPT_ARG_NONE, &global_options.min_refresh_time, 'r', "minimum refresh time for mouse follow and idle, in ms", NULL},
{"zoom (scale) factor", 'z', POPT_ARG_FLOAT, &global_options.zoom_factor, 'z', "zoom (scale) factor used to magnify source display", NULL},
/* {"invert image", 'i', POPT_ARG_NONE, &global_options.invert_image, 'i', "invert the image colormap", NULL}, */
+ {"fast-colormap-conversion", 'c', POPT_ARG_NONE, &global_options.fast_cmap_convert, 'c', "use faster colormap conversion algorithm (fails for 6 bit color)", NULL},
{"no-bonobo", '\0', POPT_ARG_NONE, &global_options.no_bonobo, '\0', "don't use bonobo for controls, use sockets", NULL},
{NULL, 0, 0, NULL, 0, 0}
};
#define MSG_LEN 80
+static GtkWidget *window; /* TODO: clean up, with accessor func? */
+
+static void
+magnifier_realize (GtkWidget *widget)
+{
+ XWMHints wm_hints;
+ Atom wm_window_protocols[2];
+ static gboolean initialized = FALSE;
+
+ if (!initialized)
+ {
+ wm_window_protocols[0] = gdk_x11_get_xatom_by_name ("WM_DELETE_WINDOW");
+ wm_window_protocols[1] = gdk_x11_get_xatom_by_name ("_NET_WM_PING");
+ }
+
+ wm_hints.flags = InputHint;
+ wm_hints.input = False;
+
+ XSetWMHints (GDK_WINDOW_XDISPLAY (widget->window),
+ GDK_WINDOW_XWINDOW (widget->window), &wm_hints);
+
+ XSetWMProtocols (GDK_WINDOW_XDISPLAY (widget->window),
+ GDK_WINDOW_XWINDOW (widget->window), wm_window_protocols, 2);
+}
+
+static void
+magnifier_exit()
+{
+ gtk_exit(0);
+}
+
static gboolean get_commands(GIOChannel* client,
GIOCondition condition,
gpointer data){
}
int main (int argc, char** argv){
- GtkWidget *window;
GIOChannel *mag_channel;
char *dpyname;
char env_string[ENV_STRING_MAX_SIZE];
global_options.mouse_follow;
magnifier->mag_data->color_inverted =
global_options.invert_image;
- magnifier->mag_data->factor =
+ magnifier->mag_data->factor_x =
(int) global_options.zoom_factor;
-
- /* TODO: enable fractional magnifications ? */
+ magnifier->mag_data->factor_y =
+ (int) global_options.zoom_factor;
+ /* TODO: enable fractional magnifications ? */
if (global_options.target_display) {
snprintf (env_string, (size_t) (ENV_STRING_MAX_SIZE-1), "DISPLAY=%s", global_options.target_display);
putenv (env_string);
}
gtk_init (&argc, &argv);
- window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ window = g_object_connect (gtk_widget_new (gtk_window_get_type (),
+ "user_data", NULL,
+ "can_focus", FALSE,
+ "type", GTK_WINDOW_TOPLEVEL,
+ "title", "magnifier",
+ "allow_grow", FALSE,
+ "allow_shrink", FALSE,
+ "border_width", 10,
+ NULL),
+ "signal::realize", magnifier_realize, NULL,
+ "signal::destroy", magnifier_exit, NULL,
+ NULL);
+
drawing_area = gtk_drawing_area_new();
gtk_container_add (GTK_CONTAINER (window),drawing_area);
gtk_widget_add_events(GTK_WIDGET(drawing_area),GDK_BUTTON_PRESS_MASK);
magnifier->mag_data->source_display = XOpenDisplay (global_options.source_display);
magnifier->mag_data->target_display = GDK_DISPLAY();
- image_root_window = RootWindow(magnifier->mag_data->source_display, screen_num);
+ spi_image_root_window = RootWindow(magnifier->mag_data->source_display, screen_num);
gdk_pixbuf_xlib_init (magnifier->mag_data->source_display, screen_num);
image = gdk_pixbuf_new (GDK_COLORSPACE_RGB,FALSE, 8,
DisplayWidth (magnifier->mag_data->source_display,screen_num)/2,
if (global_options.horizontal_split)
magnifier->mag_data->mag_height = DisplayHeight (magnifier->mag_data->target_display,screen_num)/2;
else magnifier->mag_data->mag_height = DisplayHeight (magnifier->mag_data->target_display, screen_num);
+ gtk_window_set_decorated(GTK_WINDOW (window), FALSE);
gtk_widget_show_all (window);
gdk_window_move(window->window,
gdk_window_resize (window->window, magnifier->mag_data->mag_width, magnifier->mag_data->mag_height);
magnifier->mag_data->output_window = window;
if (global_options.fullscreen) gdk_window_stick (window->window);
- gdk_window_set_decorations(window->window, 0);
gdk_window_set_functions(window->window, 0);
gdk_window_raise(window->window);
- gtk_timeout_add(global_options.refresh_time, display_image, magnifier->mag_data);
+ gtk_timeout_add(global_options.min_refresh_time, display_image, magnifier->mag_data);
obj_id = "OAFIID:Accessibility_Util_Magnifier:proto0.1";
if (! global_options.no_bonobo)
{
- bonobo_activation_active_server_register (
- obj_id,
- bonobo_object_corba_objref (bonobo_object (magnifier)));
+ int ret = bonobo_activation_active_server_register (
+ obj_id, BONOBO_OBJREF (magnifier));
- bonobo_main ();
+ if (ret == Bonobo_ACTIVATION_REG_SUCCESS)
+ {
+ bonobo_main ();
+ }
}
else
{
impl_magnifier_fullscreen (PortableServer_Servant servant,
CORBA_Environment *ev)
{
+ Magnifier *magnifier = MAGNIFIER (bonobo_object_from_servant (servant));
+ magnifier->mag_data->mag_width = DisplayWidth (magnifier->mag_data->target_display, screen_num);
+ magnifier->mag_data->mag_height = DisplayHeight (magnifier->mag_data->target_display, screen_num);
}
static void
CORBA_long y2,
CORBA_Environment *ev)
{
+ Magnifier *magnifier = MAGNIFIER (bonobo_object_from_servant (servant));
+ magnifier->mag_data->mag_width = x2 - x1;
+ magnifier->mag_data->mag_height = y2 - y1;
+ gdk_window_move(window->window, x1, y1);
}
static void
static void
impl_magnifier_set_roi (PortableServer_Servant servant,
+ const CORBA_short zoom_region,
const CORBA_long x1,
const CORBA_long y1,
const CORBA_long x2,
static void
impl_magnifier_set_mag_factor (PortableServer_Servant servant,
- const CORBA_float mag_factor,
+ const CORBA_short zoom_region,
+ const CORBA_float mag_factor_x,
+ const CORBA_float mag_factor_y,
+ CORBA_Environment *ev)
+{
+ Magnifier *magnifier = MAGNIFIER (bonobo_object_from_servant (servant));
+ if (zoom_region == (CORBA_short) 0) /* TODO: fix for multi-zoom-regions */
+ {
+ magnifier->mag_data->factor_x = (float) mag_factor_x;
+ magnifier->mag_data->factor_y = (float) mag_factor_y;
+ }
+}
+
+static void
+impl_magnifier_mark_dirty (PortableServer_Servant servant,
+ const CORBA_short zoom_region,
+ CORBA_Environment *ev)
+{
+ Magnifier *magnifier = MAGNIFIER (bonobo_object_from_servant (servant));
+ /* TODO: implement */
+}
+
+static void
+impl_magnifier_mark_unmanaged (PortableServer_Servant servant,
+ const CORBA_short zoom_region,
CORBA_Environment *ev)
{
Magnifier *magnifier = MAGNIFIER (bonobo_object_from_servant (servant));
- magnifier->mag_data->factor = (float) mag_factor;
+ /* TODO: implement */
+}
+
+static CORBA_short
+impl_magnifier_create_zoom_region (PortableServer_Servant servant,
+ const CORBA_float zx,
+ const CORBA_float zy,
+ const CORBA_long x1,
+ const CORBA_long y1,
+ const CORBA_long x2,
+ const CORBA_long y2,
+ CORBA_Environment *ev)
+{
+ Magnifier *magnifier = MAGNIFIER (bonobo_object_from_servant (servant));
+ return -1;
+}
+
+static CORBA_boolean
+impl_magnifier_get_zoom_region_params (PortableServer_Servant servant,
+ const CORBA_short zoom_region,
+ CORBA_float * zx,
+ CORBA_float * zy, CORBA_long * x1,
+ CORBA_long * y1, CORBA_long * x2,
+ CORBA_long * y2,
+ CORBA_Environment * ev)
+{
+ Magnifier *magnifier = MAGNIFIER (bonobo_object_from_servant (servant));
+ if (zoom_region == (CORBA_short) 0)
+ {
+ *zx = magnifier->mag_data->factor_x;
+ *zy = magnifier->mag_data->factor_y;
+ *x1 = 0;
+ *y1 = 0;
+ *x2 = *x1 + magnifier->mag_data->mag_width;
+ *y2 = *y1 + magnifier->mag_data->mag_height;
+ return CORBA_TRUE;
+ }
+ else return CORBA_FALSE;
+}
+
+static void
+impl_magnifier_resize_zoom_region (PortableServer_Servant _servant,
+ const CORBA_short zoom_region,
+ const CORBA_long x1, const CORBA_long y1,
+ const CORBA_long x2, const CORBA_long y2,
+ CORBA_Environment * ev)
+{
+}
+
+static void
+impl_magnifier_destroy_zoom_region (PortableServer_Servant _servant,
+ const CORBA_short zoom_region,
+ CORBA_Environment * ev)
+{
+}
+
+static void
+impl_magnifier_clear_all_zoom_regions (PortableServer_Servant _servant,
+ CORBA_Environment * ev)
+{
}
static void
epv->_set_SourceDisplay = impl_magnifier_set_source_display;
epv->_set_TargetDisplay = impl_magnifier_set_target_display;
epv->setROI = impl_magnifier_set_roi;
- epv->_set_MagFactor = impl_magnifier_set_mag_factor;
+ epv->setMagFactor = impl_magnifier_set_mag_factor;
+ epv->markDirty = impl_magnifier_mark_dirty;
+ epv->markUnmanaged = impl_magnifier_mark_unmanaged;
+ epv->createZoomRegion = impl_magnifier_create_zoom_region;
+ epv->getZoomRegionParams = impl_magnifier_get_zoom_region_params;
+ epv->resizeZoomRegion = impl_magnifier_resize_zoom_region;
+ epv->destroyZoomRegion = impl_magnifier_destroy_zoom_region;
+ epv->clearAllZoomRegions = impl_magnifier_clear_all_zoom_regions;
epv->exit = impl_magnifier_exit;
}
magnifier_init (Magnifier *magnifier)
{
magnifier->mag_data = (MagnifierData *) g_new0 (MagnifierData, 1);
- magnifier->mag_data->factor = 2;
+ magnifier->mag_data->factor_x = 2;
+ magnifier->mag_data->factor_y = 2;
magnifier->mag_data->contrast = 0;
magnifier->mag_data->color_inverted = FALSE;
+ magnifier->mag_data->fast_rgb_convert = FALSE;
magnifier->mag_data->center.x = 0;
magnifier->mag_data->center.y = 0;
}
}
Magnifier *
-magnifier_new(int argc, char **argv)
+magnifier_new (int argc, char **argv)
{
poptContext ctx;
Magnifier *magnifier =
return magnifier;
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
projects / platform / core / uifw / at-spi2-atk.git / blobdiff