Changeset 2095 for libcacaTweet

Timestamp:

Nov 29, 2007, 12:20:05 AM (13 years ago)

Author:

Sam Hocevar

Message:

• Implemented the empty CuculCanvas? constructor.
• Implemented CacaDisplay?.Canvas which acts the same as caca_get_canvas().

Location:

libcaca/trunk/csharp

Files:

• Caca.cs (modified) (11 diffs)
• Cucul.cs (modified) (54 diffs)

libcaca/trunk/csharp/Caca.cs

@@ -201 +201 @@
     public class CacaDisplay : IDisposable
     {
-        private IntPtr _cv;
-        private IntPtr _dp;
+        private CuculCanvas _cv;
+        public CuculCanvas Canvas { get { return _cv; } }
+
+        private IntPtr _c_cv;
+        private IntPtr _c_dp;
 
         [DllImport("libcaca.dll", CallingConvention=CallingConvention.Cdecl),
@@ -209 +212 @@
         public CacaDisplay(CuculCanvas cv)
         {
-            _cv = cv._cv;
-            _dp = caca_create_display(_cv);
+            _cv = cv;
+            _c_cv = _cv._c_cv;
+            _c_dp = caca_create_display(_c_cv);
+        }
+
+        public CacaDisplay()
+        {
+            /* XXX: we do not call caca_create_display() with a NULL
+             * argument because it's then impossible to create a CuculCanvas
+             * and I don't want to add a weird constructor */
+            _cv = new CuculCanvas();
+            _c_cv = _cv._c_cv;
+            _c_dp = caca_create_display(_c_cv);
         }
 
@@ -218 +232 @@
         public void Dispose()
         {
-            caca_free_display(_dp);
+            caca_free_display(_c_dp);
             GC.SuppressFinalize(this);
         }
@@ -227 +241 @@
         public void Refresh()
         {
-            caca_refresh_display(_dp);
+            caca_refresh_display(_c_dp);
         }
 
@@ -238 +252 @@
         public int DisplayTime
         {
-            get { return caca_get_display_time(_dp); }
-            set { caca_set_display_time(_dp, value); }
+            get { return caca_get_display_time(_c_dp); }
+            set { caca_set_display_time(_c_dp, value); }
         }
 
@@ -250 +264 @@
         {
             CacaEvent e = new CacaEvent();
-            caca_get_event(_dp, (int)t, e.cevent, timeout);
+            caca_get_event(_c_dp, (int)t, e.cevent, timeout);
             return e;
         }
@@ -262 +276 @@
         public Size Size
         {
-            get { return new Size(caca_get_display_width(_dp),
-                                  caca_get_display_height(_dp)); }
+            get { return new Size(caca_get_display_width(_c_dp),
+                                  caca_get_display_height(_c_dp)); }
         }
 
@@ -271 +285 @@
         public string Title
         {
-            set { caca_set_display_title(_dp, value); }
+            set { caca_set_display_title(_c_dp, value); }
         }
 
@@ -279 +293 @@
         public bool Mouse
         {
-            set { caca_set_mouse(_dp, value); }
+            set { caca_set_mouse(_c_dp, value); }
         }
 
@@ -290 +304 @@
         public Point MousePos
         {
-            get { return new Point(caca_get_mouse_x(_dp),
-                                   caca_get_mouse_y(_dp)); }
+            get { return new Point(caca_get_mouse_x(_c_dp),
+                                   caca_get_mouse_y(_c_dp)); }
         }
 
@@ -299 +313 @@
         public bool Cursor
         {
-            set { caca_set_cursor(_dp, value); }
+            set { caca_set_cursor(_c_dp, value); }
         }
     }

libcaca/trunk/csharp/Cucul.cs

@@ -67 +67 @@
     public class CuculCanvas : IDisposable
     {
-        public readonly IntPtr _cv;
+        public readonly IntPtr _c_cv;
 
         /* libcucul basic functions */
@@ -76 +76 @@
         public CuculCanvas()
         {
-            _cv = cucul_create_canvas(0, 0);
+            _c_cv = cucul_create_canvas(0, 0);
         }
 
         public CuculCanvas(Size s)
         {
-            _cv = cucul_create_canvas(s.Width, s.Height);
+            _c_cv = cucul_create_canvas(s.Width, s.Height);
         }
 
         public CuculCanvas(int w, int h)
         {
-            _cv = cucul_create_canvas(h, w);
+            _c_cv = cucul_create_canvas(h, w);
         }
 
@@ -94 +94 @@
         public void Dispose()
         {
-           cucul_free_canvas(_cv);
+           /* FIXME: don't destroy ourselves if we're attached */
+           cucul_free_canvas(_c_cv);
            GC.SuppressFinalize(this);
         }
@@ -110 +111 @@
         public Size Size
         {
-            get { return new Size(cucul_get_canvas_width(_cv),
-                                  cucul_get_canvas_height(_cv)); }
-            set { cucul_set_canvas_size(_cv, value.Width, value.Height); }
+            get { return new Size(cucul_get_canvas_width(_c_cv),
+                                  cucul_get_canvas_height(_c_cv)); }
+            set { cucul_set_canvas_size(_c_cv, value.Width, value.Height); }
         }
 
         public Rectangle Rectangle
         {
-            get { return new Rectangle(0, 0, cucul_get_canvas_width(_cv),
-                                             cucul_get_canvas_height(_cv)); }
-            set { cucul_set_canvas_size(_cv, value.Width, value.Height); }
+            get { return new Rectangle(0, 0, cucul_get_canvas_width(_c_cv),
+                                             cucul_get_canvas_height(_c_cv)); }
+            set { cucul_set_canvas_size(_c_cv, value.Width, value.Height); }
         }
 
@@ -135 +136 @@
         public Point Cursor
         {
-            get { return new Point(cucul_get_cursor_x(_cv),
-                                   cucul_get_cursor_y(_cv)); }
-            set { cucul_gotoxy(_cv, value.X, value.Y); }
+            get { return new Point(cucul_get_cursor_x(_c_cv),
+                                   cucul_get_cursor_y(_c_cv)); }
+            set { cucul_gotoxy(_c_cv, value.X, value.Y); }
         }
 
@@ -146 +147 @@
         public int putChar(Point p, int c)
         {
-            return cucul_put_char(_cv, p.X, p.Y, c);
+            return cucul_put_char(_c_cv, p.X, p.Y, c);
         }
 
         public int putChar(int x, int y, int c)
         {
-            return cucul_put_char(_cv, x, y, c);
+            return cucul_put_char(_c_cv, x, y, c);
         }
 
@@ -159 +160 @@
         public int getChar(Point p)
         {
-            return cucul_get_char(_cv, p.X, p.Y);
+            return cucul_get_char(_c_cv, p.X, p.Y);
         }
 
         public int getChar(int x, int y)
         {
-            return cucul_get_char(_cv, x, y);
+            return cucul_get_char(_c_cv, x, y);
         }
 
@@ -173 +174 @@
         public int putStr(Point p, string c)
         {
-            return cucul_put_str(_cv, p.X, p.Y, c);
+            return cucul_put_str(_c_cv, p.X, p.Y, c);
         }
 
         public int putStr(int x, int y, string c)
         {
-            return cucul_put_str(_cv, x, y, c);
+            return cucul_put_str(_c_cv, x, y, c);
         }
 
@@ -186 +187 @@
         public int getAttr(Point p)
         {
-            return cucul_get_attr(_cv, p.X, p.Y);
+            return cucul_get_attr(_c_cv, p.X, p.Y);
         }
 
         public int getAttr(int x, int y)
         {
-            return cucul_get_attr(_cv, x, y);
+            return cucul_get_attr(_c_cv, x, y);
         }
 
@@ -199 +200 @@
         public int setAttr(int a)
         {
-            return cucul_set_attr(_cv, a);
+            return cucul_set_attr(_c_cv, a);
         }
 
@@ -208 +209 @@
         public int putAttr(Point p, int a)
         {
-            return cucul_put_attr(_cv, p.X, p.Y, a);
+            return cucul_put_attr(_c_cv, p.X, p.Y, a);
         }
 
         public int putAttr(int x, int y, int a)
         {
-            return cucul_put_attr(_cv, x, y, a);
+            return cucul_put_attr(_c_cv, x, y, a);
         }
 
@@ -222 +223 @@
         public int setColorAnsi(int fg, int bg)
         {
-            return cucul_set_color_ansi(_cv, (byte)fg, (byte)bg);
+            return cucul_set_color_ansi(_c_cv, (byte)fg, (byte)bg);
         }
 
@@ -231 +232 @@
         public int setColorArgb(int fg, int bg)
         {
-            return cucul_set_color_argb(_cv, fg, bg);
+            return cucul_set_color_argb(_c_cv, fg, bg);
         }
 
@@ -239 +240 @@
         public int Clear()
         {
-            return cucul_clear_canvas(_cv);
+            return cucul_clear_canvas(_c_cv);
         }
 
@@ -254 +255 @@
         public Point Handle
         {
-            get { return new Point(cucul_get_canvas_handle_x(_cv),
-                                   cucul_get_canvas_handle_y(_cv)); }
-            set { cucul_set_canvas_handle(_cv, value.X, value.Y); }
+            get { return new Point(cucul_get_canvas_handle_x(_c_cv),
+                                   cucul_get_canvas_handle_y(_c_cv)); }
+            set { cucul_set_canvas_handle(_c_cv, value.X, value.Y); }
         }
 
@@ -265 +266 @@
         public int Blit(Point p, CuculCanvas canvas)
         {
-            return cucul_blit(_cv, p.X, p.Y, canvas._cv, IntPtr.Zero);
+            return cucul_blit(_c_cv, p.X, p.Y, canvas._c_cv, IntPtr.Zero);
         }
 
         public int Blit(Point p, CuculCanvas cv, CuculCanvas mask)
         {
-            return cucul_blit(_cv, p.X, p.Y, cv._cv, mask._cv);
+            return cucul_blit(_c_cv, p.X, p.Y, cv._c_cv, mask._c_cv);
         }
 
         public int Blit(int x, int y, CuculCanvas canvas)
         {
-            return cucul_blit(_cv, x, y, canvas._cv, IntPtr.Zero);
+            return cucul_blit(_c_cv, x, y, canvas._c_cv, IntPtr.Zero);
         }
 
         public int Blit(int x, int y, CuculCanvas cv, CuculCanvas mask)
         {
-            return cucul_blit(_cv, x, y, cv._cv, mask._cv);
+            return cucul_blit(_c_cv, x, y, cv._c_cv, mask._c_cv);
         }
 
@@ -290 +291 @@
         public int setBoundaries(Rectangle r)
         {
-            return cucul_set_canvas_boundaries(_cv, r.X, r.Y,
+            return cucul_set_canvas_boundaries(_c_cv, r.X, r.Y,
                                                r.Width, r.Height);
         }
@@ -296 +297 @@
         public int setBoundaries(int x, int y, int w, int h)
         {
-            return cucul_set_canvas_boundaries(_cv, x, y, w, h);
+            return cucul_set_canvas_boundaries(_c_cv, x, y, w, h);
         }
 
@@ -306 +307 @@
         public int Invert()
         {
-            return cucul_invert(_cv);
+            return cucul_invert(_c_cv);
         }
 
@@ -314 +315 @@
         public int Flip()
         {
-            return cucul_flip(_cv);
+            return cucul_flip(_c_cv);
         }
 
@@ -322 +323 @@
         public int Flop()
         {
-            return cucul_flop(_cv);
+            return cucul_flop(_c_cv);
         }
 
@@ -330 +331 @@
         public int Rotate180()
         {
-            return cucul_rotate_180(_cv);
+            return cucul_rotate_180(_c_cv);
         }
 
@@ -338 +339 @@
         public int RotateLeft()
         {
-            return cucul_rotate_left(_cv);
+            return cucul_rotate_left(_c_cv);
         }
 
@@ -346 +347 @@
         public int RotateRight()
         {
-            return cucul_rotate_right(_cv);
+            return cucul_rotate_right(_c_cv);
         }
 
@@ -354 +355 @@
         public int StretchLeft()
         {
-            return cucul_stretch_left(_cv);
+            return cucul_stretch_left(_c_cv);
         }
 
@@ -362 +363 @@
         public int StretchRight()
         {
-            return cucul_stretch_right(_cv);
+            return cucul_stretch_right(_c_cv);
         }
 
@@ -373 +374 @@
         public int drawLine(Point p1, Point p2, uint c)
         {
-            return cucul_draw_line(_cv, p1.X, p1.Y, p2.X, p2.Y, c);
+            return cucul_draw_line(_c_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);
+            return cucul_draw_line(_c_cv, x1, y1, x2, y2, c);
         }
 
@@ -394 +395 @@
                 ly[i] = lp[i].Y;
             }
-            return cucul_draw_polyline(_cv, lx, ly, lp.Length - 1, c);
+            return cucul_draw_polyline(_c_cv, lx, ly, lp.Length - 1, c);
         }
 
@@ -402 +403 @@
                 return -1;
 
-            return cucul_draw_polyline(_cv, lx, ly, lx.Length - 1, c);
+            return cucul_draw_polyline(_c_cv, lx, ly, lx.Length - 1, c);
         }
 
