cvs: php4 /ext/printer printer.c

dbeu Fri Oct 27 13:17:45 2000 EDT Modified files: /php4/ext/printer printer.c Log: added printer_draw_elipse() Index: php4/ext/printer/printer.c diff -u php4/ext/printer/printer.c:1.2 php4/ext/printer/printer.c:1.3 --- php4/ext/printer/printer.c:1.2 Fri Oct 27 13:07:14 2000 +++ php4/ext/printer/printer.c Fri Oct 27 13:17:45 2000 @@ -25,13 +25,6 @@ #include "php_printer.h" -/* windows headers */ -#include <windows.h> -#include <wingdi.h> -#include <winspool.h> - -#ifdef PHP_WIN32 - #ifdef ZTS int printer_globals_id; #else @@ -44,6 +37,12 @@ static int font_id; +#ifdef PHP_WIN32 +/* windows headers */ +#include <windows.h> +#include <wingdi.h> +#include <winspool.h> + /* some protos */ char *get_default_printer(void); COLORREF hex_to_rgb(char * hex); @@ -76,6 +75,7 @@ PHP_FE(printer_draw_roundrect, NULL) PHP_FE(printer_draw_rectangle, NULL) PHP_FE(printer_draw_text, NULL) + PHP_FE(printer_draw_elipse, NULL) PHP_FE(printer_create_font, NULL) PHP_FE(printer_delete_font, NULL) PHP_FE(printer_select_font, NULL) @@ -100,10 +100,12 @@ PHP_MINFO_FUNCTION(printer) { + char* printer = get_default_printer(); + php_info_print_table_start(); php_info_print_table_row(2, "Printer Support" , "enabled"); php_info_print_table_row(2, "Default printing device", get_default_printer()); - php_info_print_table_row(2, "RCS Version" , "$Id: printer.c,v 1.2 2000/10/27 20:07:14 fmk Exp $"); + php_info_print_table_row(2, "RCS Version" , "$Id: printer.c,v 1.3 2000/10/27 20:17:45 dbeu Exp $"); php_info_print_table_end(); } @@ -850,6 +852,35 @@ convert_to_long_ex(arg5); Rectangle(resource->dc, + (*arg2)->value.lval, + (*arg3)->value.lval, + (*arg4)->value.lval, + (*arg5)->value.lval); +} +/* }}} */ + + +/* {{{ proto void printer_draw_elipse(int left, int top, int right, int bottom) + Draw an elipse */ +PHP_FUNCTION(printer_draw_elipse) +{ + pval **arg1, **arg2, **arg3, **arg4, **arg5; + printer *resource; + + PRINTERLS_FETCH(); + + if ( zend_get_parameters_ex(5, &arg1, &arg2, &arg3, &arg4, &arg5) == FAILURE ) { + WRONG_PARAM_COUNT; + } + + ZEND_FETCH_RESOURCE(resource, printer *, arg1, -1, "Printer Handle", PRINTERG(printer_id)); + + convert_to_long_ex(arg2); + convert_to_long_ex(arg3); + convert_to_long_ex(arg4); + convert_to_long_ex(arg5); + + Ellipse(resource->dc, (*arg2)->value.lval, (*arg3)->value.lval, (*arg4)->value.lval,