|
clisp-cvs Digest, Vol 10, Issue 8
From: <clisp-cvs-request@li...> - 2007-02-28 20:11
|
Send clisp-cvs mailing list submissions to clisp-cvs@... To subscribe or unsubscribe via the World Wide Web, visit https://lists.sourceforge.net/lists/listinfo/clisp-cvs or, via email, send a message with subject or body 'help' to clisp-cvs-request@... You can reach the person managing the list at clisp-cvs-owner@... When replying, please edit your Subject line so it is more specific than "Re: Contents of clisp-cvs digest..." CLISP CVS commits for today Today's Topics: 1. clisp/modules/clx/new-clx clx.lisp,1.17,1.18 clx.f,2.63,2.64 (Sam Steingold) 2. clisp/src ChangeLog,1.5504,1.5505 (Sam Steingold) ---------------------------------------------------------------------- Message: 1 Date: Wed, 28 Feb 2007 02:48:35 +0000 From: Sam Steingold <sds@...> Subject: clisp/modules/clx/new-clx clx.lisp,1.17,1.18 clx.f,2.63,2.64 To: clisp-cvs@... Message-ID: <E1HMErt-0008KI-5s@...> Update of /cvsroot/clisp/clisp/modules/clx/new-clx In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv32741/modules/clx/new-clx Modified Files: clx.lisp clx.f Log Message: (display): added DISPLAY slot Index: clx.f =================================================================== RCS file: /cvsroot/clisp/clisp/modules/clx/new-clx/clx.f,v retrieving revision 2.63 retrieving revision 2.64 diff -u -d -r2.63 -r2.64 --- clx.f 22 Feb 2007 19:05:02 -0000 2.63 +++ clx.f 28 Feb 2007 02:48:33 -0000 2.64 @@ -598,18 +598,22 @@ /* Objects of type DISPLAY are currently represented as structure; here are the slots: The actual defstruct definition in clx.lisp must match. There is a warning in the code. */ -#define slot_DISPLAY_FOREIGN_POINTER 1 -#define slot_DISPLAY_HASH_TABLE 2 -#define slot_DISPLAY_PLIST 3 -#define slot_DISPLAY_AFTER_FUNCTION 4 -#define slot_DISPLAY_ERROR_HANDLER 5 +enum { + slot_DISPLAY_FOREIGN_POINTER, + slot_DISPLAY_HASH_TABLE, + slot_DISPLAY_PLIST, + slot_DISPLAY_AFTER_FUNCTION, + slot_DISPLAY_ERROR_HANDLER, + slot_DISPLAY_DISPLAY, + display_structure_size +}; /* The display contains a hash table. All XID objects are entered there, so that two XID objects, with equal XID are actually eq. */ -static object make_display (Display *dpy) +static object make_display (Display *dpy, int display_number) { /* Given the C representation of a display create the Lisp one and initialize it. The newly created display is added to XLIB:*DISPLAYS*. */ - pushSTACK(`(XLIB::DISPLAY)`); pushSTACK(fixnum(6)); + pushSTACK(`(XLIB::DISPLAY)`); pushSTACK(fixnum(display_structure_size)); funcall(L(make_structure),2); pushSTACK(value1); TheStructure(STACK_0)->recdata[slot_DISPLAY_FOREIGN_POINTER] = allocate_fpointer (dpy); @@ -623,6 +627,8 @@ TheStructure(STACK_0)->recdata[slot_DISPLAY_PLIST] = NIL; TheStructure(STACK_0)->recdata[slot_DISPLAY_AFTER_FUNCTION] = NIL; TheStructure(STACK_0)->recdata[slot_DISPLAY_ERROR_HANDLER] = NIL; + TheStructure(STACK_0)->recdata[slot_DISPLAY_DISPLAY] = + make_uint8 (display_number); /* Now enter the display into the list of all displays: */ pushSTACK(STACK_0); @@ -1786,7 +1792,7 @@ disable_sigpipe(); # endif - VALUES1(make_display(dpy)); + VALUES1(make_display(dpy, display_number)); skipSTACK(argcount); } @@ -1822,13 +1828,10 @@ VALUES1((BIG_ENDIAN_P) ? `:MSBFIRST` : `:LSBFIRST`); } -DEFUN(XLIB:DISPLAY-DISPLAY, display) -{ /* What should this function return?! - From manual: Returns the /display-number/ for the host - associated with /display/. - Not very informative, is it? */ +DEFUN(XLIB:DISPLAY-DISPLAY, display) { /* OK */ + ensure_living_display (&(STACK_0)); + VALUES1(TheStructure (STACK_0)->recdata[slot_DISPLAY_DISPLAY]); skipSTACK(1); - VALUES1(fixnum(0)); } DEFUN(XLIB:DISPLAY-ERROR-HANDLER, display) /* OK */ Index: clx.lisp =================================================================== RCS file: /cvsroot/clisp/clisp/modules/clx/new-clx/clx.lisp,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- clx.lisp 23 Jan 2007 03:36:45 -0000 1.17 +++ clx.lisp 28 Feb 2007 02:48:33 -0000 1.18 @@ -336,7 +336,8 @@ hash-table ;; .. so leave hands off here! plist after-function - error-handler) + error-handler + display) ;; *************************************************************************** ;; ... CAUTION ending here. ------------------------------ Message: 2 Date: Wed, 28 Feb 2007 02:48:35 +0000 From: Sam Steingold <sds@...> Subject: clisp/src ChangeLog,1.5504,1.5505 To: clisp-cvs@... Message-ID: <E1HMErs-0008K6-RF@...> Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv32741/src Modified Files: ChangeLog Log Message: (display): added DISPLAY slot Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.5504 retrieving revision 1.5505 diff -u -d -r1.5504 -r1.5505 --- ChangeLog 22 Feb 2007 20:11:57 -0000 1.5504 +++ ChangeLog 28 Feb 2007 02:48:31 -0000 1.5505 @@ -1,3 +1,14 @@ +2007-02-27 Shawn Betts <sabetts@...> + Sam Steingold <sds@...> + + * modules/clx/new-clx/clx.f: + use enum instead of #define for slot_DISPLAY_* + (slot_DISPLAY_DISPLAY, display_structure_size): added + (make_display): accept display_number + (OPEN-DISPLAY): pass it to make_display() + (DISPLAY-DISPLAY): return the new display slot + * modules/clx/new-clx/clx.lisp (display): added DISPLAY slot + 2007-02-22 Sam Steingold <sds@...> fix bug #[ 1666470 ]: EXT::LAUNCH crash ------------------------------ ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ------------------------------ _______________________________________________ clisp-cvs mailing list clisp-cvs@... https://lists.sourceforge.net/lists/listinfo/clisp-cvs End of clisp-cvs Digest, Vol 10, Issue 8 **************************************** |
| Thread | Author | Date |
|---|---|---|
| clisp-cvs Digest, Vol 10, Issue 8 | <clisp-cvs-request@li...> |