@@ -411 +412 @@
         public int drawThinLine(Point p1, Point p2)
         {
-            return cucul_draw_thin_line(_cv, p1.X, p1.Y, p2.X, p2.Y);
+            return cucul_draw_thin_line(_c_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);
+            return cucul_draw_thin_line(_c_cv, x1, y1, x2, y2);
         }
 
@@ -432 +433 @@
                 ly[i] = lp[i].Y;
             }
-            return cucul_draw_thin_polyline(_cv, lx, ly, lp.Length - 1);
+            return cucul_draw_thin_polyline(_c_cv, lx, ly, lp.Length - 1);
         }
 
@@ -440 +441 @@
                 return -1;
 
-            return cucul_draw_thin_polyline(_cv, lx, ly, lx.Length - 1);
+            return cucul_draw_thin_polyline(_c_cv, lx, ly, lx.Length - 1);
         }
 
@@ -449 +450 @@
         public int drawCircle(Point p, int r, uint c)
         {
-            return cucul_draw_circle(_cv, p.X, p.Y, r, c);
+            return cucul_draw_circle(_c_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);
+            return cucul_draw_circle(_c_cv, x, y, r, c);
         }
 
@@ -463 +464 @@
         public int drawEllipse(Point p, int a, int b, uint c)
         {
-            return cucul_draw_ellipse(_cv, p.X, p.Y, a, b, c);
+            return cucul_draw_ellipse(_c_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);
+            return cucul_draw_ellipse(_c_cv, x, y, a, b, c);
         }
 
