pygame: src/rect.c annotate

annotate src/rect.c @ 3194:9fcb7abf3185 default tip

Remove some gcc 4.7.2 compiler warnings

author	Lenard Lindstrom <len-l@telus.net>
date	Tue, 23 Apr 2013 19:53:36 -0700
parents	4f65c537da28
children

rev	line source
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	1 /*
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	2 pygame - Python Game Library
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	3 Copyright (C) 2000-2001 Pete Shinners
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	4
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	5 This library is free software; you can redistribute it and/or
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	6 modify it under the terms of the GNU Library General Public
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	7 License as published by the Free Software Foundation; either
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	8 version 2 of the License, or (at your option) any later version.
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	9
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	10 This library is distributed in the hope that it will be useful,
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	11 but WITHOUT ANY WARRANTY; without even the implied warranty of
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	13 Library General Public License for more details.
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	14
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	15 You should have received a copy of the GNU Library General Public
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	16 License along with this library; if not, write to the Free
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	17 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	18
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	19 Pete Shinners
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	20 pete@shinners.org
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	21 */
99d32cc487b7 Initial revision ahvezda parents: diff changeset	22
99d32cc487b7 Initial revision ahvezda parents: diff changeset	23 /*
99d32cc487b7 Initial revision ahvezda parents: diff changeset	24 * Python Rect Object -- useful 2d rectangle class
99d32cc487b7 Initial revision ahvezda parents: diff changeset	25 */
99d32cc487b7 Initial revision ahvezda parents: diff changeset	26 #define PYGAMEAPI_RECT_INTERNAL
99d32cc487b7 Initial revision ahvezda parents: diff changeset	27 #include "pygame.h"
1937 0d661c00c1aa Merged FreeType branch into trunk. tanoku parents: 1582 diff changeset	28 #include "doc/rect_doc.h"
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	29 #include "structmember.h"
1553 ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	30 #include "pgcompat.h"
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	31
1553 ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	32 static PyTypeObject PyRect_Type;
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	33 #define PyRect_Check(x) ((x)->ob_type == &PyRect_Type)
99d32cc487b7 Initial revision ahvezda parents: diff changeset	34
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	35 static PyObject* rect_new (PyTypeObject type, PyObject args, PyObject *kwds);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	36 static int rect_init (PyRectObject self, PyObject args, PyObject *kwds);
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	37
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	38 GAME_Rect*
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	39 GameRect_FromObject (PyObject* obj, GAME_Rect* temp)
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	40 {
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	41 int val;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	42 int length;
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	43
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	44 if (PyRect_Check (obj))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	45 return &((PyRectObject*) obj)->r;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	46 if (PySequence_Check (obj) && (length = PySequence_Length (obj)) > 0)
363 a5aeb6f96394 tuned sprites a little pygame parents: 362 diff changeset	47 {
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	48 if (length == 4)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	49 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	50 if (!IntFromObjIndex (obj, 0, &val))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	51 return NULL;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	52 temp->x = val;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	53 if (!IntFromObjIndex (obj, 1, &val))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	54 return NULL;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	55 temp->y = val;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	56 if (!IntFromObjIndex (obj, 2, &val))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	57 return NULL;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	58 temp->w = val;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	59 if (!IntFromObjIndex (obj, 3, &val))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	60 return NULL;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	61 temp->h = val;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	62 return temp;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	63 }
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	64 if (length == 2)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	65 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	66 PyObject* sub = PySequence_GetItem (obj, 0);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	67 if (!sub \|\| !PySequence_Check (sub) \|\| PySequence_Length (sub) != 2)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	68 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	69 Py_XDECREF (sub);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	70 return NULL;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	71 }
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	72 if (!IntFromObjIndex (sub, 0, &val))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	73 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	74 Py_DECREF (sub);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	75 return NULL;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	76 }
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	77 temp->x = val;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	78 if (!IntFromObjIndex (sub, 1, &val))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	79 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	80 Py_DECREF (sub);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	81 return NULL;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	82 }
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	83 temp->y = val;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	84 Py_DECREF (sub);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	85
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	86 sub = PySequence_GetItem (obj, 1);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	87 if (!sub \|\| !PySequence_Check (sub) \|\| PySequence_Length (sub) != 2)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	88 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	89 Py_XDECREF (sub);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	90 return NULL;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	91 }
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	92 if (!IntFromObjIndex (sub, 0, &val))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	93 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	94 Py_DECREF (sub);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	95 return NULL;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	96 }
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	97 temp->w = val;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	98 if (!IntFromObjIndex (sub, 1, &val))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	99 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	100 Py_DECREF (sub);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	101 return NULL;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	102 }
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	103 temp->h = val;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	104 Py_DECREF (sub);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	105 return temp;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	106 }
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	107 if (PyTuple_Check (obj) && length == 1) /looks like an arg?/
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	108 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	109 PyObject* sub = PyTuple_GET_ITEM (obj, 0);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	110 if (sub)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	111 return GameRect_FromObject (sub, temp);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	112 }
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	113 }
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	114 if (PyObject_HasAttrString (obj, "rect"))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	115 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	116 PyObject *rectattr;
363 a5aeb6f96394 tuned sprites a little pygame parents: 362 diff changeset	117 GAME_Rect *returnrect;
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	118 rectattr = PyObject_GetAttrString (obj, "rect");
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	119 if (PyCallable_Check (rectattr)) /call if it's a method/
361 d3b047e3954c working on rect magic pygame parents: 351 diff changeset	120 {
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	121 PyObject *rectresult = PyObject_CallObject (rectattr, NULL);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	122 Py_DECREF (rectattr);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	123 if (!rectresult)
363 a5aeb6f96394 tuned sprites a little pygame parents: 362 diff changeset	124 return NULL;
a5aeb6f96394 tuned sprites a little pygame parents: 362 diff changeset	125 rectattr = rectresult;
361 d3b047e3954c working on rect magic pygame parents: 351 diff changeset	126 }
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	127 returnrect = GameRect_FromObject (rectattr, temp);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	128 Py_DECREF (rectattr);
363 a5aeb6f96394 tuned sprites a little pygame parents: 362 diff changeset	129 return returnrect;
a5aeb6f96394 tuned sprites a little pygame parents: 362 diff changeset	130 }
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	131 return NULL;
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	132 }
99d32cc487b7 Initial revision ahvezda parents: diff changeset	133
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	134 PyObject*
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	135 PyRect_New (SDL_Rect* r)
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	136 {
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	137 PyRectObject* rect;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	138 rect = (PyRectObject *) PyRect_Type.tp_new (&PyRect_Type, NULL, NULL);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	139 if (rect)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	140 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	141 rect->r.x = r->x;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	142 rect->r.y = r->y;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	143 rect->r.w = r->w;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	144 rect->r.h = r->h;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	145 }
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	146 return (PyObject*)rect;
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	147 }
99d32cc487b7 Initial revision ahvezda parents: diff changeset	148
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	149 PyObject*
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	150 PyRect_New4 (int x, int y, int w, int h)
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	151 {
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	152 PyRectObject* rect;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	153 rect = (PyRectObject *) PyRect_Type.tp_new (&PyRect_Type, NULL, NULL);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	154 if (rect)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	155 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	156 rect->r.x = x;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	157 rect->r.y = y;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	158 rect->r.w = w;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	159 rect->r.h = h;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	160 }
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	161 return (PyObject*)rect;
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	162 }
99d32cc487b7 Initial revision ahvezda parents: diff changeset	163
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	164 static int
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	165 DoRectsIntersect (GAME_Rect A, GAME_Rect B)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	166 {
3156 4f65c537da28 Optimise rect intersection. Sam Bull <sam@sambull.org> parents: 2120 diff changeset	167 //A.topleft < B.bottomright &&
4f65c537da28 Optimise rect intersection. Sam Bull <sam@sambull.org> parents: 2120 diff changeset	168 //A.bottomright > B.topleft
4f65c537da28 Optimise rect intersection. Sam Bull <sam@sambull.org> parents: 2120 diff changeset	169 return (A->x < B->x + B->w && A->y < B->y + B->h &&
4f65c537da28 Optimise rect intersection. Sam Bull <sam@sambull.org> parents: 2120 diff changeset	170 A->x + A->w > B->x && A->y + A->h > B->y);
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	171 }
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	172
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	173 static PyObject*
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	174 rect_normalize (PyObject* oself)
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	175 {
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	176 PyRectObject* self = (PyRectObject*)oself;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	177
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	178 if (self->r.w < 0)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	179 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	180 self->r.x += self->r.w;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	181 self->r.w = -self->r.w;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	182 }
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	183 if (self->r.h < 0)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	184 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	185 self->r.y += self->r.h;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	186 self->r.h = -self->r.h;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	187 }
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	188
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	189 Py_RETURN_NONE;
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	190 }
99d32cc487b7 Initial revision ahvezda parents: diff changeset	191
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	192 static PyObject*
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	193 rect_move (PyObject* oself, PyObject* args)
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	194 {
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	195 PyRectObject* self = (PyRectObject*)oself;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	196 int x, y;
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	197
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	198 if (!TwoIntsFromObj (args, &x, &y))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	199 return RAISE (PyExc_TypeError, "argument must contain two numbers");
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	200
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	201 return PyRect_New4 (self->r.x + x, self->r.y + y, self->r.w, self->r.h);
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	202 }
99d32cc487b7 Initial revision ahvezda parents: diff changeset	203
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	204 static PyObject*
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	205 rect_move_ip (PyObject* oself, PyObject* args)
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	206 {
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	207 PyRectObject* self = (PyRectObject*)oself;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	208 int x, y;
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	209
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	210 if (!TwoIntsFromObj (args, &x, &y))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	211 return RAISE (PyExc_TypeError, "argument must contain two numbers");
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	212
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	213 self->r.x += x;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	214 self->r.y += y;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	215 Py_RETURN_NONE;
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	216 }
99d32cc487b7 Initial revision ahvezda parents: diff changeset	217
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	218 static PyObject*
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	219 rect_inflate (PyObject* oself, PyObject* args)
204 4cfdaabc3d10 the 1.1 release candidate pygame parents: 182 diff changeset	220 {
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	221 PyRectObject* self = (PyRectObject*)oself;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	222 int x, y;
204 4cfdaabc3d10 the 1.1 release candidate pygame parents: 182 diff changeset	223
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	224 if (!TwoIntsFromObj (args, &x, &y))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	225 return RAISE (PyExc_TypeError, "argument must contain two numbers");
204 4cfdaabc3d10 the 1.1 release candidate pygame parents: 182 diff changeset	226
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	227 return PyRect_New4 (self->r.x - x / 2, self->r.y - y / 2,
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	228 self->r.w + x, self->r.h + y);
204 4cfdaabc3d10 the 1.1 release candidate pygame parents: 182 diff changeset	229 }
4cfdaabc3d10 the 1.1 release candidate pygame parents: 182 diff changeset	230
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	231 static PyObject*
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	232 rect_inflate_ip (PyObject* oself, PyObject* args)
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	233 {
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	234 PyRectObject* self = (PyRectObject*)oself;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	235 int x, y;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	236
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	237 if (!TwoIntsFromObj (args, &x, &y))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	238 return RAISE (PyExc_TypeError, "argument must contain two numbers");
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	239
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	240 self->r.x -= x / 2;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	241 self->r.y -= y / 2;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	242 self->r.w += x;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	243 self->r.h += y;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	244 Py_RETURN_NONE;
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	245 }
99d32cc487b7 Initial revision ahvezda parents: diff changeset	246
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	247 static PyObject*
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	248 rect_union (PyObject* oself, PyObject* args)
204 4cfdaabc3d10 the 1.1 release candidate pygame parents: 182 diff changeset	249 {
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	250 PyRectObject* self = (PyRectObject*)oself;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	251 GAME_Rect *argrect, temp;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	252 int x, y, w, h;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	253 if (!(argrect = GameRect_FromObject (args, &temp)))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	254 return RAISE (PyExc_TypeError, "Argument must be rect style object");
204 4cfdaabc3d10 the 1.1 release candidate pygame parents: 182 diff changeset	255
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	256 x = MIN (self->r.x, argrect->x);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	257 y = MIN (self->r.y, argrect->y);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	258 w = MAX (self->r.x + self->r.w, argrect->x + argrect->w) - x;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	259 h = MAX (self->r.y + self->r.h, argrect->y + argrect->h) - y;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	260 return PyRect_New4 (x, y, w, h);
204 4cfdaabc3d10 the 1.1 release candidate pygame parents: 182 diff changeset	261 }
4cfdaabc3d10 the 1.1 release candidate pygame parents: 182 diff changeset	262
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	263 static PyObject*
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	264 rect_union_ip (PyObject* oself, PyObject* args)
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	265 {
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	266 PyRectObject* self = (PyRectObject*)oself;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	267 GAME_Rect *argrect, temp;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	268 int x, y, w, h;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	269 if (!(argrect = GameRect_FromObject (args, &temp)))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	270 return RAISE (PyExc_TypeError, "Argument must be rect style object");
474 71c16a56021f add html into rect docs pygame parents: 451 diff changeset	271
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	272 x = MIN (self->r.x, argrect->x);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	273 y = MIN (self->r.y, argrect->y);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	274 w = MAX (self->r.x + self->r.w, argrect->x + argrect->w) - x;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	275 h = MAX (self->r.y + self->r.h, argrect->y + argrect->h) - y;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	276 self->r.x = x;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	277 self->r.y = y;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	278 self->r.w = w;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	279 self->r.h = h;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	280 Py_RETURN_NONE;
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	281 }
99d32cc487b7 Initial revision ahvezda parents: diff changeset	282
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	283 static PyObject*
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	284 rect_unionall (PyObject* oself, PyObject* args)
204 4cfdaabc3d10 the 1.1 release candidate pygame parents: 182 diff changeset	285 {
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	286 PyRectObject* self = (PyRectObject*)oself;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	287 GAME_Rect *argrect, temp;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	288 int loop, size;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	289 PyObject* list, *obj;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	290 int t, l, b, r;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	291
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	292 if (!PyArg_ParseTuple (args, "O", &list))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	293 return NULL;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	294 if (!PySequence_Check (list))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	295 return RAISE (PyExc_TypeError,
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	296 "Argument must be a sequence of rectstyle objects.");
474 71c16a56021f add html into rect docs pygame parents: 451 diff changeset	297
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	298 l = self->r.x;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	299 t = self->r.y;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	300 r = self->r.x + self->r.w;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	301 b = self->r.y + self->r.h;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	302 size = PySequence_Length (list); /warning, size could be -1 on error?/
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	303 if (size < 1)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	304 return PyRect_New4 (l, t, r-l, b-t);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	305
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	306 for (loop = 0; loop < size; ++loop)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	307 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	308 obj = PySequence_GetItem (list, loop);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	309 if(!obj \|\| !(argrect = GameRect_FromObject (obj, &temp)))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	310 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	311 RAISE (PyExc_TypeError,
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	312 "Argument must be a sequence of rectstyle objects.");
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	313 Py_XDECREF (obj);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	314 break;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	315 }
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	316 l = MIN (l, argrect->x);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	317 t = MIN (t, argrect->y);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	318 r = MAX (r, argrect->x + argrect->w);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	319 b = MAX (b, argrect->y + argrect->h);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	320 Py_DECREF (obj);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	321 }
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	322 return PyRect_New4 (l, t, r-l, b-t);
204 4cfdaabc3d10 the 1.1 release candidate pygame parents: 182 diff changeset	323 }
4cfdaabc3d10 the 1.1 release candidate pygame parents: 182 diff changeset	324
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	325 static PyObject*
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	326 rect_unionall_ip (PyObject* oself, PyObject* args)
182 8d83fca24ce3 rect updates pygame parents: 163 diff changeset	327 {
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	328 PyRectObject* self = (PyRectObject*)oself;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	329 GAME_Rect *argrect, temp;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	330 int loop, size;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	331 PyObject* list, *obj;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	332 int t, l, b, r;
182 8d83fca24ce3 rect updates pygame parents: 163 diff changeset	333
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	334 if (!PyArg_ParseTuple (args, "O", &list))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	335 return NULL;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	336 if (!PySequence_Check (list))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	337 return RAISE (PyExc_TypeError,
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	338 "Argument must be a sequence of rectstyle objects.");
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	339
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	340 l = self->r.x;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	341 t = self->r.y;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	342 r = self->r.x + self->r.w;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	343 b = self->r.y + self->r.h;
182 8d83fca24ce3 rect updates pygame parents: 163 diff changeset	344
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	345 size = PySequence_Length (list); /warning, size could be -1 on error?/
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	346 if (size < 1)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	347 return PyRect_New4 (l, t, r-l, b-t);
182 8d83fca24ce3 rect updates pygame parents: 163 diff changeset	348
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	349 for (loop = 0; loop < size; ++loop)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	350 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	351 obj = PySequence_GetItem (list, loop);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	352 if (!obj \|\| !(argrect = GameRect_FromObject (obj, &temp)))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	353 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	354 RAISE (PyExc_TypeError,
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	355 "Argument must be a sequence of rectstyle objects.");
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	356 Py_XDECREF (obj);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	357 break;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	358 }
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	359 l = MIN (l, argrect->x);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	360 t = MIN (t, argrect->y);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	361 r = MAX (r, argrect->x + argrect->w);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	362 b = MAX (b, argrect->y + argrect->h);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	363 Py_DECREF (obj);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	364 }
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	365
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	366 self->r.x = l;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	367 self->r.y = t;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	368 self->r.w = r - l;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	369 self->r.h = b - t;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	370 Py_RETURN_NONE;
182 8d83fca24ce3 rect updates pygame parents: 163 diff changeset	371 }
8d83fca24ce3 rect updates pygame parents: 163 diff changeset	372
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	373 static PyObject*
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	374 rect_collidepoint (PyObject* oself, PyObject* args)
204 4cfdaabc3d10 the 1.1 release candidate pygame parents: 182 diff changeset	375 {
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	376 PyRectObject* self = (PyRectObject*)oself;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	377 int x, y;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	378 int inside;
204 4cfdaabc3d10 the 1.1 release candidate pygame parents: 182 diff changeset	379
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	380 if (!TwoIntsFromObj (args, &x, &y))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	381 return RAISE (PyExc_TypeError, "argument must contain two numbers");
204 4cfdaabc3d10 the 1.1 release candidate pygame parents: 182 diff changeset	382
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	383 inside = x >= self->r.x && x < self->r.x + self->r.w &&
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	384 y >= self->r.y && y < self->r.y + self->r.h;
204 4cfdaabc3d10 the 1.1 release candidate pygame parents: 182 diff changeset	385
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	386 return PyInt_FromLong (inside);
204 4cfdaabc3d10 the 1.1 release candidate pygame parents: 182 diff changeset	387 }
4cfdaabc3d10 the 1.1 release candidate pygame parents: 182 diff changeset	388
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	389 static PyObject*
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	390 rect_colliderect (PyObject* oself, PyObject* args)
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	391 {
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	392 PyRectObject* self = (PyRectObject*)oself;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	393 GAME_Rect *argrect, temp;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	394 if (!(argrect = GameRect_FromObject (args, &temp)))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	395 return RAISE (PyExc_TypeError, "Argument must be rect style object");
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	396
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	397 return PyInt_FromLong (DoRectsIntersect (&self->r, argrect));
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	398 }
99d32cc487b7 Initial revision ahvezda parents: diff changeset	399
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	400 static PyObject*
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	401 rect_collidelist (PyObject* oself, PyObject* args)
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	402 {
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	403 PyRectObject* self = (PyRectObject*)oself;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	404 GAME_Rect *argrect, temp;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	405 int loop, size;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	406 PyObject* list, *obj;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	407 PyObject* ret = NULL;
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	408
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	409 if (!PyArg_ParseTuple (args, "O", &list))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	410 return NULL;
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	411
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	412 if (!PySequence_Check (list))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	413 return RAISE (PyExc_TypeError,
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	414 "Argument must be a sequence of rectstyle objects.");
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	415
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	416 size = PySequence_Length (list); /warning, size could be -1 on error?/
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	417 for (loop = 0; loop < size; ++loop)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	418 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	419 obj = PySequence_GetItem (list, loop);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	420 if (!obj \|\| !(argrect = GameRect_FromObject (obj, &temp)))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	421 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	422 RAISE (PyExc_TypeError,
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	423 "Argument must be a sequence of rectstyle objects.");
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	424 Py_XDECREF (obj);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	425 break;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	426 }
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	427 if (DoRectsIntersect (&self->r, argrect))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	428 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	429 ret = PyInt_FromLong (loop);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	430 Py_DECREF (obj);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	431 break;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	432 }
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	433 Py_DECREF (obj);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	434 }
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	435 if (loop == size)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	436 ret = PyInt_FromLong (-1);
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	437
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	438 return ret;
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	439 }
99d32cc487b7 Initial revision ahvezda parents: diff changeset	440
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	441 static PyObject*
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	442 rect_collidelistall (PyObject* oself, PyObject* args)
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	443 {
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	444 PyRectObject* self = (PyRectObject*)oself;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	445 GAME_Rect *argrect, temp;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	446 int loop, size;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	447 PyObject* list, *obj;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	448 PyObject* ret = NULL;
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	449
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	450 if (!PyArg_ParseTuple (args, "O", &list))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	451 return NULL;
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	452
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	453 if (!PySequence_Check (list))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	454 return RAISE (PyExc_TypeError,
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	455 "Argument must be a sequence of rectstyle objects.");
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	456
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	457 ret = PyList_New (0);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	458 if (!ret)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	459 return NULL;
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	460
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	461 size = PySequence_Length (list); /warning, size could be -1?/
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	462 for (loop = 0; loop < size; ++loop)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	463 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	464 obj = PySequence_GetItem (list, loop);
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	465
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	466 if(!obj \|\| !(argrect = GameRect_FromObject (obj, &temp)))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	467 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	468 Py_XDECREF (obj);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	469 Py_DECREF (ret);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	470 return RAISE (PyExc_TypeError,
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	471 "Argument must be a sequence of rectstyle objects.");
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	472 }
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	473
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	474 if (DoRectsIntersect (&self->r, argrect))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	475 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	476 PyObject* num = PyInt_FromLong (loop);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	477 if (!num)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	478 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	479 Py_DECREF (obj);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	480 return NULL;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	481 }
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	482 PyList_Append (ret, num);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	483 Py_DECREF (num);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	484 }
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	485 Py_DECREF (obj);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	486 }
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	487
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	488 return ret;
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	489 }
99d32cc487b7 Initial revision ahvezda parents: diff changeset	490
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	491 static PyObject*
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	492 rect_collidedict (PyObject* oself, PyObject* args)
361 d3b047e3954c working on rect magic pygame parents: 351 diff changeset	493 {
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	494 PyRectObject* self = (PyRectObject*)oself;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	495 GAME_Rect *argrect, temp;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	496 Py_ssize_t loop=0;
1547 f4e8669d6af7 Patch from Sean Berry updating missing tests for Rects. Rene Dudfield <renesd@gmail.com> parents: 1506 diff changeset	497 Py_ssize_t values=0;
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	498 PyObject* dict, key, val;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	499 PyObject* ret = NULL;
361 d3b047e3954c working on rect magic pygame parents: 351 diff changeset	500
1547 f4e8669d6af7 Patch from Sean Berry updating missing tests for Rects. Rene Dudfield <renesd@gmail.com> parents: 1506 diff changeset	501 if (!PyArg_ParseTuple (args, "O\|i", &dict, &values))
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	502 return NULL;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	503 if (!PyDict_Check (dict))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	504 return RAISE (PyExc_TypeError,
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	505 "Argument must be a dict with rectstyle keys.");
361 d3b047e3954c working on rect magic pygame parents: 351 diff changeset	506
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	507 while (PyDict_Next (dict, &loop, &key, &val))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	508 {
1547 f4e8669d6af7 Patch from Sean Berry updating missing tests for Rects. Rene Dudfield <renesd@gmail.com> parents: 1506 diff changeset	509 if(values) {
f4e8669d6af7 Patch from Sean Berry updating missing tests for Rects. Rene Dudfield <renesd@gmail.com> parents: 1506 diff changeset	510 if (!(argrect = GameRect_FromObject (val, &temp)))
f4e8669d6af7 Patch from Sean Berry updating missing tests for Rects. Rene Dudfield <renesd@gmail.com> parents: 1506 diff changeset	511 {
f4e8669d6af7 Patch from Sean Berry updating missing tests for Rects. Rene Dudfield <renesd@gmail.com> parents: 1506 diff changeset	512 RAISE (PyExc_TypeError,
f4e8669d6af7 Patch from Sean Berry updating missing tests for Rects. Rene Dudfield <renesd@gmail.com> parents: 1506 diff changeset	513 "Argument must be a dict with rectstyle values.");
f4e8669d6af7 Patch from Sean Berry updating missing tests for Rects. Rene Dudfield <renesd@gmail.com> parents: 1506 diff changeset	514 break;
f4e8669d6af7 Patch from Sean Berry updating missing tests for Rects. Rene Dudfield <renesd@gmail.com> parents: 1506 diff changeset	515 }
f4e8669d6af7 Patch from Sean Berry updating missing tests for Rects. Rene Dudfield <renesd@gmail.com> parents: 1506 diff changeset	516 } else {
f4e8669d6af7 Patch from Sean Berry updating missing tests for Rects. Rene Dudfield <renesd@gmail.com> parents: 1506 diff changeset	517 if (!(argrect = GameRect_FromObject (key, &temp)))
f4e8669d6af7 Patch from Sean Berry updating missing tests for Rects. Rene Dudfield <renesd@gmail.com> parents: 1506 diff changeset	518 {
f4e8669d6af7 Patch from Sean Berry updating missing tests for Rects. Rene Dudfield <renesd@gmail.com> parents: 1506 diff changeset	519 RAISE (PyExc_TypeError,
f4e8669d6af7 Patch from Sean Berry updating missing tests for Rects. Rene Dudfield <renesd@gmail.com> parents: 1506 diff changeset	520 "Argument must be a dict with rectstyle keys.");
f4e8669d6af7 Patch from Sean Berry updating missing tests for Rects. Rene Dudfield <renesd@gmail.com> parents: 1506 diff changeset	521 break;
f4e8669d6af7 Patch from Sean Berry updating missing tests for Rects. Rene Dudfield <renesd@gmail.com> parents: 1506 diff changeset	522 }
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	523 }
1547 f4e8669d6af7 Patch from Sean Berry updating missing tests for Rects. Rene Dudfield <renesd@gmail.com> parents: 1506 diff changeset	524
f4e8669d6af7 Patch from Sean Berry updating missing tests for Rects. Rene Dudfield <renesd@gmail.com> parents: 1506 diff changeset	525
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	526 if (DoRectsIntersect (&self->r, argrect))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	527 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	528 ret = Py_BuildValue ("(OO)", key, val);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	529 break;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	530 }
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	531 }
361 d3b047e3954c working on rect magic pygame parents: 351 diff changeset	532
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	533 if (!ret)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	534 Py_RETURN_NONE;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	535 return ret;
361 d3b047e3954c working on rect magic pygame parents: 351 diff changeset	536 }
d3b047e3954c working on rect magic pygame parents: 351 diff changeset	537
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	538 static PyObject*
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	539 rect_collidedictall (PyObject* oself, PyObject* args)
361 d3b047e3954c working on rect magic pygame parents: 351 diff changeset	540 {
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	541 PyRectObject* self = (PyRectObject*)oself;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	542 GAME_Rect *argrect, temp;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	543 Py_ssize_t loop=0;
1547 f4e8669d6af7 Patch from Sean Berry updating missing tests for Rects. Rene Dudfield <renesd@gmail.com> parents: 1506 diff changeset	544 /* should we use values or keys? */
f4e8669d6af7 Patch from Sean Berry updating missing tests for Rects. Rene Dudfield <renesd@gmail.com> parents: 1506 diff changeset	545 Py_ssize_t values=0;
f4e8669d6af7 Patch from Sean Berry updating missing tests for Rects. Rene Dudfield <renesd@gmail.com> parents: 1506 diff changeset	546
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	547 PyObject* dict, key, val;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	548 PyObject* ret = NULL;
361 d3b047e3954c working on rect magic pygame parents: 351 diff changeset	549
1547 f4e8669d6af7 Patch from Sean Berry updating missing tests for Rects. Rene Dudfield <renesd@gmail.com> parents: 1506 diff changeset	550 if (!PyArg_ParseTuple (args, "O\|i", &dict, &values))
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	551 return NULL;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	552 if (!PyDict_Check (dict))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	553 return RAISE (PyExc_TypeError,
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	554 "Argument must be a dict with rectstyle keys.");
361 d3b047e3954c working on rect magic pygame parents: 351 diff changeset	555
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	556 ret = PyList_New (0);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	557 if(!ret)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	558 return NULL;
361 d3b047e3954c working on rect magic pygame parents: 351 diff changeset	559
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	560 while (PyDict_Next (dict, &loop, &key, &val))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	561 {
1547 f4e8669d6af7 Patch from Sean Berry updating missing tests for Rects. Rene Dudfield <renesd@gmail.com> parents: 1506 diff changeset	562 if (values) {
f4e8669d6af7 Patch from Sean Berry updating missing tests for Rects. Rene Dudfield <renesd@gmail.com> parents: 1506 diff changeset	563 if (!(argrect = GameRect_FromObject (val, &temp)))
f4e8669d6af7 Patch from Sean Berry updating missing tests for Rects. Rene Dudfield <renesd@gmail.com> parents: 1506 diff changeset	564 {
f4e8669d6af7 Patch from Sean Berry updating missing tests for Rects. Rene Dudfield <renesd@gmail.com> parents: 1506 diff changeset	565 Py_DECREF (ret);
f4e8669d6af7 Patch from Sean Berry updating missing tests for Rects. Rene Dudfield <renesd@gmail.com> parents: 1506 diff changeset	566 return RAISE (PyExc_TypeError,
f4e8669d6af7 Patch from Sean Berry updating missing tests for Rects. Rene Dudfield <renesd@gmail.com> parents: 1506 diff changeset	567 "Argument must be a dict with rectstyle values.");
f4e8669d6af7 Patch from Sean Berry updating missing tests for Rects. Rene Dudfield <renesd@gmail.com> parents: 1506 diff changeset	568 }
f4e8669d6af7 Patch from Sean Berry updating missing tests for Rects. Rene Dudfield <renesd@gmail.com> parents: 1506 diff changeset	569 } else {
f4e8669d6af7 Patch from Sean Berry updating missing tests for Rects. Rene Dudfield <renesd@gmail.com> parents: 1506 diff changeset	570 if (!(argrect = GameRect_FromObject (key, &temp)))
f4e8669d6af7 Patch from Sean Berry updating missing tests for Rects. Rene Dudfield <renesd@gmail.com> parents: 1506 diff changeset	571 {
f4e8669d6af7 Patch from Sean Berry updating missing tests for Rects. Rene Dudfield <renesd@gmail.com> parents: 1506 diff changeset	572 Py_DECREF (ret);
f4e8669d6af7 Patch from Sean Berry updating missing tests for Rects. Rene Dudfield <renesd@gmail.com> parents: 1506 diff changeset	573 return RAISE (PyExc_TypeError,
f4e8669d6af7 Patch from Sean Berry updating missing tests for Rects. Rene Dudfield <renesd@gmail.com> parents: 1506 diff changeset	574 "Argument must be a dict with rectstyle keys.");
f4e8669d6af7 Patch from Sean Berry updating missing tests for Rects. Rene Dudfield <renesd@gmail.com> parents: 1506 diff changeset	575 }
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	576 }
361 d3b047e3954c working on rect magic pygame parents: 351 diff changeset	577
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	578 if (DoRectsIntersect (&self->r, argrect))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	579 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	580 PyObject* num = Py_BuildValue ("(OO)", key, val);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	581 if(!num)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	582 return NULL;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	583 PyList_Append (ret, num);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	584 Py_DECREF (num);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	585 }
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	586 }
361 d3b047e3954c working on rect magic pygame parents: 351 diff changeset	587
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	588 return ret;
361 d3b047e3954c working on rect magic pygame parents: 351 diff changeset	589 }
d3b047e3954c working on rect magic pygame parents: 351 diff changeset	590
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	591 static PyObject*
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	592 rect_clip (PyObject* self, PyObject* args)
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	593 {
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	594 GAME_Rect A, B, temp;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	595 int x, y, w, h;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	596
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	597 A = &((PyRectObject*) self)->r;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	598 if (!(B = GameRect_FromObject (args, &temp)))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	599 return RAISE (PyExc_TypeError, "Argument must be rect style object");
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	600
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	601 /* Left */
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	602 if ((A->x >= B->x) && (A->x < (B->x + B->w)))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	603 x = A->x;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	604 else if ((B->x >= A->x) && (B->x < (A->x + A->w)))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	605 x = B->x;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	606 else
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	607 goto nointersect;
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	608
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	609 /* Right */
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	610 if (((A->x + A->w) > B->x) && ((A->x + A->w) <= (B->x + B->w)))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	611 w = (A->x + A->w) - x;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	612 else if (((B->x + B->w) > A->x) && ((B->x + B->w) <= (A->x + A->w)))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	613 w = (B->x + B->w) - x;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	614 else
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	615 goto nointersect;
474 71c16a56021f add html into rect docs pygame parents: 451 diff changeset	616
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	617 /* Top */
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	618 if ((A->y >= B->y) && (A->y < (B->y + B->h)))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	619 y = A->y;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	620 else if ((B->y >= A->y) && (B->y < (A->y + A->h)))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	621 y = B->y;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	622 else
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	623 goto nointersect;
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	624
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	625 /* Bottom */
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	626 if (((A->y + A->h) > B->y) && ((A->y + A->h) <= (B->y + B->h)))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	627 h = (A->y + A->h) - y;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	628 else if (((B->y + B->h) > A->y) && ((B->y + B->h) <= (A->y + A->h)))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	629 h = (B->y + B->h) - y;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	630 else
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	631 goto nointersect;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	632
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	633 return PyRect_New4 (x, y, w, h);
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	634
99d32cc487b7 Initial revision ahvezda parents: diff changeset	635 nointersect:
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	636 return PyRect_New4 (A->x, A->y, 0, 0);
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	637 }
99d32cc487b7 Initial revision ahvezda parents: diff changeset	638
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	639 static PyObject*
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	640 rect_contains (PyObject* oself, PyObject* args)
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	641 {
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	642 int contained;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	643 PyRectObject* self = (PyRectObject*)oself;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	644 GAME_Rect *argrect, temp;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	645 if (!(argrect = GameRect_FromObject (args, &temp)))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	646 return RAISE (PyExc_TypeError, "Argument must be rect style object");
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	647
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	648 contained = (self->r.x <= argrect->x) && (self->r.y <= argrect->y) &&
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	649 (self->r.x + self->r.w >= argrect->x + argrect->w) &&
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	650 (self->r.y + self->r.h >= argrect->y + argrect->h) &&
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	651 (self->r.x + self->r.w > argrect->x) &&
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	652 (self->r.y + self->r.h > argrect->y);
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	653
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	654 return PyInt_FromLong (contained);
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	655 }
99d32cc487b7 Initial revision ahvezda parents: diff changeset	656
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	657 static PyObject*
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	658 rect_clamp (PyObject* oself, PyObject* args)
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	659 {
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	660 PyRectObject* self = (PyRectObject*)oself;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	661 GAME_Rect *argrect, temp;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	662 int x, y;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	663 if (!(argrect = GameRect_FromObject (args, &temp)))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	664 return RAISE (PyExc_TypeError, "Argument must be rect style object");
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	665
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	666 if (self->r.w >= argrect->w)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	667 x = argrect->x + argrect->w / 2 - self->r.w / 2;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	668 else if (self->r.x < argrect->x)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	669 x = argrect->x;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	670 else if (self->r.x + self->r.w > argrect->x + argrect->w)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	671 x = argrect->x + argrect->w - self->r.w;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	672 else
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	673 x = self->r.x;
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	674
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	675 if (self->r.h >= argrect->h)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	676 y = argrect->y + argrect->h / 2 - self->r.h / 2;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	677 else if (self->r.y < argrect->y)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	678 y = argrect->y;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	679 else if (self->r.y + self->r.h > argrect->y + argrect->h)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	680 y = argrect->y + argrect->h - self->r.h;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	681 else
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	682 y = self->r.y;
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	683
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	684 return PyRect_New4 (x, y, self->r.w, self->r.h);
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	685 }
99d32cc487b7 Initial revision ahvezda parents: diff changeset	686
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	687 static PyObject*
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	688 rect_fit (PyObject* oself, PyObject* args)
525 1fc0d7b87974 Rect and Surface conveniences pygame parents: 524 diff changeset	689 {
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	690 PyRectObject* self = (PyRectObject*)oself;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	691 GAME_Rect *argrect, temp;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	692 int w, h, x, y;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	693 float xratio, yratio, maxratio;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	694 if (!(argrect = GameRect_FromObject (args, &temp)))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	695 return RAISE (PyExc_TypeError, "Argument must be rect style object");
525 1fc0d7b87974 Rect and Surface conveniences pygame parents: 524 diff changeset	696
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	697 xratio = (float) self->r.w / (float) argrect->w;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	698 yratio = (float) self->r.h / (float) argrect->h;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	699 maxratio = (xratio > yratio) ? xratio : yratio;
528 df11f5a31fce arc fixes pygame parents: 525 diff changeset	700
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	701 w = (int) (self->r.w / maxratio);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	702 h = (int) (self->r.h / maxratio);
525 1fc0d7b87974 Rect and Surface conveniences pygame parents: 524 diff changeset	703
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	704 x = argrect->x + (argrect->w - w)/2;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	705 y = argrect->y + (argrect->h - h)/2;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	706
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	707 return PyRect_New4 (x, y, w, h);
525 1fc0d7b87974 Rect and Surface conveniences pygame parents: 524 diff changeset	708 }
1fc0d7b87974 Rect and Surface conveniences pygame parents: 524 diff changeset	709
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	710 static PyObject*
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	711 rect_clamp_ip (PyObject* oself, PyObject* args)
255 25b933a57715 key_repeat checks errors pygame parents: 249 diff changeset	712 {
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	713 PyRectObject* self = (PyRectObject*)oself;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	714 GAME_Rect *argrect, temp;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	715 int x, y;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	716 if (!(argrect = GameRect_FromObject (args, &temp)))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	717 return RAISE (PyExc_TypeError, "Argument must be rect style object");
255 25b933a57715 key_repeat checks errors pygame parents: 249 diff changeset	718
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	719 if (self->r.w >= argrect->w)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	720 x = argrect->x + argrect->w / 2 - self->r.w / 2;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	721 else if (self->r.x < argrect->x)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	722 x = argrect->x;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	723 else if (self->r.x + self->r.w > argrect->x + argrect->w)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	724 x = argrect->x + argrect->w - self->r.w;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	725 else
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	726 x = self->r.x;
255 25b933a57715 key_repeat checks errors pygame parents: 249 diff changeset	727
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	728 if (self->r.h >= argrect->h)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	729 y = argrect->y + argrect->h / 2 - self->r.h / 2;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	730 else if (self->r.y < argrect->y)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	731 y = argrect->y;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	732 else if (self->r.y + self->r.h > argrect->y + argrect->h)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	733 y = argrect->y + argrect->h - self->r.h;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	734 else
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	735 y = self->r.y;
255 25b933a57715 key_repeat checks errors pygame parents: 249 diff changeset	736
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	737 self->r.x = x;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	738 self->r.y = y;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	739 Py_RETURN_NONE;
255 25b933a57715 key_repeat checks errors pygame parents: 249 diff changeset	740 }
25b933a57715 key_repeat checks errors pygame parents: 249 diff changeset	741
451 145a68e231d0 osx fix pygame parents: 426 diff changeset	742 /* for pickling */
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	743 static PyObject*
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	744 rect_reduce (PyObject* oself)
451 145a68e231d0 osx fix pygame parents: 426 diff changeset	745 {
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	746 PyRectObject* self = (PyRectObject*)oself;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	747 return Py_BuildValue ("(O(iiii))", oself->ob_type,
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	748 (int)self->r.x, (int)self->r.y,
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	749 (int)self->r.w, (int)self->r.h);
451 145a68e231d0 osx fix pygame parents: 426 diff changeset	750 }
145a68e231d0 osx fix pygame parents: 426 diff changeset	751
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	752 /* for copy module */
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	753 static PyObject*
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	754 rect_copy (PyObject* oself)
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	755 {
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	756 PyRectObject* self = (PyRectObject*)oself;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	757 return PyRect_New4 (self->r.x, self->r.y, self->r.w, self->r.h);
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	758 }
98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	759
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	760 static struct PyMethodDef rect_methods[] =
99d32cc487b7 Initial revision ahvezda parents: diff changeset	761 {
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	762 { "normalize", (PyCFunction) rect_normalize, METH_NOARGS,
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	763 DOC_RECTNORMALIZE },
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	764 { "clip", rect_clip, METH_VARARGS, DOC_RECTCLIP},
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	765 { "clamp", rect_clamp, METH_VARARGS, DOC_RECTCLAMP},
1506 a60459a910fd Bugzilla feature request 25: add Rect.copy method Lenard Lindstrom <len-l@telus.net> parents: 1499 diff changeset	766 { "clamp_ip", rect_clamp_ip, METH_VARARGS, DOC_RECTCLAMPIP},
a60459a910fd Bugzilla feature request 25: add Rect.copy method Lenard Lindstrom <len-l@telus.net> parents: 1499 diff changeset	767 { "copy", (PyCFunction) rect_copy, METH_NOARGS, DOC_RECTCOPY},
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	768 { "fit", rect_fit, METH_VARARGS, DOC_RECTFIT},
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	769 { "move", rect_move, METH_VARARGS, DOC_RECTMOVE},
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	770 { "inflate", rect_inflate, METH_VARARGS, DOC_RECTINFLATE},
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	771 { "union", rect_union, METH_VARARGS, DOC_RECTUNION},
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	772 { "unionall", rect_unionall, METH_VARARGS, DOC_RECTUNIONALL},
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	773 { "move_ip", rect_move_ip, METH_VARARGS, DOC_RECTMOVEIP},
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	774 { "inflate_ip", rect_inflate_ip, METH_VARARGS, DOC_RECTINFLATEIP},
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	775 { "union_ip", rect_union_ip, METH_VARARGS, DOC_RECTUNIONIP},
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	776 { "unionall_ip", rect_unionall_ip, METH_VARARGS, DOC_RECTUNIONALLIP},
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	777 { "collidepoint", rect_collidepoint, METH_VARARGS, DOC_RECTCOLLIDEPOINT},
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	778 { "colliderect", rect_colliderect, METH_VARARGS, DOC_RECTCOLLIDERECT},
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	779 { "collidelist", rect_collidelist, METH_VARARGS, DOC_RECTCOLLIDELIST},
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	780 { "collidelistall", rect_collidelistall, METH_VARARGS,
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	781 DOC_RECTCOLLIDELISTALL},
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	782 { "collidedict", rect_collidedict, METH_VARARGS, DOC_RECTCOLLIDEDICT},
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	783 { "collidedictall", rect_collidedictall, METH_VARARGS,
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	784 DOC_RECTCOLLIDEDICTALL},
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	785 { "contains", rect_contains, METH_VARARGS, DOC_RECTCONTAINS},
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	786 { "__reduce__", (PyCFunction) rect_reduce, METH_NOARGS, NULL},
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	787 { "__copy__", (PyCFunction) rect_copy, METH_NOARGS, NULL},
798 05346fb84a05 Some cleanups from Marcus to stop compiler warnings. Rene Dudfield <renesd@gmail.com> parents: 794 diff changeset	788 { NULL, NULL, 0, NULL }
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	789 };
99d32cc487b7 Initial revision ahvezda parents: diff changeset	790
99d32cc487b7 Initial revision ahvezda parents: diff changeset	791 /* sequence functions */
99d32cc487b7 Initial revision ahvezda parents: diff changeset	792
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	793 static Py_ssize_t
1372 04fa64ae38c1 Remove some compiler warnings Lenard Lindstrom <len-l@telus.net> parents: 831 diff changeset	794 rect_length (PyObject *_self)
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	795 {
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	796 return 4;
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	797 }
99d32cc487b7 Initial revision ahvezda parents: diff changeset	798
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	799 static PyObject*
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	800 rect_item (PyObject *_self, Py_ssize_t i)
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	801 {
813 fd421ea279ae Thanks Christopher Stone, John Myers, John Poppleweel, and Marcus! Rene Dudfield <renesd@gmail.com> parents: 798 diff changeset	802 PyRectObject self = (PyRectObject ) _self;
fd421ea279ae Thanks Christopher Stone, John Myers, John Poppleweel, and Marcus! Rene Dudfield <renesd@gmail.com> parents: 798 diff changeset	803 int* data = (int*)&self->r;
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	804 if (i < 0 \|\| i > 3)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	805 return RAISE (PyExc_IndexError, "Invalid rect Index");
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	806
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	807 return PyInt_FromLong (data[i]);
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	808 }
99d32cc487b7 Initial revision ahvezda parents: diff changeset	809
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	810 static int
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	811 rect_ass_item (PyObject _self, Py_ssize_t i, PyObject v)
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	812 {
813 fd421ea279ae Thanks Christopher Stone, John Myers, John Poppleweel, and Marcus! Rene Dudfield <renesd@gmail.com> parents: 798 diff changeset	813 PyRectObject self = (PyRectObject ) _self;
fd421ea279ae Thanks Christopher Stone, John Myers, John Poppleweel, and Marcus! Rene Dudfield <renesd@gmail.com> parents: 798 diff changeset	814 int val;
fd421ea279ae Thanks Christopher Stone, John Myers, John Poppleweel, and Marcus! Rene Dudfield <renesd@gmail.com> parents: 798 diff changeset	815 int* data = (int*)&self->r;
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	816 if (i < 0 \|\| i > 3)
813 fd421ea279ae Thanks Christopher Stone, John Myers, John Poppleweel, and Marcus! Rene Dudfield <renesd@gmail.com> parents: 798 diff changeset	817 {
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	818 RAISE (PyExc_IndexError, "Invalid rect Index");
813 fd421ea279ae Thanks Christopher Stone, John Myers, John Poppleweel, and Marcus! Rene Dudfield <renesd@gmail.com> parents: 798 diff changeset	819 return -1;
fd421ea279ae Thanks Christopher Stone, John Myers, John Poppleweel, and Marcus! Rene Dudfield <renesd@gmail.com> parents: 798 diff changeset	820 }
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	821 if (!IntFromObj (v, &val))
813 fd421ea279ae Thanks Christopher Stone, John Myers, John Poppleweel, and Marcus! Rene Dudfield <renesd@gmail.com> parents: 798 diff changeset	822 {
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	823 RAISE (PyExc_TypeError, "Must assign numeric values");
813 fd421ea279ae Thanks Christopher Stone, John Myers, John Poppleweel, and Marcus! Rene Dudfield <renesd@gmail.com> parents: 798 diff changeset	824 return -1;
fd421ea279ae Thanks Christopher Stone, John Myers, John Poppleweel, and Marcus! Rene Dudfield <renesd@gmail.com> parents: 798 diff changeset	825 }
fd421ea279ae Thanks Christopher Stone, John Myers, John Poppleweel, and Marcus! Rene Dudfield <renesd@gmail.com> parents: 798 diff changeset	826 data[i] = val;
fd421ea279ae Thanks Christopher Stone, John Myers, John Poppleweel, and Marcus! Rene Dudfield <renesd@gmail.com> parents: 798 diff changeset	827 return 0;
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	828 }
99d32cc487b7 Initial revision ahvezda parents: diff changeset	829
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	830 static PyObject*
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	831 rect_slice (PyObject *_self, Py_ssize_t ilow, Py_ssize_t ihigh)
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	832 {
813 fd421ea279ae Thanks Christopher Stone, John Myers, John Poppleweel, and Marcus! Rene Dudfield <renesd@gmail.com> parents: 798 diff changeset	833 PyRectObject self = (PyRectObject ) _self;
fd421ea279ae Thanks Christopher Stone, John Myers, John Poppleweel, and Marcus! Rene Dudfield <renesd@gmail.com> parents: 798 diff changeset	834 PyObject *list;
fd421ea279ae Thanks Christopher Stone, John Myers, John Poppleweel, and Marcus! Rene Dudfield <renesd@gmail.com> parents: 798 diff changeset	835 int* data = (int*)&self->r;
fd421ea279ae Thanks Christopher Stone, John Myers, John Poppleweel, and Marcus! Rene Dudfield <renesd@gmail.com> parents: 798 diff changeset	836 int numitems, loop, l = 4;
fd421ea279ae Thanks Christopher Stone, John Myers, John Poppleweel, and Marcus! Rene Dudfield <renesd@gmail.com> parents: 798 diff changeset	837
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	838 if (ihigh < 0)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	839 ihigh += l;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	840 if (ilow < 0)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	841 ilow += l;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	842
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	843 if (ilow < 0)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	844 ilow = 0;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	845 else if (ilow > l)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	846 ilow = l;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	847
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	848 if (ihigh < 0)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	849 ihigh = 0;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	850 else if (ihigh > l)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	851 ihigh = l;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	852
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	853 if (ihigh < ilow)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	854 ihigh = ilow;
813 fd421ea279ae Thanks Christopher Stone, John Myers, John Poppleweel, and Marcus! Rene Dudfield <renesd@gmail.com> parents: 798 diff changeset	855
fd421ea279ae Thanks Christopher Stone, John Myers, John Poppleweel, and Marcus! Rene Dudfield <renesd@gmail.com> parents: 798 diff changeset	856 numitems = ihigh - ilow;
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	857 list = PyList_New (numitems);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	858 for (loop = 0; loop < numitems; ++loop)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	859 PyList_SET_ITEM (list, loop, PyInt_FromLong (data[loop + ilow]));
813 fd421ea279ae Thanks Christopher Stone, John Myers, John Poppleweel, and Marcus! Rene Dudfield <renesd@gmail.com> parents: 798 diff changeset	860
fd421ea279ae Thanks Christopher Stone, John Myers, John Poppleweel, and Marcus! Rene Dudfield <renesd@gmail.com> parents: 798 diff changeset	861 return list;
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	862 }
99d32cc487b7 Initial revision ahvezda parents: diff changeset	863
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	864 static int
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	865 rect_ass_slice(PyObject _self, Py_ssize_t ilow, Py_ssize_t ihigh, PyObject v)
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	866 {
813 fd421ea279ae Thanks Christopher Stone, John Myers, John Poppleweel, and Marcus! Rene Dudfield <renesd@gmail.com> parents: 798 diff changeset	867 PyRectObject self = (PyRectObject ) _self;
fd421ea279ae Thanks Christopher Stone, John Myers, John Poppleweel, and Marcus! Rene Dudfield <renesd@gmail.com> parents: 798 diff changeset	868 int* data = (int*)&self->r;
fd421ea279ae Thanks Christopher Stone, John Myers, John Poppleweel, and Marcus! Rene Dudfield <renesd@gmail.com> parents: 798 diff changeset	869 int numitems, loop, l = 4;
fd421ea279ae Thanks Christopher Stone, John Myers, John Poppleweel, and Marcus! Rene Dudfield <renesd@gmail.com> parents: 798 diff changeset	870 int val;
fd421ea279ae Thanks Christopher Stone, John Myers, John Poppleweel, and Marcus! Rene Dudfield <renesd@gmail.com> parents: 798 diff changeset	871
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	872 if (!PySequence_Check (v))
813 fd421ea279ae Thanks Christopher Stone, John Myers, John Poppleweel, and Marcus! Rene Dudfield <renesd@gmail.com> parents: 798 diff changeset	873 {
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	874 RAISE (PyExc_TypeError, "Assigned slice must be a sequence");
813 fd421ea279ae Thanks Christopher Stone, John Myers, John Poppleweel, and Marcus! Rene Dudfield <renesd@gmail.com> parents: 798 diff changeset	875 return -1;
fd421ea279ae Thanks Christopher Stone, John Myers, John Poppleweel, and Marcus! Rene Dudfield <renesd@gmail.com> parents: 798 diff changeset	876 }
fd421ea279ae Thanks Christopher Stone, John Myers, John Poppleweel, and Marcus! Rene Dudfield <renesd@gmail.com> parents: 798 diff changeset	877
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	878 if (ihigh < 0)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	879 ihigh += l;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	880 if (ilow < 0)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	881 ilow += l;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	882 if (ilow < 0)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	883 ilow = 0;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	884 else if (ilow > l)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	885 ilow = l;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	886
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	887 if (ihigh < 0)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	888 ihigh = 0;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	889 else if (ihigh > l)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	890 ihigh = l;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	891
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	892 if (ihigh < ilow)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	893 ihigh = ilow;
813 fd421ea279ae Thanks Christopher Stone, John Myers, John Poppleweel, and Marcus! Rene Dudfield <renesd@gmail.com> parents: 798 diff changeset	894
fd421ea279ae Thanks Christopher Stone, John Myers, John Poppleweel, and Marcus! Rene Dudfield <renesd@gmail.com> parents: 798 diff changeset	895 numitems = ihigh - ilow;
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	896 if (numitems != PySequence_Length (v))
813 fd421ea279ae Thanks Christopher Stone, John Myers, John Poppleweel, and Marcus! Rene Dudfield <renesd@gmail.com> parents: 798 diff changeset	897 {
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	898 RAISE (PyExc_ValueError, "Assigned slice must be same length");
813 fd421ea279ae Thanks Christopher Stone, John Myers, John Poppleweel, and Marcus! Rene Dudfield <renesd@gmail.com> parents: 798 diff changeset	899 return -1;
fd421ea279ae Thanks Christopher Stone, John Myers, John Poppleweel, and Marcus! Rene Dudfield <renesd@gmail.com> parents: 798 diff changeset	900 }
fd421ea279ae Thanks Christopher Stone, John Myers, John Poppleweel, and Marcus! Rene Dudfield <renesd@gmail.com> parents: 798 diff changeset	901
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	902 for (loop = 0; loop < numitems; ++loop)
813 fd421ea279ae Thanks Christopher Stone, John Myers, John Poppleweel, and Marcus! Rene Dudfield <renesd@gmail.com> parents: 798 diff changeset	903 {
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	904 if (!IntFromObjIndex (v, loop, &val))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	905 return -1;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	906 data[loop + ilow] = val;
813 fd421ea279ae Thanks Christopher Stone, John Myers, John Poppleweel, and Marcus! Rene Dudfield <renesd@gmail.com> parents: 798 diff changeset	907 }
fd421ea279ae Thanks Christopher Stone, John Myers, John Poppleweel, and Marcus! Rene Dudfield <renesd@gmail.com> parents: 798 diff changeset	908
fd421ea279ae Thanks Christopher Stone, John Myers, John Poppleweel, and Marcus! Rene Dudfield <renesd@gmail.com> parents: 798 diff changeset	909 return 0;
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	910 }
99d32cc487b7 Initial revision ahvezda parents: diff changeset	911
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	912 static PySequenceMethods rect_as_sequence =
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	913 {
813 fd421ea279ae Thanks Christopher Stone, John Myers, John Poppleweel, and Marcus! Rene Dudfield <renesd@gmail.com> parents: 798 diff changeset	914 rect_length, /length/
fd421ea279ae Thanks Christopher Stone, John Myers, John Poppleweel, and Marcus! Rene Dudfield <renesd@gmail.com> parents: 798 diff changeset	915 NULL, /concat/
fd421ea279ae Thanks Christopher Stone, John Myers, John Poppleweel, and Marcus! Rene Dudfield <renesd@gmail.com> parents: 798 diff changeset	916 NULL, /repeat/
fd421ea279ae Thanks Christopher Stone, John Myers, John Poppleweel, and Marcus! Rene Dudfield <renesd@gmail.com> parents: 798 diff changeset	917 rect_item, /item/
fd421ea279ae Thanks Christopher Stone, John Myers, John Poppleweel, and Marcus! Rene Dudfield <renesd@gmail.com> parents: 798 diff changeset	918 rect_slice, /slice/
fd421ea279ae Thanks Christopher Stone, John Myers, John Poppleweel, and Marcus! Rene Dudfield <renesd@gmail.com> parents: 798 diff changeset	919 rect_ass_item, /ass_item/
fd421ea279ae Thanks Christopher Stone, John Myers, John Poppleweel, and Marcus! Rene Dudfield <renesd@gmail.com> parents: 798 diff changeset	920 rect_ass_slice, /ass_slice/
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	921 };
99d32cc487b7 Initial revision ahvezda parents: diff changeset	922
99d32cc487b7 Initial revision ahvezda parents: diff changeset	923 /* numeric functions */
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	924 static int
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	925 rect_nonzero (PyRectObject *self)
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	926 {
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	927 return self->r.w != 0 && self->r.h != 0;
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	928 }
99d32cc487b7 Initial revision ahvezda parents: diff changeset	929
1553 ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	930 #if !PY3
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	931 static int
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	932 rect_coerce (PyObject o1, PyObject o2)
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	933 {
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	934 PyObject* new1;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	935 PyObject* new2;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	936 GAME_Rect* r, temp;
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	937
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	938 if (PyRect_Check (*o1))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	939 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	940 new1 = *o1;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	941 Py_INCREF (new1);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	942 }
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	943 else if ((r = GameRect_FromObject (*o1, &temp)))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	944 new1 = PyRect_New4 (r->x, r->y, r->w, r->h);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	945 else
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	946 return 1;
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	947
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	948 if (PyRect_Check (*o2))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	949 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	950 new2 = *o2;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	951 Py_INCREF (new2);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	952 }
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	953 else if ((r = GameRect_FromObject (*o2, &temp)))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	954 new2 = PyRect_New4 (r->x, r->y, r->w, r->h);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	955 else
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	956 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	957 Py_DECREF (new1);
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	958 return 1;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	959 }
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	960
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	961 *o1 = new1;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	962 *o2 = new2;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	963 return 0;
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	964 }
1553 ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	965 #endif
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	966
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	967 static PyNumberMethods rect_as_number =
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	968 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	969 (binaryfunc)NULL, /add/
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	970 (binaryfunc)NULL, /subtract/
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	971 (binaryfunc)NULL, /multiply/
1553 ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	972 #if !PY3
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	973 (binaryfunc)NULL, /divide/
1553 ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	974 #endif
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	975 (binaryfunc)NULL, /remainder/
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	976 (binaryfunc)NULL, /divmod/
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	977 (ternaryfunc)NULL, /power/
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	978 (unaryfunc)NULL, /negative/
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	979 (unaryfunc)NULL, /pos/
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	980 (unaryfunc)NULL, /abs/
1553 ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	981 (inquiry)rect_nonzero, /nonzero / bool/
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	982 (unaryfunc)NULL, /invert/
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	983 (binaryfunc)NULL, /lshift/
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	984 (binaryfunc)NULL, /rshift/
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	985 (binaryfunc)NULL, /and/
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	986 (binaryfunc)NULL, /xor/
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	987 (binaryfunc)NULL, /or/
1553 ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	988 #if !PY3
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	989 (coercion)rect_coerce, /coerce/
1553 ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	990 #endif
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	991 (unaryfunc)NULL, /int/
1553 ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	992 #if !PY3
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	993 (unaryfunc)NULL, /long/
1553 ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	994 #endif
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	995 (unaryfunc)NULL, /float/
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	996 };
99d32cc487b7 Initial revision ahvezda parents: diff changeset	997
99d32cc487b7 Initial revision ahvezda parents: diff changeset	998 /* object type functions */
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	999 static void
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1000 rect_dealloc (PyRectObject *self)
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	1001 {
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1002 if (self->weakreflist)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1003 PyObject_ClearWeakRefs ((PyObject*)self);
1553 ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1004 Py_TYPE(self)->tp_free ((PyObject*)self);
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	1005 }
99d32cc487b7 Initial revision ahvezda parents: diff changeset	1006
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1007 static PyObject*
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1008 rect_repr (PyRectObject *self)
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	1009 {
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1010 char string[256];
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1011 sprintf (string, "<rect(%d, %d, %d, %d)>", self->r.x, self->r.y,
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1012 self->r.w, self->r.h);
1553 ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1013 return Text_FromUTF8 (string);
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	1014 }
99d32cc487b7 Initial revision ahvezda parents: diff changeset	1015
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1016 static PyObject*
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1017 rect_str (PyRectObject *self)
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	1018 {
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1019 return rect_repr (self);
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	1020 }
99d32cc487b7 Initial revision ahvezda parents: diff changeset	1021
1553 ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1022 static PyObject*
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1023 rect_richcompare(PyObject o1, PyObject o2, int opid)
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	1024 {
1553 ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1025 GAME_Rect o1rect, o2rect, temp1, temp2;
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1026 int cmp;
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	1027
1553 ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1028 o1rect = GameRect_FromObject (o1, &temp1);
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1029 if (!o1rect) {
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1030 goto Unimplemented;
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1031 }
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1032 o2rect = GameRect_FromObject (o2, &temp2);
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1033 if (!o2rect)
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1034 {
1553 ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1035 goto Unimplemented;
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1036 }
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	1037
1553 ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1038 if (o1rect->x != o2rect->x) {
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1039 cmp = o1rect->x < o2rect->x ? -1 : 1;
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1040 }
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1041 else if (o1rect->y != o2rect->y) {
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1042 cmp = o1rect->y < o2rect->y ? -1 : 1;
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1043 }
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1044 else if (o1rect->w != o2rect->w) {
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1045 cmp = o1rect->w < o2rect->w ? -1 : 1;
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1046 }
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1047 else if (o1rect->h != o2rect->h) {
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1048 cmp = o1rect->h < o2rect->h ? -1 : 1;
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1049 }
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1050 else {
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1051 cmp = 0;
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1052 }
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	1053
1553 ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1054 switch (opid)
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1055 {
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1056 case Py_LT:
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1057 return PyBool_FromLong (cmp < 0);
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1058 case Py_LE:
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1059 return PyBool_FromLong (cmp <= 0);
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1060 case Py_EQ:
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1061 return PyBool_FromLong (cmp == 0);
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1062 case Py_NE:
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1063 return PyBool_FromLong (cmp != 0);
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1064 case Py_GT:
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1065 return PyBool_FromLong (cmp > 0);
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1066 case Py_GE:
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1067 return PyBool_FromLong (cmp >= 0);
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1068 default:
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1069 break;
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1070 }
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1071
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1072 Unimplemented:
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1073 Py_INCREF (Py_NotImplemented);
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1074 return Py_NotImplemented;
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	1075 }
99d32cc487b7 Initial revision ahvezda parents: diff changeset	1076
523 715079102cbb rect attributes handle float pygame parents: 522 diff changeset	1077 /width/
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1078 static PyObject*
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1079 rect_getwidth (PyRectObject self, void closure)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1080 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1081 return PyInt_FromLong (self->r.w);
523 715079102cbb rect attributes handle float pygame parents: 522 diff changeset	1082 }
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1083
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1084 static int
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1085 rect_setwidth (PyRectObject self, PyObject value, void *closure)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1086 {
523 715079102cbb rect attributes handle float pygame parents: 522 diff changeset	1087 int val1;
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1088 if (!IntFromObj (value, &val1))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1089 return -1;
523 715079102cbb rect attributes handle float pygame parents: 522 diff changeset	1090 self->r.w = val1;
715079102cbb rect attributes handle float pygame parents: 522 diff changeset	1091 return 0;
715079102cbb rect attributes handle float pygame parents: 522 diff changeset	1092 }
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	1093
523 715079102cbb rect attributes handle float pygame parents: 522 diff changeset	1094 /height/
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1095 static PyObject*
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1096 rect_getheight (PyRectObject self, void closure)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1097 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1098 return PyInt_FromLong (self->r.h);
523 715079102cbb rect attributes handle float pygame parents: 522 diff changeset	1099 }
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1100
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1101 static int
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1102 rect_setheight (PyRectObject self, PyObject value, void *closure)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1103 {
523 715079102cbb rect attributes handle float pygame parents: 522 diff changeset	1104 int val1;
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1105 if (!IntFromObj (value, &val1))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1106 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1107 RAISE (PyExc_TypeError, "invalid rect assignment");
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1108 return -1;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1109 }
523 715079102cbb rect attributes handle float pygame parents: 522 diff changeset	1110 self->r.h = val1;
715079102cbb rect attributes handle float pygame parents: 522 diff changeset	1111 return 0;
715079102cbb rect attributes handle float pygame parents: 522 diff changeset	1112 }
715079102cbb rect attributes handle float pygame parents: 522 diff changeset	1113
715079102cbb rect attributes handle float pygame parents: 522 diff changeset	1114 /top/
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1115 static PyObject*
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1116 rect_gettop (PyRectObject self, void closure)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1117 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1118 return PyInt_FromLong (self->r.y);
523 715079102cbb rect attributes handle float pygame parents: 522 diff changeset	1119 }
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1120
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1121 static int
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1122 rect_settop (PyRectObject self, PyObject value, void *closure)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1123 {
523 715079102cbb rect attributes handle float pygame parents: 522 diff changeset	1124 int val1;
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1125 if (!IntFromObj (value, &val1))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1126 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1127 RAISE (PyExc_TypeError, "invalid rect assignment");
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1128 return -1;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1129 }
523 715079102cbb rect attributes handle float pygame parents: 522 diff changeset	1130 self->r.y = val1;
715079102cbb rect attributes handle float pygame parents: 522 diff changeset	1131 return 0;
715079102cbb rect attributes handle float pygame parents: 522 diff changeset	1132 }
715079102cbb rect attributes handle float pygame parents: 522 diff changeset	1133
715079102cbb rect attributes handle float pygame parents: 522 diff changeset	1134 /left/
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1135 static PyObject*
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1136 rect_getleft (PyRectObject self, void closure)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1137 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1138 return PyInt_FromLong (self->r.x);
523 715079102cbb rect attributes handle float pygame parents: 522 diff changeset	1139 }
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1140
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1141 static int
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1142 rect_setleft (PyRectObject self, PyObject value, void *closure)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1143 {
523 715079102cbb rect attributes handle float pygame parents: 522 diff changeset	1144 int val1;
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1145 if (!IntFromObj (value, &val1))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1146 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1147 RAISE (PyExc_TypeError, "invalid rect assignment");
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1148 return -1;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1149 }
523 715079102cbb rect attributes handle float pygame parents: 522 diff changeset	1150 self->r.x = val1;
715079102cbb rect attributes handle float pygame parents: 522 diff changeset	1151 return 0;
715079102cbb rect attributes handle float pygame parents: 522 diff changeset	1152 }
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1153
98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1154 /right/
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1155 static PyObject*
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1156 rect_getright (PyRectObject self, void closure)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1157 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1158 return PyInt_FromLong (self->r.x + self->r.w);
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1159 }
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1160
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1161 static int
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1162 rect_setright (PyRectObject self, PyObject value, void *closure)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1163 {
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1164 int val1;
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1165 if (!IntFromObj (value, &val1))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1166 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1167 RAISE (PyExc_TypeError, "invalid rect assignment");
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1168 return -1;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1169 }
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1170 self->r.x = val1-self->r.w;
98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1171 return 0;
98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1172 }
474 71c16a56021f add html into rect docs pygame parents: 451 diff changeset	1173
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1174 /bottom/
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1175 static PyObject*
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1176 rect_getbottom (PyRectObject self, void closure)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1177 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1178 return PyInt_FromLong (self->r.y + self->r.h);
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1179 }
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1180
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1181 static int
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1182 rect_setbottom (PyRectObject self, PyObject value, void *closure)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1183 {
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1184 int val1;
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1185 if (!IntFromObj (value, &val1))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1186 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1187 RAISE (PyExc_TypeError, "invalid rect assignment");
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1188 return -1;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1189 }
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1190 self->r.y = val1-self->r.h;
98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1191 return 0;
98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1192 }
98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1193
98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1194 /centerx/
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1195 static PyObject*
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1196 rect_getcenterx (PyRectObject self, void closure)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1197 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1198 return PyInt_FromLong (self->r.x + (self->r.w >> 1));
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1199 }
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1200
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1201 static int
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1202 rect_setcenterx (PyRectObject self, PyObject value, void *closure)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1203 {
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1204 int val1;
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1205 if (!IntFromObj (value, &val1))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1206 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1207 RAISE (PyExc_TypeError, "invalid rect assignment");
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1208 return -1;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1209 }
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1210 self->r.x = val1 - (self->r.w >> 1);
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1211 return 0;
98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1212 }
182 8d83fca24ce3 rect updates pygame parents: 163 diff changeset	1213
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1214 /centery/
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1215 static PyObject*
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1216 rect_getcentery (PyRectObject self, void closure)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1217 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1218 return PyInt_FromLong (self->r.y + (self->r.h >> 1));
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1219 }
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1220
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1221 static int
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1222 rect_setcentery (PyRectObject self, PyObject value, void *closure)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1223 {
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1224 int val1;
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1225 if (!IntFromObj (value, &val1))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1226 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1227 RAISE (PyExc_TypeError, "invalid rect assignment");
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1228 return -1;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1229 }
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1230 self->r.y = val1 - (self->r.h >> 1);
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1231 return 0;
98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1232 }
98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1233
98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1234 /topleft/
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1235 static PyObject*
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1236 rect_gettopleft (PyRectObject self, void closure)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1237 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1238 return Py_BuildValue ("(ii)", self->r.x, self->r.y);
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1239 }
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1240
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1241 static int
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1242 rect_settopleft (PyRectObject self, PyObject value, void *closure)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1243 {
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1244 int val1, val2;
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1245 if (!TwoIntsFromObj (value, &val1, &val2))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1246 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1247 RAISE (PyExc_TypeError, "invalid rect assignment");
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1248 return -1;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1249 }
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1250 self->r.x = val1;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1251 self->r.y = val2;
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1252 return 0;
98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1253 }
182 8d83fca24ce3 rect updates pygame parents: 163 diff changeset	1254
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1255 /topright/
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1256 static PyObject*
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1257 rect_gettopright (PyRectObject self, void closure)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1258 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1259 return Py_BuildValue ("(ii)", self->r.x+self->r.w, self->r.y);
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1260 }
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1261
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1262 static int
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1263 rect_settopright (PyRectObject self, PyObject value, void *closure)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1264 {
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1265 int val1, val2;
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1266 if (!TwoIntsFromObj (value, &val1, &val2))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1267 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1268 RAISE (PyExc_TypeError, "invalid rect assignment");
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1269 return -1;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1270 }
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1271 self->r.x = val1-self->r.w;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1272 self->r.y = val2;
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1273 return 0;
98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1274 }
451 145a68e231d0 osx fix pygame parents: 426 diff changeset	1275
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1276 /bottomleft/
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1277 static PyObject*
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1278 rect_getbottomleft (PyRectObject self, void closure)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1279 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1280 return Py_BuildValue ("(ii)", self->r.x, self->r.y+self->r.h);
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1281 }
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1282
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1283 static int
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1284 rect_setbottomleft (PyRectObject self, PyObject value, void *closure)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1285 {
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1286 int val1, val2;
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1287 if (!TwoIntsFromObj (value, &val1, &val2))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1288 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1289 RAISE (PyExc_TypeError, "invalid rect assignment");
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1290 return -1;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1291 }
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1292 self->r.x = val1;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1293 self->r.y = val2-self->r.h;
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1294 return 0;
98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1295 }
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	1296
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1297 /bottomright/
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1298 static PyObject*
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1299 rect_getbottomright (PyRectObject self, void closure)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1300 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1301 return Py_BuildValue ("(ii)", self->r.x+self->r.w, self->r.y+self->r.h);
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1302 }
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1303
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1304 static int
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1305 rect_setbottomright (PyRectObject self, PyObject value, void *closure)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1306 {
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1307 int val1, val2;
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1308 if (!TwoIntsFromObj (value, &val1, &val2))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1309 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1310 RAISE (PyExc_TypeError, "invalid rect assignment");
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1311 return -1;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1312 }
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1313 self->r.x = val1-self->r.w;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1314 self->r.y = val2-self->r.h;
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1315 return 0;
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	1316 }
99d32cc487b7 Initial revision ahvezda parents: diff changeset	1317
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1318 /midtop/
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1319 static PyObject*
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1320 rect_getmidtop (PyRectObject self, void closure)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1321 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1322 return Py_BuildValue ("(ii)", self->r.x + (self->r.w >> 1), self->r.y);
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1323 }
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1324
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1325 static int
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1326 rect_setmidtop (PyRectObject self, PyObject value, void *closure)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1327 {
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1328 int val1, val2;
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1329 if (!TwoIntsFromObj (value, &val1, &val2))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1330 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1331 RAISE (PyExc_TypeError, "invalid rect assignment");
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1332 return -1;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1333 }
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1334 self->r.x += val1 - (self->r.x + (self->r.w >> 1));
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1335 self->r.y = val2;
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1336 return 0;
98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1337 }
98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1338
98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1339 /midleft/
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1340 static PyObject*
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1341 rect_getmidleft (PyRectObject self, void closure)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1342 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1343 return Py_BuildValue ("(ii)", self->r.x, self->r.y+(self->r.h>>1));
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1344 }
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1345
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1346 static int
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1347 rect_setmidleft (PyRectObject self, PyObject value, void *closure)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1348 {
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1349 int val1, val2;
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1350 if (!TwoIntsFromObj (value, &val1, &val2))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1351 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1352 RAISE (PyExc_TypeError, "invalid rect assignment");
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1353 return -1;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1354 }
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1355 self->r.x = val1;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1356 self->r.y += val2 - (self->r.y + (self->r.h >> 1));
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1357 return 0;
98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1358 }
98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1359
98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1360 /midbottom/
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1361 static PyObject*
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1362 rect_getmidbottom (PyRectObject self, void closure)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1363 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1364 return Py_BuildValue ("(ii)", self->r.x + (self->r.w >> 1),
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1365 self->r.y + self->r.h);
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1366 }
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1367
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1368 static int
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1369 rect_setmidbottom (PyRectObject self, PyObject value, void *closure)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1370 {
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1371 int val1, val2;
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1372 if (!TwoIntsFromObj (value, &val1, &val2))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1373 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1374 RAISE (PyExc_TypeError, "invalid rect assignment");
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1375 return -1;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1376 }
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1377 self->r.x += val1 - (self->r.x + (self->r.w >> 1));
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1378 self->r.y = val2 - self->r.h;
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1379 return 0;
98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1380 }
98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1381
98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1382 /midright/
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1383 static PyObject*
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1384 rect_getmidright (PyRectObject self, void closure)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1385 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1386 return Py_BuildValue ("(ii)", self->r.x + self->r.w,
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1387 self->r.y + (self->r.h >> 1));
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1388 }
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1389
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1390 static int
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1391 rect_setmidright (PyRectObject self, PyObject value, void *closure)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1392 {
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1393 int val1, val2;
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1394 if (!TwoIntsFromObj (value, &val1, &val2))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1395 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1396 RAISE (PyExc_TypeError, "invalid rect assignment");
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1397 return -1;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1398 }
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1399 self->r.x = val1 - self->r.w;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1400 self->r.y += val2 -(self->r.y + (self->r.h >> 1));
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1401 return 0;
98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1402 }
474 71c16a56021f add html into rect docs pygame parents: 451 diff changeset	1403
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1404 /center/
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1405 static PyObject*
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1406 rect_getcenter (PyRectObject self, void closure)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1407 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1408 return Py_BuildValue ("(ii)", self->r.x + (self->r.w >> 1),
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1409 self->r.y + (self->r.h >> 1));
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1410 }
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1411
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1412 static int
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1413 rect_setcenter (PyRectObject self, PyObject value, void *closure)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1414 {
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1415 int val1, val2;
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1416 if (!TwoIntsFromObj (value, &val1, &val2))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1417 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1418 RAISE (PyExc_TypeError, "invalid rect assignment");
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1419 return -1;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1420 }
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1421 self->r.x += val1 - (self->r.x + (self->r.w >> 1));
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1422 self->r.y += val2 - (self->r.y + (self->r.h >> 1));
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1423 return 0;
98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1424 }
98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1425
98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1426 /size/
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1427 static PyObject*
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1428 rect_getsize (PyRectObject self, void closure)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1429 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1430 return Py_BuildValue ("(ii)", self->r.w, self->r.h);
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1431 }
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1432
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1433 static int
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1434 rect_setsize (PyRectObject self, PyObject value, void *closure)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1435 {
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1436 int val1, val2;
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1437 if (!TwoIntsFromObj (value, &val1, &val2))
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1438 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1439 RAISE (PyExc_TypeError, "invalid rect assignment");
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1440 return -1;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1441 }
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1442 self->r.w = val1;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1443 self->r.h = val2;
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1444 return 0;
98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1445 }
98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1446
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1447 static PyObject*
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1448 rect_getsafepickle (PyRectObject self, void closure)
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1449 {
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1450 Py_RETURN_TRUE;
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1451 }
182 8d83fca24ce3 rect updates pygame parents: 163 diff changeset	1452
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1453 static PyGetSetDef rect_getsets[] = {
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1454 { "x", (getter)rect_getleft, (setter)rect_setleft, NULL, NULL },
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1455 { "y", (getter)rect_gettop, (setter)rect_settop, NULL, NULL },
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1456 { "w", (getter)rect_getwidth, (setter)rect_setwidth, NULL, NULL },
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1457 { "h", (getter)rect_getheight, (setter)rect_setheight, NULL, NULL },
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1458 { "width", (getter)rect_getwidth, (setter)rect_setwidth, NULL, NULL },
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1459 { "height", (getter)rect_getheight, (setter)rect_setheight, NULL, NULL },
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1460 { "top", (getter)rect_gettop, (setter)rect_settop, NULL, NULL },
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1461 { "left", (getter)rect_getleft, (setter)rect_setleft, NULL, NULL },
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1462 { "bottom", (getter)rect_getbottom, (setter)rect_setbottom, NULL, NULL },
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1463 { "right", (getter)rect_getright, (setter)rect_setright, NULL, NULL },
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1464 { "centerx", (getter)rect_getcenterx, (setter)rect_setcenterx, NULL, NULL },
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1465 { "centery", (getter)rect_getcentery, (setter)rect_setcentery, NULL, NULL },
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1466 { "topleft", (getter)rect_gettopleft, (setter)rect_settopleft, NULL, NULL },
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1467 { "topright", (getter)rect_gettopright, (setter)rect_settopright, NULL,
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1468 NULL },
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1469 { "bottomleft", (getter)rect_getbottomleft, (setter)rect_setbottomleft,
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1470 NULL, NULL },
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1471 { "bottomright", (getter)rect_getbottomright, (setter)rect_setbottomright,
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1472 NULL, NULL },
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1473 { "midtop", (getter)rect_getmidtop, (setter)rect_setmidtop, NULL, NULL },
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1474 { "midleft", (getter)rect_getmidleft, (setter)rect_setmidleft, NULL, NULL },
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1475 { "midbottom", (getter)rect_getmidbottom, (setter)rect_setmidbottom, NULL,
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1476 NULL },
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1477 { "midright", (getter)rect_getmidright, (setter)rect_setmidright, NULL,
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1478 NULL },
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1479 { "size", (getter)rect_getsize, (setter)rect_setsize, NULL, NULL },
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1480 { "center", (getter)rect_getcenter, (setter)rect_setcenter, NULL, NULL },
474 71c16a56021f add html into rect docs pygame parents: 451 diff changeset	1481
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1482 { "__safe_for_unpickling__", (getter)rect_getsafepickle, NULL, NULL, NULL },
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1483 { NULL, 0, NULL, NULL, NULL } /* Sentinel */
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1484 };
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	1485
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1486 static PyTypeObject PyRect_Type =
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1487 {
1553 ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1488 TYPE_HEAD (NULL, 0)
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1489 "pygame.Rect", /name/
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1490 sizeof(PyRectObject), /basicsize/
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1491 0, /itemsize/
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1492 /* methods */
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1493 (destructor)rect_dealloc, /dealloc/
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1494 (printfunc)NULL, /print/
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1495 NULL, /getattr/
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1496 NULL, /setattr/
1553 ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1497 NULL, /compare/reserved/
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1498 (reprfunc)rect_repr, /repr/
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1499 &rect_as_number, /as_number/
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1500 &rect_as_sequence, /as_sequence/
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1501 NULL, /as_mapping/
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1502 (hashfunc)NULL, /hash/
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1503 (ternaryfunc)NULL, /call/
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1504 (reprfunc)rect_str, /str/
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	1505
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1506 /* Space for future expansion */
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1507 0L,0L,0L,
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1508 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_BASETYPE, /* tp_flags */
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1509 DOC_PYGAMERECT, /* Documentation string */
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1510 0, /* tp_traverse */
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1511 0, /* tp_clear */
1553 ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1512 (richcmpfunc)rect_richcompare, /* tp_richcompare */
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1513 offsetof(PyRectObject, weakreflist), /* tp_weaklistoffset */
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1514 0, /* tp_iter */
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1515 0, /* tp_iternext */
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1516 rect_methods, /* tp_methods */
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1517 0, /* tp_members */
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1518 rect_getsets, /* tp_getset */
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1519 0, /* tp_base */
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1520 0, /* tp_dict */
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1521 0, /* tp_descr_get */
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1522 0, /* tp_descr_set */
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1523 0, /* tp_dictoffset */
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1524 (initproc)rect_init, /* tp_init */
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1525 0, /* tp_alloc */
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1526 rect_new, /* tp_new */
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	1527 };
99d32cc487b7 Initial revision ahvezda parents: diff changeset	1528
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1529 static PyObject*
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1530 rect_new (PyTypeObject type, PyObject args, PyObject *kwds)
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	1531 {
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1532 PyRectObject *self;
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1533 self = (PyRectObject *)type->tp_alloc (type, 0);
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1534 if (self)
98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1535 {
98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1536 self->r.x = self->r.y = 0;
98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1537 self->r.w = self->r.h = 0;
98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1538 self->weakreflist = NULL;
98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1539 }
98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1540 return (PyObject*)self;
98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1541 }
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	1542
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1543 static int
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1544 rect_init (PyRectObject self, PyObject args, PyObject *kwds)
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1545 {
98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1546 GAME_Rect *argrect, temp;
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1547 if (!(argrect = GameRect_FromObject (args, &temp)))
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1548 {
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1549 RAISE (PyExc_TypeError, "Argument must be rect style object");
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1550 return -1;
521 98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1551 }
98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1552
98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1553 self->r.x = argrect->x;
98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1554 self->r.y = argrect->y;
98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1555 self->r.w = argrect->w;
98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1556 self->r.h = argrect->h;
98fb409229a7 Rect and Surface newstyle types pygame parents: 497 diff changeset	1557 return 0;
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	1558 }
99d32cc487b7 Initial revision ahvezda parents: diff changeset	1559
1553 ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1560 static PyMethodDef _rect_methods[] =
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	1561 {
798 05346fb84a05 Some cleanups from Marcus to stop compiler warnings. Rene Dudfield <renesd@gmail.com> parents: 794 diff changeset	1562 {NULL, NULL, 0, NULL}
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	1563 };
99d32cc487b7 Initial revision ahvezda parents: diff changeset	1564
1553 ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1565 /DOC/ static char _rectangle_doc[] =
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1566 /DOC/ "Module for the rectangle object\n";
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	1567
1553 ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1568 MODINIT_DEFINE (rect)
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	1569 {
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1570 PyObject module, dict, *apiobj;
1553 ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1571 int ecode;
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1572 static void* c_api[PYGAMEAPI_RECT_NUMSLOTS];
1553 ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1573
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1574 #if PY3
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1575 static struct PyModuleDef _module = {
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1576 PyModuleDef_HEAD_INIT,
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1577 "rect",
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1578 _rectangle_doc,
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1579 -1,
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1580 _rect_methods,
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1581 NULL, NULL, NULL, NULL
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1582 };
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1583 #endif
474 71c16a56021f add html into rect docs pygame parents: 451 diff changeset	1584
1499 65e001d30448 bug fix - required modules not raising error when failing to import. Lenard Lindstrom <len-l@telus.net> parents: 1372 diff changeset	1585 /* imported needed apis; Do this first so if there is an error
65e001d30448 bug fix - required modules not raising error when failing to import. Lenard Lindstrom <len-l@telus.net> parents: 1372 diff changeset	1586 the module is not loaded.
65e001d30448 bug fix - required modules not raising error when failing to import. Lenard Lindstrom <len-l@telus.net> parents: 1372 diff changeset	1587 */
65e001d30448 bug fix - required modules not raising error when failing to import. Lenard Lindstrom <len-l@telus.net> parents: 1372 diff changeset	1588 import_pygame_base ();
65e001d30448 bug fix - required modules not raising error when failing to import. Lenard Lindstrom <len-l@telus.net> parents: 1372 diff changeset	1589 if (PyErr_Occurred ()) {
1553 ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1590 MODINIT_ERROR;
1499 65e001d30448 bug fix - required modules not raising error when failing to import. Lenard Lindstrom <len-l@telus.net> parents: 1372 diff changeset	1591 }
65e001d30448 bug fix - required modules not raising error when failing to import. Lenard Lindstrom <len-l@telus.net> parents: 1372 diff changeset	1592
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1593 /* Create the module and add the functions */
1553 ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1594 if (PyType_Ready (&PyRect_Type) < 0) {
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1595 MODINIT_ERROR;
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1596 }
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	1597
1553 ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1598 #if PY3
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1599 module = PyModule_Create (&_module);
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1600 #else
1582 d2d7971dca98 symbian merging Rene Dudfield <renesd@gmail.com> parents: 1553 diff changeset	1601 module = Py_InitModule3 (MODPREFIX "rect", _rect_methods, _rectangle_doc);
1553 ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1602 #endif
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1603 if (module == NULL) {
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1604 MODINIT_ERROR;
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1605 }
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1606 dict = PyModule_GetDict (module);
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	1607
1553 ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1608 if (PyDict_SetItemString (dict, "RectType", (PyObject *)&PyRect_Type)) {
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1609 DECREF_MOD (module);
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1610 MODINIT_ERROR;
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1611 }
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1612 if (PyDict_SetItemString (dict, "Rect", (PyObject *)&PyRect_Type)) {
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1613 DECREF_MOD (module);
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1614 MODINIT_ERROR;
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1615 }
37 e5eb000a88d8 object types added pygame parents: 31 diff changeset	1616
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1617 /* export the c api */
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1618 c_api[0] = &PyRect_Type;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1619 c_api[1] = PyRect_New;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1620 c_api[2] = PyRect_New4;
8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1621 c_api[3] = GameRect_FromObject;
2120 42e2bde1a12c Use capsule objects in preference to cobject objects. This allows Pygame to build an run from Python 3.2, which has to cobjects. Lenard Lindstrom <len-l@telus.net> parents: 1937 diff changeset	1622 apiobj = encapsulate_api (c_api, "rect");
1553 ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1623 if (apiobj == NULL) {
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1624 DECREF_MOD (module);
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1625 MODINIT_ERROR;
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1626 }
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1627 ecode = PyDict_SetItemString (dict, PYGAMEAPI_LOCAL_ENTRY, apiobj);
831 8749d7c235f8 Changes from Marcus for ref counting bug fixes and Rene Dudfield <renesd@gmail.com> parents: 813 diff changeset	1628 Py_DECREF (apiobj);
1553 ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1629 if (ecode) {
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1630 DECREF_MOD (module);
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1631 MODINIT_ERROR;
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1632 }
ebd545641c8b merging with python3 branch r 2048 Lenard Lindstrom <len-l@telus.net> parents: 1547 diff changeset	1633 MODINIT_RETURN (module);
7 99d32cc487b7 Initial revision ahvezda parents: diff changeset	1634 }

Mercurial > pygame

annotate src/rect.c @ 3194:9fcb7abf3185 default tip