Mercurial > hg > xemacs-beta
view src/ExternalClient-Xlib.c @ 4686:cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
lisp/ChangeLog addition:
2009-08-31 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (byte-optimize-form-code-walker):
Be careful about discarding multiple values when optimising
#'prog1 calls.
(byte-optimize-or):
Preserve any trailing nil, as this is a supported way to
explicitly discard multiple values.
(byte-optimize-cond-1):
Discard multiple values with a singleton followed by no more
clauses.
* bytecomp.el (progn):
(prog1):
(prog2):
Be careful about discarding multiple values in the byte-hunk
handler of these three forms.
* bytecomp.el (byte-compile-prog1, byte-compile-prog2):
Don't call #'values explicitly, use `(or ,(pop form) nil) instead,
since that compiles to bytecode, not a funcall.
* bytecomp.el (byte-compile-values):
With one non-const argument, byte-compile to `(or ,(second form)
nil), not an explicit #'values call.
* bytecomp.el (byte-compile-insert-header):
Be nicer in the error message to emacs versions that don't
understand our bytecode.
src/ChangeLog addition:
2009-08-31 Aidan Kehoe <kehoea@parhasard.net>
* eval.c (For, Fand):
Don't declare val as REGISTER in these functions, for some reason
it breaks the non-DEBUG union build. These functions are only
called from interpreted code, the performance implication doesn't
matter. Thank you Robert Delius Royar!
* eval.c (Fmultiple_value_list_internal):
Error on too many arguments.
tests/ChangeLog addition:
2009-08-31 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el (Assert-rounding):
Remove an overly-verbose failure message here.
Correct a couple of tests which were buggy in themselves. Add
three new tests, checking the behaviour of #'or and #'and when
passed zero arguments, and a Known-Bug-Expect-Failure call
involving letf and values. (The bug predates the C-level
multiple-value implementation.)
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sun, 06 Sep 2009 19:36:02 +0100 |
parents | 8de911beca70 |
children | 2aa9cd456ae7 |
line wrap: on
line source
/* External client, raw Xlib version. Copyright (C) 1993, 1994 Sun Microsystems, Inc. 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ /* Written by Ben Wing, February 1994. */ #include <X11/Xlib.h> #include <X11/Xresource.h> #include <X11/Xutil.h> #include "extw-Xlib.h" /* this is not a perfect solution, but otherwise we have to include all of the Xt junk */ #define XtGeometryNo 1 #if (XlibSpecificationRelease < 5) # define XPointer char * #endif static int context_inited; static XContext focus_context; /* does the specified window have the focus, given that the pointer just entered (or left) the window (according to enter_p)? This question does not have an obvious answer in X. (Basically, X sucks.) */ static int window_has_focus_p (Display *display, Window win, int enter_p) { Window focuswin; int dummy; XGetInputFocus(display, &focuswin, &dummy); if (focuswin == PointerRoot) return enter_p; if (focuswin == win) return True; if (!enter_p) return False; do { Status st; Window root_win, parent_win; Window *child_win; unsigned int nchild; st = XQueryTree (display, win, &root_win, &parent_win, &child_win, &nchild); if (!st) return False; XFree((XPointer)child_win); if (parent_win == focuswin) return True; if (parent_win == root_win) return False; win = parent_win; } while (1); } /* External entry points when using XLib directly */ void ExternalClientInitialize (Display *display, Window win); void ExternalClientInitialize (Display *display, Window win) { extw_initialize_atoms(display); extw_which_side = extw_client_send; if (!context_inited) { focus_context = XUniqueContext(); context_inited = 1; } XSaveContext(display, win, focus_context, 0); XSelectInput(display, win, EnterWindowMask | LeaveWindowMask | FocusChangeMask); } void ExternalClientEventHandler (Display *display, Window win, XEvent *event); void ExternalClientEventHandler (Display *display, Window win, XEvent *event) { if (win != event->xany.window) return; if (event->type == ClientMessage && event->xclient.message_type == a_EXTW_NOTIFY && event->xclient.data.l[0] == extw_shell_send) switch (event->xclient.data.l[1]) { case extw_notify_gm: /* for the moment, just refuse geometry requests. */ extw_send_notify_3(display, win, extw_notify_gm, XtGeometryNo, 0, 0); break; case extw_notify_init: extw_send_notify_3(display, win, extw_notify_init, EXTW_TYPE_XLIB, 0, 0); break; case extw_notify_end: XClearArea(display, win, 0, 0, 0, 0, True); break; } else { int focus_status; XPointer current_focus; if (event->type == FocusIn) focus_status = 1; else if (event->type == FocusOut) focus_status = 0; else if (event->type == EnterNotify && event->xcrossing.detail != NotifyInferior) focus_status = window_has_focus_p(display, win, 1); else if (event->type == LeaveNotify && event->xcrossing.detail != NotifyInferior) focus_status = window_has_focus_p(display, win, 0); else return; XFindContext(display, win, focus_context, ¤t_focus); if (focus_status != (int) current_focus) { XSaveContext(display, win, focus_context, (XPointer) focus_status); extw_send_notify_3(display, win, focus_status ? extw_notify_focus_in : extw_notify_focus_out, 0, 0, 0); } } }