@@ -478 +479 @@
         public int drawThinEllipse(Point p, int a, int b)
         {
-            return cucul_draw_thin_ellipse(_cv, p.X, p.Y, a, b);
+            return cucul_draw_thin_ellipse(_c_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);
+            return cucul_draw_thin_ellipse(_c_cv, x, y, a, b);
         }
 
@@ -492 +493 @@
         public int fillEllipse(Point p, int a, int b, uint c)
         {
-            return cucul_fill_ellipse(_cv, p.X, p.Y, a, b, c);
+            return cucul_fill_ellipse(_c_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);
+            return cucul_fill_ellipse(_c_cv, x, y, a, b, c);
         }
 
@@ -506 +507 @@
         public int drawBox(Rectangle r, uint c)
         {
-            return cucul_draw_box(_cv, r.X, r.Y, r.Width, r.Height, c);
+            return cucul_draw_box(_c_cv, r.X, r.Y, r.Width, r.Height, c);
         }
 
         public int drawBox(int x, int y, int w, int h, uint c)
         {
-            return cucul_draw_box(_cv, x, y, w, h, c);
+            return cucul_draw_box(_c_cv, x, y, w, h, c);
         }
 
@@ -520 +521 @@
         public int drawThinBox(Rectangle r)
         {
-            return cucul_draw_thin_box(_cv, r.X, r.Y, r.Width, r.Height);
+            return cucul_draw_thin_box(_c_cv, r.X, r.Y, r.Width, r.Height);
         }
 
         public int drawThinBox(int x, int y, int w, int h)
         {
-            return cucul_draw_thin_box(_cv, x, y, w, h);
+            return cucul_draw_thin_box(_c_cv, x, y, w, h);
         }
 
