Changeset 2091 for libcacaTweet

Timestamp:

Nov 28, 2007, 8:15:09 AM (13 years ago)

Author:

Sam Hocevar

Message:

• Re-add methods that take int as arguments in addition to the Point, Size and Rectangle versions.

File:

• libcaca/trunk/csharp/Cucul.cs (modified) (24 diffs)

libcaca/trunk/csharp/Cucul.cs

@@ -84 +84 @@
         }
 
+        public CuculCanvas(int w, int h)
+        {
+            _cv = cucul_create_canvas(h, w);
+        }
+
         [DllImport("libcucul.dll", CallingConvention=CallingConvention.Cdecl),
          SuppressUnmanagedCodeSecurity]
@@ -97 +102 @@
         private static extern int cucul_set_canvas_size(IntPtr cv,
                                                         int w, int h);
-        public void setSize(Size s)
-        {
-            cucul_set_canvas_size(_cv, s.Width, s.Height);
-        }
-
         [DllImport("libcucul.dll", CallingConvention=CallingConvention.Cdecl),
          SuppressUnmanagedCodeSecurity]
@@ -149 +149 @@
         }
 
+        public int putChar(int x, int y, int c)
+        {
+            return cucul_put_char(_cv, x, y, c);
+        }
+
         [DllImport("libcucul.dll", CallingConvention=CallingConvention.Cdecl),
          SuppressUnmanagedCodeSecurity]
@@ -155 +160 @@
         {
             return cucul_get_char(_cv, p.X, p.Y);
+        }
+
+        public int getChar(int x, int y)
+        {
+            return cucul_get_char(_cv, x, y);
         }
 
@@ -166 +176 @@
         }
 
+        public int putStr(int x, int y, string c)
+        {
+            return cucul_put_str(_cv, x, y, c);
+        }
+
         [DllImport("libcucul.dll", CallingConvention=CallingConvention.Cdecl),
          SuppressUnmanagedCodeSecurity]
@@ -172 +187 @@
         {
             return cucul_get_attr(_cv, p.X, p.Y);
+        }
+
+        public int getAttr(int x, int y)
+        {
+            return cucul_get_attr(_cv, x, y);
         }
 
@@ -191 +211 @@
         }
 
+        public int putAttr(int x, int y, int a)
+        {
+            return cucul_put_attr(_cv, x, y, a);
+        }
+
         [DllImport("libcucul.dll", CallingConvention=CallingConvention.Cdecl),
          SuppressUnmanagedCodeSecurity]
@@ -246 +271 @@
         {
             return cucul_blit(_cv, p.X, p.Y, cv._cv, mask._cv);
+        }
+
+        public int Blit(int x, int y, CuculCanvas canvas)
+        {
+            return cucul_blit(_cv, x, y, canvas._cv, IntPtr.Zero);
+        }
+
+        public int Blit(int x, int y, CuculCanvas cv, CuculCanvas mask)
+        {
+            return cucul_blit(_cv, x, y, cv._cv, mask._cv);
         }
 
@@ -259 +294 @@
         }
 
+        public int setBoundaries(int x, int y, int w, int h)
+        {
+            return cucul_set_canvas_boundaries(_cv, x, y, w, h);
+        }
+
         /* canvas transformation */
 
@@ -334 +374 @@
         {
             return cucul_draw_line(_cv, p1.X, p1.Y, p2.X, p2.Y, c);
+        }
+
+        public int drawLine(int x1, int y1, int x2, int y2, uint c)
+        {
+            return cucul_draw_line(_cv, x1, y1, x2, y2, c);
         }
 
@@ -352 +397 @@
         }
 
+        public int drawPolyline(int[] lx, int[] ly, uint c)
+        {
+            if(lx.Length != ly.Length)
+                return -1;
+
+            return cucul_draw_polyline(_cv, lx, ly, lx.Length - 1, c);
+        }
+
         [DllImport("libcucul.dll", CallingConvention=CallingConvention.Cdecl),
          SuppressUnmanagedCodeSecurity]
@@ -359 +412 @@
         {
             return cucul_draw_thin_line(_cv, p1.X, p1.Y, p2.X, p2.Y);
+        }
+
+        public int drawThinLine(int x1, int y1, int x2, int y2)
+        {
+            return cucul_draw_thin_line(_cv, x1, y1, x2, y2);
         }
 
@@ -377 +435 @@
         }
 
+        public int drawThinPolyline(int[] lx, int[] ly)
+        {
+            if(lx.Length != ly.Length)
+                return -1;
+
+            return cucul_draw_thin_polyline(_cv, lx, ly, lx.Length - 1);
+        }
+
         [DllImport("libcucul.dll", CallingConvention=CallingConvention.Cdecl),
          SuppressUnmanagedCodeSecurity]
         private static extern int cucul_draw_circle(IntPtr cv, int x, int y,
                                                     int r, uint c);
