porting to cairo 0.5.1

1 files changed, 86 insertions, 79 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/Cairo.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/Cairo.java
index bd4dd7b075..9c34cc8af0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/Cairo.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/Cairo.java
@@ -76,29 +76,27 @@ public class Cairo {
 	public static final int CAIRO_EXTEND_NONE = 0;
 	public static final int CAIRO_EXTEND_REPEAT = 1;
 	public static final int CAIRO_EXTEND_REFLECT = 2;
+	public static final int CAIRO_PATH_MOVE_TO = 0;
+	public static final int CAIRO_PATH_LINE_TO = 1;
+	public static final int CAIRO_PATH_CURVE_TO = 2;
+	public static final int CAIRO_PATH_CLOSE_PATH = 3;
 	
 /** 64*/
 public static final synchronized native int cairo_font_extents_t_sizeof ();
+public static final synchronized native int cairo_path_data_t_sizeof ();
+public static final synchronized native int cairo_path_t_sizeof ();
 	
-/** Custom natives */ 
-public static final synchronized native void cairo_add_path (int /*long*/ cr1, int /*long*/ cr2);
-public static final synchronized native void cairo_extents (int /*long*/ cr, double[] extents);
-public static final synchronized native void cairo_points (int /*long*/ cr, int[] n_types, int[] n_points, byte[] types, float[] points);
-
 /** Natives */
-public static final synchronized native int /*long*/ cairo_create ();
+public static final synchronized native int /*long*/ cairo_create (int /*long*/ target);
 public static final synchronized native void cairo_reference (int /*long*/ cr);
 public static final synchronized native void cairo_destroy (int /*long*/ cr);
 public static final synchronized native void cairo_save (int /*long*/ cr);
 public static final synchronized native void cairo_restore (int /*long*/ cr);
-public static final synchronized native void cairo_copy (int /*long*/ dest, int /*long*/ src);
-public static final synchronized native void cairo_set_target_surface (int /*long*/ cr, int /*long*/ surface);
-public static final synchronized native void cairo_set_target_image (int /*long*/ cr, int /*long*/ data, int format, int width, int height, int stride);
-public static final synchronized native void cairo_set_target_drawable (int /*long*/ cr, int /*long*/ dpy, int /*long*/ drawable);
 public static final synchronized native void cairo_set_operator (int /*long*/ cr, int op);
-public static final synchronized native void cairo_set_rgb_color (int /*long*/ cr, double red, double green, double blue);
-public static final synchronized native void cairo_set_pattern (int /*long*/ cr, int /*long*/ pattern);
-public static final synchronized native void cairo_set_alpha (int /*long*/ cr, double alpha);
+public static final synchronized native void cairo_set_source_rgb(int /*long*/ cr, double red, double green, double blue);
+public static final synchronized native void cairo_set_source_rgba(int /*long*/ cr, double red, double green, double blue, double alpha);
+public static final synchronized native void cairo_set_source(int /*long*/ cr, int /*long*/ source);
+public static final synchronized native void cairo_set_source_surface(int /*long*/ cr, int /*long*/ surface, double x, double y);
 public static final synchronized native void cairo_set_tolerance (int /*long*/ cr, double tolerance);
 public static final synchronized native void cairo_set_fill_rule (int /*long*/ cr, int fill_rule);
 public static final synchronized native void cairo_set_line_width (int /*long*/ cr, double width);
@@ -109,14 +107,13 @@ public static final synchronized native void cairo_set_miter_limit (int /*long*/
 public static final synchronized native void cairo_translate (int /*long*/ cr, double tx, double ty);
 public static final synchronized native void cairo_scale (int /*long*/ cr, double sx, double sy);
 public static final synchronized native void cairo_rotate (int /*long*/ cr, double angle);
-public static final synchronized native void cairo_concat_matrix (int /*long*/ cr, int /*long*/ matrix);
-public static final synchronized native void cairo_set_matrix (int /*long*/ cr, int /*long*/ matrix);
-public static final synchronized native void cairo_default_matrix (int /*long*/ cr);
+public static final synchronized native void cairo_transform (int /*long*/ cr, double[] matrix);
+public static final synchronized native void cairo_set_matrix (int /*long*/ cr, double[] matrix);
 public static final synchronized native void cairo_identity_matrix (int /*long*/ cr);
-public static final synchronized native void cairo_transform_point (int /*long*/ cr, double[] x, double[] y);
-public static final synchronized native void cairo_transform_distance (int /*long*/ cr, double[] dx, double[] dy);
-public static final synchronized native void cairo_inverse_transform_point (int /*long*/ cr, double[] x, double[] y);
-public static final synchronized native void cairo_inverse_transform_distance (int /*long*/ cr, double[] dx, double[] dy);
+public static final synchronized native void cairo_user_to_device (int /*long*/ cr, double[] x, double[] y);
+public static final synchronized native void cairo_user_to_device_distance (int /*long*/ cr, double[] dx, double[] dy);
+public static final synchronized native void cairo_device_to_user (int /*long*/ cr, double[] x, double[] y);
+public static final synchronized native void cairo_device_to_user_distance (int /*long*/ cr, double[] dx, double[] dy);
 public static final synchronized native void cairo_new_path (int /*long*/ cr);
 public static final synchronized native void cairo_move_to (int /*long*/ cr, double x, double y);
 public static final synchronized native void cairo_line_to (int /*long*/ cr, double x, double y);
@@ -129,84 +126,94 @@ public static final synchronized native void cairo_rel_line_to (int /*long*/ cr,
 public static final synchronized native void cairo_rel_curve_to (int /*long*/ cr, double dx1, double dy1, double dx2, double dy2, double dx3, double dy3);
 public static final synchronized native void cairo_rectangle (int /*long*/ cr, double x, double y, double width, double height);
 public static final synchronized native void cairo_close_path (int /*long*/ cr);
+public static final synchronized native void cairo_paint (int /*long*/ cr);
+public static final synchronized native void cairo_paint_with_alpha (int /*long*/ cr, double alpha);
+public static final synchronized native void cairo_mask (int /*long*/ cr, int /*long*/ pattern);
+public static final synchronized native void cairo_mask_surface (int /*long*/ cr, int /*long*/ surface, double surface_x, double surface_y);
 public static final synchronized native void cairo_stroke (int /*long*/ cr);
+public static final synchronized native void cairo_stroke_preserve (int /*long*/ cr);
 public static final synchronized native void cairo_fill (int /*long*/ cr);
+public static final synchronized native void cairo_fill_preserve (int /*long*/ cr);
 public static final synchronized native void cairo_copy_page (int /*long*/ cr);
 public static final synchronized native void cairo_show_page (int /*long*/ cr);
 public static final synchronized native int cairo_in_stroke (int /*long*/ cr, double x, double y);
 public static final synchronized native int cairo_in_fill (int /*long*/ cr, double x, double y);
 public static final synchronized native void cairo_stroke_extents (int /*long*/ cr, double[] x1, double[] y1, double[] x2, double[] y2);
 public static final synchronized native void cairo_fill_extents (int /*long*/ cr, double[] x1, double[] y1, double[] x2, double[] y2);
-public static final synchronized native void cairo_init_clip (int /*long*/ cr);
 public static final synchronized native void cairo_clip (int /*long*/ cr);
-public static final synchronized native void cairo_select_font (int /*long*/ cr, byte[] family, int slant, int weight);
-public static final synchronized native void cairo_scale_font (int /*long*/ cr, double scale);
-public static final synchronized native void cairo_transform_font (int /*long*/ cr, int /*long*/ matrix);
-public static final synchronized native void cairo_show_text (int /*long*/ ct, byte[] utf8);
-public static final synchronized native void cairo_show_glyphs (int /*long*/ ct, int /*long*/ glyphs, int num_glyphs);
-public static final synchronized native int /*long*/ cairo_current_font (int /*long*/ ct);
-public static final synchronized native void cairo_current_font_extents (int /*long*/ ct, cairo_font_extents_t extents);
-public static final synchronized native void cairo_set_font (int /*long*/ ct, int /*long*/ font);
-public static final synchronized native void cairo_text_extents (int /*long*/ ct, byte[] utf8, int /*long*/ extents);
-public static final synchronized native void cairo_glyph_extents (int /*long*/ ct, int /*long*/ glyphs, int num_glyphs, int /*long*/ extents);
-public static final synchronized native void cairo_text_path  (int /*long*/ ct, byte[] utf8);
-public static final synchronized native void cairo_glyph_path (int /*long*/ ct, int /*long*/ glyphs, int num_glyphs);
-public static final synchronized native void cairo_font_reference (int /*long*/ font);
-public static final synchronized native void cairo_font_destroy (int /*long*/ font);
-public static final synchronized native void cairo_show_surface (int /*long*/ cr, int /*long*/ surface, int width, int height);
-public static final synchronized native int /*long*/ cairo_current_operator (int /*long*/ cr);
-public static final synchronized native void cairo_current_rgb_color (int /*long*/ cr, double[] red, double[] green, double[] blue);
-public static final synchronized native int /*long*/ cairo_current_pattern (int /*long*/ cr);
-public static final synchronized native	double cairo_current_alpha (int /*long*/ cr);
-public static final synchronized native double cairo_current_tolerance (int /*long*/ cr);
-public static final synchronized native void cairo_current_point (int /*long*/ cr, double[] x, double[] y);
-public static final synchronized native int cairo_current_fill_rule (int /*long*/ cr);
-public static final synchronized native double cairo_current_line_width (int /*long*/ cr);
-public static final synchronized native int cairo_current_line_cap (int /*long*/ cr);
-public static final synchronized native int cairo_current_line_join (int /*long*/ cr);
-public static final synchronized native double cairo_current_miter_limit (int /*long*/ cr);
-public static final synchronized native void cairo_current_matrix (int /*long*/ cr, int /*long*/ matrix);
-public static final synchronized native int /*long*/ cairo_current_target_surface (int /*long*/ cr);
-public static final synchronized native void cairo_current_path (int /*long*/ cr, int /*long*/ move_to, int /*long*/ line_to, int /*long*/ curve_to, int /*long*/ close_path,int /*long*/ closure);
-public static final synchronized native void cairo_current_path_flat (int /*long*/ cr, int /*long*/ move_to, int /*long*/ line_to, int /*long*/ close_path, int /*long*/ closure);
+public static final synchronized native void cairo_clip_preserve (int /*long*/ cr);
+public static final synchronized native void cairo_reset_clip (int /*long*/ cr);
+public static final synchronized native void cairo_select_font_face (int /*long*/ cr, byte[] family, int slant, int weight);
+public static final synchronized native void cairo_set_font_size (int /*long*/ cr, double size);
+public static final synchronized native void cairo_set_font_matrix (int /*long*/ cr, double[] matrix);
+public static final synchronized native void cairo_get_font_matrix (int /*long*/ cr, double[] matrix);
+public static final synchronized native void cairo_show_text (int /*long*/ cr, byte[] utf8);
+public static final synchronized native void cairo_show_glyphs (int /*long*/ cr, int /*long*/ glyphs, int num_glyphs);
+public static final synchronized native int cairo_get_font_face (int /*long*/ cr);
+public static final synchronized native void cairo_font_extents (int /*long*/ cr, cairo_font_extents_t extents);
+public static final synchronized native void cairo_set_font_face (int /*long*/ cr, int /*long*/ font_face);
+public static final synchronized native void cairo_text_extents (int /*long*/ cr, byte[] utf8, int /*long*/ extents);
+public static final synchronized native void cairo_glyph_extents (int /*long*/ cr, int /*long*/ glyphs, int num_glyphs, int /*long*/ extents);
+public static final synchronized native void cairo_text_path (int /*long*/ cr, byte[] utf8);
+public static final synchronized native void cairo_glyph_path (int /*long*/ cr, int /*long*/ glyphs, int num_glyphs);
+public static final synchronized native int cairo_get_operator (int /*long*/ cr);
+public static final synchronized native int /*long*/ cairo_get_source (int /*long*/ cr);
+public static final synchronized native double cairo_get_tolerance (int /*long*/ cr);
+public static final synchronized native void cairo_get_current_point (int /*long*/ cr, double[] x, double[] y);
+public static final synchronized native int cairo_get_fill_rule (int /*long*/ cr);
+public static final synchronized native double cairo_get_line_width (int /*long*/ cr);
+public static final synchronized native int cairo_get_line_cap (int /*long*/ cr);
+public static final synchronized native int cairo_get_line_join (int /*long*/ cr);
+public static final synchronized native double cairo_get_miter_limit (int /*long*/ cr);
+public static final synchronized native void cairo_get_matrix (int /*long*/ cr, double[] matrix);
+public static final synchronized native int /*long*/ cairo_get_target (int /*long*/ cr);
+public static final synchronized native int /*long*/ cairo_copy_path (int /*long*/ cr);
+public static final synchronized native int /*long*/ cairo_copy_path_flat (int /*long*/ cr);
+public static final synchronized native void cairo_append_path (int /*long*/ cr, int /*long*/ path);
+public static final synchronized native void cairo_path_destroy (int /*long*/ path);
 public static final synchronized native int cairo_status (int /*long*/ cr);
-public static final synchronized native int /*long*/ cairo_status_string (int /*long*/ cr);
-public static final synchronized native int /*long*/ cairo_surface_create_for_image (int /*long*/ data, int format, int width, int height, int stride);
+public static final synchronized native int /*long*/ cairo_status_to_string (int status);
+public static final synchronized native int /*long*/ cairo_image_surface_create (int format, int width, int height);
+public static final synchronized native int /*long*/ cairo_image_surface_create_for_data (int /*long*/ data, int format, int width, int height, int stride);
+public static final synchronized native int cairo_image_surface_get_width (int /*long*/ surface);
+public static final synchronized native int cairo_image_surface_get_height (int /*long*/ surface);
 public static final synchronized native int /*long*/ cairo_surface_create_similar (int /*long*/ other, int format, int width, int height);
 public static final synchronized native void cairo_surface_reference (int /*long*/ surface);
 public static final synchronized native void cairo_surface_destroy (int /*long*/ surface);
-public static final synchronized native int cairo_surface_set_repeat (int /*long*/ surface, int repeat);
-public static final synchronized native int cairo_surface_set_matrix (int /*long*/ surface, int /*long*/ matrix);
-public static final synchronized native int cairo_surface_get_matrix (int /*long*/ surface, int /*long*/ matrix);
-public static final synchronized native int cairo_surface_set_filter (int /*long*/ surface, int filter);
-public static final synchronized native int cairo_surface_get_filter (int /*long*/ surface);
-public static final synchronized native int /*long*/ cairo_image_surface_create (int format, int width, int height);
-public static final synchronized native int /*long*/ cairo_image_surface_create_for_data (int /*long*/ data, int format, int width, int height, int stride);
+public static final synchronized native int cairo_surface_finish (int /*long*/ surface);
+public static final synchronized native int cairo_surface_set_user_data (int /*long*/ surface, int /*long*/ key, int /*long*/ user_data, int /*long*/ destroy);
+public static final synchronized native int /*long*/ cairo_surface_get_user_data (int /*long*/ surface, int /*long*/ key);
+public static final synchronized native void cairo_surface_set_device_offset (int /*long*/ surface, double x_offset, double y_offset);
 public static final synchronized native int /*long*/ cairo_pattern_create_for_surface (int /*long*/ surface);
 public static final synchronized native int /*long*/ cairo_pattern_create_linear (double x0, double y0, double x1, double y1);
 public static final synchronized native int /*long*/ cairo_pattern_create_radial (double cx0, double cy0, double radius0, double cx1, double cy1, double radius1);
 public static final synchronized native void cairo_pattern_reference (int /*long*/ pattern);
 public static final synchronized native void cairo_pattern_destroy (int /*long*/ pattern);
-public static final synchronized native int cairo_pattern_add_color_stop (int /*long*/ pattern, double offset, double red, double green, double blue, double alpha);
-public static final synchronized native int cairo_pattern_set_matrix (int /*long*/ pattern, int /*long*/ matrix);
-public static final synchronized native int cairo_pattern_get_matrix (int /*long*/ pattern, int /*long*/ matrix);
-public static final synchronized native int cairo_pattern_set_extend (int /*long*/ pattern, int extend);
+public static final synchronized native void cairo_pattern_add_color_stop_rgb (int /*long*/ pattern, double offset, double red, double green, double blue);
+public static final synchronized native void cairo_pattern_add_color_stop_rgba (int /*long*/ pattern, double offset, double red, double green, double blue, double alpha);
+public static final synchronized native void cairo_pattern_set_matrix (int /*long*/ pattern, double[] matrix);
+public static final synchronized native void cairo_pattern_get_matrix (int /*long*/ pattern, double[] matrix);
+public static final synchronized native void cairo_pattern_set_extend (int /*long*/ pattern, int extend);
 public static final synchronized native int cairo_pattern_get_extend (int /*long*/ pattern);
-public static final synchronized native int cairo_pattern_set_filter (int /*long*/ pattern, int filter);
+public static final synchronized native void cairo_pattern_set_filter (int /*long*/ pattern, int filter);
 public static final synchronized native int cairo_pattern_get_filter (int /*long*/ pattern);
-public static final synchronized native int /*long*/ cairo_xlib_surface_create (int /*long*/ dpy, int /*long*/ drawable, int /*long*/ visual, int format, int /*long*/ colormap);
-public static final synchronized native int /*long*/ cairo_matrix_create ();
-public static final synchronized native void cairo_matrix_destroy (int /*long*/ matrix);
-public static final synchronized native int cairo_matrix_copy (int /*long*/ matrix, int /*long*/ other);
-public static final synchronized native int cairo_matrix_set_identity (int /*long*/ matrix);
-public static final synchronized native int cairo_matrix_set_affine (int /*long*/ cr, double a, double b, double c, double d, double tx, double ty);
-public static final synchronized native int cairo_matrix_get_affine (int /*long*/ matrix, double[] a, double[] b, double[] c, double[] d, double[] tx, double[] ty);
-public static final synchronized native int cairo_matrix_translate (int /*long*/ matrix, double tx, double ty);
-public static final synchronized native int cairo_matrix_scale (int /*long*/ matrix, double sx, double sy);
-public static final synchronized native int cairo_matrix_rotate (int /*long*/ matrix, double radians);
-public static final synchronized native int cairo_matrix_invert (int /*long*/ matrix);
-public static final synchronized native int cairo_matrix_multiply (int /*long*/ result, int /*long*/ a, int /*long*/ b);
-public static final synchronized native int cairo_matrix_transform_distance (int /*long*/ matrix, double[] dx, double[] dy);
-public static final synchronized native int cairo_matrix_transform_point (int /*long*/ matrix, double[] x, double[] y);
+public static final synchronized native void cairo_matrix_init (double[] matrix, double xx, double yx, double xy, double yy, double x0, double y0);
+public static final synchronized native void cairo_matrix_init_identity (double[] matrix);
+public static final synchronized native void cairo_matrix_init_translate (double[] matrix, double tx, double ty);
+public static final synchronized native void cairo_matrix_init_scale (double[] matrix, double sx, double sy);
+public static final synchronized native void cairo_matrix_init_rotate (double[] matrix, double radians);
+public static final synchronized native void cairo_matrix_translate (double[] matrix, double tx, double ty);
+public static final synchronized native void cairo_matrix_scale (double[] matrix, double sx, double sy);
+public static final synchronized native void cairo_matrix_rotate (double[] matrix, double radians);
+public static final synchronized native int cairo_matrix_invert (double[] matrix);
+public static final synchronized native void cairo_matrix_multiply (double[] result, double[] a, double[] b);
+public static final synchronized native void cairo_matrix_transform_distance (double[] matrix, double[] dx, double[] dy);
+public static final synchronized native void cairo_matrix_transform_point (double[] matrix, double[] x, double[] y);
+public static final synchronized native int /*long*/ cairo_xlib_surface_create (int /*long*/ dpy, int /*long*/ drawable, int /*long*/ visual, int width, int height);
+public static final synchronized native int /*long*/ cairo_xlib_surface_create_for_bitmap (int /*long*/ dpy, int /*long*/ pixmap, int width, int height);
+public static final synchronized native void cairo_xlib_surface_set_size (int /*long*/ surface, int width, int height);
+public static final native void memmove(cairo_path_t dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(cairo_path_data_t dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(double[] dest, int /*long*/ src, int /*long*/ size);
 
 }