@@ -534 +535 @@
         public int drawCp437Box(Rectangle r)
         {
-            return cucul_draw_cp437_box(_cv, r.X, r.Y, r.Width, r.Height);
+            return cucul_draw_cp437_box(_c_cv, r.X, r.Y, r.Width, r.Height);
         }
 
         public int drawCp437Box(int x, int y, int w, int h)
         {
-            return cucul_draw_cp437_box(_cv, x, y, w, h);
+            return cucul_draw_cp437_box(_c_cv, x, y, w, h);
         }
 
@@ -548 +549 @@
         public int fillBox(Rectangle r, uint c)
         {
-            return cucul_fill_box(_cv, r.X, r.Y, r.Width, r.Height, c);
+            return cucul_fill_box(_c_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);
+            return cucul_fill_box(_c_cv, x, y, w, h, c);
         }
 
@@ -563 +564 @@
         public int drawTriangle(Point p1, Point p2, Point p3, uint c)
         {
-            return cucul_draw_triangle(_cv, p1.X, p1.Y, p2.X, p2.Y,
+            return cucul_draw_triangle(_c_cv, p1.X, p1.Y, p2.X, p2.Y,
                                        p3.X, p3.Y, c);
         }
@@ -570 +571 @@
                                 int x3, int y3, uint c)
         {
-            return cucul_draw_triangle(_cv, x1, y1, x2, y2, x3, y3, c);
+            return cucul_draw_triangle(_c_cv, x1, y1, x2, y2, x3, y3, c);
         }
 
