Mercurial > hg > xemacs-beta
view src/offix.c @ 872:79c6ff3eef26
[xemacs-hg @ 2002-06-20 21:18:01 by ben]
font changes etc.; some 21.4 changes
mule/mule-msw-init-late.el: Specify charset->windows-registry conversion.
mule/mule-x-init.el: Delete extra mule font additions here. Put them in faces.c.
cl-macs.el: Document better.
font-lock.el: Move Lisp function regexp to lisp-mode.el.
lisp-mode.el: Various indentation fixes:
Handle flet functions better.
Handle argument lists in defuns and flets.
Handle quoted lists, e.g. property lists -- don't indent like
function calls. Distinguish between lambdas and other lists.
lisp-mode.el: Handle this form.
faces.el, font-menu.el, font.el, gtk-faces.el, msw-faces.el, msw-font-menu.el, x-faces.el, x-init.el: Major overhaul of face-handling code:
-- Fix lots of bogus code in msw-faces.el, msw-font-menu.el,
font-menu.el that was "truenaming" font specs -- i.e. in the
process of frobbing a particular field in a general user-specified
font spec with wildcarded fields, sticking in particular values
for all the remaining wildcarded fields. This bug was rampant
everywhere except in x-faces.el (the oldest and only correctly
written code). This also means that we need to work with font
names at all times and not font instances, because a font instance
is essentially a truenamed font.
-- Total rewrite of extremely junky code in msw-faces.el. Work
with names as well as font instances, and return names; stop
truenaming when canonicalizing and frobbing; fix handling of the
combined style field, i.e. weight/slant (also fixed in font.el).
-- Totally rewrite the frobbing functions in faces.el. This time,
we frob all the instantiators rather than just computing a single
instance value and working backwards. That way, e.g., `bold' will
work for all charsets that have bold available, rather than only
for whatever charset was part of the computed font instance
(another example of the truename virus). Also fix up code to look
at the fallbacks (all of them) when no global value present, so we
don't need to put something in the global value. Intelligently
handle a request to frob a buffer locale, rather than signalling
an error. When frobbing instantiators, try hard to figure out
what device type is associated with them, and frob each according
to its own proper device type. Correctly handle inheritance
vectors given as instantiators. Preserve existing tags when
putting back frobbed instantiators. Extract out general
specifier-frobbing code into specifier.el. Document everything
cleanly. Do lots of other things better, etc.
-- Don't duplicatively set a global specification for the default
font -- it's already in the fallback and we no longer need a
default global specification present. Delete various code in
x-faces.el and msw-faces.el that duplicated the lists of fonts in
faces.c.
-- init-global-faces was not being called at all under MS Windows!
Major bogosity. That caused device-specific values to get stuck
into all the fonts, making it very hard to change them -- setting
global specs caused nothing to happen.
-- Correct weight names in font.el.
-- Lots more font fixups in objects*.c.
Printer.el: Warning fix.
specifier.el: Add more args to map-specifier.
Add various "heuristic" specifier functions to aid in creation of
specifier-munging code such as in faces.el.
subr.el: New functions.
lwlib.c: Fix warning.
config.inc.samp: Clean up, add args to control fastcall (not yet supported! the
changes needed are in another ws of mine), profile support, vc6
support, union-type.
xemacs.dsp, xemacs.mak: Semi-major overhaul.
Fix bug where dump-id was always getting recomputed, forcing a
redump even when nothing changed.
Add support for fastcall. Support edit-and-continue (on by
default) with vc6. Use incremental linking when doing a debug
compilation. Add support for profiling.
Consolidate the various debug flags.
Partial support for "batch-compiling" -- compiling many files on a
single invocation of the compiler. Doesn't seem to help that much
for me, so it's not finished or enabled by default.
Remove HAVE_MSW_C_DIRED, we always do.
Correct some sloppy use of directories.
s/cygwin32.h: Allow pdump to work under Cygwin (mmap is broken, so need to undefine
HAVE_MMAP).
s/win32-common.h, s/windowsnt.h: Support for fastcall. Add WIN32_ANY for identifying all Win32
variants (Cygwin, native, MinGW). Both of these are properly used
in another ws.
alloc.c, balloon-x.c, buffer.c, bytecode.c, callint.c, cm.c, cmdloop.c, cmds.c, console-gtk.c, console-gtk.h, console-msw.c, console-msw.h, console-stream.c, console-stream.h, console-tty.c, console-tty.h, console-x.c, console-x.h, console.c, console.h, device-gtk.c, device-msw.c, device-tty.c, device-x.c, device.c, device.h, devslots.h, dialog-gtk.c, dialog-msw.c, dialog-x.c, dialog.c, dired-msw.c, editfns.c, emacs.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, event-unixoid.c, events.c, extents.c, extents.h, faces.c, fileio.c, fns.c, frame-gtk.c, frame-msw.c, frame-tty.c, frame-x.c, frame.c, frame.h, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gui-gtk.c, gui-msw.c, gui-x.c, gui.c, gutter.c, input-method-xlib.c, intl-encap-win32.c, intl-win32.c, keymap.c, lisp.h, macros.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, menubar.h, minibuf.c, mule-charset.c, nt.c, objects-gtk.c, objects-gtk.h, objects-msw.c, objects-msw.h, objects-tty.c, objects-tty.h, objects-x.c, objects-x.h, objects.c, objects.h, postgresql.c, print.c, process.h, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, redisplay.h, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, select-gtk.c, select-msw.c, select-x.c, select.c, signal.c, sound.c, specifier.c, symbols.c, syntax.c, sysdep.c, syssignal.h, syswindows.h, toolbar-common.c, toolbar-gtk.c, toolbar-msw.c, toolbar-x.c, toolbar.c, unicode.c, window.c, window.h: The following are the major changes made:
(1) Separation of various header files into an external and an
internal version, similar to the existing separation of process.h
and procimpl.h. Eventually this should be done for all Lisp
objects. The external version has the same name as currently; the
internal adds -impl. The external file has XFOO() macros for
objects, but the structure is opaque and defined only in the
internal file. It's now reasonable to move all prototypes in
lisp.h into the appropriate external file, and this should be
done. Currently, separation has been done on extents.h,
objects*.h, console.h, device.h, frame.h, and window.h.
For c/d/f/w, the most basic properties are available in the
external header file, with the macros resolving to functions. In
the internal header file, the macros are redefined to directly
access the structure. Also, the global MARK_FOO_CHANGED macros
have been made into functions so that they can be accessed without
needing to include lots of -impl headers -- they are used in
almost exclusively in non-time-critical functions, and take up
enough time that the function overhead will be negligible.
Similarly, the function overhead from making the basic properties
mentioned above into functions is negligible, and code that does
heavy accessing of c/d/f/w structures inevitably ends up needing
the internal header files, anyway.
(2) More face changes.
-- Major rewrite of objects-msw.c. Now handles wildcard specs
properly, rather than "truenaming" (or even worse, signalling an
error, which previously happened with some of the fallbacks if you
tried to use them in make-font-instance!).
-- Split charset matching of fonts into two stages -- one to find
a font specifically designed for a particular charset (by
examining its registry), the second to find a Unicode font that
can support the charset. This needs to proceed as two complete,
separate instantiations in order to work properly (otherwise many
of the fonts in the HELLO page look wrong). This should also make
it easy to support iso10646 (Unicode) fonts under X.
-- All default values for fonts are now completely specified in
the fallbacks. Stuff from mule-x-init.el has all been moved here,
merged with the existing specs, and totally rethought so you get
sensible results. (HELLO now looks much better!).
-- Generalize the "default X/GTK device" stuff into a
per-device-type "default device".
-- Add mswindows-{set-}charset-registry. In time,
charset<->code-page conversion functions will be removed.
-- Wrap protective code around calls to compute device specifier tags,
and do this computation before calling the face initialization code
because the latter may need these tags to be correctly updated.
(3) Other changes.
EmacsFrame.c, glyphs-msw.c, eval.c, gui-x.c, intl-encap-win32.c, search.c, signal.c, toolbar-msw.c, unicode.c: Warning fixes.
config.h.in: #undefs meant to be frobbed by configure *MUST* go inside of
#ifndef WIN32_NO_CONFIGURE, and everything else *MUST* go outside!
eval.c: Let detailed backtraces be detailed.
specifier.c: Don't override user's print-string-length/print-length settings.
glyphs.c: New function image-instance-instantiator.
config.h.in, sysdep.c: Changes for fastcall.
sysdep.c, nt.c: Fix up a previous botched patch that tried to add support for both
EEXIST and EACCES. IF THE BOTCHED PATCH WENT INTO 21.4, THIS FIXUP
NEEDS TO GO IN, TOO.
search.c: Fix *evil* crash due to incorrect synching of syntax-cache code
with 21.1. THIS SHOULD GO INTO 21.4.
author | ben |
---|---|
date | Thu, 20 Jun 2002 21:19:10 +0000 |
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); }