* stdwinmodule.c: various new commands: setwin{pos,size},

  listfontnames, bitmap ops.
* listobject.c: use mkvalue() when possible; avoid weird error when
  calling append() without args.
* modsupport.c: new feature in getargs(): if the format string
  contains a semicolor the string after that is used as the error
  message instead of "bad argument list (format %s)" when there's an
  error.

3 files changed, 301 insertions, 20 deletions

diff --git a/Modules/stdwinmodule.c b/Modules/stdwinmodule.c
index 77ba6ec..02f7bcb 100644
--- a/Modules/stdwinmodule.c
+++ b/Modules/stdwinmodule.c
@@ -30,6 +30,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 	dp: a drawing structure (only one can exist at a time)
 	mp: a menu
 	tp: a textedit block
+	bp: a bitmap
 */
 
 /* Rules for translating C stdwin function calls into Python stwin:
@@ -116,6 +117,16 @@ extern typeobject Menutype;	/* Really static, forward */
 
 #define is_menuobject(mp) ((mp)->ob_type == &Menutype)
 
+typedef struct {
+	OB_HEAD
+	BITMAP	*b_bitmap;
+	object	*b_attr;	/* Attributes dictionary */
+} bitmapobject;
+
+extern typeobject Bitmaptype;	/* Really static, forward */
+
+#define is_bitmapobject(mp) ((mp)->ob_type == &Bitmaptype)
+
 
 /* Strongly stdwin-specific argument handlers */
 
@@ -664,7 +675,46 @@ drawing_setfgcolor(self, args)
 	return None;
 }
 
+static object *
+drawing_bitmap(self, args)
+	object *self;
+	object *args;
+{
+	int h, v;
+	object *bp;
+	object *mask = NULL;
+	if (!getargs(args, "((ii)O)", &h, &v, &bp)) {
+		err_clear();
+		if (!getargs(args, "((ii)OO)", &h, &v, &bp, &mask))
+			return NULL;
+		if (mask == None)
+			mask = NULL;
+		else if (!is_bitmapobject(mask)) {
+			err_badarg();
+			return NULL;
+		}
+	}
+	if (!is_bitmapobject(bp)) {
+		err_badarg();
+		return NULL;
+	}
+	if (((bitmapobject *)bp)->b_bitmap == NULL ||
+	    mask != NULL && ((bitmapobject *)mask)->b_bitmap == NULL) {
+		err_setstr(StdwinError, "bitmap object already close");
+		return NULL;
+	}
+	if (mask == NULL)
+		wdrawbitmap(h, v, ((bitmapobject *)bp)->b_bitmap, ALLBITS);
+	else
+		wdrawbitmap(h, v,
+			    ((bitmapobject *)bp)->b_bitmap,
+			    ((bitmapobject *)bp)->b_bitmap);
+	INCREF(None);
+	return None;
+}
+
 static struct methodlist drawing_methods[] = {
+	{"bitmap",	drawing_bitmap},
 	{"box",		drawing_box},
 	{"circle",	drawing_circle},
 	{"cliprect",	drawing_cliprect},
@@ -1293,6 +1343,161 @@ typeobject Menutype = {
 };
 
 
+/* Bitmaps objects */
+
+static bitmapobject *newbitmapobject PROTO((int, int));
+static bitmapobject *
+newbitmapobject(width, height)
+	int width, height;
+{
+	BITMAP *bitmap;
+	bitmapobject *bp;
+	bitmap = wnewbitmap(width, height);
+	if (bitmap == NULL)
+		return (bitmapobject *) err_nomem();
+	bp = NEWOBJ(bitmapobject, &Bitmaptype);
+	if (bp != NULL) {
+		bp->b_bitmap = bitmap;
+		bp->b_attr = NULL;
+	}
+	else
+		wfreebitmap(bitmap);
+	return bp;
+}
+
+/* Bitmap methods */
+
+static void
+bitmap_dealloc(bp)
+	bitmapobject *bp;
+{
+	if (bp->b_bitmap != NULL)
+		wfreebitmap(bp->b_bitmap);
+	XDECREF(bp->b_attr);
+	DEL(bp);
+}
+
+static object *
+bitmap_close(bp, args)
+	bitmapobject *bp;
+	object *args;
+{
+	if (bp->b_bitmap != NULL)
+		wfreebitmap(bp->b_bitmap);
+	bp->b_bitmap = NULL;
+	XDECREF(bp->b_attr);
+	bp->b_attr = NULL;
+	INCREF(None);
+	return None;
+}
+
+static object *
+bitmap_setbit(self, args)
+	bitmapobject *self;
+	object *args;
+{
+	int a[3];
+	if (!getpointintarg(args, a))
+		return NULL;
+	wsetbit(self->b_bitmap, a[0], a[1], a[2]);
+	INCREF(None);
+	return None;
+}
+
+static object *
+bitmap_getbit(self, args)
+	bitmapobject *self;
+	object *args;
+{
+	int a[2];
+	if (!getpointarg(args, a))
+		return NULL;
+	return newintobject((long) wgetbit(self->b_bitmap, a[0], a[1]));
+}
+
+static object *
+bitmap_getsize(self, args)
+	bitmapobject *self;
+	object *args;
+{
+	int width, height;
+	if (!getnoarg(args))
+		return NULL;
+	wgetbitmapsize(self->b_bitmap, &width, &height);
+	return mkvalue("(ii)", width, height);
+}
+
+static struct methodlist bitmap_methods[] = {
+	{"close",	bitmap_close},
+	{"getsize",	bitmap_getsize},
+	{"getbit",	bitmap_getbit},
+	{"setbit",	bitmap_setbit},
+	{NULL,		NULL}		/* sentinel */
+};
+
+static object *
+bitmap_getattr(bp, name)
+	bitmapobject *bp;
+	char *name;
+{
+	object *v = NULL;
+	if (bp->b_bitmap == NULL) {
+		err_setstr(StdwinError, "bitmap object already closed");
+		return NULL;
+	}
+	if (strcmp(name, "__dict__") == 0) {
+		v = bp->b_attr;
+		if (v == NULL)
+			v = None;
+	}
+	else if (bp->b_attr != NULL) {
+		v = dictlookup(bp->b_attr, name);
+	}
+	if (v != NULL) {
+		INCREF(v);
+		return v;
+	}
+	return findmethod(bitmap_methods, (object *)bp, name);
+}
+
+static int
+bitmap_setattr(bp, name, v)
+	bitmapobject *bp;
+	char *name;
+	object *v;
+{
+	if (bp->b_attr == NULL) {
+		bp->b_attr = newdictobject();
+		if (bp->b_attr == NULL)
+			return -1;
+	}
+	if (v == NULL) {
+		int rv = dictremove(bp->b_attr, name);
+		if (rv < 0)
+			err_setstr(AttributeError,
+			        "delete non-existing bitmap object attribute");
+		return rv;
+	}
+	else
+		return dictinsert(bp->b_attr, name, v);
+}
+
+typeobject Bitmaptype = {
+	OB_HEAD_INIT(&Typetype)
+	0,			/*ob_size*/
+	"bitmap",			/*tp_name*/
+	sizeof(bitmapobject),	/*tp_size*/
+	0,			/*tp_itemsize*/
+	/* methods */
+	bitmap_dealloc,		/*tp_dealloc*/
+	0,			/*tp_print*/
+	bitmap_getattr,		/*tp_getattr*/
+	bitmap_setattr,		/*tp_setattr*/
+	0,			/*tp_compare*/
+	0,			/*tp_repr*/
+};
+
+
 /* Windows */
 
 #define MAXNWIN 50
@@ -1406,6 +1611,32 @@ window_getwinsize(wp, args)
 }
 
 static object *