@@ -581 +582 @@
         public int drawThinTriangle(Point p1, Point p2, Point p3)
         {
-            return cucul_draw_thin_triangle(_cv, p1.X, p1.Y, p2.X, p2.Y,
+            return cucul_draw_thin_triangle(_c_cv, p1.X, p1.Y, p2.X, p2.Y,
                                             p3.X, p3.Y);
         }
@@ -588 +589 @@
                                     int x3, int y3)
         {
-            return cucul_draw_thin_triangle(_cv, x1, y1, x2, y2, x3, y3);
+            return cucul_draw_thin_triangle(_c_cv, x1, y1, x2, y2, x3, y3);
         }
 
@@ -598 +599 @@
         public int fillTriangle(Point p1, Point p2, Point p3, uint c)
         {
-            return cucul_fill_triangle(_cv, p1.X, p1.Y, p2.X, p2.Y,
+            return cucul_fill_triangle(_c_cv, p1.X, p1.Y, p2.X, p2.Y,
                                        p3.X, p3.Y, c);
         }
@@ -605 +606 @@
                                 int x3, int y3, uint c)
         {
-            return cucul_fill_triangle(_cv, x1, y1, x2, y2, x3, y3, c);
+            return cucul_fill_triangle(_c_cv, x1, y1, x2, y2, x3, y3, c);
         }
 
@@ -615 +616 @@
         public int getFrameCount()
         {
-            return cucul_get_frame_count(_cv);
+            return cucul_get_frame_count(_c_cv);
         }
 
@@ -623 +624 @@
         public int setFrame(int f)
         {
-            return cucul_set_frame(_cv, f);
+            return cucul_set_frame(_c_cv, f);
         }
 
@@ -634 +635 @@
         public string FrameName
         {
-            get { return cucul_get_frame_name(_cv); }
-            set { cucul_set_frame_name(_cv, value); }
+            get { return cucul_get_frame_name(_c_cv); }
+            set { cucul_set_frame_name(_c_cv, value); }
         }
 
@@ -643 +644 @@
         public int createFrame(int f)
         {
-            return cucul_create_frame(_cv, f);
+            return cucul_create_frame(_c_cv, f);
         }
 
@@ -651 +652 @@
         public int freeFrame(int f)
         {
-            return cucul_free_frame(_cv, f);
+            return cucul_free_frame(_c_cv, f);
         }
 
@@ -664 +665 @@
         {
             GCHandle gch = GCHandle.Alloc(data, GCHandleType.Pinned);
-            int ret = cucul_dither_bitmap(_cv, r.X, r.Y, r.Width, r.Height,
+            int ret = cucul_dither_bitmap(_c_cv, r.X, r.Y, r.Width, r.Height,
                                           d._dither, gch.AddrOfPinnedObject());
             gch.Free();
@@ -674 +675 @@
         {
             GCHandle gch = GCHandle.Alloc(data, GCHandleType.Pinned);
-            int ret = cucul_dither_bitmap(_cv, x, y, w, h, d._dither,
+            int ret = cucul_dither_bitmap(_c_cv, x, y, w, h, d._dither,
                                           gch.AddrOfPinnedObject());
             gch.Free();
@@ -947 +948 @@
         {
             GCHandle gch = GCHandle.Alloc(buf, GCHandleType.Pinned);
-            int ret = cucul_render_canvas(cv._cv, _font,
+            int ret = cucul_render_canvas(cv._c_cv, _font,
                                           gch.AddrOfPinnedObject(),
                                           buf.GetLength(0), buf.GetLength(1),