Mercurial > hg > xemacs-beta
view src/offix.c @ 4677:8f1ee2d15784
Support full Common Lisp multiple values in C.
lisp/ChangeLog
2009-08-11 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el :
Update this file to support full C-level multiple values. This
involves:
-- Four new bytecodes, and special compiler functions to compile
multiple-value-call, multiple-value-list-internal, values,
values-list, and, since it now needs to pass back multiple values
and is a special form, throw.
-- There's a new compiler variable, byte-compile-checks-on-load,
which is a list of forms that are evaluated at the very start of a
file, with an error thrown if any of them give nil.
-- The header is now inserted *after* compilation, giving a chance
for the compilation process to influence what those checks
are. There is still a check done before compilation for non-ASCII
characters, to try to turn off dynamic docstrings if appopriate,
in `byte-compile-maybe-reset-coding'.
Space is reserved for checks; comments describing the version of
the byte compiler generating the file are inserted if space
remains for them.
* bytecomp.el (byte-compile-version):
Update this, we're a newer version of the byte compiler.
* byte-optimize.el (byte-optimize-funcall):
Correct a comment.
* bytecomp.el (byte-compile-lapcode):
Discard the arg with byte-multiple-value-call.
* bytecomp.el (byte-compile-checks-and-comments-space):
New variable, describe how many octets to reserve for checks at
the start of byte-compiled files.
* cl-compat.el:
Remove the fake multiple-value implementation. Have the functions
that use it use the real multiple-value implementation instead.
* cl-macs.el (cl-block-wrapper, cl-block-throw):
Revise the byte-compile properties of these symbols to work now
we've made throw into a special form; keep the byte-compile
properties as anonymous lambdas, since we don't have docstrings
for them.
* cl-macs.el (multiple-value-bind, multiple-value-setq)
(multiple-value-list, nth-value):
Update these functions to work with the C support for multiple
values.
* cl-macs.el (values):
Modify the setf handler for this to call
#'multiple-value-list-internal appropriately.
* cl-macs.el (cl-setf-do-store):
If the store form is a cons, treat it specially as wrapping the
store value.
* cl.el (cl-block-wrapper):
Make this an alias of #'and, not #'identity, since it needs to
pass back multiple values.
* cl.el (multiple-value-apply):
We no longer support this, mark it obsolete.
* lisp-mode.el (eval-interactive-verbose):
Remove a useless space in the docstring.
* lisp-mode.el (eval-interactive):
Update this function and its docstring. It now passes back a list,
basically wrapping any eval calls with multiple-value-list. This
allows multiple values to be printed by default in *scratch*.
* lisp-mode.el (prin1-list-as-multiple-values):
New function, printing a list as multiple values in the manner of
Bruno Haible's clisp, separating each entry with " ;\n".
* lisp-mode.el (eval-last-sexp):
Call #'prin1-list-as-multiple-values on the return value of
#'eval-interactive.
* lisp-mode.el (eval-defun):
Call #'prin1-list-as-multiple-values on the return value of
#'eval-interactive.
* mouse.el (mouse-eval-sexp):
Deal with lists corresponding to multiple values from
#'eval-interactive. Call #'cl-prettyprint, which is always
available, instead of sometimes calling #'pprint and sometimes
falling back to prin1.
* obsolete.el (obsolete-throw):
New function, called from eval.c when #'funcall encounters an
attempt to call #'throw (now a special form) as a function. Only
needed for compatibility with 21.4 byte-code.
man/ChangeLog addition:
2009-08-11 Aidan Kehoe <kehoea@parhasard.net>
* cl.texi (Organization):
Remove references to the obsolete multiple-value emulating code.
src/ChangeLog addition:
2009-08-11 Aidan Kehoe <kehoea@parhasard.net>
* bytecode.c (enum Opcode /* Byte codes */):
Add four new bytecodes, to deal with multiple values.
(POP_WITH_MULTIPLE_VALUES): New macro.
(POP): Modify this macro to ignore multiple values.
(DISCARD_PRESERVING_MULTIPLE_VALUES): New macro.
(DISCARD): Modify this macro to ignore multiple values.
(TOP_WITH_MULTIPLE_VALUES): New macro.
(TOP_ADDRESS): New macro.
(TOP): Modify this macro to ignore multiple values.
(TOP_LVALUE): New macro.
(Bcall): Ignore multiple values where appropriate.
(Breturn): Pass back multiple values.
(Bdup): Preserve multiple values.
Use TOP_LVALUE with most bytecodes that assign anything to
anything.
(Bbind_multiple_value_limits, Bmultiple_value_call,
Bmultiple_value_list_internal, Bthrow): Implement the new
bytecodes.
(Bgotoifnilelsepop, Bgotoifnonnilelsepop, BRgotoifnilelsepop,
BRgotoifnonnilelsepop):
Discard any multiple values.
* callint.c (Fcall_interactively):
Ignore multiple values when calling #'eval, in two places.
* device-x.c (x_IO_error_handler):
* macros.c (pop_kbd_macro_event):
* eval.c (Fsignal):
* eval.c (flagged_a_squirmer):
Call throw_or_bomb_out, not Fthrow, now that the latter is a
special form.
* eval.c:
Make Qthrow, Qobsolete_throw available as symbols.
Provide multiple_value_current_limit, multiple-values-limit (the
latter as specified by Common Lisp.
* eval.c (For):
Ignore multiple values when comparing with Qnil, but pass any
multiple values back for the last arg.
* eval.c (Fand):
Ditto.
* eval.c (Fif):
Ignore multiple values when examining the result of the
condition.
* eval.c (Fcond):
Ignore multiple values when comparing what the clauses give, but
pass them back if a clause gave non-nil.
* eval.c (Fprog2):
Never pass back multiple values.
* eval.c (FletX, Flet):
Ignore multiple when evaluating what exactly symbols should be
bound to.
* eval.c (Fwhile):
Ignore multiple values when evaluating the test.
* eval.c (Fsetq, Fdefvar, Fdefconst):
Ignore multiple values.
* eval.c (Fthrow):
Declare this as a special form; ignore multiple values for TAG,
preserve them for VALUE.
* eval.c (throw_or_bomb_out):
Make this available to other files, now Fthrow is a special form.
* eval.c (Feval):
Ignore multiple values when calling a compiled function, a
non-special-form subr, or a lambda expression.
* eval.c (Ffuncall):
If we attempt to call #'throw (now a special form) as a function,
don't error, call #'obsolete-throw instead.
* eval.c (make_multiple_value, multiple_value_aset)
(multiple_value_aref, print_multiple_value, mark_multiple_value)
(size_multiple_value):
Implement the multiple_value type. Add a long comment describing
our implementation.
* eval.c (bind_multiple_value_limits):
New function, used by the bytecode and by #'multiple-value-call,
#'multiple-value-list-internal.
* eval.c (multiple_value_call):
New function, used by the bytecode and #'multiple-value-call.
* eval.c (Fmultiple_value_call):
New special form.
* eval.c (multiple_value_list_internal):
New function, used by the byte code and
#'multiple-value-list-internal.
* eval.c (Fmultiple_value_list_internal, Fmultiple_value_prog1):
New special forms.
* eval.c (Fvalues, Fvalues_list):
New Lisp functions.
* eval.c (values2):
New function, for C code returning multiple values.
* eval.c (syms_of_eval):
Make our new Lisp functions and symbols available.
* eval.c (multiple-values-limit):
Make this available to Lisp.
* event-msw.c (dde_eval_string):
* event-stream.c (execute_help_form):
* glade.c (connector):
* glyphs-widget.c (glyph_instantiator_to_glyph):
* glyphs.c (evaluate_xpm_color_symbols):
* gui-x.c (wv_set_evalable_slot, button_item_to_widget_value):
* gui.c (gui_item_value, gui_item_display_flush_left):
* lread.c (check_if_suppressed):
* menubar-gtk.c (menu_convert, menu_descriptor_to_widget_1):
* menubar-msw.c (populate_menu_add_item):
* print.c (Fwith_output_to_temp_buffer):
* symbols.c (Fsetq_default):
Ignore multiple values when calling Feval.
* symeval.h:
Add the header declarations necessary for the multiple-values
implementation.
* inline.c:
#include symeval.h, now that it has some inline functions.
* lisp.h:
Update Fthrow's declaration. Make throw_or_bomb_out available to
all files.
* lrecord.h (enum lrecord_type):
Add the multiple_value type here.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sun, 16 Aug 2009 20:55:49 +0100 |
parents | b39c14581166 |
children |
line wrap: on
line source
/* This is a modified DND 1.0 library which does not depend on Xt event handling. Modifications Copyright (c) 1997 Oliver Graf <ograf@fga.de> Original DND lib Copyright (C) 1996 César Crusius This file is part of the DND Library. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* #define DEBUG */ #include "offix.h" #include <X11/cursorfont.h> #include <X11/Xatom.h> #include <X11/Xmu/WinUtil.h> #include <stdio.h> #include <stdlib.h> #include <limits.h> /* Local variables */ static Display *dpy; /* current display */ static int DragPrecision; /* minimum dx,dy to start drag */ static int Dragging; /* Drag state flag */ static int DataOK; /* Non-zero if data registered */ static Atom DndProtocol; /* ClientMessage identifier */ static Atom DndSelection; /* For the data transfers */ static Atom OldDndProtocol; /* Version 0 atom */ static Atom OldDndSelection;/* Version 0 atom */ static Atom WM_STATE; /* Needed for icon stuff */ static Window Target; /* Drop window */ static Widget MainWidget; /* Main widget of application */ static int DataType; /* Current drag data type */ static int RootFlag; /* Non-zero if dropped on root */ static XColor Black,White; /* For the cursors */ /*========================================================================= * Data for the standard Dnd cursors *=========================================================================*/ #include "offix-cursors.h" /*=============================================================== CursorData * CursorData contains all the data for the cursors bitmaps *==========================================================================*/ typedef struct { int Width,Height; unsigned char *ImageData,*MaskData; int HotSpotX,HotSpotY; Pixmap ImagePixmap,MaskPixmap; Cursor CursorID; } CursorData; static CursorData DndCursor[DndEND]={ { 0,0,NULL,NULL,0,0,0 }, { grey_width, grey_height,grey_bits,grey_mask_bits, grey_x_hot,grey_y_hot}, { file_width,file_height,file_bits,file_mask_bits, file_x_hot,file_y_hot}, { files_width,files_height,files_bits,files_mask_bits, files_x_hot,files_y_hot}, { text_width,text_height,text_bits,text_mask_bits, text_x_hot,text_y_hot }, { dir_width,dir_height,dir_bits,dir_mask_bits, dir_x_hot,dir_y_hot }, { link_width,link_height,link_bits,link_mask_bits, link_x_hot,link_y_hot}, { app_width,app_height,app_bits,app_mask_bits, app_x_hot,app_y_hot }, { url_width,url_height,url_bits,url_mask_bits, url_x_hot,url_y_hot }, { mime_width,mime_height,mime_bits,mime_mask_bits, mime_x_hot,mime_y_hot } }; /* Local prototypes */ int DndIsDragging(void); void DndStartAction(Widget widget, XtPointer data, XEvent *event, Boolean *p); void DndPropertyHandler(Widget widget, XtPointer data, XEvent *event, Boolean *p); /*======================================================== DndHandleDragging * Takes care of the drag and drop process. Wait until the pointer had moved * a little. Then takes control over the pointer until the buttons are * released. After that send a Drag And Drop ClientMessage event. Returns * non-zero if a drop did take place. *===========================================================================*/ int DndHandleDragging(Widget widget,XEvent *event) { XEvent Event; Window root = RootWindowOfScreen(XtScreenOfObject(widget)); XtAppContext app= XtWidgetToApplicationContext(widget); Window DispatchWindow; int DropX,DropY; if(Dragging) return 0; XUngrabPointer(dpy,CurrentTime); /* Take control over the pointer */ XGrabPointer(dpy,root,False, ButtonMotionMask|ButtonPressMask|ButtonReleaseMask, GrabModeSync,GrabModeAsync,root, DndCursor[DataType].CursorID, CurrentTime); /* Wait for button release */ Dragging=1; RootFlag=0; while(Dragging) { XAllowEvents(dpy,SyncPointer,CurrentTime); XtAppNextEvent(app,&Event); switch(Event.type) { case ButtonRelease: if(Event.xbutton.subwindow) RootFlag=0; else RootFlag=1; Dragging=0; break; default: XtDispatchEvent(&Event); break; } } DataOK=0; /* Now release the pointer */ XUngrabPointer(dpy,CurrentTime); /* Try to guess if the drop occurred in the root window */ if(!RootFlag) { Target=XmuClientWindow(dpy,Event.xbutton.subwindow); if (Target==Event.xbutton.subwindow) DispatchWindow=Target; else DispatchWindow=PointerWindow; } else Target=DispatchWindow=XtWindow(MainWidget); /* Now build the event structure */ DropX=Event.xbutton.x_root; DropY=Event.xbutton.y_root; Event.xclient.type = ClientMessage; Event.xclient.display = dpy; Event.xclient.message_type = DndProtocol; Event.xclient.format = 32; Event.xclient.window = Target; Event.xclient.data.l[0] = DataType; Event.xclient.data.l[1] = (long)event->xbutton.state; Event.xclient.data.l[2] = (long)XtWindow(widget); Event.xclient.data.l[3] = DropX + 65536L*(long)DropY; Event.xclient.data.l[4] = 1; /* Send the drop message */ XSendEvent(dpy,DispatchWindow,True,NoEventMask,&Event); /* Send an old style version of the message just in case */ Event.xclient.message_type = OldDndProtocol; XSendEvent(dpy,DispatchWindow,True,NoEventMask,&Event); #ifdef DEBUG fprintf(stderr,"ClientMessage sent to 0x%x(0x%x).\n", DispatchWindow,Target); fprintf(stderr,"The drop coordinates are (%d,%d).\n",DropX,DropY); #endif return 1; } /*=============================================================== DndIsIcon * Return non-zero if the application is iconic (widget=toplevel) *========================================================================*/ int DndIsIcon(Widget widget) { Atom JunkAtom; int JunkInt; unsigned long WinState,JunkLong; unsigned char *Property; XGetWindowProperty(dpy,XtWindow(widget),WM_STATE, 0L,2L,False,AnyPropertyType, &JunkAtom,&JunkInt,&WinState,&JunkLong, &Property); WinState=(unsigned long)(*((long*)Property)); return (WinState==3); } /*============================================================ DndInitialize * Must be called anywhere before the top level widget creation and the * main loop. Initialize global variables and bind the DndDispatch function * to the top level widget. Creates the cursors to be used in drag actions. *=========================================================================*/ void DndInitialize(Widget shell) { int screen,i; Colormap colormap; Window root; dpy = XtDisplayOfObject(shell); screen = DefaultScreen(dpy); colormap= DefaultColormap(dpy,screen); root = DefaultRootWindow(dpy); Black.pixel=BlackPixel(dpy,screen); White.pixel=WhitePixel(dpy,screen); XQueryColor(dpy,colormap,&Black); XQueryColor(dpy,colormap,&White); for(i=1;i!=DndEND;i++) { DndCursor[i].ImagePixmap= XCreateBitmapFromData(dpy,root, (char *) DndCursor[i].ImageData, DndCursor[i].Width, DndCursor[i].Height); DndCursor[i].MaskPixmap= XCreateBitmapFromData(dpy,root, (char *) DndCursor[i].MaskData, DndCursor[i].Width, DndCursor[i].Height); DndCursor[i].CursorID= XCreatePixmapCursor(dpy,DndCursor[i].ImagePixmap, DndCursor[i].MaskPixmap, &Black,&White, DndCursor[i].HotSpotX, DndCursor[i].HotSpotY); } DndCursor[0].CursorID=XCreateFontCursor(dpy,XC_question_arrow); /* These two are for older versions */ OldDndProtocol=XInternAtom(dpy,"DndProtocol",FALSE); OldDndSelection=XInternAtom(dpy,"DndSelection",FALSE); /* Now the correct stuff */ DndProtocol=XInternAtom(dpy,"_DND_PROTOCOL",FALSE); DndSelection=XInternAtom(dpy,"_DND_SELECTION",FALSE); WM_STATE=XInternAtom(dpy,"WM_STATE",True); Dragging=0; DragPrecision=10; RootFlag=0; MainWidget=shell; } int DndIsDragging(void) { return Dragging; } /*================================================================= DndSetData * Updates the selection data. *===========================================================================*/ void DndSetData(int Type,unsigned char *Data,unsigned long Size) { Window root = DefaultRootWindow(dpy); int AuxSize; unsigned char *AuxData; unsigned long BackSize=Size; if (DataOK) return; /* Set the data type -- allow any type */ DataType = Type; /* Set the data */ AuxData = Data; AuxSize = ( Size <= INT_MAX ? (int)Size : INT_MAX ); XChangeProperty(dpy,root,DndSelection,XA_STRING,8, PropModeReplace,Data,AuxSize); for(Size-=(unsigned long)AuxSize;Size;Size-=(unsigned long)AuxSize) { Data+=AuxSize; AuxSize = ( (Size<=(INT_MAX)) ? (int)Size : (INT_MAX) ); XChangeProperty(dpy,root,DndSelection,XA_STRING,8, PropModeAppend,Data,AuxSize); } /* Set the data for old DND version */ Size = BackSize; AuxData = Data; AuxSize = ( Size <= INT_MAX ? (int)Size : INT_MAX ); XChangeProperty(dpy,root,OldDndSelection,XA_STRING,8, PropModeReplace,Data,AuxSize); for(Size-=(unsigned long)AuxSize;Size;Size-=(unsigned long)AuxSize) { Data+=AuxSize; AuxSize = ( (Size<=(INT_MAX)) ? (int)Size : (INT_MAX) ); XChangeProperty(dpy,root,OldDndSelection,XA_STRING,8, PropModeAppend,Data,AuxSize); } /* Everything is now ok */ DataOK=1; } /*================================================================== DndGetData * Return a pointer to the current data. See HOWTO for more details. *===========================================================================*/ void DndGetData(XEvent *event, unsigned char **Data,unsigned long *Size) { Window root = DefaultRootWindow(dpy); Atom ActualType,ActualDndSelection; int ActualFormat; unsigned long RemainingBytes; ActualDndSelection=(DndProtocolVersion(event) == 0L ? OldDndSelection : DndSelection ); XGetWindowProperty(dpy,root,ActualDndSelection, 0L,1000000L, FALSE,AnyPropertyType, &ActualType,&ActualFormat, Size,&RemainingBytes, Data); } /*================================== DndDataType DndDragButtons DndSourceWidget * * Return information about the Dnd event received. If a non-dnd event is * passed, the function DndDataType returns DndNotDnd, and the others * return zero. *===========================================================================*/ int DndDataType(XEvent *event) { int Type; if(!DndIsDropMessage(event)) return DndNotDnd; Type=(int)(event->xclient.data.l[0]); if(Type>=DndEND) Type=DndUnknown; return Type; } int DndDragButtons(XEvent *event) { if(!DndIsDropMessage(event)) return 0; return (int)(event->xclient.data.l[1]); } Window DndSourceWindow(XEvent *event) { if(!DndIsDropMessage(event)) return 0; if(DndProtocolVersion(event)<__DragAndDropH__) /* We will try to do something about it, but nothing is certain */ return XtWindow((Widget)(event->xclient.data.l[2])); return (Window)(event->xclient.data.l[2]); } void DndDropRootCoordinates(XEvent *event,int *x,int *y) { if(!DndIsDropMessage(event)) { *x=0; *y=0; return; } /* If it is an old protocol version we try to get the coordinates using the current pointer position. Of course, the pointer may have moved since the drop, but there's nothing we can do about it. */ if(DndProtocolVersion(event)<1L) { Window root_return,child_return; int win_x_return,win_y_return; unsigned int mask_return; XQueryPointer(dpy,DefaultRootWindow(dpy), &root_return,&child_return,x,y, &win_x_return,&win_y_return,&mask_return); return; } /* Thanks god you are using a decent protocol version */ *x=(int)((long)(event->xclient.data.l[3]) & 0xffff); *y=(int)((long)(event->xclient.data.l[3])/65536); } void DndDropCoordinates(Widget widget,XEvent *event,int *x,int *y) { int root_x,root_y; Window child_return; DndDropRootCoordinates(event,&root_x,&root_y); XTranslateCoordinates(dpy,DefaultRootWindow(dpy), XtWindow(widget), root_x,root_y, x,y, &child_return); } long DndProtocolVersion(XEvent *event) { if(!DndIsDropMessage(event)) return -1L; return event->xclient.data.l[4]; } int DndIsDropMessage(XEvent *event) { if(event->xclient.type != ClientMessage) return 0; if(event->xclient.message_type == OldDndProtocol && event->xclient.data.l[4]==0) return 1; if(event->xclient.message_type == DndProtocol) return 1; return 0; } void DndChangeCursor(int Type,int width,int height,char *image,char *mask, int hot_x,int hot_y) { DndCursor[Type].ImagePixmap= XCreateBitmapFromData(dpy,DefaultRootWindow(dpy), image,width,height); DndCursor[Type].MaskPixmap= XCreateBitmapFromData(dpy,DefaultRootWindow(dpy), mask,width,height); DndCursor[Type].CursorID= XCreatePixmapCursor(dpy,DndCursor[Type].ImagePixmap, DndCursor[Type].MaskPixmap, &Black,&White, hot_x,hot_y); }