+window_setwinpos(wp, args)
+	windowobject *wp;
+	object *args;
+{
+	int a[2];
+	if (!getpointarg(args, a))
+		return NULL;
+	wsetwinpos(wp->w_win, a[0], a[1]);
+	INCREF(None);
+	return None;
+}
+
+static object *
+window_setwinsize(wp, args)
+	windowobject *wp;
+	object *args;
+{
+	int a[2];
+	if (!getpointarg(args, a))
+		return NULL;
+	wsetwinsize(wp->w_win, a[0], a[1]);
+	INCREF(None);
+	return None;
+}
+
+static object *
 window_getdocsize(wp, args)
 	windowobject *wp;
 	object *args;
@@ -1617,6 +1848,8 @@ static struct methodlist window_methods[] = {
 	{"settimer",	window_settimer},
 	{"settitle",	window_settitle},
 	{"setwincursor",window_setwincursor},
+	{"setwinpos",	window_setwinpos},
+	{"setwinsize",	window_setwinsize},
 	{"show",	window_show},
 	{"textcreate",	window_textcreate},
 #ifdef CWI_HACKS
@@ -2168,6 +2401,46 @@ stdwin_connectionnumber(self, args)
 }
 #endif
 
+static object *
+stdwin_listfontnames(self, args)
+	object *self;
+	object *args;
+{
+	char *pattern;
+	char **fontnames;
+	int count;
+	object *list;
+	if (!getargs(args, "z", &pattern))
+		return NULL;
+	fontnames = wlistfontnames(pattern, &count);
+	list = newlistobject(count);
+	if (list != NULL) {
+		int i;
+		for (i = 0; i < count; i++) {
+			object *v = newstringobject(fontnames[i]);
+			if (v == NULL) {
+				DECREF(list);
+				list = NULL;
+				break;
+			}
+			setlistitem(list, i, v);
+		}
+	}
+	return list;
+}
+
+static object *
+stdwin_newbitmap(self, args)
+	object *self;
+	object *args;
+{
+	int width, height;
+	bitmapobject *bp;
+	if (!getargs(args, "(ii)", &width, &height))
+		return NULL;
+	return (object *)newbitmapobject(width, height);
+}
+
 static struct methodlist stdwin_methods[] = {
 	{"askfile",		stdwin_askfile},
 	{"askstr",		stdwin_askstr},
@@ -2187,8 +2460,10 @@ static struct methodlist stdwin_methods[] = {
 	{"getscrmm",		stdwin_getscrmm},
 	{"getscrsize",		stdwin_getscrsize},
 	{"getselection",	stdwin_getselection},
+	{"listfontnames",	stdwin_listfontnames},
 	{"menucreate",		stdwin_menucreate},
 	{"message",		stdwin_message},
+	{"newbitmap",		stdwin_newbitmap},
 	{"open",		stdwin_open},
 	{"pollevent",		stdwin_pollevent},
 	{"resetselection",	stdwin_resetselection},
diff --git a/Objects/listobject.c b/Objects/listobject.c
index 474932f..9a1fe23 100644
--- a/Objects/listobject.c
+++ b/Objects/listobject.c
@@ -458,13 +458,10 @@ listinsert(self, args)
 	object *args;
 {
 	int i;
-	if (args == NULL || !is_tupleobject(args) || gettuplesize(args) != 2) {
-		err_badarg();
-		return NULL;
-	}
-	if (!getintarg(gettupleitem(args, 0), &i))
+	object *v;
+	if (!getargs(args, "(iO)", &i, &v))
 		return NULL;
-	return ins(self, i, gettupleitem(args, 1));
+	return ins(self, i, v);
 }
 
 static object *
@@ -472,7 +469,10 @@ listappend(self, args)
 	listobject *self;
 	object *args;
 {
-	return ins(self, (int) self->ob_size, args);
+	object *v;
+	if (!getargs(args, "O", &v))
+		return NULL;
+	return ins(self, (int) self->ob_size, v);
 }
 
 static object *cmpfunc;
@@ -495,13 +495,9 @@ cmp(v, w)
 		return cmpobject(* (object **) v, * (object **) w);
 
 	/* Call the user-supplied comparison function */
-	t = newtupleobject(2);
+	t = mkvalue("OO", v, w);
 	if (t == NULL)
 		return 0;
-	INCREF(* (object **) v);
-	settupleitem(t, 0, * (object **) v);
-	INCREF(* (object **) w);
-	settupleitem(t, 1, * (object **) w);
 	res = call_object(cmpfunc, t);
 	DECREF(t);
 	if (res == NULL)
diff --git a/Python/modsupport.c b/Python/modsupport.c
index f92739a..b464c8e 100644
--- a/Python/modsupport.c
+++ b/Python/modsupport.c
@@ -70,7 +70,7 @@ initmodule(name, methods)
 }
 
 
-/* Helper for getargs() and mkvalue() to scan the length of a format */
+/* Helper for mkvalue() to scan the length of a format */
 
 static int countformat PROTO((char *format, int endchar));
 static int countformat(format, endchar)
@@ -292,24 +292,34 @@ int getargs(va_alist) va_dcl
 	arg = va_arg(va, object *);
 	format = va_arg(va, char *);
 #endif
-	if (*format == '\0') {
+	if (*format == '\0' || *format == ';') {
 		va_end(va);
 		if (arg != NULL) {
-			err_setstr(TypeError, "no arguments needed");
+			char *str = "no arguments needed";
+			if (*format == ';')
+				str = format+1;
+			err_setstr(TypeError, str);
 			return 0;
 		}
 		return 1;
 	}
 	
 	f = format;
-	ok = do_arg(arg, &f, &va) && *f == '\0';
+	ok = do_arg(arg, &f, &va) && (*f == '\0' || *f == ';');
 	va_end(va);
 	if (!ok) {
-		char buf[256];
 		if (!err_occurred()) {
-			sprintf(buf, "bad argument list (format '%s')",
-				format);
-			err_setstr(TypeError, buf);
+			char buf[256];
+			char *str;
+			f = strchr(format, ';');
+			if (f != NULL)
+				str = f+1;
+			else {
+				sprintf(buf, "bad argument list (format '%s')",
+					format);
+				str = buf;
+			}
+			err_setstr(TypeError, str);
 		}
 	}
 	return ok;