-        public int drawCircle(Point p1, int r, uint c)
-        {
-            return cucul_draw_circle(_cv, p1.X, p1.Y, r, c);
+        public int drawCircle(Point p, int r, uint c)
+        {
+            return cucul_draw_circle(_cv, p.X, p.Y, r, c);
+        }
+
+        public int drawCircle(int x, int y, int r, uint c)
+        {
+            return cucul_draw_circle(_cv, x, y, r, c);
         }
 
@@ -390 +461 @@
         private static extern int cucul_draw_ellipse(IntPtr cv, int x, int y,
                                                      int a, int b, uint c);
-        public int drawEllipse(Point p1, int a, int b, uint c)
-        {
-            return cucul_draw_ellipse(_cv, p1.X, p1.Y, a, b, c);
+        public int drawEllipse(Point p, int a, int b, uint c)
+        {
+            return cucul_draw_ellipse(_cv, p.X, p.Y, a, b, c);
+        }
+
+        public int drawEllipse(int x, int y, int a, int b, uint c)
+        {
+            return cucul_draw_ellipse(_cv, x, y, a, b, c);
         }
 
@@ -400 +476 @@
                                                           int x, int y,
                                                           int a, int b);
-        public int drawThinEllipse(Point p1, int a, int b)
-        {
-            return cucul_draw_thin_ellipse(_cv, p1.X, p1.Y, a, b);
+        public int drawThinEllipse(Point p, int a, int b)
+        {
+            return cucul_draw_thin_ellipse(_cv, p.X, p.Y, a, b);
+        }
+
+        public int drawThinEllipse(int x, int y, int a, int b)
+        {
+            return cucul_draw_thin_ellipse(_cv, x, y, a, b);
         }
 
@@ -409 +490 @@
         private static extern int cucul_fill_ellipse(IntPtr cv, int x, int y,
                                                      int a, int b, uint c);
-        public int fillEllipse(Point p1, int a, int b, uint c)
-        {
-            return cucul_fill_ellipse(_cv, p1.X, p1.Y, a, b, c);
+        public int fillEllipse(Point p, int a, int b, uint c)
+        {
+            return cucul_fill_ellipse(_cv, p.X, p.Y, a, b, c);
+        }
+
+        public int fillEllipse(int x, int y, int a, int b, uint c)
+        {
+            return cucul_fill_ellipse(_cv, x, y, a, b, c);
         }
 
@@ -423 +509 @@
         }
 
+        public int drawBox(int x, int y, int w, int h, uint c)
+        {
+            return cucul_draw_box(_cv, x, y, w, h, c);
+        }
+
         [DllImport("libcucul.dll", CallingConvention=CallingConvention.Cdecl),
          SuppressUnmanagedCodeSecurity]
@@ -432 +523 @@
         }
 
+        public int drawThinBox(int x, int y, int w, int h)
+        {
+            return cucul_draw_thin_box(_cv, x, y, w, h);
+        }
+
         [DllImport("libcucul.dll", CallingConvention=CallingConvention.Cdecl),
          SuppressUnmanagedCodeSecurity]
@@ -441 +537 @@
         }
 
+        public int drawCp437Box(int x, int y, int w, int h)
+        {
+            return cucul_draw_cp437_box(_cv, x, y, w, h);
+        }
+
         [DllImport("libcucul.dll", CallingConvention=CallingConvention.Cdecl),
          SuppressUnmanagedCodeSecurity]
@@ -448 +549 @@
         {
             return cucul_fill_box(_cv, r.X, r.Y, r.Width, r.Height, c);
+        }
+
+        public int fillBox(int x, int y, int w, int h, uint c)
+        {
+            return cucul_fill_box(_cv, x, y, w, h, c);
         }
 
@@ -459 +565 @@
             return cucul_draw_triangle(_cv, p1.X, p1.Y, p2.X, p2.Y,
                                        p3.X, p3.Y, c);
+        }
+
+        public int drawTriangle(int x1, int y1, int x2, int y2,
+                                int x3, int y3, uint c)
+        {
+            return cucul_draw_triangle(_cv, x1, y1, x2, y2, x3, y3, c);
         }
 
@@ -473 +585 @@
         }
 
+        public int drawThinTriangle(int x1, int y1, int x2, int y2,
+                                    int x3, int y3)
+        {
+            return cucul_draw_thin_triangle(_cv, x1, y1, x2, y2, x3, y3);
+        }
+
         [DllImport("libcucul.dll", CallingConvention=CallingConvention.Cdecl),
          SuppressUnmanagedCodeSecurity]
@@ -484 +602 @@
         }
 
+        public int fillTriangle(int x1, int y1, int x2, int y2,
+                                int x3, int y3, uint c)
+        {
+            return cucul_fill_triangle(_cv, x1, y1, x2, y2, x3, y3, c);
+        }
+
         /* frame handling */
 
@@ -542 +666 @@
             int ret = cucul_dither_bitmap(_cv, r.X, r.Y, r.Width, r.Height,
                                           d._dither, gch.AddrOfPinnedObject());
+            gch.Free();
+            return ret;
+        }
+
+        public int ditherBitmap(int x, int y, int w, int h,
+                                CuculDither d, object data)
+        {
+            GCHandle gch = GCHandle.Alloc(data, GCHandleType.Pinned);
+            int ret = cucul_dither_bitmap(_cv, x, y, w, h, d._dither,
+                                          gch.AddrOfPinnedObject());
             gch.Free();
             return ret;